Pārlūkot izejas kodu

ENABLED(NEWPANEL) => HAS_LCD_MENU

Scott Lahteine 6 gadus atpakaļ
vecāks
revīzija
cc2bc67440

+ 14
- 14
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp Parādīt failu

52
 
52
 
53
   extern float destination[XYZE], current_position[XYZE];
53
   extern float destination[XYZE], current_position[XYZE];
54
 
54
 
55
-  #if ENABLED(NEWPANEL)
55
+  #if HAS_LCD_MENU
56
     void lcd_return_to_status();
56
     void lcd_return_to_status();
57
     void _lcd_ubl_output_map_lcd();
57
     void _lcd_ubl_output_map_lcd();
58
   #endif
58
   #endif
432
         #endif // HAS_BED_PROBE
432
         #endif // HAS_BED_PROBE
433
 
433
 
434
         case 2: {
434
         case 2: {
435
-          #if ENABLED(NEWPANEL)
435
+          #if HAS_LCD_MENU
436
             //
436
             //
437
             // Manually Probe Mesh in areas that can't be reached by the probe
437
             // Manually Probe Mesh in areas that can't be reached by the probe
438
             //
438
             //
540
         }
540
         }
541
 
541
 
542
         case 4: // Fine Tune (i.e., Edit) the Mesh
542
         case 4: // Fine Tune (i.e., Edit) the Mesh
543
-          #if ENABLED(NEWPANEL)
543
+          #if HAS_LCD_MENU
544
             fine_tune_mesh(g29_x_pos, g29_y_pos, parser.seen('T'));
544
             fine_tune_mesh(g29_x_pos, g29_y_pos, parser.seen('T'));
545
           #else
545
           #else
546
             SERIAL_PROTOCOLLNPGM("?P4 is only available when an LCD is present.");
546
             SERIAL_PROTOCOLLNPGM("?P4 is only available when an LCD is present.");
683
           z_values[x][y] += g29_constant;
683
           z_values[x][y] += g29_constant;
684
   }
684
   }
685
 
685
 
686
-  #if ENABLED(NEWPANEL)
686
+  #if HAS_LCD_MENU
687
 
687
 
688
     typedef void (*clickFunc_t)();
688
     typedef void (*clickFunc_t)();
689
 
689
 
707
       return false;
707
       return false;
708
     }
708
     }
709
 
709
 
710
-  #endif // NEWPANEL
710
+  #endif // HAS_LCD_MENU
711
 
711
 
712
   #if HAS_BED_PROBE
712
   #if HAS_BED_PROBE
