浏览代码

Fix UBL "Info screen" menu items

Scott Lahteine 8 年前
父节点
当前提交
ca99d67ede
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. 6
    6
      Marlin/ultralcd.cpp

+ 6
- 6
Marlin/ultralcd.cpp 查看文件

1766
       MENU_BACK(MSG_UBL_EDIT_MESH_MENU);
1766
       MENU_BACK(MSG_UBL_EDIT_MESH_MENU);
1767
       MENU_ITEM_EDIT(int3, MSG_UBL_MESH_HEIGHT_AMOUNT, &ubl_height_amount, -9, 9);
1767
       MENU_ITEM_EDIT(int3, MSG_UBL_MESH_HEIGHT_AMOUNT, &ubl_height_amount, -9, 9);
1768
       MENU_ITEM(function, MSG_UBL_MESH_HEIGHT_ADJUST, _lcd_ubl_adjust_height_cmd);
1768
       MENU_ITEM(function, MSG_UBL_MESH_HEIGHT_ADJUST, _lcd_ubl_adjust_height_cmd);
1769
-      MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen);
1769
+      MENU_ITEM(function, MSG_WATCH, lcd_return_to_status);
1770
       END_MENU();
1770
       END_MENU();
1771
     }
1771
     }
1772
 
1772
 
1780
       MENU_ITEM(gcode, MSG_UBL_FINE_TUNE_ALL, PSTR("G29 P4 R T"));
1780
       MENU_ITEM(gcode, MSG_UBL_FINE_TUNE_ALL, PSTR("G29 P4 R T"));
1781
       MENU_ITEM(gcode, MSG_UBL_FINE_TUNE_CLOSEST, PSTR("G29 P4 T"));
1781
       MENU_ITEM(gcode, MSG_UBL_FINE_TUNE_CLOSEST, PSTR("G29 P4 T"));
1782
       MENU_ITEM(submenu, MSG_UBL_MESH_HEIGHT_ADJUST, _lcd_ubl_height_adjust_menu);
1782
       MENU_ITEM(submenu, MSG_UBL_MESH_HEIGHT_ADJUST, _lcd_ubl_height_adjust_menu);
1783
-      MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen);
1783
+      MENU_ITEM(function, MSG_WATCH, lcd_return_to_status);
1784
       END_MENU();
1784
       END_MENU();
1785
     }
1785
     }
1786
 
1786
 
1814
         MENU_ITEM(gcode, MSG_UBL_VALIDATE_ABS_MESH, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P"));
1814
         MENU_ITEM(gcode, MSG_UBL_VALIDATE_ABS_MESH, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P"));
1815
       #endif
1815
       #endif
1816
       MENU_ITEM(function, MSG_UBL_VALIDATE_CUSTOM_MESH, _lcd_ubl_validate_custom_mesh);
1816
       MENU_ITEM(function, MSG_UBL_VALIDATE_CUSTOM_MESH, _lcd_ubl_validate_custom_mesh);
1817
-      MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen);
1817
+      MENU_ITEM(function, MSG_WATCH, lcd_return_to_status);
1818
       END_MENU();
1818
       END_MENU();
1819
     }
1819
     }
1820
 
1820
 
1846
       MENU_BACK(MSG_UBL_TOOLS);
1846
       MENU_BACK(MSG_UBL_TOOLS);
1847
       MENU_ITEM(gcode, MSG_UBL_3POINT_MESH_LEVELING, PSTR("G29 J0"));
1847
       MENU_ITEM(gcode, MSG_UBL_3POINT_MESH_LEVELING, PSTR("G29 J0"));
1848
       MENU_ITEM(submenu, MSG_UBL_GRID_MESH_LEVELING, _lcd_ubl_grid_level);
1848
       MENU_ITEM(submenu, MSG_UBL_GRID_MESH_LEVELING, _lcd_ubl_grid_level);
1849
-      MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen);
1849
+      MENU_ITEM(function, MSG_WATCH, lcd_return_to_status);
1850
       END_MENU();
1850
       END_MENU();
1851
     }
1851
     }
1852
 
1852
 
1878
       MENU_ITEM(function, MSG_UBL_FILLIN_MESH, _lcd_ubl_fillin_amount_cmd);
1878
       MENU_ITEM(function, MSG_UBL_FILLIN_MESH, _lcd_ubl_fillin_amount_cmd);
1879
       MENU_ITEM(function, MSG_UBL_SMART_FILLIN, _lcd_ubl_smart_fillin_cmd);
1879
       MENU_ITEM(function, MSG_UBL_SMART_FILLIN, _lcd_ubl_smart_fillin_cmd);
1880
       MENU_ITEM(gcode, MSG_UBL_MANUAL_FILLIN, PSTR("G29 P2 B T0"));
1880
       MENU_ITEM(gcode, MSG_UBL_MANUAL_FILLIN, PSTR("G29 P2 B T0"));
1881
-      MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen);
1881
+      MENU_ITEM(function, MSG_WATCH, lcd_return_to_status);
1882
       END_MENU();
1882
       END_MENU();
1883
     }
1883
     }
1884
 
1884
 
1930
       MENU_ITEM(gcode, MSG_UBL_CONTINUE_MESH, PSTR("G29 P1 C"));
1930
       MENU_ITEM(gcode, MSG_UBL_CONTINUE_MESH, PSTR("G29 P1 C"));
1931
       MENU_ITEM(function, MSG_UBL_INVALIDATE_ALL, _lcd_ubl_invalidate);
1931
       MENU_ITEM(function, MSG_UBL_INVALIDATE_ALL, _lcd_ubl_invalidate);
1932
       MENU_ITEM(gcode, MSG_UBL_INVALIDATE_CLOSEST, PSTR("G29 I"));
1932
       MENU_ITEM(gcode, MSG_UBL_INVALIDATE_CLOSEST, PSTR("G29 I"));
1933
-      MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen);
1933
+      MENU_ITEM(function, MSG_WATCH, lcd_return_to_status);
1934
       END_MENU();
1934
       END_MENU();
1935
     }
1935
     }
1936
 
1936
 

正在加载...
取消
保存