SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5294 commits 1 branch 0 tags 118 MiB
Commit graph

4277 commits

Author SHA1 Message Date
Scott Lahteine 7b2fadd598 Apply some fixes from Andreas 
Derived from
https://github.com/AnHardt/Marlin/commit/6e8ede8c694fa4d9e3c769840b09d56
7f8d8e0dd
 2016-06-22 17:35:59 -07:00
Scott Lahteine bd01592816 Goodbye MECHANICAL_PROBE 2016-06-22 17:13:33 -07:00
Scott Lahteine 2640d13a9f Simplify initial raise in M48 2016-06-22 16:53:04 -07:00
Scott Lahteine 3763d45656 Return Z position in run_z_probe 2016-06-22 16:52:32 -07:00
Scott Lahteine 1f48b5c30f Pass a raise to probe_pt, not a Z position 2016-06-22 16:40:21 -07:00
Scott Lahteine 6fdd5ba246 Save and restore feedrate in more places 2016-06-22 16:40:20 -07:00
Scott Lahteine fe173c2bc6 Generalized probe raise, use for after probing 2016-06-22 14:44:30 -07:00
Scott Lahteine 7da3080761 Simpler cleanup in G28 / G29 2016-06-22 14:44:30 -07:00
Scott Lahteine 15229d988b Fix compile error for bed matrix in M48 2016-06-22 14:04:46 -07:00
Scott Lahteine c01352cbd5 Add a dependency for z servo macros 2016-06-22 14:04:23 -07:00
Scott Lahteine c3794bd695 Add HAS_PROBING_PROCEDURE conditional 2016-06-22 14:03:22 -07:00
Scott Lahteine 42ce60c5cc Make sure NUM_SERVOS is set for Z servo endstop 2016-06-22 14:01:19 -07:00
Scott Lahteine b590a7dee0 Make Z_RAISE_BETWEEN_PROBINGS a more general option 2016-06-22 14:00:44 -07:00
Scott Lahteine bb9c67b4b5 Tweak some feedrate vars 2016-06-22 03:27:31 -07:00
Scott Lahteine 5158bd6e93 Screen out G29 E for sled and allen key, allow single probe 2016-06-22 03:20:33 -07:00
Scott Lahteine ccae92588d Cleanup debug in G28 and G29 2016-06-22 03:20:33 -07:00
Scott Lahteine b4a9d2366c Use a macro for kinematic sync_plan_position 2016-06-22 03:20:33 -07:00
Scott Lahteine bfccf26294 Use sync_plan_position_delta where needed 2016-06-22 03:20:33 -07:00
Scott Lahteine a6b8c67df4 Move probe deploy after setup call in G29 2016-06-22 03:20:33 -07:00
Scott Lahteine e69916d1bd Split up endstop_move functions 2016-06-22 03:20:33 -07:00
Scott Lahteine 0e18a4897b Simpler handling of sled/allen-key in probe_pt 2016-06-22 03:20:33 -07:00
Scott Lahteine 1a92e2ef18 Comment on run_z_probe 2016-06-22 03:20:33 -07:00
Scott Lahteine 68e0e5855e For all probes, at the end of G29 simply raise and stow 2016-06-22 03:20:33 -07:00
Scott Lahteine c3023f8cc5 Make M401/M402 available with HAS_BED_PROBE 2016-06-22 03:20:33 -07:00
Scott Lahteine 9f0c255c69 Show uncorrected position in set_bed_level_equation_3pts 2016-06-22 03:20:33 -07:00
Scott Lahteine 07298ac992 Initialize current_position to home_offset on boot 2016-06-22 03:20:33 -07:00
Scott Lahteine d50539583a Make XY_PROBE_SPEED a general probe option 2016-06-22 03:04:47 -07:00
Scott Lahteine 2798499b71 XY_TRAVEL_SPEED => XY_PROBE_SPEED 2016-06-22 02:45:25 -07:00
Scott Lahteine 88dc543584 Add a macro for XY_TRAVEL_FEEDRATE 2016-06-22 02:23:50 -07:00
Scott Lahteine 117db77c55 make motor_current_setting static and constexpr 2016-06-21 19:50:08 -07:00
João Brázio 19fb04d761 Update bq Hephestos 2 config 2016-06-21 18:15:51 -07:00
Scott Lahteine b0e47608e6 Merge pull request #4108 from esenapaj/Fix-for-PR-#4093 
Fix for PR #4093 (Make Z Probe options independent of ABL), etc
 2016-06-21 18:12:08 -07:00
Scott Lahteine c84732e605 Merge pull request #4111 from esenapaj/Cosmetic-changes-and-small-fix-for-thermistortables.h 
Cosmetic changes and small fix for thermistortables.h
 2016-06-21 18:05:32 -07:00
Scott Lahteine cdc661ea5e Merge pull request #4110 from esenapaj/Small-cosmetic-changes-for-language-files 
Small cosmetic changes for language files
 2016-06-21 18:04:12 -07:00
