Browse Source

LCD_BED_LEVELING enables a sub-menu for ABL

Scott Lahteine 6 years ago
parent
commit
b7e938a9fb
69 changed files with 263 additions and 221 deletions
  1. 2
    2
      Marlin/Configuration.h
  2. 2
    2
      Marlin/src/config/default/Configuration.h
  3. 2
    2
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
  4. 2
    2
      Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
  5. 2
    2
      Marlin/src/config/examples/Anet/A6/Configuration.h
  6. 2
    2
      Marlin/src/config/examples/Anet/A8/Configuration.h
  7. 2
    2
      Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
  8. 2
    2
      Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
  9. 2
    2
      Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
  10. 2
    2
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  11. 2
    2
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
  12. 2
    2
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  13. 2
    2
      Marlin/src/config/examples/Cartesio/Configuration.h
  14. 2
    2
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  15. 2
    2
      Marlin/src/config/examples/Creality/CR-10S/Configuration.h
  16. 2
    2
      Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
  17. 2
    2
      Marlin/src/config/examples/Creality/CR-8/Configuration.h
  18. 2
    2
      Marlin/src/config/examples/Creality/Ender-2/Configuration.h
  19. 2
    2
      Marlin/src/config/examples/Creality/Ender-3/Configuration.h
  20. 2
    2
      Marlin/src/config/examples/Creality/Ender-4/Configuration.h
  21. 2
    2
      Marlin/src/config/examples/Felix/Configuration.h
  22. 2
    2
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  23. 2
    2
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
  24. 2
    2
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  25. 2
    2
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  26. 2
    2
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
  27. 2
    2
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
  28. 2
    2
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  29. 2
    2
      Marlin/src/config/examples/JGAurora/A5/Configuration.h
  30. 2
    2
      Marlin/src/config/examples/MakerParts/Configuration.h
  31. 2
    2
      Marlin/src/config/examples/Malyan/M150/Configuration.h
  32. 2
    2
      Marlin/src/config/examples/Malyan/M200/Configuration.h
  33. 2
    2
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  34. 2
    2
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  35. 2
    2
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  36. 2
    2
      Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h
  37. 2
    2
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  38. 2
    2
      Marlin/src/config/examples/RigidBot/Configuration.h
  39. 2
    2
      Marlin/src/config/examples/SCARA/Configuration.h
  40. 2
    2
      Marlin/src/config/examples/STM32F10/Configuration.h
  41. 2
    2
      Marlin/src/config/examples/STM32F4/Configuration.h
  42. 2
    2
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  43. 2
    2
      Marlin/src/config/examples/TheBorg/Configuration.h
  44. 2
    2
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  45. 2
    2
      Marlin/src/config/examples/Tronxy/X1/Configuration.h
  46. 2
    2
      Marlin/src/config/examples/Tronxy/X5S/Configuration.h
  47. 2
    2
      Marlin/src/config/examples/Tronxy/XY100/Configuration.h
  48. 2
    2
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
  49. 2
    2
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  50. 2
    2
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  51. 2
    2
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  52. 2
    2
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
  53. 2
    2
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  54. 2
    2
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  55. 2
    2
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
  56. 2
    2
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
  57. 2
    2
      Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
  58. 2
    2
      Marlin/src/config/examples/delta/generic/Configuration.h
  59. 2
    2
      Marlin/src/config/examples/delta/kossel_mini/Configuration.h
  60. 2
    2
      Marlin/src/config/examples/delta/kossel_pro/Configuration.h
  61. 2
    2
      Marlin/src/config/examples/delta/kossel_xl/Configuration.h
  62. 2
    2
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
  63. 2
    2
      Marlin/src/config/examples/makibox/Configuration.h
  64. 2
    2
      Marlin/src/config/examples/stm32f103ret6/Configuration.h
  65. 2
    2
      Marlin/src/config/examples/tvrrug/Round2/Configuration.h
  66. 2
    2
      Marlin/src/config/examples/wt150/Configuration.h
  67. 2
    2
      Marlin/src/inc/SanityCheck.h
  68. 1
    1
      Marlin/src/lcd/language/language_en.h
  69. 128
    86
      Marlin/src/lcd/ultralcd.cpp

+ 2
- 2
Marlin/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/default/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h View File

@@ -1084,8 +1084,8 @@
1084 1084
 #endif
1085 1085
 
1086 1086
 /**
1087
- * Use the LCD controller for bed leveling
1088
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1087
+ * Add a bed leveling sub-menu for ABL or MBL.
1088
+ * Include a guided procedure if manual probing is enabled.
1089 1089
  */
1090 1090
 //#define LCD_BED_LEVELING
1091 1091
 

+ 2
- 2
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/Anet/A6/Configuration.h View File

@@ -1202,8 +1202,8 @@
1202 1202
 #endif
1203 1203
 
1204 1204
 /**
1205
- * Use the LCD controller for bed leveling
1206
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1205
+ * Add a bed leveling sub-menu for ABL or MBL.
1206
+ * Include a guided procedure if manual probing is enabled.
1207 1207
  */
1208 1208
 //#define LCD_BED_LEVELING
1209 1209
 

+ 2
- 2
Marlin/src/config/examples/Anet/A8/Configuration.h View File

@@ -1082,8 +1082,8 @@
1082 1082
 #endif
1083 1083
 
