diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 1428453347..aea4ad4473 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -55,6 +55,7 @@ //#define MachineEnder2Pro //#define MachineEnder3V2 //#define MachineEnder3S1 +//#define MachineEnder3S1_F4 //#define MachineEnder3Max //#define MachineEnder3Pro422 //#define MachineEnder3Pro427 @@ -85,7 +86,7 @@ // Enable this if you used a plug and play creality e3d or mosquito kit and kept the Creality thermistor //#define CrealityThermistor -//#define SlicePT1000 // Enable this if you have a mosquito with the newer PT1000 sensor +#define SlicePT1000 // Enable this if you have a mosquito with the newer PT1000 sensor //#define PID50W //Set PID for 50W Heater /* * Select these if you have changed to a high performance extruder @@ -441,6 +442,11 @@ #endif #endif +#if ENABLED(MachineEnder3S1_F4) + #define MachineEnder3S1 +#endif + + #if ENABLED(MachineEnder3S1) #if NONE(ABL_NCSW, ABL_EZABL, ABL_BLTOUCH) #define ABL_BLTOUCH @@ -763,7 +769,9 @@ #define MOTHERBOARD BOARD_CREALITY_V427 #elif ENABLED(Creality422) #define MOTHERBOARD BOARD_CREALITY_V4 - #elif ENABLED(MachineEnder3S1) + #elif ENABLED(MachineEnder3S1_F4) + #define MOTHERBOARD BOARD_CREALITY_V24S1_301F4 + #elif ENABLED(MachineEnder3S1) && DISABLED(MachineEnder3S1_F4) #define MOTHERBOARD BOARD_CREALITY_V24S1_301 #elif (ENABLED(MachineCR10Orig) && DISABLED(Melzi_To_SBoardUpgrade)) #define MOTHERBOARD BOARD_MELZI_CREALITY @@ -3112,7 +3120,7 @@ * NOTE: Requires a lot of PROGMEM! */ #if ENABLED(MachineLargeROM) - #define DEBUG_LEVELING_FEATURE + //#define DEBUG_LEVELING_FEATURE #endif #if ANY(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL, PROBE_MANUALLY) diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h index d8ef00d882..535f049351 100644 --- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h +++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h @@ -129,11 +129,6 @@ #endif #define E0_ENABLE_PIN X_ENABLE_PIN -// -// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role -// -#define DISABLE_DEBUG - // // Temperature Sensors // diff --git a/platformio.ini b/platformio.ini index 4b037f40a3..30e71ec9e5 100644 --- a/platformio.ini +++ b/platformio.ini @@ -349,6 +349,8 @@ default_envs = Ender3_427_LR Ender3_427_BLT_LR Ender3_427_BLT_ZM_LR + Ender3S1 + Ender3S1F4 Ender3Max_422 Ender3Max_422_BLT Ender3Max_422_BLT_ZM @@ -3939,6 +3941,23 @@ build_flags = ${stm32_variant.build_flags} -DSS_TIMER=4 -DTIMER_SERVO=TIM5 -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3S1 +# Ender-3 S1 STM32F401RC_creality +# +[env:Ender3S1F4] +extends = stm32_variant +board = genericSTM32F401RC +board_build.variant = MARLIN_CREALITY_STM32F401RC +board_build.offset = 0x10000 +board_upload.offset_address = 0x08010000 +build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DSTM32F4 + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 + -DMachineEnder3S1_F4 +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 + [env:Ender2Pro] extends = stm32_variant board_build.variant = MARLIN_F103Rx