|
|
@ -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();
|
|
|
|