1084 1084
 /**
1085
- * Use the LCD controller for bed leveling
1086
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1085
+ * Add a bed leveling sub-menu for ABL or MBL.
1086
+ * Include a guided procedure if manual probing is enabled.
1087 1087
  */
1088 1088
 //#define LCD_BED_LEVELING
1089 1089
 

+ 2
- 2
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/BQ/Hephestos/Configuration.h View File

@@ -1052,8 +1052,8 @@
1052 1052
 #endif
1053 1053
 
1054 1054
 /**
1055
- * Use the LCD controller for bed leveling
1056
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1055
+ * Add a bed leveling sub-menu for ABL or MBL.
1056
+ * Include a guided procedure if manual probing is enabled.
1057 1057
  */
1058 1058
 //#define LCD_BED_LEVELING
1059 1059
 

+ 2
- 2
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h View File

@@ -1076,8 +1076,8 @@
1076 1076
 #endif
1077 1077
 
1078 1078
 /**
1079
- * Use the LCD controller for bed leveling
1080
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1079
+ * Add a bed leveling sub-menu for ABL or MBL.
1080
+ * Include a guided procedure if manual probing is enabled.
1081 1081
  */
1082 1082
 //#define LCD_BED_LEVELING
1083 1083
 

+ 2
- 2
Marlin/src/config/examples/BQ/WITBOX/Configuration.h View File

@@ -1052,8 +1052,8 @@
1052 1052
 #endif
1053 1053
 
1054 1054
 /**
1055
- * Use the LCD controller for bed leveling
1056
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1055
+ * Add a bed leveling sub-menu for ABL or MBL.
1056
+ * Include a guided procedure if manual probing is enabled.
1057 1057
  */
1058 1058
 //#define LCD_BED_LEVELING
1059 1059
 

+ 2
- 2
Marlin/src/config/examples/Cartesio/Configuration.h View File

@@ -1063,8 +1063,8 @@
1063 1063
 #endif
1064 1064
 
1065 1065
 /**
1066
- * Use the LCD controller for bed leveling
1067
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1066
+ * Add a bed leveling sub-menu for ABL or MBL.
1067
+ * Include a guided procedure if manual probing is enabled.
1068 1068
  */
1069 1069
 //#define LCD_BED_LEVELING
1070 1070
 

+ 2
- 2
Marlin/src/config/examples/Creality/CR-10/Configuration.h View File

@@ -1074,8 +1074,8 @@
1074 1074
 #endif
1075 1075
 
1076 1076
 /**
1077
- * Use the LCD controller for bed leveling
1078
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1077
+ * Add a bed leveling sub-menu for ABL or MBL.
1078
+ * Include a guided procedure if manual probing is enabled.
1079 1079
  */
1080 1080
 //#define LCD_BED_LEVELING
1081 1081
 

+ 2
- 2
Marlin/src/config/examples/Creality/CR-10S/Configuration.h View File

@@ -1065,8 +1065,8 @@
1065 1065
 #endif
1066 1066
 
1067 1067
 /**
1068
- * Use the LCD controller for bed leveling
1069
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1068
+ * Add a bed leveling sub-menu for ABL or MBL.
1069
+ * Include a guided procedure if manual probing is enabled.
1070 1070
  */
1071 1071
 #define LCD_BED_LEVELING
1072 1072
 

+ 2
- 2
Marlin/src/config/examples/Creality/CR-10mini/Configuration.h View File

@@ -1083,8 +1083,8 @@
1083 1083
 #endif
1084 1084
 
1085 1085
 /**
1086
- * Use the LCD controller for bed leveling
1087
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1086
+ * Add a bed leveling sub-menu for ABL or MBL.
1087
+ * Include a guided procedure if manual probing is enabled.
1088 1088
  */
1089 1089
 //#define LCD_BED_LEVELING
1090 1090
 

+ 2
- 2
Marlin/src/config/examples/Creality/CR-8/Configuration.h View File

@@ -1074,8 +1074,8 @@
1074 1074
 #endif
1075 1075
 
1076 1076
 /**
1077
- * Use the LCD controller for bed leveling
1078
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1077
+ * Add a bed leveling sub-menu for ABL or MBL.
1078
+ * Include a guided procedure if manual probing is enabled.
1079 1079
  */
1080 1080
 #define LCD_BED_LEVELING
1081 1081
 

+ 2
- 2
Marlin/src/config/examples/Creality/Ender-2/Configuration.h View File

@@ -1068,8 +1068,8 @@
1068 1068
 #endif
1069 1069
 
1070 1070
 /**
1071
- * Use the LCD controller for bed leveling
1072
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1071
+ * Add a bed leveling sub-menu for ABL or MBL.
1072
+ * Include a guided procedure if manual probing is enabled.
1073 1073
  */
1074 1074
 //#define LCD_BED_LEVELING
1075 1075
 

+ 2
- 2
Marlin/src/config/examples/Creality/Ender-3/Configuration.h View File

@@ -1068,8 +1068,8 @@
1068 1068
 #endif
1069 1069
 
1070 1070
 /**
1071
- * Use the LCD controller for bed leveling
1072
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1071
+ * Add a bed leveling sub-menu for ABL or MBL.
1072
+ * Include a guided procedure if manual probing is enabled.
1073 1073
  */
1074 1074
 //#define LCD_BED_LEVELING
1075 1075
 

