diff --git a/CR6E3Touch_NextGen_TM3D.7z b/CR6E3Touch_NextGen_TM3D.7z new file mode 100644 index 0000000000..cc0088d4b3 Binary files /dev/null and b/CR6E3Touch_NextGen_TM3D.7z differ diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 4e3ff4ba9a..1b15b6bffb 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -3635,7 +3635,7 @@ // By default Marlin assumes you have a buzzer with a fixed frequency. // #if NONE(MachineCR10Orig, SKRMiniE3V2) - #define SPEAKER + //#define SPEAKER #endif // diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 87afd049b7..b646699960 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -2157,7 +2157,7 @@ * Stop after G29_MAX_RETRIES attempts. */ #if ENABLED(ABL_BI) && NONE(MachineCR10Orig, LowMemoryBoard, SKRMiniE3V2, MachineCR30) - #define G29_RETRY_AND_RECOVER + //#define G29_RETRY_AND_RECOVER #endif #if ENABLED(G29_RETRY_AND_RECOVER) #define G29_MAX_RETRIES 3 @@ -2353,8 +2353,10 @@ // The number of linear moves that can be in the planner at once. // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g. 8, 16, 32) -#if ENABLED(MachineLargeROM) || DISABLED(EXTENSIBLE_UI) +#if ENABLED(MachineLargeROM) #define BLOCK_BUFFER_SIZE 32 +#elif DISABLED(EXTENSIBLE_UI) + #define BLOCK_BUFFER_SIZE 16 #else #define BLOCK_BUFFER_SIZE 8 #endif diff --git a/README.md b/README.md index fa3430891e..36615d0792 100644 --- a/README.md +++ b/README.md @@ -18,13 +18,22 @@ This branch adds support for the Creality touchscreen machines and was split off - [CR10S4 400mm](http://bit.ly/2XXCBmq) - [CR10S5 500mm](http://bit.ly/35K4ZuR) - [CR6 / Max](https://bit.ly/2SdYijE) +- [CR10 Smart](https://bit.ly/3JFVWzi) +- [Ender 7](https://bit.ly/3rZOCZi) +- [CR30](https://bit.ly/3rZOMQo) +- [Sermoon D1](https://amzn.to/3LXfZeD) - 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://bit.ly/35cUGo4) +- [CR10 Smart Pro](https://bit.ly/3Hg8ewN) +- [Ender 2 Pro](https://bit.ly/3oZPtHE) +- [CR5 / Pro HT](https://amzn.to/3gWvpBt) -The CRX Has screen files with or without ABL. Ender 3V2 has a dedicated file set. All other machines should use the same generic set. V3 is the current screen file version. +Ender 3V2 has a dedicated file set. CR10 Smart has a dedicated high resolution screen set. Portrait displays use the CR6/E3 Touch variant and landscape use the combined set. Screen files are archived with [7-Zip](https://www.7-zip.org/) simply because it came out 1/5 the file size of a zip file. That added up fast! @@ -50,8 +59,19 @@ This firmware is provided to the public as-is with no warranty or guarantee. It' support through their normal support queue. I will provide support to Patreons as I am able. If you require more immediate support and are not a Tiny Machines 3D customer, you may contact them at support@tinymachines3d.com about purchasing support hours. Aside from this, we are active on many Facebook groups as well as several discord channels and typically help anyone we can when we come across them. -3D Printing Discord - https://discord.gg/MZrsgVU -Marlin Discord - https://discord.gg/n5NJ59y +We have now created a dedicated Discord server to handle support and archive relevant guides and instructions. Patreon supporters will get priority assistance. + +Insanity Automation Discord - https://discord.gg/TKmJ85PyG4 +Marlin Firmware Discord - https://discord.gg/n5NJ59y + +## 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) + - Added support for enabling / disabling filament runout and power loss recovery on the touchscreen + - Added LED control for equiped machines + - Resolved issue redirecting some users to chinese language displays instead of manual move screens + - Update to upstream current as of 2022-02-04 + - CR6 / E3 Portrait Touchscreen files have an added NextGen dwin set. This supports the new DWIN OS 4 screens that began shipping in december. There are a few cosmetic issues left to resolve, but we decided to add them now anyway so that users who haver that hardware and will require it are not stuck. ## Primary Notes for DW7.4.4 - Added Feedrate / Accel / Jerk Screens @@ -136,10 +156,12 @@ Please keep in mind when flashing the Creality 32 bit boards with the binary fil ## Future Goals For this branch, we still have some active goals open that we plan to continue working on provided there is continued interest in the project. -- Volume and leveling state EEPROM storage -- Brightness control -- Develop internal Marlin state structure for better reporting of pause / block conditions -- CRX Non ABL Manual mesh interface to bring screens into parity with ABL versions +- CR10 Smart Power controls and network reset pin output to web interface device +- Add temp reporting to leveling screens so preheat is less of a mystery +- Revise aux leveling to use probe and deviation reporting when present +- Determine cause of clicking on Sermoon (need to get hands on a machine) +- Add CR5 Support +- Add Ender 3 S1 support ## Creality Firmware Branches diff --git a/TM3D_CR10Smart_V7.7z b/TM3D_CR10Smart_V7.7z new file mode 100644 index 0000000000..01b22e5f10 Binary files /dev/null and b/TM3D_CR10Smart_V7.7z differ diff --git a/TM3D_Combined480272_Landscape_V7.7z b/TM3D_Combined480272_Landscape_V7.7z new file mode 100644 index 0000000000..4717f90e62 Binary files /dev/null and b/TM3D_Combined480272_Landscape_V7.7z differ diff --git a/TM3D_DWINCombinedScreens_V6.7z b/TM3D_DWINCombinedScreens_V6.7z deleted file mode 100644 index 9cddf6b1d0..0000000000 Binary files a/TM3D_DWINCombinedScreens_V6.7z and /dev/null differ