瀏覽代碼

Return to Bed Leveling menu when done

Scott Lahteine 8 年之前
父節點
當前提交
f1e33afda4
共有 1 個檔案被更改,包括 7 行新增4 行删除
  1. 7
    4
      Marlin/ultralcd.cpp

+ 7
- 4
Marlin/ultralcd.cpp 查看文件

1504
 
1504
 
1505
           #endif
1505
           #endif
1506
 
1506
 
1507
-          lcd_return_to_status();
1507
+          lcd_goto_previous_menu(); // Return to the last clicked item ("Level Bed")
1508
+
1508
           //LCD_MESSAGEPGM(MSG_LEVEL_BED_DONE);
1509
           //LCD_MESSAGEPGM(MSG_LEVEL_BED_DONE);
1509
           lcd_completion_feedback();
1510
           lcd_completion_feedback();
1510
         }
1511
         }
1627
     /**
1628
     /**
1628
      * Step 1: Bed Level entry-point
1629
      * Step 1: Bed Level entry-point
1629
      *  - Cancel
1630
      *  - Cancel
1630
-     *  - Level Bed >
1631
      *  - Leveling On/Off (if there is leveling data)
1631
      *  - Leveling On/Off (if there is leveling data)
1632
+     *  - Level Bed >
1632
      *  - Fade Height (Req: ENABLE_LEVELING_FADE_HEIGHT)
1633
      *  - Fade Height (Req: ENABLE_LEVELING_FADE_HEIGHT)
1633
      *  - Mesh Z Offset (Req: MESH_BED_LEVELING)
1634
      *  - Mesh Z Offset (Req: MESH_BED_LEVELING)
1634
      *  - Z Probe Offset (Req: HAS_BED_PROBE, Opt: BABYSTEP_ZPROBE_OFFSET)
1635
      *  - Z Probe Offset (Req: HAS_BED_PROBE, Opt: BABYSTEP_ZPROBE_OFFSET)
1638
     void lcd_level_bed() {
1639
     void lcd_level_bed() {
1639
       START_MENU();
1640
       START_MENU();
1640
       MENU_BACK(MSG_PREPARE);
1641
       MENU_BACK(MSG_PREPARE);
1641
-      MENU_ITEM(submenu, MSG_LEVEL_BED, _lcd_level_bed_continue);
1642
+
1642
-      if (leveling_is_valid()) {      // Leveling data exists? Show more options.
1643
+      if (leveling_is_valid()) {
1643
         _level_state = leveling_is_active();
1644
         _level_state = leveling_is_active();
1644
         MENU_ITEM_EDIT_CALLBACK(bool, MSG_BED_LEVELING, &_level_state, _lcd_toggle_bed_leveling);
1645
         MENU_ITEM_EDIT_CALLBACK(bool, MSG_BED_LEVELING, &_level_state, _lcd_toggle_bed_leveling);
1645
       }
1646
       }
1660
         MENU_ITEM_EDIT_CALLBACK(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX, lcd_refresh_zprobe_zoffset);
1661
         MENU_ITEM_EDIT_CALLBACK(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX, lcd_refresh_zprobe_zoffset);
1661
       #endif
1662
       #endif
1662
 
1663
 
1664
+      MENU_ITEM(submenu, MSG_LEVEL_BED, _lcd_level_bed_continue);
1665
+
1663
       #if ENABLED(EEPROM_SETTINGS)
1666
       #if ENABLED(EEPROM_SETTINGS)
1664
         MENU_ITEM(function, MSG_LOAD_EEPROM, lcd_load_settings);
1667
         MENU_ITEM(function, MSG_LOAD_EEPROM, lcd_load_settings);
1665
         MENU_ITEM(function, MSG_STORE_EEPROM, lcd_store_settings);
1668
         MENU_ITEM(function, MSG_STORE_EEPROM, lcd_store_settings);

Loading…
取消
儲存