Browse Source

Merge pull request #6352 from thinkyhead/rc_patch_menu_bug

Fix compiler warning about z-offset callback
Scott Lahteine 8 years ago
parent
commit
5a97a7be97
1 changed files with 5 additions and 1 deletions
  1. 5
    1
      Marlin/ultralcd.cpp

+ 5
- 1
Marlin/ultralcd.cpp View File

2416
    * "Control" > "Motion" submenu
2416
    * "Control" > "Motion" submenu
2417
    *
2417
    *
2418
    */
2418
    */
2419
+  #if HAS_BED_PROBE && DISABLED(BABYSTEP_ZPROBE_OFFSET)
2420
+    static void lcd_refresh_zprobe_zoffset() { refresh_zprobe_zoffset(); }
2421
+  #endif
2422
+
2419
   void lcd_control_motion_menu() {
2423
   void lcd_control_motion_menu() {
2420
     START_MENU();
2424
     START_MENU();
2421
     MENU_BACK(MSG_CONTROL);
2425
     MENU_BACK(MSG_CONTROL);
2422
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
2426
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
2423
       MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
2427
       MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
2424
     #elif HAS_BED_PROBE
2428
     #elif HAS_BED_PROBE
2425
-      MENU_ITEM_EDIT_CALLBACK(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX, refresh_zprobe_zoffset);
2429
+      MENU_ITEM_EDIT_CALLBACK(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX, lcd_refresh_zprobe_zoffset);
2426
     #endif
2430
     #endif
2427
     // Manual bed leveling, Bed Z:
2431
     // Manual bed leveling, Bed Z:
2428
     #if ENABLED(MESH_BED_LEVELING) && ENABLED(LCD_BED_LEVELING)
2432
     #if ENABLED(MESH_BED_LEVELING) && ENABLED(LCD_BED_LEVELING)

Loading…
Cancel
Save