From f177bd32ebed2c9391b6f0f6be85bc4603d20cca Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Sun, 27 Feb 2022 21:07:56 -0500 Subject: [PATCH] Variant and Version Info --- Marlin/Configuration_adv.h | 2 +- Marlin/Version.h | 4 ++++ platformio.ini | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 9b02851b73..209b4a4e14 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -937,7 +937,7 @@ * differs, a mode set eeprom write will be completed at initialization. * Use the option below to force an eeprom write to a V3.1 probe regardless. */ - #if NONE(SKR13, SKR14, SKR14Turbo, SKRPRO11, SKRMiniE3V2, Creality422, Creality427, MachineEnder6, MachineEnder7, MachineSermoonD1, MachineCR30, MachineCR6, MachineCR6Max) + #if NONE(SKR13, SKR14, SKR14Turbo, SKRPRO11, SKRMiniE3V2, MachineEnder3S1, Creality422, Creality427, MachineEnder6, MachineEnder7, MachineSermoonD1, MachineCR30, MachineCR6, MachineCR6Max) #define BLTOUCH_SET_5V_MODE #endif /** diff --git a/Marlin/Version.h b/Marlin/Version.h index 76b5e07560..c21618723f 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -43,6 +43,8 @@ #define VerChar1 "E3" #elif ENABLED(MachineEnder3V2) #define VerChar1 "E3V2" +#elif ENABLED(MachineEnder3S1) + #define VerChar1 "E3S1" #elif ENABLED(MachineEnder3Max) #define VerChar1 "E3M" #elif(ENABLED(MachineEnder4)) @@ -148,6 +150,8 @@ #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)) diff --git a/platformio.ini b/platformio.ini index 601cfff810..9cea95e8c4 100644 --- a/platformio.ini +++ b/platformio.ini @@ -3899,6 +3899,23 @@ build_flags = ${stm32_variant.build_flags} -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED -DSS_TIMER=4 -DTIMER_SERVO=TIM5 -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineCR10Smart +[env:Ender3S1] +extends = stm32_variant +board_build.variant = MARLIN_F103Rx +board_build.offset = 0x7000 +board_upload.offset_address = 0x08007000 +build_unflags = ${stm32_variant.build_unflags} + -DUSBCON -DUSBD_USE_CDC +extra_scripts = ${stm32_variant.extra_scripts} + pre:buildroot/share/PlatformIO/scripts/random-bin.py +monitor_speed = 115200 +debug_tool = jlink +upload_protocol = jlink +board = genericSTM32F103RC +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3S1 [env:CR5Pro] platform = atmelavr