|
@@ -178,7 +178,7 @@
|
178
|
178
|
* nozzle in a problem area and doing a G29 P4 R command.
|
179
|
179
|
*/
|
180
|
180
|
void gcode_G26() {
|
181
|
|
- SERIAL_ECHOLNPGM("G26 command started. Waiting on heater(s).");
|
|
181
|
+ SERIAL_ECHOLNPGM("G26 command started. Waiting for heater(s).");
|
182
|
182
|
float tmp, start_angle, end_angle;
|
183
|
183
|
int i, xi, yi;
|
184
|
184
|
mesh_index_pair location;
|
|
@@ -775,11 +775,11 @@
|
775
|
775
|
#endif
|
776
|
776
|
ubl.has_control_of_lcd_panel = true;
|
777
|
777
|
thermalManager.setTargetBed(bed_temp);
|
778
|
|
- next = millis() + 5000;
|
|
778
|
+ next = millis() + 5000UL;
|
779
|
779
|
while (abs(thermalManager.degBed() - bed_temp) > 3) {
|
780
|
780
|
if (ubl_lcd_clicked()) return exit_from_g26();
|
781
|
|
- if (millis() > next) {
|
782
|
|
- next = millis() + 5000;
|
|
781
|
+ if (PENDING(millis(), next)) {
|
|
782
|
+ next = millis() + 5000UL;
|
783
|
783
|
print_heaterstates();
|
784
|
784
|
}
|
785
|
785
|
idle();
|
|
@@ -795,8 +795,8 @@
|
795
|
795
|
thermalManager.setTargetHotend(hotend_temp, 0);
|
796
|
796
|
while (abs(thermalManager.degHotend(0) - hotend_temp) > 3) {
|
797
|
797
|
if (ubl_lcd_clicked()) return exit_from_g26();
|
798
|
|
- if (millis() > next) {
|
799
|
|
- next = millis() + 5000;
|
|
798
|
+ if (PENDING(millis(), next)) {
|
|
799
|
+ next = millis() + 5000UL;
|
800
|
800
|
print_heaterstates();
|
801
|
801
|
}
|
802
|
802
|
idle();
|