diff --git a/Marlin/Version.h b/Marlin/Version.h index e7b34e5a92..b425b9415a 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -28,55 +28,103 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.2_Beta3" +#define SHORT_BUILD_VERSION "DW7.4.8" /** * 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(DriverA4988)) - #define VerChar1 "A" -#elif(ENABLED(Driver2209)) - #define VerChar1 "T" +#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" #endif -#if(ENABLED(BL_Touch)) - #define VerChar2 "B" +#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" #else - #define VerChar2 "E" -#endif - -#if(ENABLED(LOWRES_DWIN)) -#define VerChar3 "L" - #else -#define VerChar3 "H" +#define VerChar3 "S" #endif -#if(ENABLED(ACBed)) - #define VerChar4 "A" +#if(ENABLED(BedAC)) +#define VerChar4 "A" +#elif(ENABLED(BedDC)) +#define VerChar4 "D" #else - #define VerChar4 "D" +#define VerChar4 "N" #endif -#if(ENABLED(OpticalY)) - #define VerChar5 "O" +#if(ENABLED(ABL_EZABL)) +#define VerChar5 "A" +#elif(ENABLED(ABL_BLTOUCH)) +#define VerChar5 "B" #else - #define VerChar5 "M" +#define VerChar5 "N" #endif -#if(ENABLED(TitanExtruder)) - #define VerChar6 "T" -#elif ANY(BMGExtruderV2, BMGExtruderV3) - #define VerChar6 "B" -#elif ENABLED(BondtechLGX) - #define VerChar6 "L" +#if(ENABLED(ABL_UBL)) +#define VerChar6 "U" +#elif(ENABLED(ABL_BI)) +#define VerChar6 "B" #else - #define VerChar6 "S" +#define VerChar6 "N" #endif -#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION "_" VerChar1 VerChar2 VerChar3 VerChar4 VerChar5 VerChar6 +#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " TM3D " VerChar1 VerChar2 VerChar3 VerChar4 VerChar5 VerChar6 /** * The STRING_DISTRIBUTION_DATE represents when the binary file was built, @@ -88,12 +136,64 @@ /** * Defines a generic printer name to be output to the LCD after booting Marlin. */ -#if(ENABLED(MachineTLD3P)) - #define CUSTOM_MACHINE_NAME "LNL D3Pro" -#elif(ENABLED(MachineTLD5)) - #define CUSTOM_MACHINE_NAME "LNL D5Pro" -#elif(ENABLED(MachineTLD6)) - #define CUSTOM_MACHINE_NAME "LNL D6Pro" +#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" #endif /** @@ -102,7 +202,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/Tenlog_DWIN" +#define SOURCE_CODE_URL "https://github.com/InsanityAutomation/Marlin/tree/CrealityDwin_2.0" /** * Default generic printer UUID. @@ -113,7 +213,7 @@ * The WEBSITE_URL is the location where users can get more information such as * documentation about a specific Marlin release. */ -#define WEBSITE_URL "http://www.lnl3d.com " +#define WEBSITE_URL "tinymachines3d.com" /** * Set the vendor info the serial USB interface, if changable diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 6ca1511599..e2325e0122 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -2258,7 +2258,7 @@ #define HAS_X_MAX 1 #else #if !PIN_EXISTS(X_MAX) - #error "X_MAX Pin Doesnt Exist." + //#error "X_MAX Pin Doesnt Exist." #endif #if IS_PROBE_PIN(X,MAX) #error "X_MAX Pin Used for Probe."