From 822da9a830f28f47972fa8e31c56ef568ee2aa55 Mon Sep 17 00:00:00 2001 From: Timothy Hoogland Date: Tue, 3 Dec 2024 16:14:17 -0600 Subject: [PATCH 1/4] Fix DWIN/DACAI Bed Bitmap Not Showing --- .../TH3D_EZBoardLite/Firmware/Marlin/Configuration.h | 2 +- .../TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h | 2 +- Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h | 2 +- .../TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h | 2 +- Firmware/Marlin/Configuration_adv.h | 4 +++- Firmware/Marlin/Configuration_backend.h | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h index 61251652b451..cb3ab5588827 100644 --- a/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h @@ -5,7 +5,7 @@ #pragma once #define CONFIGURATION_H_VERSION 02010204 -#define UNIFIED_VERSION "TH3D UFW 2.94" +#define UNIFIED_VERSION "TH3D UFW 2.94a" #define STRING_DISTRIBUTION_DATE "2024-12-03" //#@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 724732d64e9f..14a0e5e37cc7 100644 --- a/Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h @@ -7,7 +7,7 @@ #pragma once #define CONFIGURATION_H_VERSION 02010204 -#define UNIFIED_VERSION "TH3D UFW 2.94" +#define UNIFIED_VERSION "TH3D UFW 2.94a" #define STRING_DISTRIBUTION_DATE "2024-12-03" //#@CONFIGURATION_START_FLAG diff --git a/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h index aee958ffad47..64a396da8cf9 100644 --- a/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h @@ -5,7 +5,7 @@ #pragma once #define CONFIGURATION_H_VERSION 02010204 -#define UNIFIED_VERSION "TH3D UFW 2.94" +#define UNIFIED_VERSION "TH3D UFW 2.94a" #define STRING_DISTRIBUTION_DATE "2024-12-03" //#@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 710a64b6107c..6fd93a27c2ea 100644 --- a/Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h @@ -7,7 +7,7 @@ #pragma once #define CONFIGURATION_H_VERSION 02010204 -#define UNIFIED_VERSION "TH3D UFW 2.94" +#define UNIFIED_VERSION "TH3D UFW 2.94a" #define STRING_DISTRIBUTION_DATE "2024-12-03" //#@CONFIGURATION_START_FLAG diff --git a/Firmware/Marlin/Configuration_adv.h b/Firmware/Marlin/Configuration_adv.h index d3a245eeb7b0..a61bfdea82d8 100644 --- a/Firmware/Marlin/Configuration_adv.h +++ b/Firmware/Marlin/Configuration_adv.h @@ -1971,7 +1971,9 @@ //#define STATUS_HOTEND_NUMBERLESS // Use plain hotend icons instead of numbered ones (with 2+ hotends) #define STATUS_HOTEND_INVERTED // Show solid nozzle bitmaps when heating (Requires STATUS_HOTEND_ANIM for numbered hotends) #define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating - #define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating + #if NONE(DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) + #define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating + #endif #define STATUS_CHAMBER_ANIM // Use a second bitmap to indicate chamber heating //#define STATUS_CUTTER_ANIM // Use a second bitmap to indicate spindle / laser active //#define STATUS_COOLER_ANIM // Use a second bitmap to indicate laser cooling diff --git a/Firmware/Marlin/Configuration_backend.h b/Firmware/Marlin/Configuration_backend.h index 0c42d5f0bb0f..98b3d092cf28 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.94" + #define UNIFIED_VERSION "TH3D UFW 2.94a" #endif /** From 767a127ce0b88623a7b90fef857a7f8a194f05f4 Mon Sep 17 00:00:00 2001 From: Timothy Hoogland Date: Tue, 3 Dec 2024 17:12:01 -0600 Subject: [PATCH 2/4] suppress warnings that do not apply and confuse skr users. --- Firmware/Marlin/Configuration_backend.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/Marlin/Configuration_backend.h b/Firmware/Marlin/Configuration_backend.h index 98b3d092cf28..d6dd4bc5d3e1 100644 --- a/Firmware/Marlin/Configuration_backend.h +++ b/Firmware/Marlin/Configuration_backend.h @@ -288,6 +288,7 @@ #define NO_CREALITY_422_DRIVER_WARNING #define NO_AUTO_ASSIGN_WARNING +#define DIAG_JUMPERS_REMOVED #if ENABLED(G26_MESH_VALIDATION) #define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle. From fd2c326c5e0f9c66d310b5a92e8782783e75ed3c Mon Sep 17 00:00:00 2001 From: Timothy Hoogland Date: Thu, 5 Dec 2024 12:22:55 -0600 Subject: [PATCH 3/4] Fix Build Error for Manual Mesh leveling - Fix Typo in Config ADV file for 2560 boards. --- Firmware/Marlin/Configuration_adv.h | 2 +- Firmware/Marlin/Configuration_backend.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin/Configuration_adv.h b/Firmware/Marlin/Configuration_adv.h index a61bfdea82d8..72ccb0793e8d 100644 --- a/Firmware/Marlin/Configuration_adv.h +++ b/Firmware/Marlin/Configuration_adv.h @@ -1855,7 +1855,7 @@ * Use 'M503 C' to write the settings out to the SD Card as 'mc.zip'. * See docs/ConfigEmbedding.md for details on how to use 'mc-apply.py'. */ - #if DISABLED(SPAVE_SAVER_2560) + #if DISABLED(SPACE_SAVER_2560) #define CONFIGURATION_EMBEDDING #endif diff --git a/Firmware/Marlin/Configuration_backend.h b/Firmware/Marlin/Configuration_backend.h index d6dd4bc5d3e1..dedd48d34987 100644 --- a/Firmware/Marlin/Configuration_backend.h +++ b/Firmware/Marlin/Configuration_backend.h @@ -673,4 +673,9 @@ #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define XY_PROBE_FEEDRATE (50*60) #define MESH_EDIT_MENU + + #undef Z_PROBE_OFFSET_RANGE_MIN + #define Z_PROBE_OFFSET_RANGE_MIN -10 + #undef Z_PROBE_OFFSET_RANGE_MAX + #define Z_PROBE_OFFSET_RANGE_MAX 1 #endif From d6f738d31dfaf17bea01909bfe4f83e38bc02341 Mon Sep 17 00:00:00 2001 From: Timothy Hoogland Date: Thu, 5 Dec 2024 12:23:37 -0600 Subject: [PATCH 4/4] 2.94a Release File Time and Version Stamp --- Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h | 2 +- .../TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h | 2 +- Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h | 2 +- .../TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h index cb3ab5588827..832c424bdc69 100644 --- a/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h @@ -6,7 +6,7 @@ #define CONFIGURATION_H_VERSION 02010204 #define UNIFIED_VERSION "TH3D UFW 2.94a" -#define STRING_DISTRIBUTION_DATE "2024-12-03" +#define STRING_DISTRIBUTION_DATE "2024-12-05" //#@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 14a0e5e37cc7..717b47226b15 100644 --- a/Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h @@ -8,7 +8,7 @@ #define CONFIGURATION_H_VERSION 02010204 #define UNIFIED_VERSION "TH3D UFW 2.94a" -#define STRING_DISTRIBUTION_DATE "2024-12-03" +#define STRING_DISTRIBUTION_DATE "2024-12-05" //#@CONFIGURATION_START_FLAG diff --git a/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h index 64a396da8cf9..13b50395cd3b 100644 --- a/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h @@ -6,7 +6,7 @@ #define CONFIGURATION_H_VERSION 02010204 #define UNIFIED_VERSION "TH3D UFW 2.94a" -#define STRING_DISTRIBUTION_DATE "2024-12-03" +#define STRING_DISTRIBUTION_DATE "2024-12-05" //#@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 6fd93a27c2ea..a753b2bb3022 100644 --- a/Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h @@ -8,7 +8,7 @@ #define CONFIGURATION_H_VERSION 02010204 #define UNIFIED_VERSION "TH3D UFW 2.94a" -#define STRING_DISTRIBUTION_DATE "2024-12-03" +#define STRING_DISTRIBUTION_DATE "2024-12-05" //#@CONFIGURATION_START_FLAG