zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

implement G26 changes per review

Browse source
This commit is contained in:
Bob-the-Kuhn 2017-04-30 19:05:25 -05:00
parent dcde202157
commit ce87c7803e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Marlin/G26_Mesh_Validation_Tool.cpp
View file

@ -178,7 +178,7 @@
* nozzle in a problem area and doing a G29 P4 R command. * nozzle in a problem area and doing a G29 P4 R command.
*/ */
void gcode_G26() { void gcode_G26() {
SERIAL_ECHOLNPGM("G26 command started. Waiting on heater(s)."); SERIAL_ECHOLNPGM("G26 command started. Waiting for heater(s).");
float tmp, start_angle, end_angle; float tmp, start_angle, end_angle;
int i, xi, yi; int i, xi, yi;
mesh_index_pair location; mesh_index_pair location;
@ -775,11 +775,11 @@
#endif #endif
ubl.has_control_of_lcd_panel = true; ubl.has_control_of_lcd_panel = true;
thermalManager.setTargetBed(bed_temp); thermalManager.setTargetBed(bed_temp);
next = millis() + 5000; next = millis() + 5000UL;
while (abs(thermalManager.degBed() - bed_temp) > 3) { while (abs(thermalManager.degBed() - bed_temp) > 3) {
if (ubl_lcd_clicked()) return exit_from_g26(); if (ubl_lcd_clicked()) return exit_from_g26();
if (millis() > next) { if (PENDING(millis(), next)) {
next = millis() + 5000; next = millis() + 5000UL;
print_heaterstates(); print_heaterstates();
} }
idle(); idle();
@ -795,8 +795,8 @@
thermalManager.setTargetHotend(hotend_temp, 0); thermalManager.setTargetHotend(hotend_temp, 0);
while (abs(thermalManager.degHotend(0) - hotend_temp) > 3) { while (abs(thermalManager.degHotend(0) - hotend_temp) > 3) {
if (ubl_lcd_clicked()) return exit_from_g26(); if (ubl_lcd_clicked()) return exit_from_g26();
if (millis() > next) { if (PENDING(millis(), next)) {
next = millis() + 5000; next = millis() + 5000UL;
print_heaterstates(); print_heaterstates();
} }
idle(); idle();