MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #7168 from thinkyhead/bf_M217_echo_to_serial

Browse Source 
M118 echo to serial
This commit is contained in:
Scott Lahteine 2017-06-28 01:12:09 -05:00 committed by GitHub
commit 797d6a97e7
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/Marlin_main.cpp
View File

@ -130,6 +130,7 @@
* M114 - Report current position. * M114 - Report current position.
* M115 - Report capabilities. (Extended capabilities requires EXTENDED_CAPABILITIES_REPORT) * M115 - Report capabilities. (Extended capabilities requires EXTENDED_CAPABILITIES_REPORT)
* M117 - Display a message on the controller screen. (Requires an LCD) * M117 - Display a message on the controller screen. (Requires an LCD)
* M118 - Display a message in the host console.
* M119 - Report endstops status. * M119 - Report endstops status.
* M120 - Enable endstops detection. * M120 - Enable endstops detection.
* M121 - Disable endstops detection. * M121 - Disable endstops detection.
@ -7991,6 +7992,14 @@ inline void gcode_M115() {
*/ */
inline void gcode_M117() { lcd_setstatus(parser.string_arg); } inline void gcode_M117() { lcd_setstatus(parser.string_arg); }
/**
* M118: Display a message in the host console.
*/
inline void gcode_M118() {
SERIAL_ECHO_START();
SERIAL_ECHOLN(parser.string_arg);
}
/** /**
* M119: Output endstop states to serial output * M119: Output endstop states to serial output
*/ */
@ -10758,6 +10767,9 @@ void process_next_command() {
case 117: // M117: Set LCD message text, if possible case 117: // M117: Set LCD message text, if possible
gcode_M117(); gcode_M117();
break; break;
case 118: // M118: Display a message in the host console
gcode_M118();
break;
case 119: // M119: Report endstop states case 119: // M119: Report endstop states
gcode_M119(); gcode_M119();
break; break;

2
Marlin/gcode.cpp
View File

@ -150,7 +150,7 @@ void GCodeParser::parse(char *p) {
#endif #endif
// Only use string_arg for these M codes // Only use string_arg for these M codes
if (letter == 'M') switch (codenum) { case 23: case 28: case 30: case 117: case 928: string_arg = p; return; default: break; } if (letter == 'M') switch (codenum) { case 23: case 28: case 30: case 117: case 118: case 928: string_arg = p; return; default: break; }
#if ENABLED(DEBUG_GCODE_PARSER) #if ENABLED(DEBUG_GCODE_PARSER)
const bool debug = codenum == 800; const bool debug = codenum == 800;