From 11a0186b350b69ca093e5fc98a01a0434dc4d4e2 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Fri, 15 Apr 2022 15:44:15 -0400 Subject: [PATCH 1/6] Update for extui recent changes --- Marlin/src/lcd/extui/dgus_creality_lcd.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Marlin/src/lcd/extui/dgus_creality_lcd.cpp b/Marlin/src/lcd/extui/dgus_creality_lcd.cpp index 21f9ba70e6..76f0e995d4 100644 --- a/Marlin/src/lcd/extui/dgus_creality_lcd.cpp +++ b/Marlin/src/lcd/extui/dgus_creality_lcd.cpp @@ -165,11 +165,11 @@ bool hasPrintTimer = false; ScreenHandler.OnHomingStart(); } - void onHomingComplete() { + void onHomingDone() { ScreenHandler.OnHomingComplete(); } - void onPrintFinished() { + void onPrintDone() { ScreenHandler.OnPrintFinished(); } @@ -185,19 +185,21 @@ bool hasPrintTimer = false; // Called after loading or resetting stored settings } - void onConfigurationStoreWritten(bool success) { + void onSettingsStored(bool success) { // Called after the entire EEPROM has been written, // whether successful or not. } - void onConfigurationStoreRead(bool success) { + void onSettingsLoaded(bool success) { // Called after the entire EEPROM has been read, // whether successful or not. } #if HAS_MESH - void onMeshLevelingStart() { - ScreenHandler.OnMeshLevelingStart(); + void onLevelingStart() { + #if HAS_BED_PROBE + ScreenHandler.OnMeshLevelingStart(); + #endif } void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) { From 947ee4560e0a4aef0d265dea5b3a8dadd1b6187e Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Fri, 15 Apr 2022 16:09:23 -0400 Subject: [PATCH 2/6] E2Pro no runout stock --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 5c106f6f7c..364e59624e 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -458,7 +458,7 @@ #define SpriteExtruder #endif -#if ANY(MachineCR10SV2, MachineEnder2Pro) +#if ANY(MachineCR10SV2) #define lerdgeFilSensor #endif From b99b6250ee83c20140795ebb6ec8d130e1cdec19 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Mon, 18 Apr 2022 14:48:31 -0400 Subject: [PATCH 3/6] Update Configuration.h --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 364e59624e..b926f2efb9 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -718,7 +718,7 @@ * * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ -#if ANY(MachineEnder3V2, MachineEnder3S1, CrealityViewerKit, MachineCR6, MachineCR6Max, MachineEnder3Touchscreen, MachineCR10Smart, MachineCR10SmartPro, FORCEV2DISPLAY) +#if ANY(MachineEnder3V2, MachineEnder3S1, CrealityViewerKit, MachineCR6, MachineCR6Max, MachineEnder3Touchscreen, MachineCR10Smart, MachineCR10SmartPro, FORCEV2DISPLAY, MachineEnder2Pro) #define BAUDRATE 115200 #else #define BAUDRATE 250000 From 3a1646b2e89f816ad3a8088e50b459f7c0b6e95f Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Mon, 18 Apr 2022 14:50:05 -0400 Subject: [PATCH 4/6] Update Configuration_adv.h --- Marlin/Configuration_adv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index b885ba5bc3..6d95dfbb62 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -4181,9 +4181,9 @@ #define MAIN_MENU_ITEM_1_DESC "Setup" #if (ENABLED(ABL_UBL)) - #define MAIN_MENU_ITEM_1_GCODE "M190S" CommBedTmp "\nG28" DualZComm "\nG29P1\nG29P3\nG29S1\nG29S0\nG29F0.0\nG29A\nM104S215\nG28\nM109S215\nG1X150Y150F5000\nG1Z0\nM500\nM400\nM117 Set Z Offset" + #define MAIN_MENU_ITEM_1_GCODE "M190S" CommBedTmp "\nG28" DualZComm "\nG29P1\nG29P3\nG29S1\nG29S0\nG29F0.0\nG29A\nM104S215\nG28\nM109S215\nG1X150Y150F5000\nG1Z0\nM500\nM400\nM77\nM117 Set Z Offset" #elif ENABLED(ABL_BI) - #define MAIN_MENU_ITEM_1_GCODE "M190S" CommBedTmp "\nG28" DualZComm "\nG29\nM400\nM104S215\nG28\nM109S215\nM420S1\nG1X100Y100F5000\nG1Z0\nM500\nM117 Set Z Offset" + #define MAIN_MENU_ITEM_1_GCODE "M190S" CommBedTmp "\nG28" DualZComm "\nG29\nM400\nM104S215\nG28\nM109S215\nM420S1\nG1X100Y100F5000\nG1Z0\nM500\nM77\nM117 Set Z Offset" #endif //#define MAIN_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action From b35125e1a21e38b50ba161b81a80e734035a6161 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Wed, 20 Apr 2022 17:33:48 -0400 Subject: [PATCH 5/6] Update Configuration_adv.h --- Marlin/Configuration_adv.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 6d95dfbb62..b5d5ae9608 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -2689,6 +2689,8 @@ #define FILAMENT_CHANGE_UNLOAD_LENGTH 125 #elif ANY(MachineEnder5Plus, MachineCR10Max, MachineCR10S4, MachineCR10S5) #define FILAMENT_CHANGE_UNLOAD_LENGTH 700 + #elif ANY(MachineEnder2, MachineEnder2Pro) + #define FILAMENT_CHANGE_UNLOAD_LENGTH 325 // (mm) The length of filament for a complete unload. #else #define FILAMENT_CHANGE_UNLOAD_LENGTH 430 // (mm) The length of filament for a complete unload. #endif From 474111f1c9833aaf2875ed18817a8dfb27648d11 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Fri, 22 Apr 2022 09:11:22 -0400 Subject: [PATCH 6/6] Minor touchups from last rebase --- Marlin/Configuration.h | 3 +-- .../src/lcd/extui/Creality/Creality_DWIN.cpp | 4 ++++ README.md | 18 +++++++++++++----- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index b926f2efb9..a262a1b61c 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1727,9 +1727,8 @@ #define J_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define K_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define W_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. -#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe. -#if NONE(ABL_EZABL, MachineCR2020, MachineCR5) +#if NONE(ABL_EZABL, MachineCR2020) #define Z_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe. #else diff --git a/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp b/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp index a39d9fe959..9454f9aa6b 100644 --- a/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp @@ -2541,6 +2541,10 @@ void onLevelingStart() { } +void onLevelingDone() { + +} + void onSteppersEnabled() { diff --git a/README.md b/README.md index 1e4276f30b..e5ca2d7401 100644 --- a/README.md +++ b/README.md @@ -21,14 +21,14 @@ This branch adds support for the Creality touchscreen machines and was split off - [CR30](https://www.tinymachines3d.com/products/cr-30-infinite-z-belt-3d-printer?rfsn=3419592.cc302fe) - [Sermoon D1](https://amzn.to/3LXfZeD) - [CR5 / Pro HT](https://amzn.to/3gWvpBt) +- [Ender 3 S1](https://www.tinymachines3d.com/products/ender-3-s1-3d-printer?rfsn=3419592.cc302fe) +- [Ender 2 Pro](https://www.tinymachines3d.com/products/ender-2-pro-3d-printer?rfsn=3419592.cc302fe) - CR10S, CR10S4, CR20 and Pro, CR10, CR10Mini, CR2020, Ender 4, Ender 2 - Legacy support - These configurations exist however due to age and product availability are no longer actively tested ## Coming Soon -- [Ender 3 S1](https://www.tinymachines3d.com/products/ender-3-s1-3d-printer?rfsn=3419592.cc302fe) - [CR10 Smart Pro](https://www.tinymachines3d.com/products/cr-10-smart-pro-3d-printer?rfsn=3419592.cc302fe) -- [Ender 2 Pro](https://www.tinymachines3d.com/products/ender-2-pro-3d-printer?rfsn=3419592.cc302fe) - [CR200B]() ## Resin machines below from Tiny Machines are listed simply as an additional way to help support the project. If youre considering buying one, please do so through the following links : @@ -70,6 +70,14 @@ We have now created a dedicated Discord server to handle support and archive rel Insanity Automation Discord - https://discord.gg/TKmJ85PyG4 Marlin Firmware Discord - https://discord.gg/n5NJ59y +## Primary Notes for DW7.4.6 + - Added Support for the Ender 2 Pro + - Added support for the Ender 3 S1 thanks to F1rst Layer providing a machine! + - Added support for the new DACAI screens being used on current production E3V2 and S1 machines + - Added support for runtime configurable runout sensors matching RRF M591 including type and polarity + - Moved E3V2/S1 machines to Marlin Display + - - Due to the ongoing fued between developers and GPL violations involved with both the Pro/Enahnced UI and the Jyers UI, we have decided to support neither and stay away from the conflict as much as possible. The Marlin UI has more configuration functionality and the menus are more adaptive to the configuration of the machine. This is based off of the default Marlin menu system and will be the most stable long term going forward as well. The cosmetics and graphical icons may not be as nice as with the other UI's however we belive the added functionality more than makes up for it. + ## Primary Notes for DW7.4.5 - Added support for CR10 Smart - Thanks to Tinymachines for providing the machine - Revised file size issues causing corrupted screens on DWINOS3/4 displays (Sermoon, E6/7 etc) @@ -82,11 +90,11 @@ Marlin Firmware Discord - https://discord.gg/n5NJ59y ## Primary Notes for DW7.4.4 - Added Feedrate / Accel / Jerk Screens - Touchscreen DGUS tools bumped to 8.2 - -- All Portrait displays operate with the same build - -- Older screens (10S Pro) audio file selection is a bit off, havnt found a way to properly enforce wav file used yet + - - All Portrait displays operate with the same build + - - Older screens (10S Pro) audio file selection is a bit off, havnt found a way to properly enforce wav file used yet - Ender 7 support - Sermoon D1 Support - -- Some users have reported Z clicking that the scripts run in the Leveling screen resolves, so if you hear clicking from the Z stepper when printing, run measuring from the leveling screen after powerup before printing. + - - Some users have reported Z clicking that the scripts run in the Leveling screen resolves, so if you hear clicking from the Z stepper when printing, run measuring from the leveling screen after powerup before printing. - E3V2 Screens Icon issue fixed thanks to note from Jyers on icon file size limit ## Primary Notes for DW7.4.3