CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,190 Commits 1 Branch 0 Tags 107 MiB
c8186e9423
Commit Graph

5190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d8dcc4ac57 Merge pull request #4117 from thinkyhead/rc_i2c_comment_fix 
Fix comments on EXPERIMENTAL_I2CBUS
 2016-06-21 18:00:36 -07:00
Scott Lahteine
40cd20a236 Fix comments on EXPERIMENTAL_I2CBUS 2016-06-21 17:58:44 -07:00
Scott Lahteine
67750d73ef Merge pull request #4107 from thinkyhead/rc_fixup_M48_config 
Clean up configs for Z_MIN_PROBE_REPEATABILITY_TEST
 2016-06-21 14:56:35 -07:00
esenapaj
14b661b9e5 Enclose #error string by double-quotes 2016-06-21 21:06:14 +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
5e469622c9 Merge pull request #4105 from thinkyhead/rc_combine_probe_blocks 
Move raise_z_after_probing into earlier block
 2016-06-21 02:14:38 -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
71534dc11f Merge pull request #4100 from thinkyhead/rc_z_deploy 
Use deploy/stow with FIX_MOUNTED_PROBE too
 2016-06-21 00:40:48 -07:00
Scott Lahteine
6563b07879 Test for mechanical and fix mounted probes 2016-06-20 16:40:44 -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
524f6d9bd6 Merge pull request #4096 from thinkyhead/rc_always_raise_servo 
Always raise Z (if needed) for servo deploy/stow
 2016-06-19 20:40:06 -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
42ccb5b0df Travis test a servo probe without ABL 2016-06-19 18:47:27 -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
15a5eeb740 Merge pull request #4094 from thinkyhead/rc_cartesio_config 
Cartesio UI display option in all configs
 2016-06-19 17:43:25 -07:00
Scott Lahteine
f8c278ce4d Cartesio UI display option in all configs 2016-06-19 17:39:46 -07:00
Scott Lahteine
43ec24158e Merge pull request #4092 from thinkyhead/rc_sd_error 
Output a message for SD read errors
 2016-06-19 17:30:29 -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
b714fb644c Merge pull request #4085 from thinkyhead/rc_fix_M851 
Fix M851
 2016-06-18 15:42:52 -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
Scott Lahteine
da526f6ba9 Merge pull request #4080 from thinkyhead/rc_probe_feedrates 
Save / restore feedrate in probing functions
 2016-06-18 02:44:52 -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