Browse Source

Merge pull request #6354 from thinkyhead/rc_doubleclick_fix

Fix undefined symbol if DOUBLECLICK_FOR_Z_BABYSTEPPING and HAS_BED_PROBE defined
Scott Lahteine 8 years ago
parent
commit
4e04383d18
1 changed files with 23 additions and 11 deletions
  1. 23
    11
      Marlin/ultralcd.cpp

+ 23
- 11
Marlin/ultralcd.cpp View File

@@ -51,7 +51,11 @@ int lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_speed[2
51 51
 
52 52
 #if ENABLED(BABYSTEPPING)
53 53
   long babysteps_done = 0;
54
-  static void lcd_babystep_z();
54
+  #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
55
+    static void lcd_babystep_zoffset();
56
+  #else
57
+    static void lcd_babystep_z();
58
+  #endif
55 59
 #endif
56 60
 
57 61
 uint8_t lcd_status_message_level;
@@ -431,7 +435,13 @@ uint16_t max_display_update_time = 0;
431 435
             doubleclick_expire_ms = millis() + DOUBLECLICK_MAX_INTERVAL;
432 436
         }
433 437
         else if (screen == lcd_status_screen && currentScreen == lcd_main_menu && PENDING(millis(), doubleclick_expire_ms))
434
-          screen = lcd_babystep_z;
438
+          screen =
439
+            #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
440
+              lcd_babystep_zoffset
441
+            #else
442
+              lcd_babystep_z
443
+            #endif
444
+          ;
435 445
       #endif
436 446
 
437 447
       currentScreen = screen;
@@ -851,7 +861,7 @@ void kill_screen(const char* lcd_msg) {
851 861
       void lcd_babystep_y() { lcd_goto_screen(_lcd_babystep_y); babysteps_done = 0; defer_return_to_status = true; }
852 862
     #endif
853 863
 
854
-    #if HAS_BED_PROBE
864
+    #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
855 865
 
856 866
       void lcd_babystep_zoffset() {
857 867
         if (lcd_clicked) { defer_return_to_status = false; return lcd_goto_previous_menu(); }
@@ -876,14 +886,14 @@ void kill_screen(const char* lcd_msg) {
876 886
           lcd_implementation_drawedit(PSTR(MSG_ZPROBE_ZOFFSET), ftostr43sign(zprobe_zoffset));
877 887
       }
878 888
 
879
-    #else // !HAS_BED_PROBE
889
+    #else // !BABYSTEP_ZPROBE_OFFSET
880 890
 
881 891
       void _lcd_babystep_z() { _lcd_babystep(Z_AXIS, PSTR(MSG_BABYSTEPPING_Z)); }
882 892
       void lcd_babystep_z() { lcd_goto_screen(_lcd_babystep_z); babysteps_done = 0; defer_return_to_status = true; }
883 893
 
884
-    #endif // HAS_BED_PROBE
894
+    #endif // !BABYSTEP_ZPROBE_OFFSET
885 895
 
886
-  #endif //BABYSTEPPING
896
+  #endif // BABYSTEPPING
887 897
 
888 898
   #if ENABLED(AUTO_BED_LEVELING_UBL)
889 899
 
@@ -1072,10 +1082,10 @@ void kill_screen(const char* lcd_msg) {
1072 1082
           MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N4, &flow_percentage[3], 10, 999);
1073 1083
           #if EXTRUDERS > 4
1074 1084
             MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N5, &flow_percentage[4], 10, 999);
1075
-          #endif //EXTRUDERS > 4
1076
-        #endif //EXTRUDERS > 3
1077
-      #endif //EXTRUDERS > 2
1078
-    #endif //EXTRUDERS > 1
1085
+          #endif // EXTRUDERS > 4
1086
+        #endif // EXTRUDERS > 3
1087
+      #endif // EXTRUDERS > 2
1088
+    #endif // EXTRUDERS > 1
1079 1089
 
1080 1090
     //
1081 1091
     // Babystep X:
@@ -1087,7 +1097,9 @@ void kill_screen(const char* lcd_msg) {
1087 1097
         MENU_ITEM(submenu, MSG_BABYSTEP_X, lcd_babystep_x);
1088 1098
         MENU_ITEM(submenu, MSG_BABYSTEP_Y, lcd_babystep_y);
1089 1099
       #endif
1090
-      #if DISABLED(BABYSTEP_ZPROBE_OFFSET)
1100
+      #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
1101
+        MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
1102
+      #else
1091 1103
         MENU_ITEM(submenu, MSG_BABYSTEP_Z, lcd_babystep_z);
1092 1104
       #endif
1093 1105
     #endif

Loading…
Cancel
Save