Browse Source

Merge pull request #6511 from Bob-the-Kuhn/UBL--G26-minor-improvements

UBL: G26 minor improvements
Scott Lahteine 7 years ago
parent
commit
806f670092
1 changed files with 11 additions and 0 deletions
  1. 11
    0
      Marlin/G26_Mesh_Validation_Tool.cpp

+ 11
- 0
Marlin/G26_Mesh_Validation_Tool.cpp View File

179
    * nozzle in a problem area and doing a G29 P4 R command.
179
    * nozzle in a problem area and doing a G29 P4 R command.
180
    */
180
    */
181
   void gcode_G26() {
181
   void gcode_G26() {
182
+    SERIAL_ECHOLNPGM("G26 command started.  Waiting for heater(s).");
182
     float tmp, start_angle, end_angle;
183
     float tmp, start_angle, end_angle;
183
     int   i, xi, yi;
184
     int   i, xi, yi;
184
     mesh_index_pair location;
185
     mesh_index_pair location;
766
    * wait for them to get up to temperature.
767
    * wait for them to get up to temperature.
767
    */
768
    */
768
   bool turn_on_heaters() {
769
   bool turn_on_heaters() {
770
+    millis_t next;
769
     #if HAS_TEMP_BED
771
     #if HAS_TEMP_BED
770
       #if ENABLED(ULTRA_LCD)
772
       #if ENABLED(ULTRA_LCD)
771
         if (bed_temp > 25) {
773
         if (bed_temp > 25) {
774
       #endif
776
       #endif
775
           ubl.has_control_of_lcd_panel = true;
777
           ubl.has_control_of_lcd_panel = true;
776
           thermalManager.setTargetBed(bed_temp);
778
           thermalManager.setTargetBed(bed_temp);
779
+          next = millis() + 5000UL;
777
           while (abs(thermalManager.degBed() - bed_temp) > 3) {
780
           while (abs(thermalManager.degBed() - bed_temp) > 3) {
778
             if (ubl_lcd_clicked()) return exit_from_g26();
781
             if (ubl_lcd_clicked()) return exit_from_g26();
782
+            if (PENDING(millis(), next)) {
783
+              next = millis() + 5000UL;
784
+              print_heaterstates();
785
+            }
779
             idle();
786
             idle();
780
           }
787
           }
781
       #if ENABLED(ULTRA_LCD)
788
       #if ENABLED(ULTRA_LCD)
789
     thermalManager.setTargetHotend(hotend_temp, 0);
796
     thermalManager.setTargetHotend(hotend_temp, 0);
790
     while (abs(thermalManager.degHotend(0) - hotend_temp) > 3) {
797
     while (abs(thermalManager.degHotend(0) - hotend_temp) > 3) {
791
       if (ubl_lcd_clicked()) return exit_from_g26();
798
       if (ubl_lcd_clicked()) return exit_from_g26();
799
+      if (PENDING(millis(), next)) {
800
+        next = millis() + 5000UL;
801
+        print_heaterstates();
802
+      }
792
       idle();
803
       idle();
793
     }
804
     }
794
 
805
 

Loading…
Cancel
Save