+ 2
- 2
Marlin/src/config/examples/Creality/Ender-4/Configuration.h View File

@@ -1074,8 +1074,8 @@
1074 1074
 #endif
1075 1075
 
1076 1076
 /**
1077
- * Use the LCD controller for bed leveling
1078
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1077
+ * Add a bed leveling sub-menu for ABL or MBL.
1078
+ * Include a guided procedure if manual probing is enabled.
1079 1079
  */
1080 1080
 #define LCD_BED_LEVELING
1081 1081
 

+ 2
- 2
Marlin/src/config/examples/Felix/Configuration.h View File

@@ -1046,8 +1046,8 @@
1046 1046
 #endif
1047 1047
 
1048 1048
 /**
1049
- * Use the LCD controller for bed leveling
1050
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1049
+ * Add a bed leveling sub-menu for ABL or MBL.
1050
+ * Include a guided procedure if manual probing is enabled.
1051 1051
  */
1052 1052
 //#define LCD_BED_LEVELING
1053 1053
 

+ 2
- 2
Marlin/src/config/examples/Felix/DUAL/Configuration.h View File

@@ -1046,8 +1046,8 @@
1046 1046
 #endif
1047 1047
 
1048 1048
 /**
1049
- * Use the LCD controller for bed leveling
1050
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1049
+ * Add a bed leveling sub-menu for ABL or MBL.
1050
+ * Include a guided procedure if manual probing is enabled.
1051 1051
  */
1052 1052
 //#define LCD_BED_LEVELING
1053 1053
 

+ 2
- 2
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h View File

@@ -1088,8 +1088,8 @@
1088 1088
 #endif
1089 1089
 
1090 1090
 /**
1091
- * Use the LCD controller for bed leveling
1092
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1091
+ * Add a bed leveling sub-menu for ABL or MBL.
1092
+ * Include a guided procedure if manual probing is enabled.
1093 1093
  */
1094 1094
 //#define LCD_BED_LEVELING
1095 1095
 

+ 2
- 2
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h View File

@@ -1079,8 +1079,8 @@
1079 1079
 #endif
1080 1080
 
1081 1081
 /**
1082
- * Use the LCD controller for bed leveling
1083
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1082
+ * Add a bed leveling sub-menu for ABL or MBL.
1083
+ * Include a guided procedure if manual probing is enabled.
1084 1084
  */
1085 1085
 //#define LCD_BED_LEVELING
1086 1086
 

+ 2
- 2
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h View File

@@ -1080,8 +1080,8 @@
1080 1080
 #endif
1081 1081
 
1082 1082
 /**
1083
- * Use the LCD controller for bed leveling
1084
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1083
+ * Add a bed leveling sub-menu for ABL or MBL.
1084
+ * Include a guided procedure if manual probing is enabled.
1085 1085
  */
1086 1086
 //#define LCD_BED_LEVELING
1087 1087
 

+ 2
- 2
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h View File

@@ -1079,8 +1079,8 @@
1079 1079
 #endif
1080 1080
 
1081 1081
 /**
1082
- * Use the LCD controller for bed leveling
1083
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1082
+ * Add a bed leveling sub-menu for ABL or MBL.
1083
+ * Include a guided procedure if manual probing is enabled.
1084 1084
  */
1085 1085
 #define LCD_BED_LEVELING
1086 1086
 

+ 2
- 2
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h View File

@@ -1068,8 +1068,8 @@
1068 1068
 #endif
1069 1069
 
1070 1070
 /**
1071
- * Use the LCD controller for bed leveling
1072
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1071
+ * Add a bed leveling sub-menu for ABL or MBL.
1072
+ * Include a guided procedure if manual probing is enabled.
1073 1073
  */
1074 1074
 //#define LCD_BED_LEVELING
1075 1075
 

+ 2
- 2
Marlin/src/config/examples/JGAurora/A5/Configuration.h View File

@@ -1075,8 +1075,8 @@
1075 1075
 #endif
1076 1076
 
1077 1077
 /**
1078
- * Use the LCD controller for bed leveling
1079
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1078
+ * Add a bed leveling sub-menu for ABL or MBL.
1079
+ * Include a guided procedure if manual probing is enabled.
1080 1080
  */
1081 1081
 #define LCD_BED_LEVELING
1082 1082
 

+ 2
- 2
Marlin/src/config/examples/MakerParts/Configuration.h View File

@@ -1084,8 +1084,8 @@
1084 1084
 #endif
1085 1085
 
1086 1086
 /**
1087
- * Use the LCD controller for bed leveling
1088
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1087
+ * Add a bed leveling sub-menu for ABL or MBL.
1088
+ * Include a guided procedure if manual probing is enabled.
1089 1089
  */
1090 1090
 //#define LCD_BED_LEVELING
1091 1091
 

+ 2
- 2
Marlin/src/config/examples/Malyan/M150/Configuration.h View File

@@ -1103,8 +1103,8 @@
1103 1103
 #endif
1104 1104
 
1105 1105
 /**
1106
- * Use the LCD controller for bed leveling
1107
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1106
+ * Add a bed leveling sub-menu for ABL or MBL.
1107
+ * Include a guided procedure if manual probing is enabled.
1108 1108
  */
1109 1109
 //#define LCD_BED_LEVELING
1110 1110
 

+ 2
- 2
Marlin/src/config/examples/Malyan/M200/Configuration.h View File

