diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 14932fdc7d..d537f634ac 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -66,7 +66,7 @@ // Author info of this build printed to the host during boot and M115 #define STRING_CONFIG_H_AUTHOR "InsanityAutomation" // Who made the changes. -//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) +#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) /** * *** VENDORS PLEASE READ *** @@ -1272,6 +1272,8 @@ #define ESTEPS 382.17 #elif ANY(BMGExtruderV2, BMGExtruderV3) #define ESTEPS 413 +#elif ENABLED(BondtechLGX) + #define ESTEPS 400 #elif ENABLED(H2Extruder) #define ESTEPS 932 #else diff --git a/Marlin/Version.h b/Marlin/Version.h index 785e5a592f..a8b9a934dc 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -28,103 +28,55 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "DW7.4.7" +#define SHORT_BUILD_VERSION "2.1.2_Beta1" /** * Verbose version identifier which should contain a reference to the location * from where the binary was downloaded or the source code was compiled. */ -#if(ENABLED(MachineMini)) - #define VerChar1 "M" -#elif(ENABLED(MachineEnder2)) - #define VerChar1 "E2" -#elif(ENABLED(MachineEnder2Pro)) - #define VerChar1 "E2P" -#elif(ENABLED(MachineEnder3)) - #define VerChar1 "E3" -#elif ENABLED(MachineEnder3V2) - #define VerChar1 "E3V2" -#elif ENABLED(MachineEnder3S1) - #define VerChar1 "E3S1" -#elif ENABLED(MachineEnder3Max) - #define VerChar1 "E3M" -#elif(ENABLED(MachineEnder4)) - #define VerChar1 "E4" -#elif(ENABLED(MachineEnder5)) - #define VerChar1 "E5" -#elif(ENABLED(MachineEnder6)) - #define VerChar1 "E6" -#elif(ENABLED(MachineEnder7)) - #define VerChar1 "E7" -#elif(ENABLED(MachineSermoonD1)) - #define VerChar1 "D1" -#elif(ENABLED(MachineEnder5Plus)) - #define VerChar1 "E5P" -#elif(ENABLED(MachineCR20)) - #define VerChar1 "2" -#elif(ENABLED(MachineCR10Orig)) - #define VerChar1 "O" -#elif(ENABLED(MachineCR10Std)) - #define VerChar1 "S" -#elif(ENABLED(MachineCRX)) - #define VerChar1 "X" -#elif(ENABLED(MachineCR6)) - #define VerChar1 "CR6" -#elif(ENABLED(MachineCR5)) - #define VerChar1 "CR5" -#elif(ENABLED(MachineCR6Max)) - #define VerChar1 "CR6M" -#elif(ENABLED(MachineS4)) - #define VerChar1 "4" -#elif(ENABLED(MachineS5) || ENABLED(MachineCR10Max)) - #define VerChar1 "5" -#elif ENABLED(MachineCR2020) - #define VerChar1 "20" -#elif(ENABLED(MachineCR30)) - #define VerChar1 "CR30" +#if(ENABLED(DriverA4988)) + #define VerChar1 "A" +#elif(ENABLED(Driver2209)) + #define VerChar1 "T" #endif -#if(ENABLED(HotendStock)) -#define VerChar2 "S" -#elif(ENABLED(HotendE3D)) -#define VerChar2 "E" -#elif ENABLED(HotendMosquito) -#define VerChar2 "M" -#endif - -#if(ENABLED(HotendAllMetal)) -#define VerChar3 "M" +#if(ENABLED(BL_Touch)) + #define VerChar2 "B" #else -#define VerChar3 "S" + #define VerChar2 "E" +#endif + +#if(ENABLED(LOWRES_DWIN)) +#define VerChar3 "L" + #else +#define VerChar3 "H" #endif -#if(ENABLED(BedAC)) -#define VerChar4 "A" -#elif(ENABLED(BedDC)) -#define VerChar4 "D" +#if(ENABLED(ACBed)) + #define VerChar4 "A" #else -#define VerChar4 "N" + #define VerChar4 "D" #endif -#if(ENABLED(ABL_EZABL)) -#define VerChar5 "A" -#elif(ENABLED(ABL_BLTOUCH)) -#define VerChar5 "B" +#if(ENABLED(OpticalY)) + #define VerChar5 "O" #else -#define VerChar5 "N" + #define VerChar5 "M" #endif -#if(ENABLED(ABL_UBL)) -#define VerChar6 "U" -#elif(ENABLED(ABL_BI)) -#define VerChar6 "B" +#if(ENABLED(TitanExtruder)) + #define VerChar6 "T" +#elif ANY(BMGExtruderV2, BMGExtruderV3) + #define VerChar6 "B" +#elif ENABLED(BondtechLGX) + #define VerChar6 "L" #else -#define VerChar6 "N" + #define VerChar6 "S" #endif -#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " TM3D " VerChar1 VerChar2 VerChar3 VerChar4 VerChar5 VerChar6 +#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION "_" VerChar1 VerChar2 VerChar3 VerChar4 VerChar5 VerChar6 /** * The STRING_DISTRIBUTION_DATE represents when the binary file was built, @@ -136,64 +88,12 @@ /** * Defines a generic printer name to be output to the LCD after booting Marlin. */ -#if(ENABLED(MachineMini)) - #define CUSTOM_MACHINE_NAME "Mini SuPeR" -#elif(ENABLED(MachineCR10Smart)) - #define CUSTOM_MACHINE_NAME "TM3D CR10Smart" -#elif(ENABLED(MachineCR10SmartPro)) - #define CUSTOM_MACHINE_NAME "TM3D CR10SmartPro" -#elif(ENABLED(MachineEnder2)) - #define CUSTOM_MACHINE_NAME "TM3D Ender2" -#elif(ENABLED(MachineEnder2Pro)) - #define CUSTOM_MACHINE_NAME "TM3D Ender2 Pro" -#elif(ENABLED(MachineEnder3)) - #define CUSTOM_MACHINE_NAME "TM3D Ender3" -#elif(ENABLED(MachineEnder3Max)) - #define CUSTOM_MACHINE_NAME "TM3D E3Max" -#elif(ENABLED(MachineEnder6)) - #define CUSTOM_MACHINE_NAME "TM3D Ender6" -#elif(ENABLED(MachineEnder7)) - #define CUSTOM_MACHINE_NAME "TM3D Ender7" -#elif(ENABLED(MachineEnder3V2)) - #define CUSTOM_MACHINE_NAME "TM3D Ender3V2" -#elif(ENABLED(MachineEnder3S1)) - #define CUSTOM_MACHINE_NAME "TM3D Ender3S1" -#elif(ENABLED(MachineEnder4)) - #define CUSTOM_MACHINE_NAME "TM3D Ender4" -#elif(ENABLED(MachineEnder5)) - #define CUSTOM_MACHINE_NAME "TM3D Ender5" -#elif(ENABLED(MachineEnder5Plus)) - #define CUSTOM_MACHINE_NAME "TM3D E5 Plus" -#elif(ENABLED(MachineCR20)) - #define CUSTOM_MACHINE_NAME "SuPeR CR-20" -#elif(ENABLED(MachineCR10Orig)) - #define CUSTOM_MACHINE_NAME "SuPeR CR-10" -#elif(ENABLED(MachineCRX)) - #define CUSTOM_MACHINE_NAME "TM3D CR-X" -#elif ENABLED(MachineCR10SProV2) - #define CUSTOM_MACHINE_NAME "TM3D 10SProV2" -#elif(ENABLED(MachineCR10SPro)) - #define CUSTOM_MACHINE_NAME "TM3D 10S Pro" -#elif(ENABLED(MachineCR10Max)) - #define CUSTOM_MACHINE_NAME "TM3D Max" -#elif(ENABLED(MachineCR10SV3)) - #define CUSTOM_MACHINE_NAME "TM3D CR10V3" -#elif(ENABLED(MachineCR10SV2)) - #define CUSTOM_MACHINE_NAME "TM3D CR10V2" -#elif(ENABLED(MachineCR10Std)) - #define CUSTOM_MACHINE_NAME "300 SuPeR" -#elif(ENABLED(MachineS4)) - #define CUSTOM_MACHINE_NAME "400 SuPeR" -#elif(ENABLED(MachineS5)) - #define CUSTOM_MACHINE_NAME "500 SuPeR" -#elif ENABLED(MachineCR2020) - #define CUSTOM_MACHINE_NAME "TM3D 2020" -#elif ENABLED(MachineSermoonD1) - #define CUSTOM_MACHINE_NAME "SermoonD1" -#elif ENABLED(MachineCR5) - #define CUSTOM_MACHINE_NAME "CR5 Pro" -#elif ENABLED(MachineCR30) - #define CUSTOM_MACHINE_NAME "CR30 Printmill" +#if(ENABLED(MachineTLD3P)) + #define CUSTOM_MACHINE_NAME "TL D3P" +#elif(ENABLED(MachineTLD5)) + #define CUSTOM_MACHINE_NAME "TL D5" +#elif(ENABLED(MachineTLD6)) + #define CUSTOM_MACHINE_NAME "TL D6" #endif /** @@ -202,7 +102,7 @@ * has a distinct Github fork— the Source Code URL should just be the main * Marlin repository. */ -#define SOURCE_CODE_URL "https://github.com/InsanityAutomation/Marlin/tree/CrealityDwin_2.0" +#define SOURCE_CODE_URL "https://github.com/InsanityAutomation/Marlin/tree/Tenlog_DWIN" /** * Default generic printer UUID. @@ -213,7 +113,7 @@ * The WEBSITE_URL is the location where users can get more information such as * documentation about a specific Marlin release. */ -#define WEBSITE_URL "tinymachines3d.com" +#define WEBSITE_URL "lnl3d.com" /** * Set the vendor info the serial USB interface, if changable diff --git a/README.md b/README.md index 945a7d53cd..641c72f5c5 100644 --- a/README.md +++ b/README.md @@ -1,75 +1,29 @@ -## Creality Touch/TFT Screen supported firmware +## Dwin Touch/TFT Screen supported firmware -This branch adds support for the Creality touchscreen machines and was split off from the standard Creality branches due to specific custom changes not found upstream. This includes extensions to the EXTui framework among other smaller tweaks that we have been working towards getting submitted upstream. Machines supported here are : - -- [CR10S Pro / V2](https://www.tinymachines3d.com/products/cr-10s-pro-v2-3d-printer?rfsn=3419592.cc302fe) -- [CR10 Max](https://www.tinymachines3d.com/products/creality-cr-10-max-3d-printer?rfsn=3419592.cc302fe) -- [Ender 5 Plus](https://www.tinymachines3d.com/products/ender-5-plus-silent-board-custom-dual-z-3d-printer?rfsn=3419592.cc302fe) -- [Ender 6](https://amzn.to/3JRyOhi) -- [CR-X / Pro](https://www.tinymachines3d.com/products/creality-cr-x-pro-3d-printer-with-dual-extruder-and-bl-touch?rfsn=3419592.cc302fe) -- [CR10 V2 ](https://www.tinymachines3d.com/products/creality-cr-10-v2-3d-printer?rfsn=3419592.cc302fe) -- [CR10 V3 ](https://www.tinymachines3d.com/products/creality-cr-10-v3-plus-3d-printer-with-genuine-e3d-direct-drive-extruder-and-bl-touch?rfsn=3419592.cc302fe) -- [Ender 3 / Pro 4.2.2 and 4.2.7](https://amzn.to/3BRHlxY) -- [Ender 3 V2](https://www.tinymachines3d.com/products/ender-3-v2?rfsn=3419592.cc302fe) -- [Ender 3 Max](https://www.tinymachines3d.com/products/ender-3-max-3d-printer?rfsn=3419592.cc302fe) -- [Ender 5 / Pro 4.2.2 and 4.2.7](https://amzn.to/3gMb2Yu) -- [CR10S5 500mm](https://www.tinymachines3d.com/products/creality-cr-10-s5-3d-printer?rfsn=3419592.cc302fe) -- [CR6 SE](https://www.tinymachines3d.com/products/creality-cr-6-se-3d-printer?rfsn=3419592.cc302fe) -- [CR6 Max](https://www.tinymachines3d.com/products/creality-cr-6-max-3d-printer?rfsn=3419592.cc302fe) -- [CR10 Smart](https://www.tinymachines3d.com/products/creality-cr-10-smart-3d-printer?rfsn=3419592.cc302fe) -- [Ender 7](https://www.tinymachines3d.com/products/ender-7-3d-printer?rfsn=3419592.cc302fe) -- [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 -- [CR10 Smart Pro](https://www.tinymachines3d.com/products/cr-10-smart-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 : - - [Halot One CL-60](https://www.tinymachines3d.com/products/halot-one-cl-60-resin-3d-printer?rfsn=3419592.cc302fe) - - [LD-002R](https://www.tinymachines3d.com/products/ld-002r-resin-printer?rfsn=3419592.cc302fe) - - [LD-002H](https://www.tinymachines3d.com/products/ld-002h-resin-3d-printer?rfsn=3419592.cc302fe) - - [LD-006](https://www.tinymachines3d.com/products/ld-006-resin-3d-printer?rfsn=3419592.cc302fe) - - [UW-02 Washer](https://www.tinymachines3d.com/products/uw-02-washing-curing-machine?rfsn=3419592.cc302fe) - - -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! - -There is a limitation with Windows systems and path depth so the file names need to be shorter than we would prefer. If you get an error compiling due to the path limit, move the folder to the root of your hard drive. Here is a legend to help decode the files: - -- BLT = BLTouch -- BIL = Bilinear Leveling -- UBL - Unified Bed Leveling -- DZ = Dual Z Steppers -- Fil = FilamentRunout -- Slnt = Creality Silent Board -- H = E3D Hemera Extruder -- MC = Mosquito Creality mount -- ME = Mosquito E3D mount -- Melzi Host option disables local SD card to allow more features and buffer for Octoprint control -- NF = Noise filtering for machines with cable extensions - reduces homing accuracy! -- LR = Stock runout replaced with Lerdge -- ZM = BLTouch connected to ZMin port instead of Probe pin 5 connector harness +- Info screen Version Code Reference +- - Char 1 - Driver (A-4988, T-TMC220X) +- - Char 2 - Z Stop(B-BLTouch, E-Endstop) +- - Char 3 - Screen(L-LowRes, H-THighRes) +- - Char 4 - Bed (A-AC, D-DC) +- - Char 5 - Endstop(O-Optical Y, M-Mechanical Y) +- - Char 6 - Extruder (T-Titan, B-BMG, L-LGX, S-Basic) ## Support -This firmware is provided to the public as-is with no warranty or guarantee. It's based on a large open source project and there is no entitlement to support. That said, Tiny Machines 3D customers may obtain -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. +This firmware is provided to the public as-is with no warranty or guarantee. It's based on a large open source project and there is no entitlement to support. That said, LNL Solutions customers may obtain support through their normal support queue. I will provide support to Patreons as I am able. Aside from this, we are active on many discord channels and typically help anyone we can when we come across them. 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.7 + - Added IDEX screens + - Added Branch / support for Tenlog IDEX machines with LNL Solutions + - Fan adjustment now numeric instead of simple on/off + - Tap Z offset on adjustment screen to type numeric value + - Sync to 2.1.2 with LA now on for all builds, Silent specific builds eliminated + ## 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! @@ -173,11 +127,8 @@ Please keep in mind when flashing the Creality 32 bit boards with the binary fil 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. - 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 +- Screens for IS and LA adjustment + ## Creality Firmware Branches @@ -201,10 +152,8 @@ For this branch, we still have some active goals open that we plan to continue w [Marlin Commit History](https://github.com/MarlinFirmware/Marlin/pulls?q=is%3Apr+is%3Aclosed+author%3AInsanityAutomation) - ## Marlin -This is just one of many forks of Marlin. We don't try to bury that behind fancy marketting or anything else. As you can see from the links above, most of the work done here is submitted back to the mainstream Marlin -branches. The end goal of every project is to get it to the point where it is merged and maintained there. See marlin resources, including how to contribute to the Marlin Project as well, down below. +This is just one of many forks of Marlin. We don't try to bury that behind fancy marketting or anything else.

| Project Maintainer | |||
| - - 🇺🇸 **Scott Lahteine** - [@thinkyhead](https://github.com/thinkyhead) - [ Donate 💸 ](https://www.thinkyhead.com/donate-to-marlin) - - | - - 🇺🇸 **Roxanne Neufeld** - [@Roxy-3D](https://github.com/Roxy-3D) - - 🇺🇸 **Keith Bennett** - [@thisiskeithb](https://github.com/thisiskeithb) - [ Donate 💸 ](https://github.com/sponsors/thisiskeithb) - - 🇺🇸 **Jason Smith** - [@sjasonsmith](https://github.com/sjasonsmith) - - | - - 🇧🇷 **Victor Oliveira** - [@rhapsodyv](https://github.com/rhapsodyv) - - 🇬🇧 **Chris Pepper** - [@p3p](https://github.com/p3p) - -🇳🇿 **Peter Ellens** - [@ellensp](https://github.com/ellensp) - [ Donate 💸 ](https://ko-fi.com/ellensp) - - | - - 🇺🇸 **Bob Kuhn** - [@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn) - - 🇳🇱 **Erik van der Zalm** - [@ErikZalm](https://github.com/ErikZalm) - [ Donate 💸 ](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) - - |