From 495ebe8d5926feab3560c60b68a4f669dba6bc81 Mon Sep 17 00:00:00 2001 From: Timothy Hoogland Date: Sat, 9 Mar 2024 23:06:36 -0600 Subject: [PATCH 1/3] add INVERT_EZABL_LOGIC option --- Firmware/Marlin/Configuration_backend.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin/Configuration_backend.h b/Firmware/Marlin/Configuration_backend.h index 4e1f3af58ec1..4ac050328d3b 100644 --- a/Firmware/Marlin/Configuration_backend.h +++ b/Firmware/Marlin/Configuration_backend.h @@ -7,7 +7,7 @@ //=========================================================================== #ifndef UNIFIED_VERSION - #define UNIFIED_VERSION "TH3D UFW 2.84" + #define UNIFIED_VERSION "TH3D UFW 2.85" #endif /** @@ -317,7 +317,7 @@ #define Z_MIN_PROBE_ENDSTOP_INVERTING false #undef Z_MIN_ENDSTOP_INVERTING #define Z_MIN_ENDSTOP_INVERTING false - #elif (ENABLED(CR10S_PRO_STOCK_ABL) && ENABLED(CR10S_PRO)) || ANY(ENDER3_S1, ENDER3_S1_PRO, ENDER3_S1_PLUS, ENDER5_S1) || (ANY(SOVOL_SV06, SOVOL_SV06_PLUS) && DISABLED(SV06_EZABL_INSTALLED)) + #elif (ENABLED(CR10S_PRO_STOCK_ABL) && ENABLED(CR10S_PRO)) || ANY(ENDER3_S1, ENDER3_S1_PRO, ENDER3_S1_PLUS, ENDER5_S1, INVERT_EZABL_LOGIC) || (ANY(SOVOL_SV06, SOVOL_SV06_PLUS) && DISABLED(SV06_EZABL_INSTALLED)) //Ender 3 S1 & 5 S1 J713 header for Z Endstop is reverse logic via hardware for some reason. Need to invert the EZABL logic for it here. #undef Z_MIN_PROBE_ENDSTOP_INVERTING #define Z_MIN_PROBE_ENDSTOP_INVERTING false From 566f5ed20c0c79c7e1e8d898b07fb1b38a78efcc Mon Sep 17 00:00:00 2001 From: Timothy Hoogland Date: Sat, 9 Mar 2024 23:13:05 -0600 Subject: [PATCH 2/3] Add logic for E3 S1 and E5 S1 series for INVERT_EZABL_LOGIC --- Firmware/Marlin/Configuration_backend.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin/Configuration_backend.h b/Firmware/Marlin/Configuration_backend.h index 4ac050328d3b..822b9ed6c647 100644 --- a/Firmware/Marlin/Configuration_backend.h +++ b/Firmware/Marlin/Configuration_backend.h @@ -317,7 +317,7 @@ #define Z_MIN_PROBE_ENDSTOP_INVERTING false #undef Z_MIN_ENDSTOP_INVERTING #define Z_MIN_ENDSTOP_INVERTING false - #elif (ENABLED(CR10S_PRO_STOCK_ABL) && ENABLED(CR10S_PRO)) || ANY(ENDER3_S1, ENDER3_S1_PRO, ENDER3_S1_PLUS, ENDER5_S1, INVERT_EZABL_LOGIC) || (ANY(SOVOL_SV06, SOVOL_SV06_PLUS) && DISABLED(SV06_EZABL_INSTALLED)) + #elif (ENABLED(CR10S_PRO_STOCK_ABL) && ENABLED(CR10S_PRO)) || (ANY(ENDER3_S1, ENDER3_S1_PRO, ENDER3_S1_PLUS, ENDER5_S1) && DISABLED(INVERT_EZABL_LOGIC)) || (ANY(SOVOL_SV06, SOVOL_SV06_PLUS) && DISABLED(SV06_EZABL_INSTALLED)) || (NONE(ENDER3_S1, ENDER3_S1_PRO, ENDER3_S1_PLUS, ENDER5_S1) && ENABLED(INVERT_EZABL_LOGIC)) //Ender 3 S1 & 5 S1 J713 header for Z Endstop is reverse logic via hardware for some reason. Need to invert the EZABL logic for it here. #undef Z_MIN_PROBE_ENDSTOP_INVERTING #define Z_MIN_PROBE_ENDSTOP_INVERTING false From 112a8c0475b69b9eb684fcf24218bc72ed53ef05 Mon Sep 17 00:00:00 2001 From: Timothy Hoogland Date: Sat, 9 Mar 2024 23:14:02 -0600 Subject: [PATCH 3/3] 2.85 release --- .../TH3D_EZBoardLite/Firmware/Marlin/Configuration.h | 4 ++-- .../TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h | 4 ++-- Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h | 4 ++-- .../TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h index de635ae96692..c91b1cd70d75 100644 --- a/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h @@ -5,8 +5,8 @@ #pragma once #define CONFIGURATION_H_VERSION 02010200 -#define UNIFIED_VERSION "TH3D UFW 2.84" -#define STRING_DISTRIBUTION_DATE "2024-03-08" +#define UNIFIED_VERSION "TH3D UFW 2.85" +#define STRING_DISTRIBUTION_DATE "2024-03-09" //#@CONFIGURATION_START_FLAG diff --git a/Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h index e022a82a830f..d0f2e5c89b1f 100644 --- a/Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h @@ -7,8 +7,8 @@ #pragma once #define CONFIGURATION_H_VERSION 02010200 -#define UNIFIED_VERSION "TH3D UFW 2.84" -#define STRING_DISTRIBUTION_DATE "2024-03-08" +#define UNIFIED_VERSION "TH3D UFW 2.85" +#define STRING_DISTRIBUTION_DATE "2024-03-09" //#@CONFIGURATION_START_FLAG diff --git a/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h index f6b7bec956e7..a235dc4eea29 100644 --- a/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h @@ -5,8 +5,8 @@ #pragma once #define CONFIGURATION_H_VERSION 02010200 -#define UNIFIED_VERSION "TH3D UFW 2.84" -#define STRING_DISTRIBUTION_DATE "2024-03-08" +#define UNIFIED_VERSION "TH3D UFW 2.85" +#define STRING_DISTRIBUTION_DATE "2024-03-09" //#@CONFIGURATION_START_FLAG diff --git a/Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h index 3aeec5c963ea..6573d980a693 100644 --- a/Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h @@ -7,8 +7,8 @@ #pragma once #define CONFIGURATION_H_VERSION 02010200 -#define UNIFIED_VERSION "TH3D UFW 2.84" -#define STRING_DISTRIBUTION_DATE "2024-03-08" +#define UNIFIED_VERSION "TH3D UFW 2.85" +#define STRING_DISTRIBUTION_DATE "2024-03-09" //#@CONFIGURATION_START_FLAG