@@ -1063,8 +1063,8 @@
1063 1063
 #endif
1064 1064
 
1065 1065
 /**
1066
- * Use the LCD controller for bed leveling
1067
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1066
+ * Add a bed leveling sub-menu for ABL or MBL.
1067
+ * Include a guided procedure if manual probing is enabled.
1068 1068
  */
1069 1069
 //#define LCD_BED_LEVELING
1070 1070
 

+ 2
- 2
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h View File

@@ -1068,8 +1068,8 @@
1068 1068
 #endif
1069 1069
 
1070 1070
 /**
1071
- * Use the LCD controller for bed leveling
1072
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1071
+ * Add a bed leveling sub-menu for ABL or MBL.
1072
+ * Include a guided procedure if manual probing is enabled.
1073 1073
  */
1074 1074
 #define LCD_BED_LEVELING
1075 1075
 

+ 2
- 2
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h View File

@@ -1068,8 +1068,8 @@
1068 1068
 #endif
1069 1069
 
1070 1070
 /**
1071
- * Use the LCD controller for bed leveling
1072
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1071
+ * Add a bed leveling sub-menu for ABL or MBL.
1072
+ * Include a guided procedure if manual probing is enabled.
1073 1073
  */
1074 1074
 //#define LCD_BED_LEVELING
1075 1075
 

+ 2
- 2
Marlin/src/config/examples/Mks/Sbase/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h View File

@@ -1113,8 +1113,8 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley
1113 1113
 #endif
1114 1114
 
1115 1115
 /**
1116
- * Use the LCD controller for bed leveling
1117
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1116
+ * Add a bed leveling sub-menu for ABL or MBL.
1117
+ * Include a guided procedure if manual probing is enabled.
1118 1118
  */
1119 1119
 //#define LCD_BED_LEVELING
1120 1120
 

+ 2
- 2
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/RigidBot/Configuration.h View File

@@ -1062,8 +1062,8 @@
1062 1062
 #endif
1063 1063
 
1064 1064
 /**
1065
- * Use the LCD controller for bed leveling
1066
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1065
+ * Add a bed leveling sub-menu for ABL or MBL.
1066
+ * Include a guided procedure if manual probing is enabled.
1067 1067
  */
1068 1068
 //#define LCD_BED_LEVELING
1069 1069
 

+ 2
- 2
Marlin/src/config/examples/SCARA/Configuration.h View File

@@ -1077,8 +1077,8 @@
1077 1077
 #endif
1078 1078
 
1079 1079
 /**
1080
- * Use the LCD controller for bed leveling
1081
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1080
+ * Add a bed leveling sub-menu for ABL or MBL.
1081
+ * Include a guided procedure if manual probing is enabled.
1082 1082
  */
1083 1083
 //#define LCD_BED_LEVELING
1084 1084
 

+ 2
- 2
Marlin/src/config/examples/STM32F10/Configuration.h View File

@@ -1067,8 +1067,8 @@
1067 1067
 #endif
1068 1068
 
1069 1069
 /**
1070
- * Use the LCD controller for bed leveling
1071
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1070
+ * Add a bed leveling sub-menu for ABL or MBL.
1071
+ * Include a guided procedure if manual probing is enabled.
1072 1072
  */
1073 1073
 //#define LCD_BED_LEVELING
1074 1074
 

+ 2
- 2
Marlin/src/config/examples/STM32F4/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/Sanguinololu/Configuration.h View File

@@ -1095,8 +1095,8 @@
1095 1095
 #endif
1096 1096
 
1097 1097
 /**
1098
- * Use the LCD controller for bed leveling
1099
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1098
+ * Add a bed leveling sub-menu for ABL or MBL.
1099
+ * Include a guided procedure if manual probing is enabled.
1100 1100
  */
1101 1101
 //#define LCD_BED_LEVELING
1102 1102
 

+ 2
- 2
Marlin/src/config/examples/TheBorg/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/TinyBoy2/Configuration.h View File

@@ -1120,8 +1120,8 @@
1120 1120
 #endif
1121 1121
 
1122 1122
 /**
1123
- * Use the LCD controller for bed leveling
1124
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1123
+ * Add a bed leveling sub-menu for ABL or MBL.
1124
+ * Include a guided procedure if manual probing is enabled.
1125 1125
  */
1126 1126
 //#define LCD_BED_LEVELING
1127 1127
 

+ 2
- 2
Marlin/src/config/examples/Tronxy/X1/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/Tronxy/X5S/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/Tronxy/XY100/Configuration.h View File

@@ -1075,8 +1075,8 @@
1075 1075
 #endif
1076 1076
 
1077 1077
 /**
1078
- * Use the LCD controller for bed leveling
1079
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1078
+ * Add a bed leveling sub-menu for ABL or MBL.
1079
+ * Include a guided procedure if manual probing is enabled.
1080 1080
  */
1081 1081
 //#define LCD_BED_LEVELING
1082 1082
 

+ 2
- 2
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/Velleman/K8200/Configuration.h View File

@@ -1094,8 +1094,8 @@
1094 1094
 #endif
1095 1095
 
1096 1096
 /**
1097
- * Use the LCD controller for bed leveling
1098
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1097
+ * Add a bed leveling sub-menu for ABL or MBL.
1098
+ * Include a guided procedure if manual probing is enabled.
1099 1099
  */
