bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Move M110 to cpp

Browse Source
This commit is contained in:
Scott Lahteine
2017-09-16 22:34:40 -05:00
parent 7479ff98b7
commit a831977dee
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/Marlin.cpp
View File

@@ -374,8 +374,6 @@ bool pin_is_protected(const int8_t pin) {
return false; return false;
} }
#include "gcode/host/M110.h"
#include "gcode/control/M111.h" #include "gcode/control/M111.h"
#if ENABLED(HOST_KEEPALIVE_FEATURE) #if ENABLED(HOST_KEEPALIVE_FEATURE)

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

@@ -124,7 +124,6 @@ extern void gcode_M83();
extern void gcode_M85(); extern void gcode_M85();
extern void gcode_M92(); extern void gcode_M92();
extern void gcode_M100(); extern void gcode_M100();
extern void gcode_M110();
extern void gcode_M111(); extern void gcode_M111();
extern void gcode_M113(); extern void gcode_M113();
extern void gcode_M114(); extern void gcode_M114();
@@ -448,9 +447,7 @@ void GcodeSuite::process_next_command() {
case 104: M104(); break; // M104: Set hot end temperature case 104: M104(); break; // M104: Set hot end temperature
case 109: M109(); break; // M109: Wait for hotend temperature to reach target case 109: M109(); break; // M109: Wait for hotend temperature to reach target
case 110: // M110: Set Current Line Number case 110: M110(); break; // M110: Set Current Line Number
gcode_M110();
break;
case 111: // M111: Set debug level case 111: // M111: Set debug level
gcode_M111(); gcode_M111();

5
Marlin/src/gcode/host/M110.h → Marlin/src/gcode/host/M110.cpp
View File

@@ -20,11 +20,12 @@
* *
*/ */
#include "../queue.h" #include "../gcode.h"
#include "../queue.h" // for gcode_LastN
/** /**
* M110: Set Current Line Number * M110: Set Current Line Number
*/ */
void gcode_M110() { void GcodeSuite::M110() {
if (parser.seenval('N')) gcode_LastN = parser.value_long(); if (parser.seenval('N')) gcode_LastN = parser.value_long();
} }