SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move M117 to cpp

Browse source
This commit is contained in:
Scott Lahteine 2017-09-17 00:40:59 -05:00
parent 1d2061c935
commit 811c32b85a
3 changed files with 5 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

@ -355,8 +355,6 @@ bool pin_is_protected(const int8_t pin) {
return false; return false;
} }
#include "gcode/lcd/M117.h"
#include "gcode/host/M118.h" #include "gcode/host/M118.h"
#include "gcode/host/M119.h" #include "gcode/host/M119.h"

5
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_M117();
extern void gcode_M118(); extern void gcode_M118();
extern void gcode_M119(); extern void gcode_M119();
extern void gcode_M120(); extern void gcode_M120();
@ -498,9 +497,7 @@ void GcodeSuite::process_next_command() {
case 115: M115(); break; // M115: Report capabilities case 115: M115(); break; // M115: Report capabilities
case 117: // M117: Set LCD message text, if possible case 117: M117(); break; // M117: Set LCD message text, if possible
gcode_M117();
break;
case 118: // M118: Display a message in the host console case 118: // M118: Display a message in the host console
gcode_M118(); gcode_M118();
break; break;

5
Marlin/src/gcode/lcd/M117.h → Marlin/src/gcode/lcd/M117.cpp
View file

@ -20,10 +20,13 @@
* *
*/ */
#include "../gcode.h"
#include "../../lcd/ultralcd.h"
/** /**
* M117: Set LCD Status Message * M117: Set LCD Status Message
*/ */
void gcode_M117() { void GcodeSuite::M117() {
lcd_setstatus(parser.string_arg); lcd_setstatus(parser.string_arg);