1100 1100
 //#define LCD_BED_LEVELING
1101 1101
 

+ 2
- 2
Marlin/src/config/examples/Velleman/K8400/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h View File

@@ -1071,8 +1071,8 @@
1071 1071
 #endif
1072 1072
 
1073 1073
 /**
1074
- * Use the LCD controller for bed leveling
1075
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1074
+ * Add a bed leveling sub-menu for ABL or MBL.
1075
+ * Include a guided procedure if manual probing is enabled.
1076 1076
  */
1077 1077
 //#define LCD_BED_LEVELING
1078 1078
 

+ 2
- 2
Marlin/src/config/examples/adafruit/ST7565/Configuration.h View File

@@ -1064,8 +1064,8 @@
1064 1064
 #endif
1065 1065
 
1066 1066
 /**
1067
- * Use the LCD controller for bed leveling
1068
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1067
+ * Add a bed leveling sub-menu for ABL or MBL.
1068
+ * Include a guided procedure if manual probing is enabled.
1069 1069
  */
1070 1070
 //#define LCD_BED_LEVELING
1071 1071
 

+ 2
- 2
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h View File

@@ -1215,8 +1215,8 @@
1215 1215
 #endif
1216 1216
 
1217 1217
 /**
1218
- * Use the LCD controller for bed leveling
1219
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1218
+ * Add a bed leveling sub-menu for ABL or MBL.
1219
+ * Include a guided procedure if manual probing is enabled.
1220 1220
  */
1221 1221
 //#define LCD_BED_LEVELING
1222 1222
 

+ 2
- 2
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h View File

@@ -1197,8 +1197,8 @@
1197 1197
 #endif
1198 1198
 
1199 1199
 /**
1200
- * Use the LCD controller for bed leveling
1201
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1200
+ * Add a bed leveling sub-menu for ABL or MBL.
1201
+ * Include a guided procedure if manual probing is enabled.
1202 1202
  */
1203 1203
 //#define LCD_BED_LEVELING
1204 1204
 

+ 2
- 2
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h View File

@@ -1196,8 +1196,8 @@
1196 1196
 #endif
1197 1197
 
1198 1198
 /**
1199
- * Use the LCD controller for bed leveling
1200
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1199
+ * Add a bed leveling sub-menu for ABL or MBL.
1200
+ * Include a guided procedure if manual probing is enabled.
1201 1201
  */
1202 1202
 //#define LCD_BED_LEVELING
1203 1203
 

+ 2
- 2
Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h View File

@@ -1210,8 +1210,8 @@
1210 1210
 #endif
1211 1211
 
1212 1212
 /**
1213
- * Use the LCD controller for bed leveling
1214
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1213
+ * Add a bed leveling sub-menu for ABL or MBL.
1214
+ * Include a guided procedure if manual probing is enabled.
1215 1215
  */
1216 1216
 //#define LCD_BED_LEVELING
1217 1217
 

+ 2
- 2
Marlin/src/config/examples/delta/generic/Configuration.h View File

@@ -1184,8 +1184,8 @@
1184 1184
 #endif
1185 1185
 
1186 1186
 /**
1187
- * Use the LCD controller for bed leveling
1188
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1187
+ * Add a bed leveling sub-menu for ABL or MBL.
1188
+ * Include a guided procedure if manual probing is enabled.
1189 1189
  */
1190 1190
 //#define LCD_BED_LEVELING
1191 1191
 

+ 2
- 2
Marlin/src/config/examples/delta/kossel_mini/Configuration.h View File

@@ -1187,8 +1187,8 @@
1187 1187
 #endif
1188 1188
 
1189 1189
 /**
1190
- * Use the LCD controller for bed leveling
1191
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1190
+ * Add a bed leveling sub-menu for ABL or MBL.
1191
+ * Include a guided procedure if manual probing is enabled.
1192 1192
  */
1193 1193
 //#define LCD_BED_LEVELING
1194 1194
 

+ 2
- 2
Marlin/src/config/examples/delta/kossel_pro/Configuration.h View File

@@ -1187,8 +1187,8 @@
1187 1187
 #endif
1188 1188
 
1189 1189
 /**
1190
- * Use the LCD controller for bed leveling
1191
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1190
+ * Add a bed leveling sub-menu for ABL or MBL.
1191
+ * Include a guided procedure if manual probing is enabled.
1192 1192
  */
1193 1193
 //#define LCD_BED_LEVELING
1194 1194
 

+ 2
- 2
Marlin/src/config/examples/delta/kossel_xl/Configuration.h View File

@@ -1187,8 +1187,8 @@
1187 1187
 #endif
1188 1188
 
1189 1189
 /**
1190
- * Use the LCD controller for bed leveling
1191
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1190
+ * Add a bed leveling sub-menu for ABL or MBL.
1191
+ * Include a guided procedure if manual probing is enabled.
1192 1192
  */
1193 1193
 //#define LCD_BED_LEVELING
1194 1194
 

+ 2
- 2
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h View File

@@ -1085,8 +1085,8 @@
1085 1085
 #endif
1086 1086
 
1087 1087
 /**
1088
- * Use the LCD controller for bed leveling
1089
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1088
+ * Add a bed leveling sub-menu for ABL or MBL.
1089
+ * Include a guided procedure if manual probing is enabled.
1090 1090
  */
