浏览代码

implement G26 changes per review

Bob-the-Kuhn 8 年前
父节点
当前提交
ce87c7803e
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. 6
    6
      Marlin/G26_Mesh_Validation_Tool.cpp

+ 6
- 6
Marlin/G26_Mesh_Validation_Tool.cpp 查看文件

178
    * nozzle in a problem area and doing a G29 P4 R command.
178
    * nozzle in a problem area and doing a G29 P4 R command.
179
    */
179
    */
180
   void gcode_G26() {
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
     float tmp, start_angle, end_angle;
182
     float tmp, start_angle, end_angle;
183
     int   i, xi, yi;
183
     int   i, xi, yi;
184
     mesh_index_pair location;
184
     mesh_index_pair location;
775
       #endif
775
       #endif
776
           ubl.has_control_of_lcd_panel = true;
776
           ubl.has_control_of_lcd_panel = true;
777
           thermalManager.setTargetBed(bed_temp);
777
           thermalManager.setTargetBed(bed_temp);
778
-          next = millis() + 5000;
778
+          next = millis() + 5000UL;
779
           while (abs(thermalManager.degBed() - bed_temp) > 3) {
779
           while (abs(thermalManager.degBed() - bed_temp) > 3) {
780
             if (ubl_lcd_clicked()) return exit_from_g26();
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
               print_heaterstates();
783
               print_heaterstates();
784
             }
784
             }
785
             idle();
785
             idle();
795
     thermalManager.setTargetHotend(hotend_temp, 0);
795
     thermalManager.setTargetHotend(hotend_temp, 0);
796
     while (abs(thermalManager.degHotend(0) - hotend_temp) > 3) {
796
     while (abs(thermalManager.degHotend(0) - hotend_temp) > 3) {
797
       if (ubl_lcd_clicked()) return exit_from_g26();
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
         print_heaterstates();
800
         print_heaterstates();
801
       }
801
       }
802
       idle();
802
       idle();

正在加载...
取消
保存