melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move M999 to cpp

Browse Source
This commit is contained in:
Scott Lahteine 2017-09-18 00:52:06 -05:00
parent 1a37ebc76d
commit 927524af6b
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/Marlin.cpp
View File

@ -320,8 +320,6 @@ void quickstop_stepper() {
SYNC_PLAN_POSITION_KINEMATIC();
}
#include "gcode/control/M999.h"
#include "gcode/control/T.h"
#if ENABLED(USE_CONTROLLER_FAN)

8
Marlin/src/gcode/control/M999.h → Marlin/src/gcode/control/M999.cpp
View File

@ -20,7 +20,11 @@
*
*/
#include "../queue.h"
#include "../gcode.h"
#include "../../lcd/ultralcd.h" // for lcd_reset_alert_level
#include "../../Marlin.h" // for Running
#include "../queue.h" // for flush_and_request_resend
/**
* M999: Restart after being stopped
@ -32,7 +36,7 @@
* existing command buffer.
*
*/
void gcode_M999() {
void GcodeSuite::M999() {
Running = true;
lcd_reset_alert_level();

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

@ -116,7 +116,6 @@ void GcodeSuite::dwell(millis_t time) {
//
// Placeholders for non-migrated codes
//
extern void gcode_M999();
extern void gcode_T(uint8_t tmp_extruder);
#if ENABLED(M100_FREE_MEMORY_WATCHER)
@ -687,9 +686,7 @@ void GcodeSuite::process_next_command() {
case 869: M869(); break; // M869: Report axis error
#endif
case 999: // M999: Restart after being Stopped
gcode_M999();
break;
case 999: M999(); break; // M999: Restart after being Stopped
}
break;