1091 1091
 //#define LCD_BED_LEVELING
1092 1092
 

+ 2
- 2
Marlin/src/config/examples/makibox/Configuration.h View File

@@ -1067,8 +1067,8 @@
1067 1067
 #endif
1068 1068
 
1069 1069
 /**
1070
- * Use the LCD controller for bed leveling
1071
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1070
+ * Add a bed leveling sub-menu for ABL or MBL.
1071
+ * Include a guided procedure if manual probing is enabled.
1072 1072
  */
1073 1073
 //#define LCD_BED_LEVELING
1074 1074
 

+ 2
- 2
Marlin/src/config/examples/stm32f103ret6/Configuration.h View File

@@ -1065,8 +1065,8 @@
1065 1065
 #endif
1066 1066
 
1067 1067
 /**
1068
- * Use the LCD controller for bed leveling
1069
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1068
+ * Add a bed leveling sub-menu for ABL or MBL.
1069
+ * Include a guided procedure if manual probing is enabled.
1070 1070
  */
1071 1071
 //#define LCD_BED_LEVELING
1072 1072
 

+ 2
- 2
Marlin/src/config/examples/tvrrug/Round2/Configuration.h View File

@@ -1059,8 +1059,8 @@
1059 1059
 #endif
1060 1060
 
1061 1061
 /**
1062
- * Use the LCD controller for bed leveling
1063
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1062
+ * Add a bed leveling sub-menu for ABL or MBL.
1063
+ * Include a guided procedure if manual probing is enabled.
1064 1064
  */
1065 1065
 //#define LCD_BED_LEVELING
1066 1066
 

+ 2
- 2
Marlin/src/config/examples/wt150/Configuration.h View File

@@ -1069,8 +1069,8 @@
1069 1069
 #endif
1070 1070
 
1071 1071
 /**
1072
- * Use the LCD controller for bed leveling
1073
- * Requires MESH_BED_LEVELING or PROBE_MANUALLY
1072
+ * Add a bed leveling sub-menu for ABL or MBL.
1073
+ * Include a guided procedure if manual probing is enabled.
1074 1074
  */
1075 1075
 //#define LCD_BED_LEVELING
1076 1076
 

+ 2
- 2
Marlin/src/inc/SanityCheck.h View File

@@ -921,8 +921,8 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
921 921
 #if ENABLED(LCD_BED_LEVELING)
922 922
   #if DISABLED(ULTIPANEL)
923 923
     #error "LCD_BED_LEVELING requires an LCD controller."
924
-  #elif !(ENABLED(MESH_BED_LEVELING) || (OLDSCHOOL_ABL && ENABLED(PROBE_MANUALLY)))
925
-    #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or ABL with PROBE_MANUALLY."
924
+  #elif !(ENABLED(MESH_BED_LEVELING) || OLDSCHOOL_ABL)
925
+    #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING."
926 926
   #endif
927 927
 #endif
928 928
 

+ 1
- 1
Marlin/src/lcd/language/language_en.h View File

@@ -769,7 +769,7 @@
769 769
   #define MSG_FIRST                           _UxGT("first")
770 770
 #endif
771 771
 #ifndef MSG_ZPROBE_ZOFFSET
772
-  #define MSG_ZPROBE_ZOFFSET                  _UxGT("Z Offset")
772
+  #define MSG_ZPROBE_ZOFFSET                  _UxGT("Probe Z Offset")
773 773
 #endif
774 774
 #ifndef MSG_BABYSTEP_X
775 775
   #define MSG_BABYSTEP_X                      _UxGT("Babystep X")

+ 128
- 86
Marlin/src/lcd/ultralcd.cpp View File

@@ -1404,13 +1404,20 @@ void lcd_quick_feedback(const bool clear_buttons) {
1404 1404
     //
1405 1405
     MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_percentage, 10, 999);
1406 1406
 
1407
+    //
1407 1408
     // Manual bed leveling, Bed Z:
1409
+    //
1408 1410
     #if ENABLED(MESH_BED_LEVELING) && ENABLED(LCD_BED_LEVELING)
1409 1411
       MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
1410 1412
     #endif
1411
-    #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
1413
+
1414
+    //
1415
+    // Leveling Fade Height
1416
+    //
1417
+    #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) && DISABLED(SLIM_LCD_MENUS)
1412 1418
       MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_Z_FADE_HEIGHT, &new_z_fade_height, 0.0, 100.0, _lcd_set_z_fade_height);
1413 1419
     #endif
1420
+
1414 1421
     //
1415 1422
     // Nozzle:
1416 1423
     // Nozzle [1-4]:
@@ -1883,7 +1890,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
1883 1890
 
1884 1891
   #endif // LEVEL_BED_CORNERS
1885 1892
 
1886
-  #if ENABLED(LCD_BED_LEVELING)
1893
+  #if ENABLED(LCD_BED_LEVELING) && (ENABLED(PROBE_MANUALLY) || ENABLED(MESH_BED_LEVELING))
1887 1894
 
1888 1895
     /**
1889 1896
      *
@@ -2045,76 +2052,6 @@ void lcd_quick_feedback(const bool clear_buttons) {
2045 2052
       enqueue_and_echo_commands_P(PSTR("G28"));
2046 2053
     }
2047 2054
 
2048
-    static bool new_level_state;
2049
-    void _lcd_toggle_bed_leveling() { set_bed_leveling_enabled(new_level_state); }
2050
-
2051
-    /**
2052
-     * Step 1: Bed Level entry-point
2053
-     *
2054
-     * << Prepare
2055
-     *    Auto Home           (if homing needed)
2056
-     *    Leveling On/Off     (if data exists, and homed)
2057
-     *    Fade Height: ---    (Req: ENABLE_LEVELING_FADE_HEIGHT)
2058
-     *    Mesh Z Offset: ---  (Req: MESH_BED_LEVELING)
2059
-     *    Z Probe Offset: --- (Req: HAS_BED_PROBE, Opt: BABYSTEP_ZPROBE_OFFSET)
2060
-     *    Level Bed >
2061
-     *    Level Corners >     (if homed)
2062
-     *    Load Settings       (Req: EEPROM_SETTINGS)
2063
-     *    Save Settings       (Req: EEPROM_SETTINGS)
2064
-     */
2065
-    void lcd_bed_leveling() {
2066
-      START_MENU();
2067
-      MENU_BACK(MSG_PREPARE);
2068
-
2069
-      #if DISABLED(MESH_BED_LEVELING)
2070
-        if (!(axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]))
2071
-          MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
2072
-        else
2073
-      #endif
2074
-        if (leveling_is_valid()) {
2075
-          new_level_state = planner.leveling_active;
2076
-          MENU_ITEM_EDIT_CALLBACK(bool, MSG_BED_LEVELING, &new_level_state, _lcd_toggle_bed_leveling);
2077
-        }
2078
-
2079
-      #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
2080
-        MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_Z_FADE_HEIGHT, &new_z_fade_height, 0.0, 100.0, _lcd_set_z_fade_height);
2081
-      #endif
2082
-
2083
-      //
2084
-      // MBL Z Offset
2085
-      //
2086
-      #if ENABLED(MESH_BED_LEVELING)
2087
-        MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
2088
-      #endif
2089
-
2090
-      #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
2091
-        MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
2092
-      #elif HAS_BED_PROBE
2093
-        MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
2094
-      #endif
2095
-
2096
-      MENU_ITEM(submenu, MSG_LEVEL_BED, _lcd_level_bed_continue);
2097
-
2098
-      #if ENABLED(LEVEL_BED_CORNERS)
2099
-        // Move to the next corner for leveling
2100
-        if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
2101
-          MENU_ITEM(submenu, MSG_LEVEL_CORNERS, _lcd_level_bed_corners);
2102
-      #endif
2103
-
2104
-      #if ENABLED(EEPROM_SETTINGS)
2105
-        MENU_ITEM(function, MSG_LOAD_EEPROM, lcd_load_settings);
2106
-        MENU_ITEM(function, MSG_STORE_EEPROM, lcd_store_settings);
2107
-      #endif
2108
-      END_MENU();
2109
-    }
2110
-
2111
-    #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
2112
-      void _lcd_goto_bed_leveling() {
2113
-        lcd_goto_screen(lcd_bed_leveling);
2114
-        new_z_fade_height = planner.z_fade_height;
2115
-      }
2116
-    #endif
2117
-
2118 2055
   #elif ENABLED(AUTO_BED_LEVELING_UBL)
2119 2056
 
2120 2057
     void _lcd_ubl_level_bed();
@@ -2647,6 +2584,93 @@ void lcd_quick_feedback(const bool clear_buttons) {
2647 2584
 
2648 2585
   #endif // AUTO_BED_LEVELING_UBL
2649 2586
 
2587
+
2588
+  #if ENABLED(LCD_BED_LEVELING) || (PLANNER_LEVELING && DISABLED(SLIM_LCD_MENUS))
2589
+    void _lcd_toggle_bed_leveling() { set_bed_leveling_enabled(!planner.leveling_active); }
2590
+  #endif
2591
+
2592
+  #if ENABLED(LCD_BED_LEVELING)
2593
+
2594
+    /**
2595
+     * Step 1: Bed Level entry-point
2596
+     *
2597
+     * << Prepare
2598
+     *    Auto Home           (if homing needed)
2599
+     *    Leveling On/Off     (if data exists, and homed)
2600
+     *    Fade Height: ---    (Req: ENABLE_LEVELING_FADE_HEIGHT)
2601
+     *    Mesh Z Offset: ---  (Req: MESH_BED_LEVELING)
2602
+     *    Z Probe Offset: --- (Req: HAS_BED_PROBE, Opt: BABYSTEP_ZPROBE_OFFSET)
2603
+     *    Level Bed >
2604
+     *    Level Corners >     (if homed)
2605
+     *    Load Settings       (Req: EEPROM_SETTINGS)
2606
+     *    Save Settings       (Req: EEPROM_SETTINGS)
2607
+     */
2608
+    void lcd_bed_leveling() {
2609
+      START_MENU();
2610
+      MENU_BACK(MSG_PREPARE);
2611
+
2612
+      const bool is_homed = axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS];
2613
+
2614
+      // Auto Home if not using manual probing
2615
+      #if DISABLED(PROBE_MANUALLY) && DISABLED(MESH_BED_LEVELING)
2616
+        if (!is_homed) MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
2617
+      #endif
2618
+
2619
+      // Level Bed
2620
+      #if ENABLED(PROBE_MANUALLY) || ENABLED(MESH_BED_LEVELING)
2621
+        // Manual leveling uses a guided procedure
2622
+        MENU_ITEM(submenu, MSG_LEVEL_BED, _lcd_level_bed_continue);
2623
+      #else
2624
+        // Automatic leveling can just run the G-code
2625
+        MENU_ITEM(gcode, MSG_LEVEL_BED, is_homed ? PSTR("G29") : PSTR("G28\nG29"));
2626
+      #endif
2627
+
2628
+      // Homed and leveling is valid? Then leveling can be toggled.
2629
+      if (is_homed && leveling_is_valid()) {
2630
+        bool new_level_state = planner.leveling_active;
2631
+        MENU_ITEM_EDIT_CALLBACK(bool, MSG_BED_LEVELING, &new_level_state, _lcd_toggle_bed_leveling);
2632
+      }
2633
+
2634
+      // Z Fade Height
2635
+      #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
2636
+        MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_Z_FADE_HEIGHT, &new_z_fade_height, 0.0, 100.0, _lcd_set_z_fade_height);
2637
+      #endif
2638
+
2639
+      //
2640
+      // MBL Z Offset
2641
+      //
2642
+      #if ENABLED(MESH_BED_LEVELING)
2643
+        MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
2644
+      #endif
2645
+
2646
+      #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
2647
+        MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
2648
+      #elif HAS_BED_PROBE
2649
+        MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
2650
+      #endif
2651
+
2652
+      #if ENABLED(LEVEL_BED_CORNERS)
2653
+        // Move to the next corner for leveling
2654
+        if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
2655
+          MENU_ITEM(submenu, MSG_LEVEL_CORNERS, _lcd_level_bed_corners);
2656
+      #endif
2657
+
2658
+      #if ENABLED(EEPROM_SETTINGS)
2659
+        MENU_ITEM(function, MSG_LOAD_EEPROM, lcd_load_settings);
2660
+        MENU_ITEM(function, MSG_STORE_EEPROM, lcd_store_settings);
2661
+      #endif
2662
+      END_MENU();
2663
+    }
2664
+
2665
+    #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
2666
+      void _lcd_goto_bed_leveling() {
2667
+        lcd_goto_screen(lcd_bed_leveling);
2668
+        new_z_fade_height = planner.z_fade_height;
2669
+      }
2670
+    #endif
2671
+
2672
+  #endif // LCD_BED_LEVELING
2673
+
2650 2674
   /**
2651 2675
    *
2652 2676
    * "Prepare" submenu
@@ -2683,26 +2707,44 @@ void lcd_quick_feedback(const bool clear_buttons) {
2683 2707
     // Level Bed
2684 2708
     //
2685 2709
     #if ENABLED(AUTO_BED_LEVELING_UBL)
2686
-      MENU_ITEM(submenu, MSG_UBL_LEVEL_BED,
2687
-        #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
2688
-          _lcd_goto_ubl_level_bed
2689
-        #else
2690
-          _lcd_ubl_level_bed
2691
-        #endif
2710
+
2711
+      MENU_ITEM(submenu, MSG_UBL_LEVEL_BED, (
2712
+          #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
2713
+            _lcd_goto_ubl_level_bed
2714
+          #else
2715
+            _lcd_ubl_level_bed
2716
+          #endif
2717
+        )
2692 2718
       );
2719
+
2693 2720
     #elif ENABLED(LCD_BED_LEVELING)
2721
+
2694 2722
       #if ENABLED(PROBE_MANUALLY)
2695 2723
         if (!g29_in_progress)
2696 2724
       #endif
2697
-          MENU_ITEM(submenu, MSG_BED_LEVELING,
2698
-            #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
2699
-              _lcd_goto_bed_leveling
2700
-            #else
2701
-              lcd_bed_leveling
2702
-            #endif
2725
+
2726
+          MENU_ITEM(submenu, MSG_BED_LEVELING, (
2727
+              #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
2728
+                _lcd_goto_bed_leveling
2729
+              #else
2730
+                lcd_bed_leveling
2731
+              #endif
2732
+            )
2703 2733
           );
2704
-    #elif PLANNER_LEVELING && DISABLED(PROBE_MANUALLY) && DISABLED(SLIM_LCD_MENUS)
2705
-      MENU_ITEM(gcode, MSG_BED_LEVELING, PSTR("G28\nG29"));
2734
+
2735
+    #elif PLANNER_LEVELING && DISABLED(SLIM_LCD_MENUS)
2736
+
2737
+      #if DISABLED(PROBE_MANUALLY)
2738
+        MENU_ITEM(gcode, MSG_LEVEL_BED, PSTR("G28\nG29"));
2739
+      #endif
2740
+      if (leveling_is_valid()) {
2741
+        bool new_level_state = planner.leveling_active;
2742
+        MENU_ITEM_EDIT_CALLBACK(bool, MSG_BED_LEVELING, &new_level_state, _lcd_toggle_bed_leveling);
2743
+      }
2744
+      #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
2745
+        MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_Z_FADE_HEIGHT, &new_z_fade_height, 0.0, 100.0, _lcd_set_z_fade_height);
2746
+      #endif
2747
+
2706 2748
     #endif
2707 2749
 
2708 2750
     #if ENABLED(LEVEL_BED_CORNERS) && DISABLED(LCD_BED_LEVELING)

Loading…
Cancel
Save