713
     /**
713
     /**
717
     void unified_bed_leveling::probe_entire_mesh(const float &rx, const float &ry, const bool do_ubl_mesh_map, const bool stow_probe, const bool do_furthest) {
717
     void unified_bed_leveling::probe_entire_mesh(const float &rx, const float &ry, const bool do_ubl_mesh_map, const bool stow_probe, const bool do_furthest) {
718
       mesh_index_pair location;
718
       mesh_index_pair location;
719
 
719
 
720
-      #if ENABLED(NEWPANEL)
720
+      #if HAS_LCD_MENU
721
         lcd_external_control = true;
721
         lcd_external_control = true;
722
       #endif
722
       #endif
723
 
723
 
729
       do {
729
       do {
730
         if (do_ubl_mesh_map) display_map(g29_map_type);
730
         if (do_ubl_mesh_map) display_map(g29_map_type);
731
 
731
 
732
-        #if ENABLED(NEWPANEL)
732
+        #if HAS_LCD_MENU
733
           if (is_lcd_clicked()) {
733
           if (is_lcd_clicked()) {
734
             SERIAL_PROTOCOLLNPGM("\nMesh only partially populated.\n");
734
             SERIAL_PROTOCOLLNPGM("\nMesh only partially populated.\n");
735
             lcd_quick_feedback(false);
735
             lcd_quick_feedback(false);
775
 
775
 
776
   #endif // HAS_BED_PROBE
776
   #endif // HAS_BED_PROBE
777
 
777
 
778
-  #if ENABLED(NEWPANEL)
778
+  #if HAS_LCD_MENU
779
 
779
 
780
     void unified_bed_leveling::move_z_with_encoder(const float &multiplier) {
780
     void unified_bed_leveling::move_z_with_encoder(const float &multiplier) {
781
       wait_for_release();
781
       wait_for_release();
908
       KEEPALIVE_STATE(IN_HANDLER);
908
       KEEPALIVE_STATE(IN_HANDLER);
909
       do_blocking_move_to(rx, ry, Z_CLEARANCE_DEPLOY_PROBE);
909
       do_blocking_move_to(rx, ry, Z_CLEARANCE_DEPLOY_PROBE);
910
     }
910
     }
911
-  #endif // NEWPANEL
911
+  #endif // HAS_LCD_MENU
912
 
912
 
913
   bool unified_bed_leveling::g29_parameter_parsing() {
913
   bool unified_bed_leveling::g29_parameter_parsing() {
914
     bool err_flag = false;
914
     bool err_flag = false;
915
 
915
 
916
-    #if ENABLED(NEWPANEL)
916
+    #if HAS_LCD_MENU
917
       LCD_MESSAGEPGM(MSG_UBL_DOING_G29);
917
       LCD_MESSAGEPGM(MSG_UBL_DOING_G29);
918
       lcd_quick_feedback(true);
918
       lcd_quick_feedback(true);
919
     #endif
919
     #endif
1036
       ubl_state_recursion_chk++;
1036
       ubl_state_recursion_chk++;
1037
       if (ubl_state_recursion_chk != 1) {
1037
       if (ubl_state_recursion_chk != 1) {
1038
         SERIAL_ECHOLNPGM("save_ubl_active_state_and_disabled() called multiple times in a row.");
1038
         SERIAL_ECHOLNPGM("save_ubl_active_state_and_disabled() called multiple times in a row.");
1039
-        #if ENABLED(NEWPANEL)
1039
+        #if HAS_LCD_MENU
1040
           LCD_MESSAGEPGM(MSG_UBL_SAVE_ERROR);
1040
           LCD_MESSAGEPGM(MSG_UBL_SAVE_ERROR);
1041
           lcd_quick_feedback(true);
1041
           lcd_quick_feedback(true);
1042
         #endif
1042
         #endif
1051
     #if ENABLED(UBL_DEVEL_DEBUGGING)
1051
     #if ENABLED(UBL_DEVEL_DEBUGGING)
1052
       if (--ubl_state_recursion_chk) {
1052
       if (--ubl_state_recursion_chk) {
1053
         SERIAL_ECHOLNPGM("restore_ubl_active_state_and_leave() called too many times.");
1053
         SERIAL_ECHOLNPGM("restore_ubl_active_state_and_leave() called too many times.");
1054
-        #if ENABLED(NEWPANEL)
1054
+        #if HAS_LCD_MENU
1055
           LCD_MESSAGEPGM(MSG_UBL_RESTORE_ERROR);
1055
           LCD_MESSAGEPGM(MSG_UBL_RESTORE_ERROR);
1056
           lcd_quick_feedback(true);
1056
           lcd_quick_feedback(true);
1057
         #endif
1057
         #endif
1339
     return out_mesh;
1339
     return out_mesh;
1340
   }
1340
   }
1341
 
1341
 
1342
-  #if ENABLED(NEWPANEL)
1342
+  #if HAS_LCD_MENU
1343
 
1343
 
1344
     void abort_fine_tune() {
1344
     void abort_fine_tune() {
1345
       lcd_return_to_status();
1345
       lcd_return_to_status();
1450
         lcd_return_to_status();
1450
         lcd_return_to_status();
1451
     }
1451
     }
1452
 
1452
 
1453
-  #endif // NEWPANEL
1453
+  #endif // HAS_LCD_MENU
1454
 
1454
 
1455
   /**
1455
   /**
1456
    * 'Smart Fill': Scan from the outward edges of the mesh towards the center.
1456
    * 'Smart Fill': Scan from the outward edges of the mesh towards the center.

+ 1
- 1
Marlin/src/gcode/queue.cpp Parādīt failu

757
               printerEventLEDs.onPrintCompleted();
757
               printerEventLEDs.onPrintCompleted();
758
               #if HAS_RESUME_CONTINUE
758
               #if HAS_RESUME_CONTINUE
759
                 enqueue_and_echo_commands_P(PSTR("M0 S"
759
                 enqueue_and_echo_commands_P(PSTR("M0 S"
760
-                  #if ENABLED(NEWPANEL)
760
+                  #if HAS_LCD_MENU
761
                     "1800"
761
                     "1800"
762
                   #else
762
                   #else
763
                     "60"
763
                     "60"

Notiek ielāde…
Atcelt
Saglabāt