|
@@ -28,6 +28,10 @@
|
28
|
28
|
|
29
|
29
|
#if ENABLED(DWIN_CREALITY_LCD)
|
30
|
30
|
|
|
31
|
+#if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT) && DISABLED(PROBE_MANUALLY)
|
|
32
|
+ #define HAS_ONESTEP_LEVELING 1
|
|
33
|
+#endif
|
|
34
|
+
|
31
|
35
|
#include "dwin.h"
|
32
|
36
|
|
33
|
37
|
#include <WString.h>
|
|
@@ -57,7 +61,7 @@
|
57
|
61
|
#include "../../feature/host_actions.h"
|
58
|
62
|
#endif
|
59
|
63
|
|
60
|
|
-#if HAS_LEVELING
|
|
64
|
+#if HAS_ONESTEP_LEVELING
|
61
|
65
|
#include "../../feature/bedlevel/bedlevel.h"
|
62
|
66
|
#endif
|
63
|
67
|
|
|
@@ -596,7 +600,7 @@ inline void Draw_Prepare_Menu() {
|
596
|
600
|
inline void Draw_Control_Menu() {
|
597
|
601
|
Clear_Main_Window();
|
598
|
602
|
|
599
|
|
- const int16_t scroll = TERN(HAS_LEVELING, MROWS - index_control, 0); // Scrolled-up lines
|
|
603
|
+ const int16_t scroll = TERN(HAS_ONESTEP_LEVELING, MROWS - index_control, 0); // Scrolled-up lines
|
600
|
604
|
|
601
|
605
|
#define CSCROL(L) (scroll + (L))
|
602
|
606
|
#define CLINE(L) MBASE(CSCROL(L))
|
|
@@ -976,7 +980,7 @@ void Goto_MainMenu(void) {
|
976
|
980
|
ICON_Print();
|
977
|
981
|
ICON_Prepare();
|
978
|
982
|
ICON_Control();
|
979
|
|
- TERN(HAS_LEVELING, ICON_Leveling, ICON_StartInfo)(select_page.now == 3);
|
|
983
|
+ TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(select_page.now == 3);
|
980
|
984
|
}
|
981
|
985
|
|
982
|
986
|
inline ENCODER_DiffState get_encoder_state() {
|
|
@@ -1782,7 +1786,7 @@ void HMI_MainMenu(void) {
|
1782
|
1786
|
case 0: ICON_Print(); break;
|
1783
|
1787
|
case 1: ICON_Print(); ICON_Prepare(); break;
|
1784
|
1788
|
case 2: ICON_Prepare(); ICON_Control(); break;
|
1785
|
|
- case 3: ICON_Control(); TERN(HAS_LEVELING, ICON_Leveling, ICON_StartInfo)(1); break;
|
|
1789
|
+ case 3: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(1); break;
|
1786
|
1790
|
}
|
1787
|
1791
|
}
|
1788
|
1792
|
}
|
|
@@ -1791,8 +1795,8 @@ void HMI_MainMenu(void) {
|
1791
|
1795
|
switch (select_page.now) {
|
1792
|
1796
|
case 0: ICON_Print(); ICON_Prepare(); break;
|
1793
|
1797
|
case 1: ICON_Prepare(); ICON_Control(); break;
|
1794
|
|
- case 2: ICON_Control(); TERN(HAS_LEVELING, ICON_Leveling, ICON_StartInfo)(0); break;
|
1795
|
|
- case 3: TERN(HAS_LEVELING, ICON_Leveling, ICON_StartInfo)(1); break;
|
|
1798
|
+ case 2: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(0); break;
|
|
1799
|
+ case 3: TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(1); break;
|
1796
|
1800
|
}
|
1797
|
1801
|
}
|
1798
|
1802
|
}
|
|
@@ -1822,7 +1826,7 @@ void HMI_MainMenu(void) {
|
1822
|
1826
|
|
1823
|
1827
|
/* Leveling */
|
1824
|
1828
|
case 3:
|
1825
|
|
- #if HAS_LEVELING
|
|
1829
|
+ #if HAS_ONESTEP_LEVELING
|
1826
|
1830
|
checkkey = Leveling;
|
1827
|
1831
|
HMI_Leveling();
|
1828
|
1832
|
#else
|
|
@@ -2324,7 +2328,7 @@ void HMI_Control(void) {
|
2324
|
2328
|
|
2325
|
2329
|
// Avoid flicker by updating only the previous menu
|
2326
|
2330
|
if (encoder_diffState == ENCODER_DIFF_CW) {
|
2327
|
|
- #define CONTROL_ITEMS (5 + ENABLED(HAS_LEVELING))
|
|
2331
|
+ #define CONTROL_ITEMS (5 + ENABLED(HAS_ONESTEP_LEVELING))
|
2328
|
2332
|
if (select_control.inc(CONTROL_ITEMS)) {
|
2329
|
2333
|
if (select_control.now > MROWS && select_control.now > index_control) {
|
2330
|
2334
|
index_control = select_control.now;
|
|
@@ -2402,12 +2406,17 @@ void HMI_Control(void) {
|
2402
|
2406
|
DWIN_UpdateLCD();
|
2403
|
2407
|
}
|
2404
|
2408
|
|
2405
|
|
-/* Leveling */
|
2406
|
|
-void HMI_Leveling(void) {
|
2407
|
|
- Popup_Window_Leveling();
|
2408
|
|
- DWIN_UpdateLCD();
|
2409
|
|
- queue.inject_P(PSTR("G28O\nG29"));
|
2410
|
|
-}
|
|
2409
|
+
|
|
2410
|
+#if HAS_ONESTEP_LEVELING
|
|
2411
|
+
|
|
2412
|
+ /* Leveling */
|
|
2413
|
+ void HMI_Leveling(void) {
|
|
2414
|
+ Popup_Window_Leveling();
|
|
2415
|
+ DWIN_UpdateLCD();
|
|
2416
|
+ queue.inject_P(PSTR("G28O\nG29"));
|
|
2417
|
+ }
|
|
2418
|
+
|
|
2419
|
+#endif
|
2411
|
2420
|
|
2412
|
2421
|
/* Axis Move */
|
2413
|
2422
|
void HMI_AxisMove(void) {
|
|
@@ -2896,7 +2905,7 @@ void HMI_Info(void) {
|
2896
|
2905
|
ENCODER_DiffState encoder_diffState = get_encoder_state();
|
2897
|
2906
|
if (encoder_diffState == ENCODER_DIFF_NO) return;
|
2898
|
2907
|
if (encoder_diffState == ENCODER_DIFF_ENTER) {
|
2899
|
|
- #if HAS_LEVELING
|
|
2908
|
+ #if HAS_ONESTEP_LEVELING
|
2900
|
2909
|
checkkey = Control;
|
2901
|
2910
|
select_control.set(CONTROL_ITEMS);
|
2902
|
2911
|
Draw_Control_Menu();
|