CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4085 from thinkyhead/rc_fix_M851

Browse Source 
Fix M851
This commit is contained in:
Scott Lahteine 2016-06-18 15:42:52 -07:00 committed by GitHub
commit b714fb644c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/Marlin_main.cpp
View File

@ -227,6 +227,7 @@
* M665 - Set delta configurations: L<diagonal rod> R<delta radius> S<segments/s> * M665 - Set delta configurations: L<diagonal rod> R<delta radius> S<segments/s>
* M666 - Set delta endstop adjustment * M666 - Set delta endstop adjustment
* M605 - Set dual x-carriage movement mode: S<mode> [ X<duplication x-offset> R<duplication temp offset> ] * M605 - Set dual x-carriage movement mode: S<mode> [ X<duplication x-offset> R<duplication temp offset> ]
* M851 - Set Z probe's Z offset (mm). Set to a negative value for probes that trigger below the nozzle.
* M907 - Set digital trimpot motor current using axis codes. * M907 - Set digital trimpot motor current using axis codes.
* M908 - Control digital trimpot directly. * M908 - Control digital trimpot directly.
* M909 - DAC_STEPPER_CURRENT: Print digipot/DAC current value * M909 - DAC_STEPPER_CURRENT: Print digipot/DAC current value
@ -245,9 +246,6 @@
* *
* ************ Custom codes - This can change to suit future G-code regulations * ************ Custom codes - This can change to suit future G-code regulations
* M100 - Watch Free Memory (For Debugging Only) * M100 - Watch Free Memory (For Debugging Only)
* M851 - Set Z probe's Z offset (mm above extruder -- The value will always be negative)
* M928 - Start SD logging (M928 filename.g) - ended by M29 * M928 - Start SD logging (M928 filename.g) - ended by M29
* M999 - Restart after being stopped by error * M999 - Restart after being stopped by error
* *
@ -7363,11 +7361,11 @@ void process_next_command() {
break; break;
#endif #endif
#ifdef CUSTOM_M_CODE_SET_Z_PROBE_OFFSET #if HAS_BED_PROBE
case CUSTOM_M_CODE_SET_Z_PROBE_OFFSET: case 851:
gcode_M851(); gcode_M851();
break; break;
#endif // CUSTOM_M_CODE_SET_Z_PROBE_OFFSET #endif // HAS_BED_PROBE
#if ENABLED(FILAMENTCHANGEENABLE) #if ENABLED(FILAMENTCHANGEENABLE)
case 600: //Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal] case 600: //Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]