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

Move M111 to cpp

Browse source
This commit is contained in:
Scott Lahteine 2017-09-16 22:40:04 -05:00
parent a831977dee
commit 06f3c8029e
3 changed files with 5 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

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

6
Marlin/src/gcode/control/M111.h → Marlin/src/gcode/control/M111.cpp
View file

@ -20,10 +20,12 @@
* *
*/ */
#include "../gcode.h"
/** /**
* M111: Set the debug level * M111: Set the debug level
*/ */
void gcode_M111() { void GcodeSuite::M111() {
if (parser.seen('S')) marlin_debug_flags = parser.byteval('S'); if (parser.seen('S')) marlin_debug_flags = parser.byteval('S');
const static char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO, const static char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO,
@ -50,7 +52,7 @@ void gcode_M111() {
for (uint8_t i = 0; i < COUNT(debug_strings); i++) { for (uint8_t i = 0; i < COUNT(debug_strings); i++) {
if (TEST(marlin_debug_flags, i)) { if (TEST(marlin_debug_flags, i)) {
if (comma++) SERIAL_CHAR(','); if (comma++) SERIAL_CHAR(',');
serialprintPGM((char*)pgm_read_word(&debug_strings[i])); serialprintPGM((char*)pgm_read_ptr(&debug_strings[i]));
} }
} }
} }

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_M111();
extern void gcode_M113(); extern void gcode_M113();
extern void gcode_M114(); extern void gcode_M114();
extern void gcode_M115(); extern void gcode_M115();
@ -449,9 +448,7 @@ void GcodeSuite::process_next_command() {
case 110: M110(); break; // M110: Set Current Line Number case 110: M110(); break; // M110: Set Current Line Number
case 111: // M111: Set debug level case 111: M111(); break; // M111: Set debug level
gcode_M111();
break;
#if DISABLED(EMERGENCY_PARSER) #if DISABLED(EMERGENCY_PARSER)
case 108: M108(); break; // M108: Cancel Waiting case 108: M108(); break; // M108: Cancel Waiting