MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Move M92 to cpp

Browse Source
This commit is contained in:
Scott Lahteine 2017-09-17 00:28:10 -05:00
parent 381b17e6a9
commit beb346e49f
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/Marlin.cpp
View File

@ -359,8 +359,6 @@ bool pin_is_protected(const int8_t pin) {
return false; return false;
} }
#include "gcode/config/M92.h"
#if ENABLED(M100_FREE_MEMORY_WATCHER) #if ENABLED(M100_FREE_MEMORY_WATCHER)
#include "gcode/calibrate/M100.h" #include "gcode/calibrate/M100.h"
#endif #endif

5
Marlin/src/gcode/config/M92.h → Marlin/src/gcode/config/M92.cpp
View File

@ -20,13 +20,16 @@
* *
*/ */
#include "../gcode.h"
#include "../../module/planner.h"
/** /**
* M92: Set axis steps-per-unit for one or more axes, X, Y, Z, and E. * M92: Set axis steps-per-unit for one or more axes, X, Y, Z, and E.
* (Follows the same syntax as G92) * (Follows the same syntax as G92)
* *
* With multiple extruders use T to specify which one. * With multiple extruders use T to specify which one.
*/ */
void gcode_M92() { void GcodeSuite::M92() {
GET_TARGET_EXTRUDER(); GET_TARGET_EXTRUDER();

6
Marlin/src/gcode/gcode.cpp
View File

@ -116,7 +116,6 @@ void GcodeSuite::dwell(millis_t time) {
// //
// Placeholders for non-migrated codes // Placeholders for non-migrated codes
// //
extern void gcode_M92();
extern void gcode_M100(); extern void gcode_M100();
extern void gcode_M114(); extern void gcode_M114();
extern void gcode_M115(); extern void gcode_M115();
@ -498,9 +497,8 @@ void GcodeSuite::process_next_command() {
case 84: M18_M84(); break; // M84: Disable all steppers or set timeout case 84: M18_M84(); break; // M84: Disable all steppers or set timeout
case 85: M85(); break; // M85: Set inactivity stepper shutdown timeout case 85: M85(); break; // M85: Set inactivity stepper shutdown timeout
case 92: // M92: Set the steps-per-unit for one or more axes case 92: M92(); break; // M92: Set the steps-per-unit for one or more axes
gcode_M92();
break;
case 114: // M114: Report current position case 114: // M114: Report current position
gcode_M114(); gcode_M114();
break; break;