Merge pull request #201 from th3dstudio/2.0.x

2.0.x
th3dstudio · Dec 3, 2024 · 03b1991 · 03b1991
2 parents da3387a + 6a9d08a
commit 03b1991
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 22 deletions.
diff --git 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 02010204
 
-#define UNIFIED_VERSION "TH3D UFW 2.93"
-#define STRING_DISTRIBUTION_DATE "2024-11-21"
+#define UNIFIED_VERSION "TH3D UFW 2.94"
+#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
@@ -7,8 +7,8 @@
 #pragma once
 #define CONFIGURATION_H_VERSION 02010204
 
-#define UNIFIED_VERSION "TH3D UFW 2.93"
-#define STRING_DISTRIBUTION_DATE "2024-11-21"
+#define UNIFIED_VERSION "TH3D UFW 2.94"
+#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
@@ -5,8 +5,8 @@
 #pragma once
 #define CONFIGURATION_H_VERSION 02010204
 
-#define UNIFIED_VERSION "TH3D UFW 2.93"
-#define STRING_DISTRIBUTION_DATE "2024-11-21"
+#define UNIFIED_VERSION "TH3D UFW 2.94"
+#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
@@ -7,8 +7,8 @@
 #pragma once
 #define CONFIGURATION_H_VERSION 02010204
 
-#define UNIFIED_VERSION "TH3D UFW 2.93"
-#define STRING_DISTRIBUTION_DATE "2024-11-21"
+#define UNIFIED_VERSION "TH3D UFW 2.94"
+#define STRING_DISTRIBUTION_DATE "2024-12-03"
 
 //#@CONFIGURATION_START_FLAG
 

diff --git a/Firmware/Marlin/Configuration_adv.h b/Firmware/Marlin/Configuration_adv.h
@@ -1700,10 +1700,10 @@
    */
   //#define POWER_LOSS_RECOVERY
   #if ENABLED(POWER_LOSS_RECOVERY)
-    #define PLR_ENABLED_DEFAULT   false // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
+    #define PLR_ENABLED_DEFAULT    true // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
     //#define BACKUP_POWER_SUPPLY       // Backup power / UPS to move the steppers on power loss
     //#define POWER_LOSS_ZRAISE       2 // (mm) Z axis raise on resume (on power loss with UPS)
-    //#define POWER_LOSS_PIN         44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
+    #define POWER_LOSS_PIN           -1 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
     //#define POWER_LOSS_STATE     HIGH // State of pin indicating power loss
     //#define POWER_LOSS_PULLUP         // Set pullup / pulldown as appropriate for your sensor
     //#define POWER_LOSS_PULLDOWN

diff --git 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.93"
+  #define UNIFIED_VERSION "TH3D UFW 2.94"
 #endif
 
 /**

diff --git a/Firmware/Marlin/src/lcd/e3v2/common/dwin_api.cpp b/Firmware/Marlin/src/lcd/e3v2/common/dwin_api.cpp
@@ -234,7 +234,7 @@ void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
 //  *string: The string
 //  rlimit: To limit the drawn string length
 void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit/*=0xFFFF*/) {
-  #if NONE(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, IS_DWIN_MARLINUI)
+  #if NONE(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI) //TH3D FIX FOR MARLIN UI ON DACAI
     DWIN_Draw_Rectangle(1, bColor, x, y, x + (fontWidth(size) * strlen_P(string)), y + fontHeight(size));
   #endif
   constexpr uint8_t widthAdjust = 0;

diff --git a/LCD Firmware/DWIN DACAI Color LCDs/HOW TO UPDATE.txt b/LCD Firmware/DWIN DACAI Color LCDs/HOW TO UPDATE.txt
@@ -1,27 +1,25 @@
 This LCD firmware works on both the older and new version of the LCDs Found on the Ender 3 V2, Ender 3 NEO Models, Ender 3 S1, and Aquila X1 printers. Both use the same file to update and directions below. On LCDs with a landscape orientation the TH3D bootscreen will be sideways, this is normal. This works with the DACAI and DWIN versions of the LCDs. 
 
-If you have a "VIEWE" it is not supported and will need to be replaced. We carry 12864 LCD kits for these machines to convert them from the unsupported LCD to the 12864 Style Display. Here is how to determine what LCD type you have: https://support.th3dstudio.com/helpcenter/creality-printers-color-lcds/
+If you have a "VIEWE" or "TJC" it is not supported and will need to be replaced. We carry 12864 LCD kits for these machines to convert them from the unsupported LCD to the 12864 Style Display. Here is how to determine what LCD type you have: https://support.th3dstudio.com/helpcenter/creality-printers-color-lcds/
 
 Credit: Thank you to Dave at Insanity Automation for the custom LCD firmware for both LCD versions.
 
 ---------------------------------------------------------------------------------------------------
 DIRECTIONS:
 
-1. In the firmware download there is a folder called "LCD Firmware". Open that folder and then open the folder labeled "Ender 3 V2 S1"
-
-2. In there is a ZIP file called "DWIN_DACAI_LCDUpdate_TH3D_X.X". Extract the DWIN_SET folder to a blank, FAT32 formatted MicroSD card.
+1. In this folder is a ZIP file called "DWIN_DACAI_LCDUpdate_TH3D_X.X". Extract the DWIN_SET folder to a blank, FAT32 formatted MicroSD card.
 
 NOTE: The files must be in the folders as they are in the ZIP file, including the 拷贝private到SD卡根目录.txt file.
 
-3. Power the printer off and remove the LCD from its snap on bracket.
+2. Power the printer off and remove the LCD from its snap on bracket.
 
-4. On the rear of the LCD there is a SD slot that you access by removing the 4 screws on the rear of the casing.
+3. On the rear of the LCD there is a SD slot that you access by removing the 4 screws on the rear of the casing.
 
-5. Insert the MicroSD card with the files on it into the LCD.
+4. Insert the MicroSD card with the files on it into the LCD.
 NOTE - The MicroSD card MUST be formatted with FAT/FAT32 with a 4096 byte allocation size or it will NOT flash.
 
-6. With the LCD cable connected to the printer and the MicroSD card inserted into the rear of the LCD turn on the printer. You will see the LCD change from black to blue to orange. Wait 30 seconds after it turns orange and then power off the printer.
+5. With the LCD cable connected to the printer and the MicroSD card inserted into the rear of the LCD turn on the printer. You will see the LCD change from black to blue to orange. Wait 30 seconds after it turns orange and then power off the printer.
 
-7. Remove the MicroSD card and re-assemble the LCD
+6. Remove the MicroSD card and re-assemble the LCD
 
-8. Turn the printer on. You should see our logo when you power on if the firmware updated successfully
+7. Turn the printer on. You should see our logo when you power on if the firmware updated successfully