diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index a4297d1522..46a704c5fe 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -4,7 +4,7 @@ Select Machine */ - +#define DWIN_PORTRAIT // Touchscreen //#define MachineCR10SPro // Graphics LCD Requires soldering R64 and R66 diff --git a/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp b/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp index cf29d771a1..67393451b2 100644 --- a/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp @@ -2432,7 +2432,7 @@ void SetTouchScreenConfiguration() { if (Settings.display_sound) cfg_bits |= 1UL << 3; // 3: audio if (Settings.display_standby) cfg_bits |= 1UL << 2; // 2: backlight on standby if(Settings.screen_rotation==10) cfg_bits |= 1UL << 1; // 1 & 0: Inversion - #if DISABLED(LOWRES_DWIN) + #if (DISABLED(LOWRES_DWIN) && DISABLED(DWIN_PORTRAIT)) || (ENABLED(LOWRES_DWIN) && ENABLED(DWIN_PORTRAIT)) cfg_bits |= 1UL << 0; // Portrait Mode or 800x480 display has 0 point rotated 90deg from 480x272 display #endif diff --git a/binaries/firmware_E3Max_Touch_422_DW7.4.9.bin.zip b/binaries/firmware_E3Max_Touch_422_DW7.4.9.bin.zip index ee8cd29e78..adbc249bca 100644 Binary files a/binaries/firmware_E3Max_Touch_422_DW7.4.9.bin.zip and b/binaries/firmware_E3Max_Touch_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3Max_Touch_BLT_422_DW7.4.9.bin.zip b/binaries/firmware_E3Max_Touch_BLT_422_DW7.4.9.bin.zip index 85f97dc583..46a8805cbf 100644 Binary files a/binaries/firmware_E3Max_Touch_BLT_422_DW7.4.9.bin.zip and b/binaries/firmware_E3Max_Touch_BLT_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3Max_Touch_BLT_DW7.4.9.bin.zip b/binaries/firmware_E3Max_Touch_BLT_DW7.4.9.bin.zip index b036087f72..2c7a33d843 100644 Binary files a/binaries/firmware_E3Max_Touch_BLT_DW7.4.9.bin.zip and b/binaries/firmware_E3Max_Touch_BLT_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3Max_Touch_BLT_ZM_422_DW7.4.9.bin.zip b/binaries/firmware_E3Max_Touch_BLT_ZM_422_DW7.4.9.bin.zip index 5d21a2d352..a4558d8abc 100644 Binary files a/binaries/firmware_E3Max_Touch_BLT_ZM_422_DW7.4.9.bin.zip and b/binaries/firmware_E3Max_Touch_BLT_ZM_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3Max_Touch_BLT_ZM_DW7.4.9.bin.zip b/binaries/firmware_E3Max_Touch_BLT_ZM_DW7.4.9.bin.zip index ffd7e1f22a..5e6d966a21 100644 Binary files a/binaries/firmware_E3Max_Touch_BLT_ZM_DW7.4.9.bin.zip and b/binaries/firmware_E3Max_Touch_BLT_ZM_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3Max_Touch_DW7.4.9.bin.zip b/binaries/firmware_E3Max_Touch_DW7.4.9.bin.zip index 140d0cca73..d27c33fec8 100644 Binary files a/binaries/firmware_E3Max_Touch_DW7.4.9.bin.zip and b/binaries/firmware_E3Max_Touch_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3P_Tall_Touch_422_DW7.4.9.bin.zip b/binaries/firmware_E3P_Tall_Touch_422_DW7.4.9.bin.zip index ca60668f55..b79945cc0c 100644 Binary files a/binaries/firmware_E3P_Tall_Touch_422_DW7.4.9.bin.zip and b/binaries/firmware_E3P_Tall_Touch_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3P_Tall_Touch_BLT_422_DW7.4.9.bin.zip b/binaries/firmware_E3P_Tall_Touch_BLT_422_DW7.4.9.bin.zip index c608744c54..103aaba52a 100644 Binary files a/binaries/firmware_E3P_Tall_Touch_BLT_422_DW7.4.9.bin.zip and b/binaries/firmware_E3P_Tall_Touch_BLT_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3P_Tall_Touch_BLT_DW7.4.9.bin.zip b/binaries/firmware_E3P_Tall_Touch_BLT_DW7.4.9.bin.zip index 7e5f037edc..48f2364e7e 100644 Binary files a/binaries/firmware_E3P_Tall_Touch_BLT_DW7.4.9.bin.zip and b/binaries/firmware_E3P_Tall_Touch_BLT_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3P_Tall_Touch_BLT_ZM_422_DW7.4.9.bin.zip b/binaries/firmware_E3P_Tall_Touch_BLT_ZM_422_DW7.4.9.bin.zip index c6a48fe4b1..2da4be796c 100644 Binary files a/binaries/firmware_E3P_Tall_Touch_BLT_ZM_422_DW7.4.9.bin.zip and b/binaries/firmware_E3P_Tall_Touch_BLT_ZM_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3P_Tall_Touch_BLT_ZM_DW7.4.9.bin.zip b/binaries/firmware_E3P_Tall_Touch_BLT_ZM_DW7.4.9.bin.zip index 75f43ee287..b798eb0f35 100644 Binary files a/binaries/firmware_E3P_Tall_Touch_BLT_ZM_DW7.4.9.bin.zip and b/binaries/firmware_E3P_Tall_Touch_BLT_ZM_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3P_Tall_Touch_DW7.4.9.bin.zip b/binaries/firmware_E3P_Tall_Touch_DW7.4.9.bin.zip index 0f27398253..06b05d7bac 100644 Binary files a/binaries/firmware_E3P_Tall_Touch_DW7.4.9.bin.zip and b/binaries/firmware_E3P_Tall_Touch_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3P_Touch_422_DW7.4.9.bin.zip b/binaries/firmware_E3P_Touch_422_DW7.4.9.bin.zip index 4493a9b7cd..8aff485343 100644 Binary files a/binaries/firmware_E3P_Touch_422_DW7.4.9.bin.zip and b/binaries/firmware_E3P_Touch_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3P_Touch_BLT_422_DW7.4.9.bin.zip b/binaries/firmware_E3P_Touch_BLT_422_DW7.4.9.bin.zip index 82417c9b34..bb83ecc9f1 100644 Binary files a/binaries/firmware_E3P_Touch_BLT_422_DW7.4.9.bin.zip and b/binaries/firmware_E3P_Touch_BLT_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3P_Touch_BLT_DW7.4.9.bin.zip b/binaries/firmware_E3P_Touch_BLT_DW7.4.9.bin.zip index 3840ec3f1d..c7ee135141 100644 Binary files a/binaries/firmware_E3P_Touch_BLT_DW7.4.9.bin.zip and b/binaries/firmware_E3P_Touch_BLT_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3P_Touch_BLT_ZM_422_DW7.4.9.bin.zip b/binaries/firmware_E3P_Touch_BLT_ZM_422_DW7.4.9.bin.zip index c3487e93ac..63cbc2583a 100644 Binary files a/binaries/firmware_E3P_Touch_BLT_ZM_422_DW7.4.9.bin.zip and b/binaries/firmware_E3P_Touch_BLT_ZM_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3P_Touch_BLT_ZM_DW7.4.9.bin.zip b/binaries/firmware_E3P_Touch_BLT_ZM_DW7.4.9.bin.zip index a400ce459e..3569faeab8 100644 Binary files a/binaries/firmware_E3P_Touch_BLT_ZM_DW7.4.9.bin.zip and b/binaries/firmware_E3P_Touch_BLT_ZM_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3P_Touch_DW7.4.9.bin.zip b/binaries/firmware_E3P_Touch_DW7.4.9.bin.zip index c339ff7526..aa614d1860 100644 Binary files a/binaries/firmware_E3P_Touch_DW7.4.9.bin.zip and b/binaries/firmware_E3P_Touch_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3_Tall_Touch_422_DW7.4.9.bin.zip b/binaries/firmware_E3_Tall_Touch_422_DW7.4.9.bin.zip index 9e5ed5d96f..7351a119db 100644 Binary files a/binaries/firmware_E3_Tall_Touch_422_DW7.4.9.bin.zip and b/binaries/firmware_E3_Tall_Touch_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3_Tall_Touch_BLT_422_DW7.4.9.bin.zip b/binaries/firmware_E3_Tall_Touch_BLT_422_DW7.4.9.bin.zip index 5b63d33278..9db9e18da0 100644 Binary files a/binaries/firmware_E3_Tall_Touch_BLT_422_DW7.4.9.bin.zip and b/binaries/firmware_E3_Tall_Touch_BLT_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3_Tall_Touch_BLT_DW7.4.9.bin.zip b/binaries/firmware_E3_Tall_Touch_BLT_DW7.4.9.bin.zip index b5871eb44a..6b99ef49da 100644 Binary files a/binaries/firmware_E3_Tall_Touch_BLT_DW7.4.9.bin.zip and b/binaries/firmware_E3_Tall_Touch_BLT_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3_Tall_Touch_BLT_ZM_422_DW7.4.9.bin.zip b/binaries/firmware_E3_Tall_Touch_BLT_ZM_422_DW7.4.9.bin.zip index 69222537b5..6116816909 100644 Binary files a/binaries/firmware_E3_Tall_Touch_BLT_ZM_422_DW7.4.9.bin.zip and b/binaries/firmware_E3_Tall_Touch_BLT_ZM_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3_Tall_Touch_BLT_ZM_DW7.4.9.bin.zip b/binaries/firmware_E3_Tall_Touch_BLT_ZM_DW7.4.9.bin.zip index 2971bfcbac..217f14d961 100644 Binary files a/binaries/firmware_E3_Tall_Touch_BLT_ZM_DW7.4.9.bin.zip and b/binaries/firmware_E3_Tall_Touch_BLT_ZM_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3_Tall_Touch_DW7.4.9.bin.zip b/binaries/firmware_E3_Tall_Touch_DW7.4.9.bin.zip index c06a35d4f0..2e3698f365 100644 Binary files a/binaries/firmware_E3_Tall_Touch_DW7.4.9.bin.zip and b/binaries/firmware_E3_Tall_Touch_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3_Touch_422_DW7.4.9.bin.zip b/binaries/firmware_E3_Touch_422_DW7.4.9.bin.zip index 4a79a09bf6..29048a21e8 100644 Binary files a/binaries/firmware_E3_Touch_422_DW7.4.9.bin.zip and b/binaries/firmware_E3_Touch_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3_Touch_BLT_422_DW7.4.9.bin.zip b/binaries/firmware_E3_Touch_BLT_422_DW7.4.9.bin.zip index 0a4badbecc..e1616b912b 100644 Binary files a/binaries/firmware_E3_Touch_BLT_422_DW7.4.9.bin.zip and b/binaries/firmware_E3_Touch_BLT_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3_Touch_BLT_DW7.4.9.bin.zip b/binaries/firmware_E3_Touch_BLT_DW7.4.9.bin.zip index 4d7111e4c0..fafd02409e 100644 Binary files a/binaries/firmware_E3_Touch_BLT_DW7.4.9.bin.zip and b/binaries/firmware_E3_Touch_BLT_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3_Touch_BLT_ZM_422_DW7.4.9.bin.zip b/binaries/firmware_E3_Touch_BLT_ZM_422_DW7.4.9.bin.zip index 677e911452..ab1772572b 100644 Binary files a/binaries/firmware_E3_Touch_BLT_ZM_422_DW7.4.9.bin.zip and b/binaries/firmware_E3_Touch_BLT_ZM_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3_Touch_BLT_ZM_DW7.4.9.bin.zip b/binaries/firmware_E3_Touch_BLT_ZM_DW7.4.9.bin.zip index 7fc1607813..821f6ce298 100644 Binary files a/binaries/firmware_E3_Touch_BLT_ZM_DW7.4.9.bin.zip and b/binaries/firmware_E3_Touch_BLT_ZM_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E3_Touch_DW7.4.9.bin.zip b/binaries/firmware_E3_Touch_DW7.4.9.bin.zip index 68e14713d8..b5839e3e6a 100644 Binary files a/binaries/firmware_E3_Touch_DW7.4.9.bin.zip and b/binaries/firmware_E3_Touch_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E5P_Touch_422_DW7.4.9.bin.zip b/binaries/firmware_E5P_Touch_422_DW7.4.9.bin.zip index f39e171ded..f2d79b5b4a 100644 Binary files a/binaries/firmware_E5P_Touch_422_DW7.4.9.bin.zip and b/binaries/firmware_E5P_Touch_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E5P_Touch_BLT_422_DW7.4.9.bin.zip b/binaries/firmware_E5P_Touch_BLT_422_DW7.4.9.bin.zip index 53a8696862..1e1d5f3dfc 100644 Binary files a/binaries/firmware_E5P_Touch_BLT_422_DW7.4.9.bin.zip and b/binaries/firmware_E5P_Touch_BLT_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E5P_Touch_BLT_DW7.4.9.bin.zip b/binaries/firmware_E5P_Touch_BLT_DW7.4.9.bin.zip index 7780992644..61c8635248 100644 Binary files a/binaries/firmware_E5P_Touch_BLT_DW7.4.9.bin.zip and b/binaries/firmware_E5P_Touch_BLT_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E5P_Touch_BLT_ZM_422_DW7.4.9.bin.zip b/binaries/firmware_E5P_Touch_BLT_ZM_422_DW7.4.9.bin.zip index f18c83920b..6f0c09dad6 100644 Binary files a/binaries/firmware_E5P_Touch_BLT_ZM_422_DW7.4.9.bin.zip and b/binaries/firmware_E5P_Touch_BLT_ZM_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E5P_Touch_BLT_ZM_DW7.4.9.bin.zip b/binaries/firmware_E5P_Touch_BLT_ZM_DW7.4.9.bin.zip index eaa7a9ffb5..7a7f68b3e7 100644 Binary files a/binaries/firmware_E5P_Touch_BLT_ZM_DW7.4.9.bin.zip and b/binaries/firmware_E5P_Touch_BLT_ZM_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E5P_Touch_DW7.4.9.bin.zip b/binaries/firmware_E5P_Touch_DW7.4.9.bin.zip index eef104d5a5..aa447f8413 100644 Binary files a/binaries/firmware_E5P_Touch_DW7.4.9.bin.zip and b/binaries/firmware_E5P_Touch_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E5_Touch_422_DW7.4.9.bin.zip b/binaries/firmware_E5_Touch_422_DW7.4.9.bin.zip index 4fcda3325f..2dcf7f6936 100644 Binary files a/binaries/firmware_E5_Touch_422_DW7.4.9.bin.zip and b/binaries/firmware_E5_Touch_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E5_Touch_BLT_422_DW7.4.9.bin.zip b/binaries/firmware_E5_Touch_BLT_422_DW7.4.9.bin.zip index b738b921fc..bf0106814e 100644 Binary files a/binaries/firmware_E5_Touch_BLT_422_DW7.4.9.bin.zip and b/binaries/firmware_E5_Touch_BLT_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E5_Touch_BLT_DW7.4.9.bin.zip b/binaries/firmware_E5_Touch_BLT_DW7.4.9.bin.zip index e382291457..6166f1a907 100644 Binary files a/binaries/firmware_E5_Touch_BLT_DW7.4.9.bin.zip and b/binaries/firmware_E5_Touch_BLT_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E5_Touch_BLT_ZM_422_DW7.4.9.bin.zip b/binaries/firmware_E5_Touch_BLT_ZM_422_DW7.4.9.bin.zip index 52eec334c3..2c41a7e012 100644 Binary files a/binaries/firmware_E5_Touch_BLT_ZM_422_DW7.4.9.bin.zip and b/binaries/firmware_E5_Touch_BLT_ZM_422_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E5_Touch_BLT_ZM_DW7.4.9.bin.zip b/binaries/firmware_E5_Touch_BLT_ZM_DW7.4.9.bin.zip index 6d7b9cf19b..344055f9f1 100644 Binary files a/binaries/firmware_E5_Touch_BLT_ZM_DW7.4.9.bin.zip and b/binaries/firmware_E5_Touch_BLT_ZM_DW7.4.9.bin.zip differ diff --git a/binaries/firmware_E5_Touch_DW7.4.9.bin.zip b/binaries/firmware_E5_Touch_DW7.4.9.bin.zip index 449db0daad..95f0fd1bb2 100644 Binary files a/binaries/firmware_E5_Touch_DW7.4.9.bin.zip and b/binaries/firmware_E5_Touch_DW7.4.9.bin.zip differ