Browse Source

Add GFX overlay to UBL mesh edit (#8038)

* Add GFX overlay to UBL mesh edit

Fixed misplaced HAS_TEMP_BED in dogm_bitmaps.h

rename _lcd_babystep_zoffset_overlay to _lcd_zoffset_overlay_gfx and move it out of BABYSTEP_ZPROBE_OFFSET to we can use it for over things. Add this function into UBL mesh edit screen.

update all Configuration.h to add ENABLE_MESH_EDIT_GFX_OVERLAY

* Add Sanity to UBL  insanity

Need to check for DOGLCD  otherwise error out.
cdedwards 7 years ago
parent
commit
6296ab2173
44 changed files with 170 additions and 126 deletions
  1. 2
    1
      Marlin/Configuration.h
  2. 1
    0
      Marlin/src/config/default/Configuration.h
  3. 1
    0
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
  4. 1
    0
      Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
  5. 1
    0
      Marlin/src/config/examples/Anet/A6/Configuration.h
  6. 1
    0
      Marlin/src/config/examples/Anet/A8/Configuration.h
  7. 1
    0
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  8. 1
    0
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
  9. 1
    0
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  10. 1
    0
      Marlin/src/config/examples/Cartesio/Configuration.h
  11. 1
    0
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  12. 1
    0
      Marlin/src/config/examples/Felix/Configuration.h
  13. 1
    0
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  14. 1
    0
      Marlin/src/config/examples/Folger Tech/i3-2020/Configuration.h
  15. 1
    0
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  16. 1
    0
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  17. 1
    0
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  18. 1
    0
      Marlin/src/config/examples/Malyan/M150/Configuration.h
  19. 1
    0
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  20. 1
    0
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  21. 1
    0
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  22. 1
    0
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  23. 1
    0
      Marlin/src/config/examples/RigidBot/Configuration.h
  24. 1
    0
      Marlin/src/config/examples/SCARA/Configuration.h
  25. 1
    0
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  26. 1
    0
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  27. 1
    0
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  28. 1
    0
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  29. 1
    0
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  30. 1
    0
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  31. 1
    0
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  32. 1
    0
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
  33. 1
    0
      Marlin/src/config/examples/delta/generic/Configuration.h
  34. 1
    0
      Marlin/src/config/examples/delta/kossel_mini/Configuration.h
  35. 1
    0
      Marlin/src/config/examples/delta/kossel_pro/Configuration.h
  36. 1
    0
      Marlin/src/config/examples/delta/kossel_xl/Configuration.h
  37. 1
    0
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
  38. 1
    0
      Marlin/src/config/examples/makibox/Configuration.h
  39. 1
    0
      Marlin/src/config/examples/stm32f103ret6/Configuration.h
  40. 1
    0
      Marlin/src/config/examples/tvrrug/Round2/Configuration.h
  41. 1
    0
      Marlin/src/config/examples/wt150/Configuration.h
  42. 3
    1
      Marlin/src/inc/SanityCheck.h
  43. 86
    88
      Marlin/src/lcd/dogm/dogm_bitmaps.h
  44. 39
    36
      Marlin/src/lcd/ultralcd.cpp

+ 2
- 1
Marlin/Configuration.h View File

@@ -854,7 +854,7 @@
854 854
  * - AUTO_BED_LEVELING_UBL (Unified Bed Leveling)
855 855
  *   A comprehensive bed leveling system combining the features and benefits
856 856
  *   of other systems. UBL also includes integrated Mesh Generation, Mesh
857
- *   Validation and Mesh Editing systems. 
857
+ *   Validation and Mesh Editing systems.
858 858
  *
859 859
  * - MESH_BED_LEVELING
860 860
  *   Probe a grid manually
@@ -875,6 +875,7 @@
875 875
  * NOTE: Requires a lot of PROGMEM!
876 876
  */
877 877
 //#define DEBUG_LEVELING_FEATURE
878
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
878 879
 
879 880
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
880 881
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -875,6 +875,7 @@
875 875
  * NOTE: Requires a lot of PROGMEM!
876 876
  */
877 877
 //#define DEBUG_LEVELING_FEATURE
878
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
878 879
 
879 880
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
880 881
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -895,6 +895,7 @@
895 895
  * NOTE: Requires a lot of PROGMEM!
896 896
  */
897 897
 //#define DEBUG_LEVELING_FEATURE
898
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
898 899
 
899 900
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
900 901
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -875,6 +875,7 @@
875 875
  * NOTE: Requires a lot of PROGMEM!
876 876
  */
877 877
 //#define DEBUG_LEVELING_FEATURE
878
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
878 879
 
879 880
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
880 881
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -994,6 +994,7 @@
994 994
  * NOTE: Requires a lot of PROGMEM!
995 995
  */
996 996
 //#define DEBUG_LEVELING_FEATURE
997
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
997 998
 
998 999
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
999 1000
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -881,6 +881,7 @@
881 881
  * NOTE: Requires a lot of PROGMEM!
882 882
  */
883 883
 //#define DEBUG_LEVELING_FEATURE
884
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
884 885
 
885 886
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
886 887
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -866,6 +866,7 @@
866 866
  * NOTE: Requires a lot of PROGMEM!
867 867
  */
868 868
 //#define DEBUG_LEVELING_FEATURE
869
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
869 870
 
870 871
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
871 872
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -876,6 +876,7 @@
876 876
  * NOTE: Requires a lot of PROGMEM!
877 877
  */
878 878
 //#define DEBUG_LEVELING_FEATURE
879
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
879 880
 
880 881
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
881 882
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -866,6 +866,7 @@
866 866
  * NOTE: Requires a lot of PROGMEM!
867 867
  */
868 868
 //#define DEBUG_LEVELING_FEATURE
869
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
869 870
 
870 871
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
871 872
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -874,6 +874,7 @@
874 874
  * NOTE: Requires a lot of PROGMEM!
875 875
  */
876 876
 //#define DEBUG_LEVELING_FEATURE
877
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
877 878
 
878 879
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
879 880
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -885,6 +885,7 @@
885 885
  * NOTE: Requires a lot of PROGMEM!
886 886
  */
887 887
 //#define DEBUG_LEVELING_FEATURE
888
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
888 889
 
889 890
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
890 891
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -857,6 +857,7 @@
857 857
  * NOTE: Requires a lot of PROGMEM!
858 858
  */
859 859
 //#define DEBUG_LEVELING_FEATURE
860
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
860 861
 
861 862
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
862 863
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -857,6 +857,7 @@
857 857
  * NOTE: Requires a lot of PROGMEM!
858 858
  */
859 859
 //#define DEBUG_LEVELING_FEATURE
860
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
860 861
 
861 862
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
862 863
   // Gradually reduce leveling correction until a set height is reached,

+ 1
- 0
Marlin/src/config/examples/Folger Tech/i3-2020/Configuration.h View File

@@ -872,6 +872,7 @@
872 872
  * NOTE: Requires a lot of PROGMEM!
873 873
  */
874 874
 //#define DEBUG_LEVELING_FEATURE
875
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
875 876
 
876 877
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
877 878
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -890,6 +890,7 @@
890 890
  * NOTE: Requires a lot of PROGMEM!
891 891
  */
892 892
 //#define DEBUG_LEVELING_FEATURE
893
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
893 894
 
894 895
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
895 896
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -875,6 +875,7 @@
875 875
  * NOTE: Requires a lot of PROGMEM!
876 876
  */
877 877
 //#define DEBUG_LEVELING_FEATURE
878
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
878 879
 
879 880
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
880 881
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -879,6 +879,7 @@
879 879
  * NOTE: Requires a lot of PROGMEM!
880 880
  */
881 881
 //#define DEBUG_LEVELING_FEATURE
882
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
882 883
 
883 884
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
884 885
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -903,6 +903,7 @@
903 903
  * NOTE: Requires a lot of PROGMEM!
904 904
  */
905 905
 //#define DEBUG_LEVELING_FEATURE
906
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
906 907
 
907 908
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
908 909
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -879,6 +879,7 @@
879 879
  * NOTE: Requires a lot of PROGMEM!
880 880
  */
881 881
 //#define DEBUG_LEVELING_FEATURE
882
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
882 883
 
883 884
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
884 885
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -879,6 +879,7 @@
879 879
  * NOTE: Requires a lot of PROGMEM!
880 880
  */
881 881
 //#define DEBUG_LEVELING_FEATURE
882
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
882 883
 
883 884
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
884 885
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -877,6 +877,7 @@
877 877
  * NOTE: Requires a lot of PROGMEM!
878 878
  */
879 879
 //#define DEBUG_LEVELING_FEATURE
880
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
880 881
 
881 882
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
882 883
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -875,6 +875,7 @@
875 875
  * NOTE: Requires a lot of PROGMEM!
876 876
  */
877 877
 //#define DEBUG_LEVELING_FEATURE
878
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
878 879
 
879 880
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
880 881
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -873,6 +873,7 @@
873 873
  * NOTE: Requires a lot of PROGMEM!
874 874
  */
875 875
 //#define DEBUG_LEVELING_FEATURE
876
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
876 877
 
877 878
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
878 879
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -887,6 +887,7 @@
887 887
  * NOTE: Requires a lot of PROGMEM!
888 888
  */
889 889
 //#define DEBUG_LEVELING_FEATURE
890
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
890 891
 
891 892
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
892 893
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -906,6 +906,7 @@
906 906
  * NOTE: Requires a lot of PROGMEM!
907 907
  */
908 908
 //#define DEBUG_LEVELING_FEATURE
909
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
909 910
 
910 911
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
911 912
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -931,6 +931,7 @@
931 931
  * NOTE: Requires a lot of PROGMEM!
932 932
  */
933 933
 //#define DEBUG_LEVELING_FEATURE
934
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
934 935
 
935 936
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
936 937
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -905,6 +905,7 @@
905 905
  * NOTE: Requires a lot of PROGMEM!
906 906
  */
907 907
 //#define DEBUG_LEVELING_FEATURE
908
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
908 909
 
909 910
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
910 911
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -875,6 +875,7 @@
875 875
  * NOTE: Requires a lot of PROGMEM!
876 876
  */
877 877
 //#define DEBUG_LEVELING_FEATURE
878
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
878 879
 
879 880
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
880 881
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -875,6 +875,7 @@
875 875
  * NOTE: Requires a lot of PROGMEM!
876 876
  */
877 877
 //#define DEBUG_LEVELING_FEATURE
878
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
878 879
 
879 880
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
880 881
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -875,6 +875,7 @@
875 875
  * NOTE: Requires a lot of PROGMEM!
876 876
  */
877 877
 //#define DEBUG_LEVELING_FEATURE
878
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
878 879
 
879 880
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
880 881
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -999,6 +999,7 @@
999 999
  * NOTE: Requires a lot of PROGMEM!
1000 1000
  */
1001 1001
 //#define DEBUG_LEVELING_FEATURE
1002
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
1002 1003
 
1003 1004
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
1004 1005
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -999,6 +999,7 @@
999 999
  * NOTE: Requires a lot of PROGMEM!
1000 1000
  */
1001 1001
 //#define DEBUG_LEVELING_FEATURE
1002
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
1002 1003
 
1003 1004
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
1004 1005
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -986,6 +986,7 @@
986 986
  * NOTE: Requires a lot of PROGMEM!
987 987
  */
988 988
 //#define DEBUG_LEVELING_FEATURE
989
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
989 990
 
990 991
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
991 992
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -989,6 +989,7 @@
989 989
  * NOTE: Requires a lot of PROGMEM!
990 990
  */
991 991
 //#define DEBUG_LEVELING_FEATURE
992
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
992 993
 
993 994
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
994 995
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -989,6 +989,7 @@
989 989
  * NOTE: Requires a lot of PROGMEM!
990 990
  */
991 991
 //#define DEBUG_LEVELING_FEATURE
992
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
992 993
 
993 994
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
994 995
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -998,6 +998,7 @@
998 998
  * NOTE: Requires a lot of PROGMEM!
999 999
  */
1000 1000
 //#define DEBUG_LEVELING_FEATURE
1001
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
1001 1002
 
1002 1003
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
1003 1004
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -889,6 +889,7 @@
889 889
  * NOTE: Requires a lot of PROGMEM!
890 890
  */
891 891
 #define DEBUG_LEVELING_FEATURE
892
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
892 893
 
893 894
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
894 895
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -878,6 +878,7 @@
878 878
  * NOTE: Requires a lot of PROGMEM!
879 879
  */
880 880
 //#define DEBUG_LEVELING_FEATURE
881
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
881 882
 
882 883
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
883 884
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -862,6 +862,7 @@
862 862
  * NOTE: Requires a lot of PROGMEM!
863 863
  */
864 864
 //#define DEBUG_LEVELING_FEATURE
865
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
865 866
 
866 867
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
867 868
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -870,6 +870,7 @@
870 870
  * NOTE: Requires a lot of PROGMEM!
871 871
  */
872 872
 //#define DEBUG_LEVELING_FEATURE
873
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
873 874
 
874 875
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
875 876
   // Gradually reduce leveling correction until a set height is reached,

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

@@ -880,6 +880,7 @@
880 880
  * NOTE: Requires a lot of PROGMEM!
881 881
  */
882 882
 //#define DEBUG_LEVELING_FEATURE
883
+//#define ENABLE_MESH_EDIT_GFX_OVERLAY  // enable a graphics overly while editing the mesh from auto-level
883 884
 
884 885
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
885 886
   // Gradually reduce leveling correction until a set height is reached,

+ 3
- 1
Marlin/src/inc/SanityCheck.h View File

@@ -736,7 +736,9 @@ static_assert(1 >= 0
736 736
     static_assert(WITHIN(UBL_PROBE_PT_2_Y, MIN_PROBE_Y, MAX_PROBE_Y), "UBL_PROBE_PT_2_Y can't be reached by the Z probe.");
737 737
     static_assert(WITHIN(UBL_PROBE_PT_3_Y, MIN_PROBE_Y, MAX_PROBE_Y), "UBL_PROBE_PT_3_Y can't be reached by the Z probe.");
738 738
   #endif
739
-
739
+  #if ENABLED(ENABLE_MESH_EDIT_GFX_OVERLAY) && !ENABLED(DOGLCD)
740
+    #error "ENABLE_MESH_EDIT_GFX_OVERLAY requires a DOGLCD."
741
+  #endif
740 742
 #elif HAS_ABL
741 743
 
742 744
   /**

+ 86
- 88
Marlin/src/lcd/dogm/dogm_bitmaps.h View File

@@ -419,97 +419,95 @@
419 419
       0x0C, 0x00, 0x00, 0x06, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
420 420
     };
421 421
   #endif // Extruders
422
+#endif // HAS_TEMP_BED
423
+#if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) || ENABLED(ENABLE_MESH_EDIT_GFX_OVERLAY)
424
+  const unsigned char cw_bmp[] PROGMEM = { //AVR-GCC, WinAVR
425
+    0x07,0xf8,0x00, // 000001111111100000000000
426
+    0x0c,0x0c,0x00, // 000011000000110000000000
427
+    0x10,0x02,0x00, // 000100000000001000000000
428
+    0x20,0x01,0x00, // 001000000000000100000000
429
+    0x60,0x01,0x80, // 011000000000000100000000
430
+    0x40,0x00,0x80, // 010000000000000010000000
431
+    0x40,0x03,0xe0, // 010000000000001111100000
432
+    0x40,0x01,0xc0, // 010000000000000111000000
433
+    0x40,0x00,0x80, // 010000000000000010000000
434
+    0x40,0x00,0x00, // 010000000000000000000000
435
+    0x40,0x00,0x00, // 010000000000000000000000
436
+    0x60,0x00,0x00, // 011000000000000000000000
437
+    0x20,0x00,0x00, // 001000000000000000000000
438
+    0x10,0x00,0x00, // 000100000000000000000000
439
+    0x0c,0x0c,0x00, // 000011000000110000000000
440
+    0x07,0xf8,0x00  // 000001111111100000000000
441
+  };
422 442
 
423
-  #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY)
424
-    const unsigned char cw_bmp[] PROGMEM = { //AVR-GCC, WinAVR
425
-      0x07,0xf8,0x00, // 000001111111100000000000
426
-      0x0c,0x0c,0x00, // 000011000000110000000000
427
-      0x10,0x02,0x00, // 000100000000001000000000
428
-      0x20,0x01,0x00, // 001000000000000100000000
429
-      0x60,0x01,0x80, // 011000000000000100000000
430
-      0x40,0x00,0x80, // 010000000000000010000000
431
-      0x40,0x03,0xe0, // 010000000000001111100000
432
-      0x40,0x01,0xc0, // 010000000000000111000000
433
-      0x40,0x00,0x80, // 010000000000000010000000
434
-      0x40,0x00,0x00, // 010000000000000000000000
435
-      0x40,0x00,0x00, // 010000000000000000000000
436
-      0x60,0x00,0x00, // 011000000000000000000000
437
-      0x20,0x00,0x00, // 001000000000000000000000
438
-      0x10,0x00,0x00, // 000100000000000000000000
439
-      0x0c,0x0c,0x00, // 000011000000110000000000
440
-      0x07,0xf8,0x00  // 000001111111100000000000
441
-    };
442
-
443
-    const unsigned char ccw_bmp[] PROGMEM = { //AVR-GCC, WinAVR
444
-      0x01,0xfe,0x00, // 000000011111111000000000
445
-      0x03,0x03,0x00, // 000000110000001100000000
446
-      0x04,0x00,0x80, // 000001000000000010000000
447
-      0x08,0x00,0x40, // 000010000000000001000000
448
-      0x18,0x00,0x60, // 000110000000000001100000
449
-      0x10,0x00,0x20, // 000100000000000000100000
450
-      0x7c,0x00,0x20, // 011111000000000000100000
451
-      0x38,0x00,0x20, // 001110000000000000100000
452
-      0x10,0x00,0x20, // 000100000000000000100000
453
-      0x00,0x00,0x20, // 000000000000000000100000
454
-      0x00,0x00,0x20, // 000000000000000000100000
455
-      0x00,0x00,0x60, // 000000000000000001100000
456
-      0x00,0x00,0x40, // 000000000000000001000000
457
-      0x00,0x00,0x80, // 000000000000000010000000
458
-      0x03,0x03,0x00, // 000000110000001100000000
459
-      0x01,0xfe,0x00  // 000000011111111000000000
460
-    };
461
-
443
+  const unsigned char ccw_bmp[] PROGMEM = { //AVR-GCC, WinAVR
444
+    0x01,0xfe,0x00, // 000000011111111000000000
445
+    0x03,0x03,0x00, // 000000110000001100000000
446
+    0x04,0x00,0x80, // 000001000000000010000000
447
+    0x08,0x00,0x40, // 000010000000000001000000
448
+    0x18,0x00,0x60, // 000110000000000001100000
449
+    0x10,0x00,0x20, // 000100000000000000100000
450
+    0x7c,0x00,0x20, // 011111000000000000100000
451
+    0x38,0x00,0x20, // 001110000000000000100000
452
+    0x10,0x00,0x20, // 000100000000000000100000
453
+    0x00,0x00,0x20, // 000000000000000000100000
454
+    0x00,0x00,0x20, // 000000000000000000100000
455
+    0x00,0x00,0x60, // 000000000000000001100000
456
+    0x00,0x00,0x40, // 000000000000000001000000
457
+    0x00,0x00,0x80, // 000000000000000010000000
458
+    0x03,0x03,0x00, // 000000110000001100000000
459
+    0x01,0xfe,0x00  // 000000011111111000000000
460
+  };
462 461
 
463
-    const unsigned char up_arrow_bmp[] PROGMEM = { //AVR-GCC, WinAVR
464
-      0x06,0x00, // 000001100000
465
-      0x0F,0x00, // 000011110000
466
-      0x1F,0x80, // 000111111000
467
-      0x3F,0xC0, // 001111111100
468
-      0x06,0x00, // 000001100000
469
-      0x06,0x00, // 000001100000
470
-      0x06,0x00, // 000001100000
471
-      0x06,0x00, // 000001100000
472
-      0x06,0x00, // 000001100000
473
-      0x06,0x00, // 000001100000
474
-      0x06,0x00, // 000001100000
475
-      0x06,0x00, // 000001100000
476
-      0x06,0x00  // 000001100000
477
-    };
478 462
 
479
-    const unsigned char down_arrow_bmp[] PROGMEM = { //AVR-GCC, WinAVR
480
-      0x06,0x00, // 000001100000
481
-      0x06,0x00, // 000001100000
482
-      0x06,0x00, // 000001100000
483
-      0x06,0x00, // 000001100000
484
-      0x06,0x00, // 000001100000
485
-      0x06,0x00, // 000001100000
486
-      0x06,0x00, // 000001100000
487
-      0x06,0x00, // 000001100000
488
-      0x06,0x00, // 000001100000
489
-      0x3F,0xC0, // 001111111100
490
-      0x1F,0x80, // 000111111000
491
-      0x0F,0x00, // 000011110000
492
-      0x06,0x00  // 000001100000
493
-    };
463
+  const unsigned char up_arrow_bmp[] PROGMEM = { //AVR-GCC, WinAVR
464
+    0x06,0x00, // 000001100000
465
+    0x0F,0x00, // 000011110000
466
+    0x1F,0x80, // 000111111000
467
+    0x3F,0xC0, // 001111111100
468
+    0x06,0x00, // 000001100000
469
+    0x06,0x00, // 000001100000
470
+    0x06,0x00, // 000001100000
471
+    0x06,0x00, // 000001100000
472
+    0x06,0x00, // 000001100000
473
+    0x06,0x00, // 000001100000
474
+    0x06,0x00, // 000001100000
475
+    0x06,0x00, // 000001100000
476
+    0x06,0x00  // 000001100000
477
+  };
494 478
 
495
-    const unsigned char offset_bedline_bmp[] PROGMEM = { //AVR-GCC, WinAVR
496
-      0xFF,0xFF,0xFF // 111111111111111111111111
497
-    };
479
+  const unsigned char down_arrow_bmp[] PROGMEM = { //AVR-GCC, WinAVR
480
+    0x06,0x00, // 000001100000
481
+    0x06,0x00, // 000001100000
482
+    0x06,0x00, // 000001100000
483
+    0x06,0x00, // 000001100000
484
+    0x06,0x00, // 000001100000
485
+    0x06,0x00, // 000001100000
486
+    0x06,0x00, // 000001100000
487
+    0x06,0x00, // 000001100000
488
+    0x06,0x00, // 000001100000
489
+    0x3F,0xC0, // 001111111100
490
+    0x1F,0x80, // 000111111000
491
+    0x0F,0x00, // 000011110000
492
+    0x06,0x00  // 000001100000
493
+  };
498 494
 
499
-    const unsigned char nozzle_bmp[] PROGMEM = { //AVR-GCC, WinAVR
500
-      0x7F,0x80, // 0111111110000000
501
-      0xFF,0xC0, // 1111111111000000
502
-      0xFF,0xC0, // 1111111111000000
503
-      0xFF,0xC0, // 1111111111000000
504
-      0x7F,0x80, // 0111111110000000
505
-      0x7F,0x80, // 0111111110000000
506
-      0xFF,0xC0, // 1111111111000000
507
-      0xFF,0xC0, // 1111111111000000
508
-      0xFF,0xC0, // 1111111111000000
509
-      0x3F,0x00, // 0011111100000000
510
-      0x1E,0x00, // 0001111000000000
511
-      0x0C,0x00  // 0000110000000000
512
-    };
513
-  #endif // BABYSTEP_ZPROBE_GFX_OVERLAY
495
+  const unsigned char offset_bedline_bmp[] PROGMEM = { //AVR-GCC, WinAVR
496
+    0xFF,0xFF,0xFF // 111111111111111111111111
497
+  };
514 498
 
515
-#endif // HAS_TEMP_BED
499
+  const unsigned char nozzle_bmp[] PROGMEM = { //AVR-GCC, WinAVR
500
+    0x7F,0x80, // 0111111110000000
501
+    0xFF,0xC0, // 1111111111000000
502
+    0xFF,0xC0, // 1111111111000000
503
+    0xFF,0xC0, // 1111111111000000
504
+    0x7F,0x80, // 0111111110000000
505
+    0x7F,0x80, // 0111111110000000
506
+    0xFF,0xC0, // 1111111111000000
507
+    0xFF,0xC0, // 1111111111000000
508
+    0xFF,0xC0, // 1111111111000000
509
+    0x3F,0x00, // 0011111100000000
510
+    0x1E,0x00, // 0001111000000000
511
+    0x0C,0x00  // 0000110000000000
512
+  };
513
+#endif // BABYSTEP_ZPROBE_GFX_OVERLAY || ENABLE_MESH_EDIT_GFX_OVERLAY

+ 39
- 36
Marlin/src/lcd/ultralcd.cpp View File

@@ -1057,47 +1057,47 @@ void kill_screen(const char* lcd_msg) {
1057 1057
       void lcd_babystep_y() { lcd_goto_screen(_lcd_babystep_y); babysteps_done = 0; defer_return_to_status = true; }
1058 1058
     #endif
1059 1059
 
1060
-    #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
1061
-
1062
-      #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY)
1063
-
1064
-        void _lcd_babystep_zoffset_overlay(const float in_zoffset) {
1065
-          // Determine whether the user is raising or lowering the nozzle.
1066
-          int8_t dir = 0;
1067
-          static float old_zprobe_zoffset = 0;
1068
-          if (in_zoffset != old_zprobe_zoffset) {
1069
-            dir = (in_zoffset > old_zprobe_zoffset) ? 1 : -1;
1070
-            old_zprobe_zoffset = in_zoffset;
1071
-          }
1060
+    #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) || ENABLED(ENABLE_MESH_EDIT_GFX_OVERLAY)
1061
+
1062
+      void _lcd_zoffset_overlay_gfx(const float in_zoffset) {
1063
+        // Determine whether the user is raising or lowering the nozzle.
1064
+        int8_t dir = 0;
1065
+        static float old_zprobe_zoffset = 0;
1066
+        if (in_zoffset != old_zprobe_zoffset) {
1067
+          dir = (in_zoffset > old_zprobe_zoffset) ? 1 : (in_zoffset == 0) ? 0 : -1;
1068
+          old_zprobe_zoffset = in_zoffset;
1069
+        }
1072 1070
 
1073
-          #if ENABLED(BABYSTEP_ZPROBE_GFX_REVERSE)
1074
-            const unsigned char *rot_up   = ccw_bmp;
1075
-            const unsigned char *rot_down = cw_bmp;
1076
-          #else
1077
-            const unsigned char *rot_up   = cw_bmp;
1078
-            const unsigned char *rot_down = ccw_bmp;
1079
-          #endif
1071
+        #if ENABLED(BABYSTEP_ZPROBE_GFX_REVERSE)
1072
+          const unsigned char *rot_up   = ccw_bmp;
1073
+          const unsigned char *rot_down = cw_bmp;
1074
+        #else
1075
+          const unsigned char *rot_up   = cw_bmp;
1076
+          const unsigned char *rot_down = ccw_bmp;
1077
+        #endif
1080 1078
 
1081
-          #if ENABLED(USE_BIG_EDIT_FONT)
1082
-            const int left = 0, right = 45, nozzle = 95;
1083
-          #else
1084
-            const int left = 5, right = 90, nozzle = 60;
1085
-          #endif
1079
+        #if ENABLED(USE_BIG_EDIT_FONT)
1080
+          const int left = 0, right = 45, nozzle = 95;
1081
+        #else
1082
+          const int left = 5, right = 90, nozzle = 60;
1083
+        #endif
1086 1084
 
1087
-          // Draw a representation of the nozzle
1088
-          if (PAGE_CONTAINS(3, 16))  u8g.drawBitmapP(nozzle + 6, 4 - dir, 2, 12, nozzle_bmp);
1089
-          if (PAGE_CONTAINS(20, 20)) u8g.drawBitmapP(nozzle + 0, 20, 3, 1, offset_bedline_bmp);
1085
+        // Draw a representation of the nozzle
1086
+        if (PAGE_CONTAINS(3, 16))  u8g.drawBitmapP(nozzle + 6, 4 - dir, 2, 12, nozzle_bmp);
1087
+        if (PAGE_CONTAINS(20, 20)) u8g.drawBitmapP(nozzle + 0, 20, 3, 1, offset_bedline_bmp);
1090 1088
 
1091
-          // Draw cw/ccw indicator and up/down arrows.
1092
-          if (PAGE_CONTAINS(47,62)) {
1093
-            u8g.drawBitmapP(left  + 0, 47, 3, 16, rot_down);
1094
-            u8g.drawBitmapP(right + 0, 47, 3, 16, rot_up);
1095
-            u8g.drawBitmapP(right + 20, 48 - dir, 2, 13, up_arrow_bmp);
1096
-            u8g.drawBitmapP(left  + 20, 49 - dir, 2, 13, down_arrow_bmp);
1097
-          }
1089
+        // Draw cw/ccw indicator and up/down arrows.
1090
+        if (PAGE_CONTAINS(47,62)) {
1091
+          u8g.drawBitmapP(left  + 0, 47, 3, 16, rot_down);
1092
+          u8g.drawBitmapP(right + 0, 47, 3, 16, rot_up);
1093
+          u8g.drawBitmapP(right + 20, 48 - dir, 2, 13, up_arrow_bmp);
1094
+          u8g.drawBitmapP(left  + 20, 49 - dir, 2, 13, down_arrow_bmp);
1098 1095
         }
1096
+      }
1097
+
1098
+    #endif // BABYSTEP_ZPROBE_GFX_OVERLAY || ENABLE_MESH_EDIT_GFX_OVERLAY
1099 1099
 
1100
-      #endif // BABYSTEP_ZPROBE_GFX_OVERLAY
1100
+    #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
1101 1101
 
1102 1102
       void lcd_babystep_zoffset() {
1103 1103
         if (lcd_clicked) { return lcd_goto_previous_menu_no_defer(); }
@@ -1121,7 +1121,7 @@ void kill_screen(const char* lcd_msg) {
1121 1121
         if (lcdDrawUpdate) {
1122 1122
           lcd_implementation_drawedit(PSTR(MSG_ZPROBE_ZOFFSET), ftostr43sign(zprobe_zoffset));
1123 1123
           #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY)
1124
-            _lcd_babystep_zoffset_overlay(zprobe_zoffset);
1124
+            _lcd_zoffset_overlay_gfx(zprobe_zoffset);
1125 1125
           #endif
1126 1126
         }
1127 1127
       }
@@ -1158,6 +1158,9 @@ void kill_screen(const char* lcd_msg) {
1158 1158
 
1159 1159
       if (lcdDrawUpdate)
1160 1160
         lcd_implementation_drawedit(msg, ftostr43sign(mesh_edit_value));
1161
+        #if ENABLED(ENABLE_MESH_EDIT_GFX_OVERLAY)
1162
+          _lcd_zoffset_overlay_gfx(mesh_edit_value);
1163
+        #endif
1161 1164
     }
1162 1165
 
1163 1166
     void _lcd_mesh_edit_NOP() {

Loading…
Cancel
Save