From 7d25d8b76b65657a18458690a903b8fc88fbe975 Mon Sep 17 00:00:00 2001 From: classicrocker883 Date: Fri, 19 May 2023 17:13:37 -0400 Subject: [PATCH 1/5] relocate call for dwin.h --- Marlin/src/module/motion.cpp | 4 ---- Marlin/src/module/motion.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp index a15cfe079610..e6df20a99843 100644 --- a/Marlin/src/module/motion.cpp +++ b/Marlin/src/module/motion.cpp @@ -38,10 +38,6 @@ #include "../lcd/marlinui.h" #endif -#if ALL(DWIN_LCD_PROUI, INDIVIDUAL_AXIS_HOMING_SUBMENU, MESH_BED_LEVELING) - #include "../lcd/e3v2/proui/dwin.h" -#endif - #if ENABLED(POLAR) #include "polar.h" #endif diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h index 71d80f954e41..b7e37f6b7043 100644 --- a/Marlin/src/module/motion.h +++ b/Marlin/src/module/motion.h @@ -30,6 +30,10 @@ #include "../inc/MarlinConfig.h" +#if ALL(DWIN_LCD_PROUI, INDIVIDUAL_AXIS_HOMING_SUBMENU, MESH_BED_LEVELING) + #include "../lcd/e3v2/proui/dwin.h" +#endif + #if IS_SCARA #include "scara.h" #elif ENABLED(POLAR) From 9669eadaf9524aec66af8996df6324fcc4b33ca6 Mon Sep 17 00:00:00 2001 From: classicrocker883 Date: Fri, 19 May 2023 17:14:20 -0400 Subject: [PATCH 2/5] USE_UBL_VIEWER enabled for bedlevel_tools.h --- Marlin/src/lcd/e3v2/proui/meshviewer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp index 18cdffd00d62..69d21c044ce9 100644 --- a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp +++ b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp @@ -40,7 +40,7 @@ #include "../../../feature/bedlevel/bedlevel.h" #include "meshviewer.h" -#if ENABLED(AUTO_BED_LEVELING_UBL) +#if ENABLED(USE_UBL_VIEWER) #include "bedlevel_tools.h" #endif From 436c51075c71512849a0dfa9f79cf324febc82ba Mon Sep 17 00:00:00 2001 From: classicrocker883 Date: Sun, 4 Jun 2023 00:32:00 -0400 Subject: [PATCH 3/5] Clean up --- Marlin/src/gcode/parser.cpp | 2 +- Marlin/src/inc/Conditionals_post.h | 1 - Marlin/src/module/stepper/indirection.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp index 90586e371f50..ccd6b4111f10 100644 --- a/Marlin/src/gcode/parser.cpp +++ b/Marlin/src/gcode/parser.cpp @@ -229,7 +229,7 @@ void GCodeParser::parse(char *p) { } #endif - } break; + } break; #if ENABLED(GCODE_MOTION_MODES) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 588484ff3e3b..6d2bbd6edf22 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -474,7 +474,6 @@ #define _LCD_CONTRAST_INIT 195 #elif ENABLED(FYSETC_MINI_12864_2_1) #define _LCD_CONTRAST_MIN 230 - #define _LCD_CONTRAST_MIN 255 #define _LCD_CONTRAST_INIT 255 #elif ENABLED(FYSETC_MINI_12864) #define _LCD_CONTRAST_MIN 180 diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h index 99a677c81fe1..5700a2d39b22 100644 --- a/Marlin/src/module/stepper/indirection.h +++ b/Marlin/src/module/stepper/indirection.h @@ -717,7 +717,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset #elif E_STEPPERS == 1 #define E_STEP_WRITE(E,V) E0_STEP_WRITE(V) #define FWD_E_DIR(E) E0_DIR_WRITE(HIGH) - #define REV_E_DIR(E) E0_DIR_WRITE(LOW ) + #define REV_E_DIR(E) E0_DIR_WRITE(LOW) #else #define E_STEP_WRITE(E,V) NOOP From 0413abcb9104fc33b7e3ef0b667aff2ec85fe0fe Mon Sep 17 00:00:00 2001 From: classicrocker883 Date: Sun, 4 Jun 2023 00:41:18 -0400 Subject: [PATCH 4/5] Cleanup --- Marlin/src/inc/Conditionals_post.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 6d2bbd6edf22..9e2b002ee43a 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -473,8 +473,9 @@ #define _LCD_CONTRAST_MIN 120 #define _LCD_CONTRAST_INIT 195 #elif ENABLED(FYSETC_MINI_12864_2_1) - #define _LCD_CONTRAST_MIN 230 - #define _LCD_CONTRAST_INIT 255 + #define _LCD_CONTRAST_MIN 127 + #define _LCD_CONTRAST_INIT 230 + #define _LCD_CONTRAST_MAX 255 // not sure what these should be defined, but it's close enough #elif ENABLED(FYSETC_MINI_12864) #define _LCD_CONTRAST_MIN 180 #define _LCD_CONTRAST_INIT 220 From c05b6c35df8f35eee76423b448bf60b5763624a5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 4 Jun 2023 04:17:09 -0500 Subject: [PATCH 5/5] also --- Marlin/src/inc/Conditionals_post.h | 5 ++--- Marlin/src/module/stepper/indirection.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 9e2b002ee43a..6d2bbd6edf22 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -473,9 +473,8 @@ #define _LCD_CONTRAST_MIN 120 #define _LCD_CONTRAST_INIT 195 #elif ENABLED(FYSETC_MINI_12864_2_1) - #define _LCD_CONTRAST_MIN 127 - #define _LCD_CONTRAST_INIT 230 - #define _LCD_CONTRAST_MAX 255 // not sure what these should be defined, but it's close enough + #define _LCD_CONTRAST_MIN 230 + #define _LCD_CONTRAST_INIT 255 #elif ENABLED(FYSETC_MINI_12864) #define _LCD_CONTRAST_MIN 180 #define _LCD_CONTRAST_INIT 220 diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h index 5700a2d39b22..99a677c81fe1 100644 --- a/Marlin/src/module/stepper/indirection.h +++ b/Marlin/src/module/stepper/indirection.h @@ -717,7 +717,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset #elif E_STEPPERS == 1 #define E_STEP_WRITE(E,V) E0_STEP_WRITE(V) #define FWD_E_DIR(E) E0_DIR_WRITE(HIGH) - #define REV_E_DIR(E) E0_DIR_WRITE(LOW) + #define REV_E_DIR(E) E0_DIR_WRITE(LOW ) #else #define E_STEP_WRITE(E,V) NOOP