3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-30 15:26:18 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7170 from thinkyhead/bf_M217_echo_to_serial

Browse Source 
Add A (action) and E (echo) parameters to M118
This commit is contained in:
Scott Lahteine 2017-06-28 02:13:13 -05:00 committed by GitHub
commit 5c1888467f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Marlin_main.cpp
View File

@ -7994,9 +7994,13 @@ inline void gcode_M117() { lcd_setstatus(parser.string_arg); }
/** /**
* M118: Display a message in the host console. * M118: Display a message in the host console.
*
* A Append '// ' for an action command, as in OctoPrint
* E Have the host 'echo:' the text
*/ */
inline void gcode_M118() { inline void gcode_M118() {
SERIAL_ECHO_START(); if (parser.boolval('E')) SERIAL_ECHO_START();
if (parser.boolval('A')) SERIAL_ECHOPGM("// ");
SERIAL_ECHOLN(parser.string_arg); SERIAL_ECHOLN(parser.string_arg);
} }