Scott Lahteine c8186e9423 Merge pull request #4109 from esenapaj/Enclose-#error-string-by-double-quotes 
Enclose #error string by double-quotes
 2016-06-21 18:03:30 -07:00
Scott Lahteine 40cd20a236 Fix comments on EXPERIMENTAL_I2CBUS 2016-06-21 17:58:44 -07:00
esenapaj 385945ca31 Cosmetic changes and small fix for thermistortables.h 
・Adjust spacing
・Standardize comments position
・Remove ',' at the tail of array
 2016-06-21 21:19:47 +09:00
esenapaj fac58f0291 Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
esenapaj 14b661b9e5 Enclose #error string by double-quotes 2016-06-21 21:06:14 +09:00
esenapaj d583ea852d Standardize format description of Panel 2016-06-21 20:51:27 +09:00
esenapaj aa6d35bd49 Move code block of probe to appropriate position 2016-06-21 20:36:46 +09:00
esenapaj 740fb2ce39 Adjust spacing 2016-06-21 19:37:45 +09:00
esenapaj f77f3ffa70 Remove duplicated Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX 2016-06-21 19:33:45 +09:00
Scott Lahteine 19fe93a5a9 Clean up configs for Z_MIN_PROBE_REPEATABILITY_TEST 2016-06-21 03:10:46 -07:00
Scott Lahteine 71a7408012 Merge pull request #4106 from thinkyhead/rc_temp_compile_err 
Fix compile error with watch_bed_next_ms
 2016-06-21 02:48:46 -07:00
Scott Lahteine dcb8ec32ee Fix compile error with watch_bed_next_ms 2016-06-21 02:13:41 -07:00
Scott Lahteine 3996242e9d Allow Z_MIN_PROBE_REPEATABILITY_TEST solo 2016-06-21 01:56:40 -07:00
Scott Lahteine 26a9cd0b08 Move run_z_probe to earlier block 2016-06-21 01:25:23 -07:00
Scott Lahteine 7f8a2025af Move raise_z_after_probing into earlier block 2016-06-21 01:03:40 -07:00
Scott Lahteine 2530371516 Always disable probe at the end of G29 2016-06-20 16:40:44 -07:00
Scott Lahteine 6aba98e470 Comment on setup_for_endstop_move 2016-06-20 16:40:44 -07:00
Scott Lahteine 04e88d008e Clear up ordering in G30 2016-06-20 16:40:44 -07:00
Scott Lahteine ed75b0ea11 Make clean_up function available for probes 2016-06-20 16:28:45 -07:00
Scott Lahteine 51d52cb52a Make run_z_probe available for any bed probe 2016-06-20 16:02:36 -07:00
Scott Lahteine f6b09cf465 Always use deploy/stow for dock_sled 2016-06-20 15:51:01 -07:00
Scott Lahteine 3b457c2dd3 Use deploy/stow with FIX_MOUNTED_PROBE too 2016-06-20 15:25:01 -07:00
Scott Lahteine 7e9d4a68d4 Always raise Z (if needed) for servo deploy/stow 2016-06-19 20:17:13 -07:00
Scott Lahteine 9beb3f2f5e Merge pull request #4097 from thinkyhead/rc_fil_runout_cleanup 
FIL_RUNOUT_INVERTING false by default
 2016-06-19 19:46:14 -07:00
Scott Lahteine f215b30932 Merge pull request #4093 from thinkyhead/rc_probe_without_abl 
Make Z Probe options independent of ABL
 2016-06-19 19:44:25 -07:00
Scott Lahteine 2fd2301928 FILRUNOUT => FIL_RUNOUT 2016-06-19 19:25:26 -07:00
Scott Lahteine dfbf8b3c2c FIL_RUNOUT_INVERTING false by default 2016-06-19 19:25:26 -07:00
Scott Lahteine 7b5cd314a5 Merge pull request #4095 from thinkyhead/rc_fil_runout_cleanup 
Improve FILAMENT_RUNOUT_SENSOR, FILRUNOUT_PIN
 2016-06-19 18:48:18 -07:00
Scott Lahteine de12228758 Make Z Probe options independent of ABL 2016-06-19 18:47:27 -07:00
Scott Lahteine add0032820 Improve FILAMENT_RUNOUT_SENSOR, FILRUNOUT_PIN 2016-06-19 18:13:33 -07:00
Scott Lahteine f8c278ce4d Cartesio UI display option in all configs 2016-06-19 17:39:46 -07:00
Scott Lahteine 400e13d136 Output a message for SD read errors 2016-06-19 17:14:56 -07:00
Roxy-3D 96b8bcca84 Merge pull request #4081 from thinkyhead/rc_tweaky_m48_tweaks 
Cleanup of M48
 2016-06-18 22:21:16 -05:00
