|
@@ -330,7 +330,7 @@ bool axis_homed[XYZ] = { false }, axis_known_position[XYZ] = { false };
|
330
|
330
|
/**
|
331
|
331
|
* GCode line number handling. Hosts may opt to include line numbers when
|
332
|
332
|
* sending commands to Marlin, and lines will be checked for sequentiality.
|
333
|
|
- * M110 S<int> sets the current line number.
|
|
333
|
+ * M110 N<int> sets the current line number.
|
334
|
334
|
*/
|
335
|
335
|
static long gcode_N, gcode_LastN, Stopped_gcode_LastN = 0;
|
336
|
336
|
|
|
@@ -629,7 +629,7 @@ static bool send_ok[BUFSIZE];
|
629
|
629
|
|
630
|
630
|
#ifdef CHDK
|
631
|
631
|
millis_t chdkHigh = 0;
|
632
|
|
- boolean chdkActive = false;
|
|
632
|
+ bool chdkActive = false;
|
633
|
633
|
#endif
|
634
|
634
|
|
635
|
635
|
#if ENABLED(PID_EXTRUSION_SCALING)
|
|
@@ -966,7 +966,7 @@ void gcode_line_error(const char* err, bool doFlush = true) {
|
966
|
966
|
|
967
|
967
|
inline void get_serial_commands() {
|
968
|
968
|
static char serial_line_buffer[MAX_CMD_SIZE];
|
969
|
|
- static boolean serial_comment_mode = false;
|
|
969
|
+ static bool serial_comment_mode = false;
|
970
|
970
|
|
971
|
971
|
// If the command buffer is empty for too long,
|
972
|
972
|
// send "wait" to indicate Marlin is still waiting.
|
|
@@ -1006,7 +1006,7 @@ inline void get_serial_commands() {
|
1006
|
1006
|
|
1007
|
1007
|
if (npos) {
|
1008
|
1008
|
|
1009
|
|
- boolean M110 = strstr_P(command, PSTR("M110")) != NULL;
|
|
1009
|
+ bool M110 = strstr_P(command, PSTR("M110")) != NULL;
|
1010
|
1010
|
|
1011
|
1011
|
if (M110) {
|
1012
|
1012
|
char* n2pos = strchr(command + 4, 'N');
|
|
@@ -5680,7 +5680,7 @@ inline void gcode_M109() {
|
5680
|
5680
|
* M110: Set Current Line Number
|
5681
|
5681
|
*/
|
5682
|
5682
|
inline void gcode_M110() {
|
5683
|
|
- if (code_seen('N')) gcode_N = code_value_long();
|
|
5683
|
+ if (code_seen('N')) gcode_LastN = code_value_long();
|
5684
|
5684
|
}
|
5685
|
5685
|
|
5686
|
5686
|
/**
|