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

flush comment to match 1.1.x

Browse Source
This commit is contained in:
Scott Lahteine 2018-02-14 02:55:57 -06:00
parent 272f132b82
commit 8d71ad37cb
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View File

@ -767,10 +767,7 @@
const float measured_z = probe_pt(rawx, rawy, stow_probe, g29_verbose_level); // TODO: Needs error handling const float measured_z = probe_pt(rawx, rawy, stow_probe, g29_verbose_level); // TODO: Needs error handling
z_values[location.x_index][location.y_index] = measured_z; z_values[location.x_index][location.y_index] = measured_z;
} }
MYSERIAL0.flush(); // G29 P2's take a long time to complete. PronterFace can MYSERIAL0.flush(); // Prevent host M105 buffer overrun.
// over run the serial character buffer with M105's without
// this fix
} while (location.x_index >= 0 && --max_iterations); } while (location.x_index >= 0 && --max_iterations);
STOW_PROBE(); STOW_PROBE();
@ -908,9 +905,7 @@
SERIAL_PROTOCOL_F(z_values[location.x_index][location.y_index], 6); SERIAL_PROTOCOL_F(z_values[location.x_index][location.y_index], 6);
SERIAL_EOL(); SERIAL_EOL();
} }
MYSERIAL0.flush(); // G29 P2's take a long time to complete. PronterFace can MYSERIAL0.flush(); // Prevent host M105 buffer overrun.
// over run the serial character buffer with M105's without
// this fix
} while (location.x_index >= 0 && location.y_index >= 0); } while (location.x_index >= 0 && location.y_index >= 0);
if (do_ubl_mesh_map) display_map(g29_map_type); // show user where we're probing if (do_ubl_mesh_map) display_map(g29_map_type); // show user where we're probing
@ -1422,9 +1417,7 @@
do_blocking_move_to_z(h_offset + new_z); // Move the nozzle as the point is edited do_blocking_move_to_z(h_offset + new_z); // Move the nozzle as the point is edited
#endif #endif
idle(); idle();
MYSERIAL0.flush(); // G29 P2's take a long time to complete. PronterFace can MYSERIAL0.flush(); // Prevent host M105 buffer overrun.
// over run the serial character buffer with M105's without
// this fix
} while (!is_lcd_clicked()); } while (!is_lcd_clicked());
if (!lcd_map_control) lcd_return_to_status(); if (!lcd_map_control) lcd_return_to_status();

16
Marlin/src/gcode/bedlevel/G26.cpp
View File

@ -437,8 +437,7 @@ inline bool turn_on_heaters() {
SERIAL_EOL(); SERIAL_EOL();
} }
idle(); idle();
MYSERIAL0.flush(); // G26 takes a long time to complete. PronterFace may MYSERIAL0.flush(); // Prevent host M105 buffer overrun.
// overwhelm the serial buffer with M105's without this fix.
} }
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
} }
@ -461,10 +460,7 @@ inline bool turn_on_heaters() {
SERIAL_EOL(); SERIAL_EOL();
} }
idle(); idle();
MYSERIAL0.flush(); // Prevent host M105 buffer overrun.
MYSERIAL0.flush(); // G26 takes a long time to complete. PronterFace can
// over run the serial character buffer with M105's without
// this fix
} }
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
@ -824,16 +820,12 @@ void GcodeSuite::G26() {
//} //}
print_line_from_here_to_there(rx, ry, g26_layer_height, xe, ye, g26_layer_height); print_line_from_here_to_there(rx, ry, g26_layer_height, xe, ye, g26_layer_height);
MYSERIAL0.flush(); // G26 takes a long time to complete. PronterFace can MYSERIAL0.flush(); // Prevent host M105 buffer overrun.
// over run the serial character buffer with M105's without
// this fix
} }
if (look_for_lines_to_connect()) if (look_for_lines_to_connect())
goto LEAVE; goto LEAVE;
} }
MYSERIAL0.flush(); // G26 takes a long time to complete. PronterFace can MYSERIAL0.flush(); // Prevent host M105 buffer overrun.
// over run the serial character buffer with M105's without
// this fix
} while (--g26_repeats && location.x_index >= 0 && location.y_index >= 0); } while (--g26_repeats && location.x_index >= 0 && location.y_index >= 0);
LEAVE: LEAVE: