SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #10589 from thinkyhead/bf2_lcd_bed_leveling_abl

Browse source 
[2.0.x] Sub-menu for ABL with LCD_BED_LEVELING
This commit is contained in:
Scott Lahteine 2018-05-02 06:22:42 -05:00 committed by GitHub
commit fcc5baef52
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
79 changed files with 302 additions and 267 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/Configuration.h
View file

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

4
Marlin/src/config/default/Configuration.h
View file

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

4
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
View file

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

4
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
View file

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

4
Marlin/src/config/examples/Anet/A6/Configuration.h
View file

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

4
Marlin/src/config/examples/Anet/A8/Configuration.h
View file

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

4
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
View file

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

4
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
View file

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

4
Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
View file

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

4
Marlin/src/config/examples/BQ/Hephestos/Configuration.h
View file

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

4
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
View file

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

4
Marlin/src/config/examples/BQ/WITBOX/Configuration.h
View file

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

4
Marlin/src/config/examples/Cartesio/Configuration.h
View file

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

4
Marlin/src/config/examples/Creality/CR-10/Configuration.h
View file

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

4
Marlin/src/config/examples/Creality/CR-10S/Configuration.h
View file

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

4
Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
View file

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

4
Marlin/src/config/examples/Creality/CR-8/Configuration.h
View file

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

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

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

4
Marlin/src/config/examples/Creality/Ender-3/Configuration.h
View file

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

4
Marlin/src/config/examples/Creality/Ender-4/Configuration.h
View file

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

4
Marlin/src/config/examples/Felix/Configuration.h
View file

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

4
Marlin/src/config/examples/Felix/DUAL/Configuration.h
View file

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

4
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
View file

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

4
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
View file

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

4
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
View file

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

4
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
View file

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

4
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
View file

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

4
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
View file

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

4
Marlin/src/config/examples/JGAurora/A5/Configuration.h
View file

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

4
Marlin/src/config/examples/MakerParts/Configuration.h
View file

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

4
Marlin/src/config/examples/Malyan/M150/Configuration.h
View file

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

4
Marlin/src/config/examples/Malyan/M200/Configuration.h
View file

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

4
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
View file

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

4
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
View file

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

4
Marlin/src/config/examples/Mks/Sbase/Configuration.h
View file

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

4
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
#endif #endif
/** /**
* Use the LCD controller for bed leveling * Add a bed leveling sub-menu for ABL or MBL.
* Requires MESH_BED_LEVELING or PROBE_MANUALLY * Include a guided procedure if manual probing is enabled.
*/ */
//#define LCD_BED_LEVELING //#define LCD_BED_LEVELING

4
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
View file

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

4
Marlin/src/config/examples/RigidBot/Configuration.h
View file

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

4
Marlin/src/config/examples/SCARA/Configuration.h
View file

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

4
Marlin/src/config/examples/STM32F10/Configuration.h
View file

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

4
Marlin/src/config/examples/STM32F4/Configuration.h
View file

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

4
Marlin/src/config/examples/Sanguinololu/Configuration.h
View file

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

4
Marlin/src/config/examples/TheBorg/Configuration.h
View file

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

4
Marlin/src/config/examples/TinyBoy2/Configuration.h
View file

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

4
Marlin/src/config/examples/Tronxy/X1/Configuration.h
View file

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

4
Marlin/src/config/examples/Tronxy/X5S/Configuration.h
View file

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

4
Marlin/src/config/examples/Tronxy/XY100/Configuration.h
View file

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

4
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
View file

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

4
Marlin/src/config/examples/Velleman/K8200/Configuration.h
View file

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

4
Marlin/src/config/examples/Velleman/K8400/Configuration.h
View file

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

4
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
View file

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

4
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
View file

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

4
Marlin/src/config/examples/adafruit/ST7565/Configuration.h
View file

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

4
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
View file

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

4
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
View file

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

4
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
View file

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

4
Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
View file

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

4
Marlin/src/config/examples/delta/generic/Configuration.h
View file

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

4
Marlin/src/config/examples/delta/kossel_mini/Configuration.h
View file

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

4
Marlin/src/config/examples/delta/kossel_pro/Configuration.h
View file

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

4
Marlin/src/config/examples/delta/kossel_xl/Configuration.h
View file

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

4
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
View file

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

4
Marlin/src/config/examples/makibox/Configuration.h
View file

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

4
Marlin/src/config/examples/stm32f103ret6/Configuration.h
View file

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

4
Marlin/src/config/examples/tvrrug/Round2/Configuration.h
View file

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

4
Marlin/src/config/examples/wt150/Configuration.h
View file

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

6
Marlin/src/core/serial.cpp
View file

@ -75,10 +75,4 @@ void serial_spaces(uint8_t count) { count *= (PROPORTIONAL_FONT_RATIO); while (c
print_xyz(prefix, suffix, xyz[X_AXIS], xyz[Y_AXIS], xyz[Z_AXIS]); print_xyz(prefix, suffix, xyz[X_AXIS], xyz[Y_AXIS], xyz[Z_AXIS]);
} }
#if HAS_ABL
void print_xyz(const char* prefix, const char* suffix, const vector_3 &xyz) {
print_xyz(prefix, suffix, xyz.x, xyz.y, xyz.z);
}
#endif
#endif #endif

7
Marlin/src/core/serial.h
View file

@ -25,10 +25,6 @@
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfig.h"
#if HAS_ABL && ENABLED(DEBUG_LEVELING_FEATURE)
#include "../libs/vector_3.h"
#endif
/** /**
* Define debug bit-masks * Define debug bit-masks
*/ */
@ -243,9 +239,6 @@ void serialprintPGM(const char* str);
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
void print_xyz(const char* prefix, const char* suffix, const float x, const float y, const float z); void print_xyz(const char* prefix, const char* suffix, const float x, const float y, const float z);
void print_xyz(const char* prefix, const char* suffix, const float xyz[]); void print_xyz(const char* prefix, const char* suffix, const float xyz[]);
#if HAS_ABL
void print_xyz(const char* prefix, const char* suffix, const vector_3 &xyz);
#endif
#define DEBUG_POS(SUFFIX,VAR) do { print_xyz(PSTR(" " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n"), VAR); } while(0) #define DEBUG_POS(SUFFIX,VAR) do { print_xyz(PSTR(" " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n"), VAR); } while(0)
#endif #endif

2
Marlin/src/core/utility.cpp
View file

@ -125,7 +125,7 @@ void safe_delay(millis_t ms) {
} }
// Convert signed float to fixed-length string with 023.45 / -23.45 format // Convert signed float to fixed-length string with 023.45 / -23.45 format
char* ftostr32(const float &f) { char* ftostr52(const float &f) {
long i = (f * 1000 + (f < 0 ? -5: 5)) / 10; long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
conv[1] = MINUSOR(i, DIGIMOD(i, 10000)); conv[1] = MINUSOR(i, DIGIMOD(i, 10000));
conv[2] = DIGIMOD(i, 1000); conv[2] = DIGIMOD(i, 1000);

2
Marlin/src/core/utility.h
View file

@ -63,7 +63,7 @@ void safe_delay(millis_t ms);
char* ftostr12ns(const float &x); char* ftostr12ns(const float &x);
// Convert signed float to fixed-length string with 023.45 / -23.45 format // Convert signed float to fixed-length string with 023.45 / -23.45 format
char* ftostr32(const float &x); char* ftostr52(const float &x);
// Convert float to fixed-length string with +123.4 / -123.4 format // Convert float to fixed-length string with +123.4 / -123.4 format
char* ftostr41sign(const float &x); char* ftostr41sign(const float &x);

4
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View file

@ -41,7 +41,7 @@
#include "../../../feature/bedlevel/bedlevel.h" #include "../../../feature/bedlevel/bedlevel.h"
#include "../../../libs/least_squares_fit.h" #include "../../../libs/least_squares_fit.h"
#include "../../../feature/Max7219_Debug_LEDs.h" #include "../../../feature/Max7219_Debug_LEDs.h"
#include <math.h> #include <math.h>
@ -1496,6 +1496,8 @@
#if HAS_BED_PROBE #if HAS_BED_PROBE
#include "../../../libs/vector_3.h"
void unified_bed_leveling::tilt_mesh_based_on_probed_grid(const bool do_3_pt_leveling) { void unified_bed_leveling::tilt_mesh_based_on_probed_grid(const bool do_3_pt_leveling) {
constexpr int16_t x_min = max(MIN_PROBE_X, MESH_MIN_X), constexpr int16_t x_min = max(MIN_PROBE_X, MESH_MIN_X),
x_max = min(MAX_PROBE_X, MESH_MAX_X), x_max = min(MAX_PROBE_X, MESH_MAX_X),

4
Marlin/src/gcode/bedlevel/abl/G29.cpp
View file

@ -44,6 +44,10 @@
#include "../../../libs/least_squares_fit.h" #include "../../../libs/least_squares_fit.h"
#endif #endif
#if ABL_PLANAR
#include "../../../libs/vector_3.h"
#endif
#if ABL_GRID #if ABL_GRID
#if ENABLED(PROBE_Y_FIRST) #if ENABLED(PROBE_Y_FIRST)
#define PR_OUTER_VAR xCount #define PR_OUTER_VAR xCount

4
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,
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#if DISABLED(ULTIPANEL) #if DISABLED(ULTIPANEL)
#error "LCD_BED_LEVELING requires an LCD controller." #error "LCD_BED_LEVELING requires an LCD controller."
#elif !(ENABLED(MESH_BED_LEVELING) || (OLDSCHOOL_ABL && ENABLED(PROBE_MANUALLY))) #elif !(ENABLED(MESH_BED_LEVELING) || OLDSCHOOL_ABL)
#error "LCD_BED_LEVELING requires MESH_BED_LEVELING or ABL with PROBE_MANUALLY." #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING."
#endif #endif
#endif #endif

2
Marlin/src/lcd/language/language_en.h
View file

@ -769,7 +769,7 @@
#define MSG_FIRST _UxGT("first") #define MSG_FIRST _UxGT("first")
#endif #endif
#ifndef MSG_ZPROBE_ZOFFSET #ifndef MSG_ZPROBE_ZOFFSET
#define MSG_ZPROBE_ZOFFSET _UxGT("Z Offset") #define MSG_ZPROBE_ZOFFSET _UxGT("Probe Z Offset")
#endif #endif
#ifndef MSG_BABYSTEP_X #ifndef MSG_BABYSTEP_X
#define MSG_BABYSTEP_X _UxGT("Babystep X") #define MSG_BABYSTEP_X _UxGT("Babystep X")

238
Marlin/src/lcd/ultralcd.cpp
View file

@ -136,11 +136,11 @@ uint16_t max_display_update_time = 0;
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(int16_t, int3, itostr3); DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(int16_t, int3, itostr3);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(uint8_t, int8, i8tostr3); DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(uint8_t, int8, i8tostr3);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float3, ftostr3); DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float3, ftostr3);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float32, ftostr32); DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float52, ftostr52);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float43, ftostr43sign); DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float43, ftostr43sign);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float5, ftostr5rj); DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float5, ftostr5rj);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float51, ftostr51sign); DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float51, ftostr51sign);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float52, ftostr52sign); DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float52sign, ftostr52sign);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float62, ftostr62rj); DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float62, ftostr62rj);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(uint32_t, long5, ftostr5rj); DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(uint32_t, long5, ftostr5rj);
#define lcd_implementation_drawmenu_setting_edit_bool(sel, row, pstr, pstr2, data) DRAW_BOOL_SETTING(sel, row, pstr, data) #define lcd_implementation_drawmenu_setting_edit_bool(sel, row, pstr, pstr2, data) DRAW_BOOL_SETTING(sel, row, pstr, data)
@ -264,11 +264,11 @@ uint16_t max_display_update_time = 0;
DECLARE_MENU_EDIT_TYPE(int16_t, int3); DECLARE_MENU_EDIT_TYPE(int16_t, int3);
DECLARE_MENU_EDIT_TYPE(uint8_t, int8); DECLARE_MENU_EDIT_TYPE(uint8_t, int8);
DECLARE_MENU_EDIT_TYPE(float, float3); DECLARE_MENU_EDIT_TYPE(float, float3);
DECLARE_MENU_EDIT_TYPE(float, float32); DECLARE_MENU_EDIT_TYPE(float, float52);
DECLARE_MENU_EDIT_TYPE(float, float43); DECLARE_MENU_EDIT_TYPE(float, float43);
DECLARE_MENU_EDIT_TYPE(float, float5); DECLARE_MENU_EDIT_TYPE(float, float5);
DECLARE_MENU_EDIT_TYPE(float, float51); DECLARE_MENU_EDIT_TYPE(float, float51);
DECLARE_MENU_EDIT_TYPE(float, float52); DECLARE_MENU_EDIT_TYPE(float, float52sign);
DECLARE_MENU_EDIT_TYPE(float, float62); DECLARE_MENU_EDIT_TYPE(float, float62);
DECLARE_MENU_EDIT_TYPE(uint32_t, long5); DECLARE_MENU_EDIT_TYPE(uint32_t, long5);
@ -1404,13 +1404,20 @@ void lcd_quick_feedback(const bool clear_buttons) {
// //
MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_percentage, 10, 999); MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_percentage, 10, 999);
//
// Manual bed leveling, Bed Z: // Manual bed leveling, Bed Z:
//
#if ENABLED(MESH_BED_LEVELING) && ENABLED(LCD_BED_LEVELING) #if ENABLED(MESH_BED_LEVELING) && ENABLED(LCD_BED_LEVELING)
MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1); MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
#endif #endif
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
//
// Leveling Fade Height
//
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) && DISABLED(SLIM_LCD_MENUS)
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_Z_FADE_HEIGHT, &new_z_fade_height, 0.0, 100.0, _lcd_set_z_fade_height); MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_Z_FADE_HEIGHT, &new_z_fade_height, 0.0, 100.0, _lcd_set_z_fade_height);
#endif #endif
// //
// Nozzle: // Nozzle:
// Nozzle [1-4]: // Nozzle [1-4]:
@ -1883,7 +1890,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
#endif // LEVEL_BED_CORNERS #endif // LEVEL_BED_CORNERS
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING) && (ENABLED(PROBE_MANUALLY) || ENABLED(MESH_BED_LEVELING))
/** /**
* *
@ -2045,76 +2052,6 @@ void lcd_quick_feedback(const bool clear_buttons) {
enqueue_and_echo_commands_P(PSTR("G28")); enqueue_and_echo_commands_P(PSTR("G28"));
} }
static bool new_level_state;
void _lcd_toggle_bed_leveling() { set_bed_leveling_enabled(new_level_state); }
/**
* Step 1: Bed Level entry-point
*
* << Prepare
* Auto Home (if homing needed)
* Leveling On/Off (if data exists, and homed)
* Fade Height: --- (Req: ENABLE_LEVELING_FADE_HEIGHT)
* Mesh Z Offset: --- (Req: MESH_BED_LEVELING)
* Z Probe Offset: --- (Req: HAS_BED_PROBE, Opt: BABYSTEP_ZPROBE_OFFSET)
* Level Bed >
* Level Corners > (if homed)
* Load Settings (Req: EEPROM_SETTINGS)
* Save Settings (Req: EEPROM_SETTINGS)
*/
void lcd_bed_leveling() {
START_MENU();
MENU_BACK(MSG_PREPARE);
#if DISABLED(MESH_BED_LEVELING)
if (!(axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]))
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
else
#endif
if (leveling_is_valid()) {
new_level_state = planner.leveling_active;
MENU_ITEM_EDIT_CALLBACK(bool, MSG_BED_LEVELING, &new_level_state, _lcd_toggle_bed_leveling);
}
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_Z_FADE_HEIGHT, &new_z_fade_height, 0.0, 100.0, _lcd_set_z_fade_height);
#endif
//
// MBL Z Offset
//
#if ENABLED(MESH_BED_LEVELING)
MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
#endif
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
#elif HAS_BED_PROBE
MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
#endif
MENU_ITEM(submenu, MSG_LEVEL_BED, _lcd_level_bed_continue);
#if ENABLED(LEVEL_BED_CORNERS)
// Move to the next corner for leveling
if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
MENU_ITEM(submenu, MSG_LEVEL_CORNERS, _lcd_level_bed_corners);
#endif
#if ENABLED(EEPROM_SETTINGS)
MENU_ITEM(function, MSG_LOAD_EEPROM, lcd_load_settings);
MENU_ITEM(function, MSG_STORE_EEPROM, lcd_store_settings);
#endif
END_MENU();
}
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
void _lcd_goto_bed_leveling() {
lcd_goto_screen(lcd_bed_leveling);
new_z_fade_height = planner.z_fade_height;
}
#endif
#elif ENABLED(AUTO_BED_LEVELING_UBL) #elif ENABLED(AUTO_BED_LEVELING_UBL)
void _lcd_ubl_level_bed(); void _lcd_ubl_level_bed();
@ -2647,6 +2584,93 @@ void lcd_quick_feedback(const bool clear_buttons) {
#endif // AUTO_BED_LEVELING_UBL #endif // AUTO_BED_LEVELING_UBL
#if ENABLED(LCD_BED_LEVELING) || (PLANNER_LEVELING && DISABLED(SLIM_LCD_MENUS))
void _lcd_toggle_bed_leveling() { set_bed_leveling_enabled(!planner.leveling_active); }
#endif
#if ENABLED(LCD_BED_LEVELING)
/**
* Step 1: Bed Level entry-point
*
* << Prepare
* Auto Home (if homing needed)
* Leveling On/Off (if data exists, and homed)
* Fade Height: --- (Req: ENABLE_LEVELING_FADE_HEIGHT)
* Mesh Z Offset: --- (Req: MESH_BED_LEVELING)
* Z Probe Offset: --- (Req: HAS_BED_PROBE, Opt: BABYSTEP_ZPROBE_OFFSET)
* Level Bed >
* Level Corners > (if homed)
* Load Settings (Req: EEPROM_SETTINGS)
* Save Settings (Req: EEPROM_SETTINGS)
*/
void lcd_bed_leveling() {
START_MENU();
MENU_BACK(MSG_PREPARE);
const bool is_homed = axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS];
// Auto Home if not using manual probing
#if DISABLED(PROBE_MANUALLY) && DISABLED(MESH_BED_LEVELING)
if (!is_homed) MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
#endif
// Level Bed
#if ENABLED(PROBE_MANUALLY) || ENABLED(MESH_BED_LEVELING)
// Manual leveling uses a guided procedure
MENU_ITEM(submenu, MSG_LEVEL_BED, _lcd_level_bed_continue);
#else
// Automatic leveling can just run the G-code
MENU_ITEM(gcode, MSG_LEVEL_BED, is_homed ? PSTR("G29") : PSTR("G28\nG29"));
#endif
// Homed and leveling is valid? Then leveling can be toggled.
if (is_homed && leveling_is_valid()) {
bool new_level_state = planner.leveling_active;
MENU_ITEM_EDIT_CALLBACK(bool, MSG_BED_LEVELING, &new_level_state, _lcd_toggle_bed_leveling);
}
// Z Fade Height
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_Z_FADE_HEIGHT, &new_z_fade_height, 0.0, 100.0, _lcd_set_z_fade_height);
#endif
//
// MBL Z Offset
//
#if ENABLED(MESH_BED_LEVELING)
MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
#endif
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
#elif HAS_BED_PROBE
MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
#endif
#if ENABLED(LEVEL_BED_CORNERS)
// Move to the next corner for leveling
if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
MENU_ITEM(submenu, MSG_LEVEL_CORNERS, _lcd_level_bed_corners);
#endif
#if ENABLED(EEPROM_SETTINGS)
MENU_ITEM(function, MSG_LOAD_EEPROM, lcd_load_settings);
MENU_ITEM(function, MSG_STORE_EEPROM, lcd_store_settings);
#endif
END_MENU();
}
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
void _lcd_goto_bed_leveling() {
lcd_goto_screen(lcd_bed_leveling);
new_z_fade_height = planner.z_fade_height;
}
#endif
#endif // LCD_BED_LEVELING
/** /**
* *
* "Prepare" submenu * "Prepare" submenu
@ -2683,26 +2707,44 @@ void lcd_quick_feedback(const bool clear_buttons) {
// Level Bed // Level Bed
// //
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
MENU_ITEM(submenu, MSG_UBL_LEVEL_BED,
MENU_ITEM(submenu, MSG_UBL_LEVEL_BED, (
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
_lcd_goto_ubl_level_bed _lcd_goto_ubl_level_bed
#else #else
_lcd_ubl_level_bed _lcd_ubl_level_bed
#endif #endif
)
); );
#elif ENABLED(LCD_BED_LEVELING) #elif ENABLED(LCD_BED_LEVELING)
#if ENABLED(PROBE_MANUALLY) #if ENABLED(PROBE_MANUALLY)
if (!g29_in_progress) if (!g29_in_progress)
#endif #endif
MENU_ITEM(submenu, MSG_BED_LEVELING,
MENU_ITEM(submenu, MSG_BED_LEVELING, (
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
_lcd_goto_bed_leveling _lcd_goto_bed_leveling
#else #else
lcd_bed_leveling lcd_bed_leveling
#endif #endif
)
); );
#elif PLANNER_LEVELING && DISABLED(PROBE_MANUALLY) && DISABLED(SLIM_LCD_MENUS)
MENU_ITEM(gcode, MSG_BED_LEVELING, PSTR("G28\nG29")); #elif PLANNER_LEVELING && DISABLED(SLIM_LCD_MENUS)
#if DISABLED(PROBE_MANUALLY)
MENU_ITEM(gcode, MSG_LEVEL_BED, PSTR("G28\nG29"));
#endif
if (leveling_is_valid()) {
bool new_level_state = planner.leveling_active;
MENU_ITEM_EDIT_CALLBACK(bool, MSG_BED_LEVELING, &new_level_state, _lcd_toggle_bed_leveling);
}
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_Z_FADE_HEIGHT, &new_z_fade_height, 0.0, 100.0, _lcd_set_z_fade_height);
#endif
#endif #endif
#if ENABLED(LEVEL_BED_CORNERS) && DISABLED(LCD_BED_LEVELING) #if ENABLED(LEVEL_BED_CORNERS) && DISABLED(LCD_BED_LEVELING)
@ -2864,15 +2906,15 @@ void lcd_quick_feedback(const bool clear_buttons) {
void lcd_delta_settings() { void lcd_delta_settings() {
START_MENU(); START_MENU();
MENU_BACK(MSG_DELTA_CALIBRATE); MENU_BACK(MSG_DELTA_CALIBRATE);
MENU_ITEM_EDIT_CALLBACK(float52, MSG_DELTA_HEIGHT, &delta_height, delta_height - 10.0, delta_height + 10.0, _recalc_delta_settings); MENU_ITEM_EDIT_CALLBACK(float52sign, MSG_DELTA_HEIGHT, &delta_height, delta_height - 10.0, delta_height + 10.0, _recalc_delta_settings);
MENU_ITEM_EDIT_CALLBACK(float43, "Ex", &delta_endstop_adj[A_AXIS], -5.0, 5.0, _recalc_delta_settings); MENU_ITEM_EDIT_CALLBACK(float43, "Ex", &delta_endstop_adj[A_AXIS], -5.0, 5.0, _recalc_delta_settings);
MENU_ITEM_EDIT_CALLBACK(float43, "Ey", &delta_endstop_adj[B_AXIS], -5.0, 5.0, _recalc_delta_settings); MENU_ITEM_EDIT_CALLBACK(float43, "Ey", &delta_endstop_adj[B_AXIS], -5.0, 5.0, _recalc_delta_settings);
MENU_ITEM_EDIT_CALLBACK(float43, "Ez", &delta_endstop_adj[C_AXIS], -5.0, 5.0, _recalc_delta_settings); MENU_ITEM_EDIT_CALLBACK(float43, "Ez", &delta_endstop_adj[C_AXIS], -5.0, 5.0, _recalc_delta_settings);
MENU_ITEM_EDIT_CALLBACK(float52, MSG_DELTA_RADIUS, &delta_radius, delta_radius - 5.0, delta_radius + 5.0, _recalc_delta_settings); MENU_ITEM_EDIT_CALLBACK(float52sign, MSG_DELTA_RADIUS, &delta_radius, delta_radius - 5.0, delta_radius + 5.0, _recalc_delta_settings);
MENU_ITEM_EDIT_CALLBACK(float43, "Tx", &delta_tower_angle_trim[A_AXIS], -5.0, 5.0, _recalc_delta_settings); MENU_ITEM_EDIT_CALLBACK(float43, "Tx", &delta_tower_angle_trim[A_AXIS], -5.0, 5.0, _recalc_delta_settings);
MENU_ITEM_EDIT_CALLBACK(float43, "Ty", &delta_tower_angle_trim[B_AXIS], -5.0, 5.0, _recalc_delta_settings); MENU_ITEM_EDIT_CALLBACK(float43, "Ty", &delta_tower_angle_trim[B_AXIS], -5.0, 5.0, _recalc_delta_settings);
MENU_ITEM_EDIT_CALLBACK(float43, "Tz", &delta_tower_angle_trim[C_AXIS], -5.0, 5.0, _recalc_delta_settings); MENU_ITEM_EDIT_CALLBACK(float43, "Tz", &delta_tower_angle_trim[C_AXIS], -5.0, 5.0, _recalc_delta_settings);
MENU_ITEM_EDIT_CALLBACK(float52, MSG_DELTA_DIAG_ROD, &delta_diagonal_rod, delta_diagonal_rod - 5.0, delta_diagonal_rod + 5.0, _recalc_delta_settings); MENU_ITEM_EDIT_CALLBACK(float52sign, MSG_DELTA_DIAG_ROD, &delta_diagonal_rod, delta_diagonal_rod - 5.0, delta_diagonal_rod + 5.0, _recalc_delta_settings);
END_MENU(); END_MENU();
} }
@ -3315,7 +3357,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
#if DISABLED(NO_VOLUMETRICS) || ENABLED(ADVANCED_PAUSE_FEATURE) #if DISABLED(NO_VOLUMETRICS) || ENABLED(ADVANCED_PAUSE_FEATURE)
MENU_ITEM(submenu, MSG_FILAMENT, lcd_control_filament_menu); MENU_ITEM(submenu, MSG_FILAMENT, lcd_control_filament_menu);
#elif ENABLED(LIN_ADVANCE) #elif ENABLED(LIN_ADVANCE)
MENU_ITEM_EDIT(float32, MSG_ADVANCE_K, &planner.extruder_advance_K, 0, 999); MENU_ITEM_EDIT(float52, MSG_ADVANCE_K, &planner.extruder_advance_K, 0, 999);
#endif #endif
#if HAS_LCD_CONTRAST #if HAS_LCD_CONTRAST
@ -3500,7 +3542,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
MENU_ITEM_EDIT(bool, MSG_AUTOTEMP, &planner.autotemp_enabled); MENU_ITEM_EDIT(bool, MSG_AUTOTEMP, &planner.autotemp_enabled);
MENU_ITEM_EDIT(float3, MSG_MIN, &planner.autotemp_min, 0, HEATER_0_MAXTEMP - 15); MENU_ITEM_EDIT(float3, MSG_MIN, &planner.autotemp_min, 0, HEATER_0_MAXTEMP - 15);
MENU_ITEM_EDIT(float3, MSG_MAX, &planner.autotemp_max, 0, HEATER_0_MAXTEMP - 15); MENU_ITEM_EDIT(float3, MSG_MAX, &planner.autotemp_max, 0, HEATER_0_MAXTEMP - 15);
MENU_ITEM_EDIT(float32, MSG_FACTOR, &planner.autotemp_factor, 0.0, 1.0); MENU_ITEM_EDIT(float52, MSG_FACTOR, &planner.autotemp_factor, 0.0, 1.0);
#endif #endif
// //
@ -3516,9 +3558,9 @@ void lcd_quick_feedback(const bool clear_buttons) {
#define _PID_BASE_MENU_ITEMS(ELABEL, eindex) \ #define _PID_BASE_MENU_ITEMS(ELABEL, eindex) \
raw_Ki = unscalePID_i(PID_PARAM(Ki, eindex)); \ raw_Ki = unscalePID_i(PID_PARAM(Ki, eindex)); \
raw_Kd = unscalePID_d(PID_PARAM(Kd, eindex)); \ raw_Kd = unscalePID_d(PID_PARAM(Kd, eindex)); \
MENU_ITEM_EDIT(float52, MSG_PID_P ELABEL, &PID_PARAM(Kp, eindex), 1, 9990); \ MENU_ITEM_EDIT(float52sign, MSG_PID_P ELABEL, &PID_PARAM(Kp, eindex), 1, 9990); \
MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I ELABEL, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E ## eindex); \ MENU_ITEM_EDIT_CALLBACK(float52sign, MSG_PID_I ELABEL, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E ## eindex); \
MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D ELABEL, &raw_Kd, 1, 9990, copy_and_scalePID_d_E ## eindex) MENU_ITEM_EDIT_CALLBACK(float52sign, MSG_PID_D ELABEL, &raw_Kd, 1, 9990, copy_and_scalePID_d_E ## eindex)
#if ENABLED(PID_EXTRUSION_SCALING) #if ENABLED(PID_EXTRUSION_SCALING)
#define _PID_MENU_ITEMS(ELABEL, eindex) \ #define _PID_MENU_ITEMS(ELABEL, eindex) \
@ -3739,7 +3781,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
#if ENABLED(DELTA) #if ENABLED(DELTA)
MENU_ITEM_EDIT(float3, MSG_VC_JERK, &planner.max_jerk[C_AXIS], 1, 990); MENU_ITEM_EDIT(float3, MSG_VC_JERK, &planner.max_jerk[C_AXIS], 1, 990);
#else #else
MENU_ITEM_EDIT(float52, MSG_VC_JERK, &planner.max_jerk[C_AXIS], 0.1, 990); MENU_ITEM_EDIT(float52sign, MSG_VC_JERK, &planner.max_jerk[C_AXIS], 0.1, 990);
#endif #endif
MENU_ITEM_EDIT(float3, MSG_VE_JERK, &planner.max_jerk[E_AXIS], 1, 990); MENU_ITEM_EDIT(float3, MSG_VE_JERK, &planner.max_jerk[E_AXIS], 1, 990);
@ -3790,7 +3832,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
#if ENABLED(BABYSTEP_ZPROBE_OFFSET) #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset); MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
#elif HAS_BED_PROBE #elif HAS_BED_PROBE
MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX); MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
#endif #endif
#if DISABLED(SLIM_LCD_MENUS) #if DISABLED(SLIM_LCD_MENUS)
@ -3828,7 +3870,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
MENU_BACK(MSG_CONTROL); MENU_BACK(MSG_CONTROL);
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
MENU_ITEM_EDIT(float32, MSG_ADVANCE_K, &planner.extruder_advance_K, 0, 999); MENU_ITEM_EDIT(float52, MSG_ADVANCE_K, &planner.extruder_advance_K, 0, 999);
#endif #endif
#if DISABLED(NO_VOLUMETRICS) #if DISABLED(NO_VOLUMETRICS)
@ -3913,15 +3955,15 @@ void lcd_quick_feedback(const bool clear_buttons) {
START_MENU(); START_MENU();
MENU_BACK(MSG_CONTROL); MENU_BACK(MSG_CONTROL);
MENU_ITEM_EDIT_CALLBACK(bool, MSG_AUTORETRACT, &fwretract.autoretract_enabled, fwretract.refresh_autoretract); MENU_ITEM_EDIT_CALLBACK(bool, MSG_AUTORETRACT, &fwretract.autoretract_enabled, fwretract.refresh_autoretract);
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT, &fwretract.retract_length, 0, 100); MENU_ITEM_EDIT(float52sign, MSG_CONTROL_RETRACT, &fwretract.retract_length, 0, 100);
#if EXTRUDERS > 1 #if EXTRUDERS > 1
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_SWAP, &fwretract.swap_retract_length, 0, 100); MENU_ITEM_EDIT(float52sign, MSG_CONTROL_RETRACT_SWAP, &fwretract.swap_retract_length, 0, 100);
#endif #endif
MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACTF, &fwretract.retract_feedrate_mm_s, 1, 999); MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACTF, &fwretract.retract_feedrate_mm_s, 1, 999);
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_ZLIFT, &fwretract.retract_zlift, 0, 999); MENU_ITEM_EDIT(float52sign, MSG_CONTROL_RETRACT_ZLIFT, &fwretract.retract_zlift, 0, 999);
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER, &fwretract.retract_recover_length, -100, 100); MENU_ITEM_EDIT(float52sign, MSG_CONTROL_RETRACT_RECOVER, &fwretract.retract_recover_length, -100, 100);
#if EXTRUDERS > 1 #if EXTRUDERS > 1
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER_SWAP, &fwretract.swap_retract_recover_length, -100, 100); MENU_ITEM_EDIT(float52sign, MSG_CONTROL_RETRACT_RECOVER_SWAP, &fwretract.swap_retract_recover_length, -100, 100);
#endif #endif
MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACT_RECOVERF, &fwretract.retract_recover_feedrate_mm_s, 1, 999); MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACT_RECOVERF, &fwretract.retract_recover_feedrate_mm_s, 1, 999);
#if EXTRUDERS > 1 #if EXTRUDERS > 1
@ -4829,11 +4871,11 @@ void lcd_quick_feedback(const bool clear_buttons) {
DEFINE_MENU_EDIT_TYPE(int16_t, int3, itostr3, 1); DEFINE_MENU_EDIT_TYPE(int16_t, int3, itostr3, 1);
DEFINE_MENU_EDIT_TYPE(uint8_t, int8, i8tostr3, 1); DEFINE_MENU_EDIT_TYPE(uint8_t, int8, i8tostr3, 1);
DEFINE_MENU_EDIT_TYPE(float, float3, ftostr3, 1.0); DEFINE_MENU_EDIT_TYPE(float, float3, ftostr3, 1.0);
DEFINE_MENU_EDIT_TYPE(float, float32, ftostr32, 100.0); DEFINE_MENU_EDIT_TYPE(float, float52, ftostr52, 100.0);
DEFINE_MENU_EDIT_TYPE(float, float43, ftostr43sign, 1000.0); DEFINE_MENU_EDIT_TYPE(float, float43, ftostr43sign, 1000.0);
DEFINE_MENU_EDIT_TYPE(float, float5, ftostr5rj, 0.01); DEFINE_MENU_EDIT_TYPE(float, float5, ftostr5rj, 0.01);
DEFINE_MENU_EDIT_TYPE(float, float51, ftostr51sign, 10.0); DEFINE_MENU_EDIT_TYPE(float, float51, ftostr51sign, 10.0);
DEFINE_MENU_EDIT_TYPE(float, float52, ftostr52sign, 100.0); DEFINE_MENU_EDIT_TYPE(float, float52sign, ftostr52sign, 100.0);
DEFINE_MENU_EDIT_TYPE(float, float62, ftostr62rj, 100.0); DEFINE_MENU_EDIT_TYPE(float, float62, ftostr62rj, 100.0);
DEFINE_MENU_EDIT_TYPE(uint32_t, long5, ftostr5rj, 0.01); DEFINE_MENU_EDIT_TYPE(uint32_t, long5, ftostr5rj, 0.01);

4
Marlin/src/lcd/ultralcd_impl_DOGM.h
View file

@ -619,10 +619,10 @@ void lcd_implementation_clear() { } // Automatically cleared by Picture Loop
if (PAGE_UNDER(7)) { if (PAGE_UNDER(7)) {
lcd_moveto(5, 7); lcd_moveto(5, 7);
lcd_put_u8str("X:"); lcd_put_u8str("X:");
lcd_put_u8str(ftostr32(LOGICAL_X_POSITION(pgm_read_float(&ubl._mesh_index_to_xpos[x_plot])))); lcd_put_u8str(ftostr52(LOGICAL_X_POSITION(pgm_read_float(&ubl._mesh_index_to_xpos[x_plot]))));
lcd_moveto(74, 7); lcd_moveto(74, 7);
lcd_put_u8str("Y:"); lcd_put_u8str("Y:");
lcd_put_u8str(ftostr32(LOGICAL_Y_POSITION(pgm_read_float(&ubl._mesh_index_to_ypos[y_plot])))); lcd_put_u8str(ftostr52(LOGICAL_Y_POSITION(pgm_read_float(&ubl._mesh_index_to_ypos[y_plot]))));
} }
// Print plot position // Print plot position

8
Marlin/src/lcd/ultralcd_impl_HD44780.h
View file

@ -1065,10 +1065,10 @@ static void lcd_implementation_status_screen() {
* Show X and Y positions * Show X and Y positions
*/ */
_XLABEL(_PLOT_X, 0); _XLABEL(_PLOT_X, 0);
lcd_put_u8str(ftostr32(LOGICAL_X_POSITION(pgm_read_float(&ubl._mesh_index_to_xpos[x])))); lcd_put_u8str(ftostr52(LOGICAL_X_POSITION(pgm_read_float(&ubl._mesh_index_to_xpos[x]))));
_YLABEL(_LCD_W_POS, 0); _YLABEL(_LCD_W_POS, 0);
lcd_put_u8str(ftostr32(LOGICAL_Y_POSITION(pgm_read_float(&ubl._mesh_index_to_ypos[inverted_y])))); lcd_put_u8str(ftostr52(LOGICAL_Y_POSITION(pgm_read_float(&ubl._mesh_index_to_ypos[inverted_y]))));
lcd_moveto(_PLOT_X, 0); lcd_moveto(_PLOT_X, 0);
@ -1301,9 +1301,9 @@ static void lcd_implementation_status_screen() {
* Show all values at right of screen * Show all values at right of screen
*/ */
_XLABEL(_LCD_W_POS, 1); _XLABEL(_LCD_W_POS, 1);
lcd_put_u8str(ftostr32(LOGICAL_X_POSITION(pgm_read_float(&ubl._mesh_index_to_xpos[x])))); lcd_put_u8str(ftostr52(LOGICAL_X_POSITION(pgm_read_float(&ubl._mesh_index_to_xpos[x]))));
_YLABEL(_LCD_W_POS, 2); _YLABEL(_LCD_W_POS, 2);
lcd_put_u8str(ftostr32(LOGICAL_Y_POSITION(pgm_read_float(&ubl._mesh_index_to_ypos[inverted_y])))); lcd_put_u8str(ftostr52(LOGICAL_Y_POSITION(pgm_read_float(&ubl._mesh_index_to_ypos[inverted_y]))));
/** /**
* Show the location value * Show the location value

2
Marlin/src/libs/vector_3.cpp
View file

@ -41,7 +41,7 @@
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfig.h"
#if HAS_ABL #if ABL_PLANAR || ENABLED(AUTO_BED_LEVELING_UBL)
#include "vector_3.h" #include "vector_3.h"

2
Marlin/src/module/planner.h
View file

@ -40,7 +40,7 @@
#include "delta.h" #include "delta.h"
#endif #endif
#if HAS_ABL #if ABL_PLANAR
#include "../libs/vector_3.h" #include "../libs/vector_3.h"
#endif #endif