josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Messages: more newlines needed. 

The recent switch to send 'ok' postponed requires also sending a
newline in a few places, because this 'ok' is no longer at the
start of the line. Now it appears in its own line.

A recent commit tried to correct this already, but it missed a
few locations.  Also remove the comments promising a forthcoming
newline from gcode_parse.
This commit is contained in:
Phil Hord 2015-09-22 13:09:09 -04:00
parent 777967b3d5
commit 890879e7ee
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcode_process.c
View File

@ -335,7 +335,6 @@ void process_gcode_command() {
// unknown gcode: spit an error // unknown gcode: spit an error
default: default:
sersendf_P(PSTR("E: Bad G-code %d\n"), next_target.G); sersendf_P(PSTR("E: Bad G-code %d\n"), next_target.G);
// newline is sent from gcode_parse after we return
return; return;
} }
} }
@ -634,7 +633,6 @@ void process_gcode_command() {
print_queue(); print_queue();
} }
// newline is sent from gcode_parse after we return
break; break;
case 115: case 115:
@ -650,7 +648,6 @@ void process_gcode_command() {
//? //?
sersendf_P(PSTR("FIRMWARE_NAME:Teacup FIRMWARE_URL:http://github.com/traumflug/Teacup_Firmware/ PROTOCOL_VERSION:1.0 MACHINE_TYPE:Mendel EXTRUDER_COUNT:%d TEMP_SENSOR_COUNT:%d HEATER_COUNT:%d\n"), 1, NUM_TEMP_SENSORS, NUM_HEATERS); sersendf_P(PSTR("FIRMWARE_NAME:Teacup FIRMWARE_URL:http://github.com/traumflug/Teacup_Firmware/ PROTOCOL_VERSION:1.0 MACHINE_TYPE:Mendel EXTRUDER_COUNT:%d TEMP_SENSOR_COUNT:%d HEATER_COUNT:%d\n"), 1, NUM_TEMP_SENSORS, NUM_HEATERS);
// newline is sent from gcode_parse after we return
break; break;
case 116: case 116:
@ -802,8 +799,7 @@ void process_gcode_command() {
//? Disable echo. //? Disable echo.
//? This command is only available in DEBUG builds. //? This command is only available in DEBUG builds.
debug_flags &= ~DEBUG_ECHO; debug_flags &= ~DEBUG_ECHO;
serial_writestr_P(PSTR("Echo off")); serial_writestr_P(PSTR("Echo off\n"));
// newline is sent from gcode_parse after we return
break; break;
case 241: case 241:
@ -811,15 +807,13 @@ void process_gcode_command() {
//? Enable echo. //? Enable echo.
//? This command is only available in DEBUG builds. //? This command is only available in DEBUG builds.
debug_flags |= DEBUG_ECHO; debug_flags |= DEBUG_ECHO;
serial_writestr_P(PSTR("Echo on")); serial_writestr_P(PSTR("Echo on\n"));
// newline is sent from gcode_parse after we return
break; break;
#endif /* DEBUG */ #endif /* DEBUG */
// unknown mcode: spit an error // unknown mcode: spit an error
default: default:
sersendf_P(PSTR("E: Bad M-code %d"), next_target.M); sersendf_P(PSTR("E: Bad M-code %d\n"), next_target.M);
// newline is sent from gcode_parse after we return
} // switch (next_target.M) } // switch (next_target.M)
} // else if (next_target.seen_M) } // else if (next_target.seen_M)
} // process_gcode_command() } // process_gcode_command()