0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move M115 to cpp

Browse source
This commit is contained in:
Scott Lahteine 2017-09-17 00:38:39 -05:00
parent 81b8fbf4d6
commit 1d2061c935
3 changed files with 7 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/host/M115.h"
#include "gcode/lcd/M117.h" #include "gcode/lcd/M117.h"
#include "gcode/host/M118.h" #include "gcode/host/M118.h"

7
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_M115();
extern void gcode_M117(); extern void gcode_M117();
extern void gcode_M118(); extern void gcode_M118();
extern void gcode_M119(); extern void gcode_M119();
@ -496,9 +495,9 @@ void GcodeSuite::process_next_command() {
case 92: M92(); break; // 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
case 114: M114(); break; // M114: Report current position case 114: M114(); break; // M114: Report current position
case 115: // M115: Report capabilities
gcode_M115(); case 115: M115(); break; // M115: Report capabilities
break;
case 117: // M117: Set LCD message text, if possible case 117: // M117: Set LCD message text, if possible
gcode_M117(); gcode_M117();
break; break;

5
Marlin/src/gcode/host/M115.h → Marlin/src/gcode/host/M115.cpp
View file

@ -20,10 +20,13 @@
* *
*/ */
#include "../gcode.h"
#include "../../inc/MarlinConfig.h"
/** /**
* M115: Capabilities string * M115: Capabilities string
*/ */
void gcode_M115() { void GcodeSuite::M115() {
SERIAL_PROTOCOLLNPGM(MSG_M115_REPORT); SERIAL_PROTOCOLLNPGM(MSG_M115_REPORT);
#if ENABLED(EXTENDED_CAPABILITIES_REPORT) #if ENABLED(EXTENDED_CAPABILITIES_REPORT)