Browse Source

Clean up, put ubl menu itemization closer at hand

Scott Lahteine 8 years ago
parent
commit
499bb85a95
1 changed files with 94 additions and 83 deletions
  1. 94
    83
      Marlin/ultralcd.cpp

+ 94
- 83
Marlin/ultralcd.cpp View File

@@ -1754,15 +1754,16 @@ void kill_screen(const char* lcd_msg) {
1754 1754
 
1755 1755
     /**
1756 1756
      * Step 1: Bed Level entry-point
1757
-     *  - Cancel
1758
-     *  - Auto Home       (if homing needed)
1759
-     *  - Leveling On/Off (if data exists, and homed)
1760
-     *  - Level Bed >
1761
-     *  - Fade Height     (Req: ENABLE_LEVELING_FADE_HEIGHT)
1762
-     *  - Mesh Z Offset   (Req: MESH_BED_LEVELING)
1763
-     *  - Z Probe Offset  (Req: HAS_BED_PROBE, Opt: BABYSTEP_ZPROBE_OFFSET)
1764
-     *  - Load Settings   (Req: EEPROM_SETTINGS)
1765
-     *  - Save Settings   (Req: EEPROM_SETTINGS)
1757
+     *
1758
+     * << Prepare
1759
+     *    Auto Home           (if homing needed)
1760
+     *    Leveling On/Off     (if data exists, and homed)
1761
+     *    Level Bed
1762
+     *    Fade Height: ---    (Req: ENABLE_LEVELING_FADE_HEIGHT)
1763
+     *    Mesh Z Offset: ---  (Req: MESH_BED_LEVELING)
1764
+     *    Z Probe Offset: --- (Req: HAS_BED_PROBE, Opt: BABYSTEP_ZPROBE_OFFSET)
1765
+     *    Load Settings       (Req: EEPROM_SETTINGS)
1766
+     *    Save Settings       (Req: EEPROM_SETTINGS)
1766 1767
      */
1767 1768
     void lcd_bed_leveling() {
1768 1769
       START_MENU();
@@ -1833,6 +1834,11 @@ void kill_screen(const char* lcd_msg) {
1833 1834
 
1834 1835
     /**
1835 1836
      * UBL Custom Mesh submenu
1837
+     *
1838
+     * << Build Mesh
1839
+     *    Hotend Temp: ---
1840
+     *    Bed Temp: ---
1841
+     *    Build Custom Mesh
1836 1842
      */
1837 1843
     void _lcd_ubl_custom_mesh() {
1838 1844
       START_MENU();
@@ -1858,6 +1864,11 @@ void kill_screen(const char* lcd_msg) {
1858 1864
 
1859 1865
     /**
1860 1866
      * UBL Adjust Mesh Height submenu
1867
+     *
1868
+     * << Edit Mesh
1869
+     *    Height Amount: ---
1870
+     *    Adjust Mesh Height
1871
+     * << Info Screen
1861 1872
      */
1862 1873
     void _lcd_ubl_height_adjust_menu() {
1863 1874
       START_MENU();
@@ -1870,6 +1881,12 @@ void kill_screen(const char* lcd_msg) {
1870 1881
 
1871 1882
     /**
1872 1883
      * UBL Edit Mesh submenu
1884
+     *
1885
+     * << UBL Tools
1886
+     *    Fine Tune All
1887
+     *    Fine Tune Closest
1888
+     *  - Adjust Mesh Height >>
1889
+     * << Info Screen
1873 1890
      */
1874 1891
     void _lcd_ubl_edit_mesh() {
1875 1892
       START_MENU();
@@ -1899,6 +1916,12 @@ void kill_screen(const char* lcd_msg) {
1899 1916
 
1900 1917
     /**
1901 1918
      * UBL Validate Mesh submenu
1919
+     *
1920
+     * << UBL Tools
1921
+     *    PLA Mesh Validation
1922
+     *    ABS Mesh Validation
1923
+     *    Validate Custom Mesh
1924
+     * << Info Screen
1902 1925
      */
1903 1926
     void _lcd_ubl_validate_mesh() {
1904 1927
       START_MENU();
@@ -1926,6 +1949,10 @@ void kill_screen(const char* lcd_msg) {
1926 1949
 
1927 1950
     /**
1928 1951
      * UBL Grid Leveling submenu
1952
+     *
1953
+     * << UBL Tools
1954
+     *    Side points: ---
1955
+     *    Level Mesh
1929 1956
      */
1930 1957
     void _lcd_ubl_grid_level() {
1931 1958
       START_MENU();
@@ -1937,6 +1964,11 @@ void kill_screen(const char* lcd_msg) {
1937 1964
 
1938 1965
     /**
1939 1966
      * UBL Mesh Leveling submenu
1967
+     *
1968
+     * << UBL Tools
1969
+     *    3-Point Mesh Leveling
1970
+     *  - Grid Mesh Leveling >>
1971
+     * << Info Screen
1940 1972
      */
1941 1973
     void _lcd_ubl_mesh_leveling() {
1942 1974
       START_MENU();
@@ -1967,6 +1999,13 @@ void kill_screen(const char* lcd_msg) {
1967 1999
 
1968 2000
     /**
1969 2001
      * UBL Fill-in Mesh submenu
2002
+     *
2003
+     * << Build Mesh
2004
+     *    Fill-in Amount: ---
2005
+     *    Fill-in Mesh
2006
+     *    Smart Fill-in
2007
+     *    Manual Fill-in
2008
+     * << Info Screen
1970 2009
      */
1971 2010
     void _lcd_ubl_fillin_menu() {
1972 2011
       START_MENU();
@@ -1986,6 +2025,17 @@ void kill_screen(const char* lcd_msg) {
1986 2025
 
1987 2026
     /**
1988 2027
      * UBL Build Mesh submenu
2028
+     *
2029
+     * << UBL Tools
2030
+     *    Build PLA Mesh
2031
+     *    Build ABS Mesh
2032
+     *  - Build Custom Mesh >>
2033
+     *    Build Cold Mesh
2034
+     *  - Fill-in Mesh >>
2035
+     *    Continue Bed Mesh
2036
+     *    Invalidate All
2037
+     *    Invalidate Closest
2038
+     * << Info Screen
1989 2039
      */
1990 2040
     void _lcd_ubl_build_mesh() {
1991 2041
       START_MENU();
@@ -2051,6 +2101,11 @@ void kill_screen(const char* lcd_msg) {
2051 2101
 
2052 2102
     /**
2053 2103
      * UBL Mesh Storage submenu
2104
+     *
2105
+     * << Unified Bed Leveling
2106
+     *    Memory Slot: ---
2107
+     *    Load Bed Mesh
2108
+     *    Save Bed Mesh
2054 2109
      */
2055 2110
     void _lcd_ubl_storage_mesh() {
2056 2111
       START_MENU();
@@ -2278,6 +2333,12 @@ void kill_screen(const char* lcd_msg) {
2278 2333
 
2279 2334
     /**
2280 2335
      * UBL Output map submenu
2336
+     *
2337
+     * << Unified Bed Leveling
2338
+     *  Output for Host
2339
+     *  Output for CSV
2340
+     *  Off Printer Backup
2341
+     *  Output Mesh Map
2281 2342
      */
2282 2343
     void _lcd_ubl_output_map() {
2283 2344
       START_MENU();
@@ -2291,6 +2352,12 @@ void kill_screen(const char* lcd_msg) {
2291 2352
 
2292 2353
     /**
2293 2354
      * UBL Tools submenu
2355
+     *
2356
+     * << Unified Bed Leveling
2357
+     *  - Build Mesh >>
2358
+     *  - Validate Mesh >>
2359
+     *  - Edit Mesh >>
2360
+     *  - Mesh Leveling >>
2294 2361
      */
2295 2362
     void _lcd_ubl_tools_menu() {
2296 2363
       START_MENU();
@@ -2304,6 +2371,15 @@ void kill_screen(const char* lcd_msg) {
2304 2371
 
2305 2372
     /**
2306 2373
      * UBL Step-By-Step submenu
2374
+     *
2375
+     * << Unified Bed Leveling
2376
+     *    1 Build Cold Mesh
2377
+     *    2 Smart Fill-in
2378
+     *  - 3 Validate Mesh >>
2379
+     *    4 Fine Tune All
2380
+     *  - 5 Validate Mesh >>
2381
+     *    6 Fine Tune All
2382
+     *    7 Save Bed Mesh
2307 2383
      */
2308 2384
     void _lcd_ubl_step_by_step() {
2309 2385
       START_MENU();
@@ -2321,80 +2397,15 @@ void kill_screen(const char* lcd_msg) {
2321 2397
     /**
2322 2398
      * UBL System submenu
2323 2399
      *
2324
-     *  Prepare
2325
-     * - Unified Bed Leveling
2326
-     *   - Manually Build Mesh
2327
-     *   - Activate UBL
2328
-     *   - Deactivate UBL
2329
-     *   - Step-By-Step UBL
2330
-     *       1 Build Cold Mesh
2331
-     *       2 Smart Fill-in
2332
-     *     - 3 Validate Mesh
2333
-     *           PLA Mesh Validation
2334
-     *           ABS Mesh Validation
2335
-     *         - Custom Mesh Validation
2336
-     *             Hotend Temp:
2337
-     *             Bed Temp:
2338
-     *             Validate Mesh
2339
-     *       4 Fine Tune All
2340
-     *     - 5 Validate Mesh
2341
-     *           PLA Mesh Validation
2342
-     *           ABS Mesh Validation
2343
-     *         - Custom Mesh Validation
2344
-     *             Hotend Temp:
2345
-     *             Bed Temp:
2346
-     *             Validate Mesh
2347
-     *       6 Fine Tune All
2348
-     *       7 Save Bed Mesh
2349
-     *   - Mesh Storage
2350
-     *       Memory Slot:
2351
-     *       Load Bed Mesh
2352
-     *       Save Bed Mesh
2353
-     *   - Output Map
2354
-     *       Topography to Host
2355
-     *       CSV for Spreadsheet
2356
-     *       Mesh Output Backup
2357
-     *       Output to LCD Grid
2358
-     *   - UBL Tools
2359
-     *     - Build Mesh
2360
-     *         Build PLA Mesh
2361
-     *         Build ABS Mesh
2362
-     *       - Build Custom Mesh
2363
-     *           Hotend Temp:
2364
-     *           Bed Temp:
2365
-     *           Build Custom Mesh
2366
-     *         Info Screen
2367
-     *       - Build Cold Mesh
2368
-     *       - Fill-in Mesh
2369
-     *           Fill-in Mesh
2370
-     *           Smart Fill-in
2371
-     *           Manual Fill-in
2372
-     *           Info Screen
2373
-     *         Continue Bed Mesh
2374
-     *         Invalidate All
2375
-     *         Invalidate Closest
2376
-     *     - Validate Mesh
2377
-     *         PLA Mesh Validation
2378
-     *         ABS Mesh Validation
2379
-     *       - Custom Mesh Validation
2380
-     *           Hotend Temp:
2381
-     *           Bed Temp:
2382
-     *           Validate Mesh
2383
-     *         Info Screen
2384
-     *     - Edit Mesh
2385
-     *         Fine Tune All
2386
-     *         Fine Tune Closest
2387
-     *       - Adjust Mesh Height
2388
-     *           Height Amount:
2389
-     *           Adjust Mesh Height
2390
-     *         Info Screen
2391
-     *     - Mesh Leveling
2392
-     *         3-Point Mesh Leveling
2393
-     *       - Grid Mesh Leveling
2394
-     *           Side points:
2395
-     *           Level Mesh
2396
-     *         Info Screen
2397
-     *   - Output UBL Info
2400
+     * << Prepare
2401
+     *  - Manually Build Mesh >>
2402
+     *  - Activate UBL >>
2403
+     *  - Deactivate UBL >>
2404
+     *  - Step-By-Step UBL >>
2405
+     *  - Mesh Storage >>
2406
+     *  - Output Map >>
2407
+     *  - UBL Tools >>
2408
+     *  - Output UBL Info >>
2398 2409
      */
2399 2410
 
2400 2411
     void _lcd_ubl_level_bed() {

Loading…
Cancel
Save