From a7696f32fd5dc114c46f4cf9a00242accf23f63e Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Sun, 7 Nov 2021 10:29:11 -0500 Subject: [PATCH] Tweak accel multipliers, move to stm32 common lib --- Marlin/Configuration.h | 2 +- Marlin/Configuration_adv.h | 6 +- .../src/lcd/extui/Creality/Creality_DWIN.cpp | 10 +- platformio.ini | 684 +++++++++++++++--- 4 files changed, 586 insertions(+), 116 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index aa5ee5a4e3..f8bde0914f 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -678,7 +678,7 @@ #define LCD_SERIAL_PORT 2 #define LCD_BAUDRATE 115200 #define SERIAL_CATCHALL 0 -#elif ANY(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, MachineEnder6, Creality422, Creality427, MachineSermoonD1, MachineEnder3Touchscreen, FORCEV2DISPLAY) && NONE(GraphicLCD, OrigLCD) +#elif ANY(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, MachineEnder6, Creality422, Creality427, MachineSermoonD1, MachineEnder3Touchscreen, MachineCR6, MachineCR6Max, FORCEV2DISPLAY) && NONE(GraphicLCD, OrigLCD) #define LCD_SERIAL_PORT 3 #define LCD_BAUDRATE 115200 #define SERIAL_CATCHALL 1 diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 3619e3084d..a91e8c8c03 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1748,8 +1748,10 @@ // Additional options for DGUS / DWIN displays // #if HAS_DGUS_LCD || ENABLED(DGUS_LCD_UI_CREALITY_TOUCH) || ENABLED(FORCE10SPRODISPLAY) - //#define LCD_SERIAL_PORT 3 - //#define LCD_BAUDRATE 115200 + #ifndef LCD_SERIAL_PORT + #define LCD_SERIAL_PORT 3 + #define LCD_BAUDRATE 115200 + #endif #define DGUS_RX_BUFFER_SIZE 128 #define DGUS_TX_BUFFER_SIZE 48 diff --git a/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp b/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp index ad167ab59b..12efa31221 100644 --- a/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp @@ -361,8 +361,8 @@ void onIdle() rtscheck.RTS_SndData(((unsigned int)getAxisMaxAcceleration_mm_s2(X)/100), Accel_X); rtscheck.RTS_SndData(((unsigned int)getAxisMaxAcceleration_mm_s2(Y)/100), Accel_Y); - rtscheck.RTS_SndData(((unsigned int)getAxisMaxAcceleration_mm_s2(Z)/100), Accel_Z); - rtscheck.RTS_SndData(((unsigned int)getAxisMaxAcceleration_mm_s2(E0)/100), Accel_E); + rtscheck.RTS_SndData(((unsigned int)getAxisMaxAcceleration_mm_s2(Z)/10), Accel_Z); + rtscheck.RTS_SndData(((unsigned int)getAxisMaxAcceleration_mm_s2(E0)), Accel_E); rtscheck.RTS_SndData(((unsigned int)getAxisMaxFeedrate_mm_s(X)), Feed_X); rtscheck.RTS_SndData(((unsigned int)getAxisMaxFeedrate_mm_s(Y)), Feed_Y); @@ -1117,11 +1117,11 @@ void RTSSHOW::RTS_HandleData() setAxisMaxAcceleration_mm_s2((uint16_t)recdat.data[0]*100, Y); } else if (recdat.addr == Accel_Z) { - setAxisMaxAcceleration_mm_s2((uint16_t)recdat.data[0]*100, Z); + setAxisMaxAcceleration_mm_s2((uint16_t)recdat.data[0]*10, Z); } else if (recdat.addr == Accel_E) { - setAxisMaxAcceleration_mm_s2((uint16_t)recdat.data[0]*100, E0); - setAxisMaxAcceleration_mm_s2((uint16_t)recdat.data[0]*100, E1); + setAxisMaxAcceleration_mm_s2((uint16_t)recdat.data[0], E0); + setAxisMaxAcceleration_mm_s2((uint16_t)recdat.data[0], E1); } else if (recdat.addr == Feed_X) { diff --git a/platformio.ini b/platformio.ini index 5b4984b2c0..55eb4f174f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -2621,35 +2621,113 @@ board = megaatmega2560 build_flags = ${common.build_flags} -DMachineS5 -DBedAC -DABL_BLTOUCH -DMeshExtreme -DABL_UBL -DCableExtensionNoiseFilter -DlerdgeFilSensor [env:Ender3V2] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3V2 +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3V2 [env:Ender3V2_BLT] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3V2 -DABL_BLTOUCH +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3V2 -DABL_BLTOUCH [env:Ender3V2_BLT_ZM] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3V2 -DABL_BLTOUCH -DCreality42XUseZMin +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3V2 -DABL_BLTOUCH -DCreality42XUseZMin [env:Ender3V2_427] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3V2 -DCreality427 +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3V2 -DCreality427 [env:Ender3V2_427_BLT] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3V2 -DABL_BLTOUCH -DCreality427 +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3V2 -DABL_BLTOUCH -DCreality427 [env:Ender3V2_427_BLT_ZM] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3V2 -DABL_BLTOUCH -DCreality427 -DCreality42XUseZMin +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3V2 -DABL_BLTOUCH -DCreality427 -DCreality42XUseZMin [env:Ender3V2_SKRT] platform = ${common_LPC.platform} @@ -2676,157 +2754,547 @@ board = nxp_lpc1769 build_flags = -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g -DMachineEnder3 -DABL_BLTOUCH -DSKRE3Turbo [env:Ender3_422] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Pro422 +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3Pro422 [env:Ender3_422_BLT] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Pro422 -DABL_BLTOUCH +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3Pro422 -DABL_BLTOUCH [env:Ender3_422_BLT_ZM] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Pro422 -DABL_BLTOUCH -DCreality42XUseZMin +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3Pro422 -DABL_BLTOUCH -DCreality42XUseZMin [env:Ender3_427] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Pro427 +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3Pro427 [env:Ender3_427_BLT] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Pro427 -DABL_BLTOUCH +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3Pro427 -DABL_BLTOUCH [env:Ender3_427_BLT_ZM] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Pro427 -DABL_BLTOUCH -DCreality42XUseZMin +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3Pro427 -DABL_BLTOUCH -DCreality42XUseZMin [env:Ender3Max_422] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Max +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3Max [env:Ender3Max_422_BLT] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Max -DABL_BLTOUCH +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3Max -DABL_BLTOUCH [env:Ender3Max_422_BLT_ZM] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Max -DABL_BLTOUCH -DCreality42XUseZMin +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3Max -DABL_BLTOUCH -DCreality42XUseZMin [env:Ender3Max_427] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Max -DCreality427 +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3Max -DCreality427 [env:Ender3Max_427_BLT] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Max -DCreality427 -DABL_BLTOUCH +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3Max -DCreality427 -DABL_BLTOUCH [env:Ender3Max_427_BLT_ZM] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Max -DCreality427 -DABL_BLTOUCH -DCreality42XUseZMin +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder3Max -DCreality427 -DABL_BLTOUCH -DCreality42XUseZMin [env:SermoonD1] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineSermoonD1 -DFORCE10SPRODISPLAY +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineSermoonD1 -DFORCE10SPRODISPLAY [env:SermoonD1_BLT] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineSermoonD1 -DFORCE10SPRODISPLAY -DABL_BLTOUCH +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineSermoonD1 -DFORCE10SPRODISPLAY -DABL_BLTOUCH [env:SermoonD1_BLT_ZM] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineSermoonD1 -DFORCE10SPRODISPLAY -DABL_BLTOUCH -DCreality42XUseZMin +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineSermoonD1 -DFORCE10SPRODISPLAY -DABL_BLTOUCH -DCreality42XUseZMin [env:Ender6] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder6 -DFORCE10SPRODISPLAY +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder6 -DFORCE10SPRODISPLAY [env:Ender6_BLT] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder6 -DABL_BLTOUCH -DFORCE10SPRODISPLAY +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder6 -DABL_BLTOUCH -DFORCE10SPRODISPLAY [env:Ender6_BLT_ZM] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder6 -DABL_BLTOUCH -DFORCE10SPRODISPLAY -DCreality42XUseZMin +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder6 -DABL_BLTOUCH -DFORCE10SPRODISPLAY -DCreality42XUseZMin [env:Ender7] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder7 -DFORCE10SPRODISPLAY +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder7 -DFORCE10SPRODISPLAY [env:Ender7_BLT] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder7 -DABL_BLTOUCH -DFORCE10SPRODISPLAY +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder7 -DABL_BLTOUCH -DFORCE10SPRODISPLAY [env:Ender7_BLT_ZM] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder7 -DABL_BLTOUCH -DFORCE10SPRODISPLAY -DCreality42XUseZMin +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineEnder7 -DABL_BLTOUCH -DFORCE10SPRODISPLAY -DCreality42XUseZMin [env:CR6_452] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineCR6 -DCR6_452 +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineCR6 -DCR6_452 [env:CR6_453] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineCR6 +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineCR6 [env:CR6_LGX_452] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineCR6 -DCR6_452 -DBondtechLGX +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineCR6 -DCR6_452 -DBondtechLGX [env:CR6_LGX_453] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineCR6 -DBondtechLGX +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineCR6 -DBondtechLGX [env:CR6Max_452] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineCR6Max -DCR6_452 +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineCR6Max -DCR6_452 [env:CR6Max_453] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineCR6Max +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineCR6Max [env:CR6Max_LGX_452] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineCR6Max -DCR6_452 -DBondtechLGX +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineCR6Max -DCR6_452 -DBondtechLGX [env:CR6Max_LGX_453] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineCR6Max -DBondtechLGX +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineCR6Max -DBondtechLGX [env:CR30] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RET6_creality_maple -build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineCR30 +platform = ${common_stm32.platform} +extends = stm32_variant +board = genericSTM32F103RE +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 +debug_tool = jlink +upload_protocol = jlink +build_flags = ${stm32_variant.build_flags} + -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineCR30 # # ATmega1280