Scott Lahteine b7e3c1bbc4 Tweak M48 output conditions 2016-06-18 16:17:53 -07:00
Scott Lahteine 1dad912b03 Adjust M48 raise / move handling 2016-06-18 15:38:24 -07:00
Scott Lahteine 46d3ef2223 Simplify sample_set probe_pt call in M48 2016-06-18 15:38:23 -07:00
Scott Lahteine a647b05f82 Shrink some debug code in G28 2016-06-18 15:38:23 -07:00
Scott Lahteine 4edf813bde Just-in-time declaration style in M48 2016-06-18 15:38:23 -07:00
Juan Ricardo Gomez Anaya c475291e19 Fix M851 
Minor change missing in the process of standardize the gcode M851
 2016-06-18 15:19:07 -07:00
Scott Lahteine e35583888c Merge pull request #4082 from esenapaj/Follow-up-the-PR-#4065 
Follow-up the PR #4065 (Remove support for XY servo endstops)
 2016-06-18 03:31:12 -07:00
Scott Lahteine 6dff52d920 Merge pull request #4078 from RicardoGA/Language_Spanish 
Update Spanish Language
 2016-06-18 03:28:46 -07:00
esenapaj d55b94d606 Follow-up the PR #4065 (Remove support for XY servo endstops) 
・Update a forgotten Configuration.h of Cartesio
 2016-06-18 18:01:58 +09:00
Scott Lahteine 4e860babbc Allow setting xy_travel_speed for delta leveling also 2016-06-18 01:40:49 -07:00
Scott Lahteine d36d4edd80 Tweak partial homing code 2016-06-18 01:16:50 -07:00
Scott Lahteine d3a05de96e Save and restore feedrate in probe functions 2016-06-18 01:16:26 -07:00
Juan Ricardo Gomez Anaya 5991eb428f Update Spanish Language 
Spanish language update and also add missing messages
 2016-06-18 00:27:04 -05:00
Scott Lahteine f33bd0bb10 Merge pull request #4077 from thinkyhead/rc_delete_old_macros 
Delete some obsolete Z servo macros
 2016-06-17 18:59:16 -07:00
Scott Lahteine defcacc1a9 Delete some obsolete Z servo macros 2016-06-17 18:49:17 -07:00
Scott Lahteine bbf5b486c3 Add an SD Card stop function, use in ultralcd 2016-06-17 18:27:14 -07:00
Scott Lahteine 3a150f07c2 Merge pull request #4073 from thinkyhead/rc_temp_mystery 
Minor tweaks to M109 / M190
 2016-06-17 17:49:50 -07:00
Scott Lahteine bd4ec727e7 Merge pull request #4066 from thinkyhead/rc_M851_with_probe 
Make M851 standard with a bed probe
 2016-06-17 17:32:55 -07:00
Scott Lahteine 692a6e7c91 Merge pull request #4065 from thinkyhead/rc_goodbye_xy_servos 
Remove support for XY servo endstops
 2016-06-17 17:32:08 -07:00
Scott Lahteine de177ba6c9 Minor tweaks to M109 / M190 2016-06-17 17:26:21 -07:00
Scott Lahteine eab44b30d4 Safety and serial sections 2016-06-17 15:19:43 -07:00
Scott Lahteine fc56a547d1 Rename movement section to motion 2016-06-17 15:19:43 -07:00
Scott Lahteine a8b8796cd7 Define probe offsets when a probe exists 2016-06-17 15:19:42 -07:00
Scott Lahteine 1000563d80 Make M851 standard with a bed probe 2016-06-17 15:19:42 -07:00
Scott Lahteine f66a194159 Merge pull request #4062 from jbrazio/bugfix/compiler-warnings 
Fixes misc gcc warnings
 2016-06-17 14:23:28 -07:00
Scott Lahteine 1bed392c68 HAS_Z_ENDSTOP_SERVO => HAS_Z_SERVO_ENDSTOP 2016-06-17 14:20:17 -07:00
Scott Lahteine 47ce810f52 Remove support for XY servo endstops 2016-06-17 14:19:17 -07:00
João Brázio d1e5dc6319
Fixes misc gcc warnings 2016-06-17 20:24:24 +01:00
esenapaj c5eecb11b2 Follow-up the PR #4055 (Croatian language support) 
・Update a forgotten Configuration.h of Cartesio
 2016-06-17 21:20:15 +09:00
Scott Lahteine d991a4c24a Merge pull request #4063 from thinkyhead/rc_remove_swp_files 
Delete mysterious .swp files from #3609
 2016-06-16 17:22:48 -07:00
Scott Lahteine 8d8cbef1de Merge pull request #4055 from thinkyhead/rc_croatian_language 
Croatian language support
 2016-06-16 17:22:25 -07:00
Scott Lahteine ebbed2975e Delete mysterious .swp files from #3609 2016-06-16 16:42:03 -07:00
Scott Lahteine 02e5dad29a Include Croatian in language listings 2016-06-16 16:18:26 -07:00