From 59f42f7f27e53978ef45f45817446e3dc80f4acb Mon Sep 17 00:00:00 2001 From: ThomasToka Date: Sun, 16 Jul 2023 21:28:00 +0200 Subject: [PATCH] v003 updates - reintroduce 7x7 and 10x10 build generally - add abl7x7 and abl10x10 builds - fix runout disabled status on all events (start,pause, etc) --- Marlin/Configuration.h | 18 +++++- Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 14 ++++- Marlin/src/gcode/bedlevel/abl/G29.cpp | 14 ++++- Marlin/src/pins/pins.h | 4 +- ini/stm32f1.ini | 55 ++++++++++++++++++ ini/stm32f4.ini | 64 +++++++++++++++++++++ 6 files changed, 160 insertions(+), 9 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 29767e0ad398..20da0f0b00d8 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -118,7 +118,13 @@ #define SOFTVERSION SHORT_BUILD_VERSION #define MACHINE_TYPE "Ender-3 S1 Pro" #if ENABLED(AUTO_BED_LEVELING_BILINEAR) - #define FIRMWARE_VERSION "abl5x5-v002-byTT" + #if GRID_MAX_POINTS_X == 5 + #define FIRMWARE_VERSION "abl5x5-v002-byTT" + #elif GRID_MAX_POINTS_X == 7 + #define FIRMWARE_VERSION "abl7x7-v002-byTT" + #elif GRID_MAX_POINTS_X == 10 + #define FIRMWARE_VERSION "abl10x10-v002-byTT" + #endif #else #if GRID_MAX_POINTS_X == 5 #define FIRMWARE_VERSION "ubl5x5-v002-byTT" @@ -160,7 +166,13 @@ #define SOFTVERSION SHORT_BUILD_VERSION #define MACHINE_TYPE "Ender-3 S1 Plus" #if ENABLED(AUTO_BED_LEVELING_BILINEAR) - #define FIRMWARE_VERSION "abl5x5-v002-byTT" + #if GRID_MAX_POINTS_X == 5 + #define FIRMWARE_VERSION "abl5x5-v002-byTT" + #elif GRID_MAX_POINTS_X == 7 + #define FIRMWARE_VERSION "abl7x7-v002-byTT" + #elif GRID_MAX_POINTS_X == 10 + #define FIRMWARE_VERSION "abl10x10-v002-byTT" + #endif #else #if GRID_MAX_POINTS_X == 5 #define FIRMWARE_VERSION "ubl5x5-v002-byTT" @@ -2370,7 +2382,7 @@ #if ANY(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR) // Set the number of grid points per dimension. - #define GRID_MAX_POINTS_X 5 + //#define GRID_MAX_POINTS_X 5 #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X // Probe along the Y axis, advancing X after each column diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp index 13c5efdda5c6..3146fe0f7952 100644 --- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp +++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp @@ -845,8 +845,18 @@ void unified_bed_leveling::shift_mesh_height() { rtscheck.RTS_SndData(GRID_MAX_POINTS, AUTO_BED_LEVEL_END_POINT); rtscheck.RTS_SndData(point_num, AUTO_BED_LEVEL_CUR_POINT_VP); rtscheck.RTS_SndData(measured_z * 1000, AUTO_BED_LEVEL_1POINT_NEW_VP + (point_num_real - 1) * 2); - rtscheck.RTS_SndData(ExchangePageBase + 81, ExchangepageAddr); - change_page_font = 81; + #if GRID_MAX_POINTS_X == 5 + rtscheck.RTS_SndData(ExchangePageBase + 81, ExchangepageAddr); + change_page_font = 81; + #endif + #if GRID_MAX_POINTS_X == 7 + rtscheck.RTS_SndData(ExchangePageBase + 94, ExchangepageAddr); + change_page_font = 94; + #endif + #if GRID_MAX_POINTS_X == 10 + rtscheck.RTS_SndData(ExchangePageBase + 95, ExchangepageAddr); + change_page_font = 95; + #endif } #endif } diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp index 6eb07c6b9e63..403aed563626 100644 --- a/Marlin/src/gcode/bedlevel/abl/G29.cpp +++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp @@ -812,8 +812,18 @@ G29_TYPE GcodeSuite::G29() { rtscheck.RTS_SndData(showcount + 1, AUTO_BED_LEVEL_CUR_POINT_VP); rtscheck.RTS_SndData(z*1000, AUTO_BED_LEVEL_1POINT_NEW_VP + showcount * 2); showcount ++; - rtscheck.RTS_SndData(ExchangePageBase + 81, ExchangepageAddr); - change_page_font = 81; + #if GRID_MAX_POINTS_X == 5 + rtscheck.RTS_SndData(ExchangePageBase + 81, ExchangepageAddr); + change_page_font = 81; + #endif + #if GRID_MAX_POINTS_X == 7 + rtscheck.RTS_SndData(ExchangePageBase + 94, ExchangepageAddr); + change_page_font = 94; + #endif + #if GRID_MAX_POINTS_X == 10 + rtscheck.RTS_SndData(ExchangePageBase + 95, ExchangepageAddr); + change_page_font = 95; + #endif } } #endif diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index c4c1bee603b4..91e1097db103 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -665,7 +665,7 @@ #elif MB(CREALITY_V24S1) #include "stm32f1/pins_CREALITY_V24S1.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple #elif MB(CREALITY_V24S1_301) - #include "stm32f1/pins_CREALITY_V24S1_301.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple env:STM32F103RE_creality_e3s1pro_abl5x5 env:STM32F103RE_creality_e3s1pro_ubl5x5 env:STM32F103RE_creality_e3s1pro_ubl7x7 env:STM32F103RE_creality_e3s1pro_ubl10x10 env:STM32F103RE_creality_e3s1plus_abl5x5 env:STM32F103RE_creality_e3s1plus_ubl5x5 env:STM32F103RE_creality_e3s1plus_ubl7x7 env:STM32F103RE_creality_e3s1plus_ubl10x10 env:STM32F103RE_creality_e3s1_abl5x5 + #include "stm32f1/pins_CREALITY_V24S1_301.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple env:STM32F103RE_creality_e3s1pro_abl5x5 env:STM32F103RE_creality_e3s1pro_abl7x7 env:STM32F103RE_creality_e3s1pro_abl10x10 env:STM32F103RE_creality_e3s1pro_ubl5x5 env:STM32F103RE_creality_e3s1pro_ubl7x7 env:STM32F103RE_creality_e3s1pro_ubl10x10 env:STM32F103RE_creality_e3s1plus_abl5x5 env:STM32F103RE_creality_e3s1plus_abl7x7 env:STM32F103RE_creality_e3s1plus_abl10x10 env:STM32F103RE_creality_e3s1plus_ubl5x5 env:STM32F103RE_creality_e3s1plus_ubl7x7 env:STM32F103RE_creality_e3s1plus_ubl10x10 env:STM32F103RE_creality_e3s1_abl5x5 #elif MB(CREALITY_V25S1) #include "stm32f1/pins_CREALITY_V25S1.h" // STM32F1 env:STM32F103RE_creality_smartPro env:STM32F103RE_creality_smartPro_maple #elif MB(CREALITY_V521) @@ -787,7 +787,7 @@ #elif MB(ARTILLERY_RUBY) #include "stm32f4/pins_ARTILLERY_RUBY.h" // STM32F4 env:Artillery_Ruby #elif MB(CREALITY_V24S1_301F4) - #include "stm32f4/pins_CREALITY_V24S1_301F4.h" // STM32F4 env:STM32F401RC_creality env:STM32F401RC_creality_jlink env:STM32F401RC_creality_stlink env:STM32F401RC_creality_e3s1pro_abl5x5 env:STM32F401RC_creality_e3s1pro_abl5x5_personal env:STM32F401RC_creality_e3s1pro_ubl5x5_personal env:STM32F401RC_creality_e3s1pro_ubl5x5 env:STM32F401RC_creality_e3s1pro_ubl7x7 env:STM32F401RC_creality_e3s1pro_ubl10x10 env:STM32F401RC_creality_e3s1plus_abl5x5 env:STM32F401RC_creality_e3s1plus_ubl5x5 env:STM32F401RC_creality_e3s1plus_ubl7x7 env:STM32F401RC_creality_e3s1plus_ubl10x10 env:STM32F401RC_creality_e3s1_abl5x5 + #include "stm32f4/pins_CREALITY_V24S1_301F4.h" // STM32F4 env:STM32F401RC_creality env:STM32F401RC_creality_jlink env:STM32F401RC_creality_stlink env:STM32F401RC_creality_e3s1pro_abl5x5 env:STM32F401RC_creality_e3s1pro_abl7x7 env:STM32F401RC_creality_e3s1pro_abl10x10 env:STM32F401RC_creality_e3s1pro_abl5x5_personal env:STM32F401RC_creality_e3s1pro_ubl5x5_personal env:STM32F401RC_creality_e3s1pro_ubl5x5 env:STM32F401RC_creality_e3s1pro_ubl7x7 env:STM32F401RC_creality_e3s1pro_ubl10x10 env:STM32F401RC_creality_e3s1plus_abl5x5 env:STM32F401RC_creality_e3s1plus_abl7x7 env:STM32F401RC_creality_e3s1plus_abl10x10 env:STM32F401RC_creality_e3s1plus_ubl5x5 env:STM32F401RC_creality_e3s1plus_ubl7x7 env:STM32F401RC_creality_e3s1plus_ubl10x10 env:STM32F401RC_creality_e3s1_abl5x5 #elif MB(OPULO_LUMEN_REV4) #include "stm32f4/pins_OPULO_LUMEN_REV4.h" // STM32F4 env:Opulo_Lumen_REV4 #elif MB(FYSETC_SPIDER_KING407) diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini index 1738f591fb61..da03ed6bf287 100644 --- a/ini/stm32f1.ini +++ b/ini/stm32f1.ini @@ -176,12 +176,39 @@ build_flags = ${STM32F103Rx_creality.build_flags} -DENDER_MACHINE_OVERRIDE -DENDER_3S1_PRO -DAUTO_BED_LEVELING_BILINEAR + -DGRID_MAX_POINTS_X=5 -DBLTOUCH_HS_MODE=true -DUSER_STM32F103=1 -DMOTHERBOARD=BOARD_CREALITY_V24S1_301 -DPROBING_MARGIN=45 board_build.rename = firmware-{date}-{time}-E3S1Pro-abl5x5-LA-F1.bin +[env:STM32F103RE_creality_e3s1pro_abl7x7] +extends = env:STM32F103RE_creality +build_flags = ${STM32F103Rx_creality.build_flags} + -DLASER_FEATURE + -DENDER_MACHINE_OVERRIDE + -DENDER_3S1_PRO + -DAUTO_BED_LEVELING_BILINEAR + -DGRID_MAX_POINTS_X=7 + -DUSER_STM32F103=1 + -DMOTHERBOARD=BOARD_CREALITY_V24S1_301 + -DPROBING_MARGIN=45 +board_build.rename = firmware-{date}-{time}-E3S1Pro-abl7x7-LA-F1.bin + +[env:STM32F103RE_creality_e3s1pro_abl10x10] +extends = env:STM32F103RE_creality +build_flags = ${STM32F103Rx_creality.build_flags} + -DLASER_FEATURE + -DENDER_MACHINE_OVERRIDE + -DENDER_3S1_PRO + -DAUTO_BED_LEVELING_BILINEAR + -DGRID_MAX_POINTS_X=10 + -DUSER_STM32F103=1 + -DMOTHERBOARD=BOARD_CREALITY_V24S1_301 + -DPROBING_MARGIN=45 +board_build.rename = firmware-{date}-{time}-E3S1Pro-abl10x10-LA-F1.bin + [env:STM32F103RE_creality_e3s1pro_ubl5x5] extends = env:STM32F103RE_creality build_flags = ${STM32F103Rx_creality.build_flags} @@ -229,12 +256,39 @@ build_flags = ${STM32F103Rx_creality.build_flags} -DENDER_MACHINE_OVERRIDE -DENDER_3S1_PLUS -DAUTO_BED_LEVELING_BILINEAR + -DGRID_MAX_POINTS_X=5 -DBLTOUCH_HS_MODE=true -DUSER_STM32F103=1 -DMOTHERBOARD=BOARD_CREALITY_V24S1_301 -DPROBING_MARGIN=45 board_build.rename = firmware-{date}-{time}-E3S1Plus-abl5x5-LA-F1.bin +[env:STM32F103RE_creality_e3s1plus_abl7x7] +extends = env:STM32F103RE_creality +build_flags = ${STM32F103Rx_creality.build_flags} + -DLASER_FEATURE + -DENDER_MACHINE_OVERRIDE + -DENDER_3S1_PLUS + -DAUTO_BED_LEVELING_BILINEAR + -DGRID_MAX_POINTS_X=7 + -DUSER_STM32F103=1 + -DMOTHERBOARD=BOARD_CREALITY_V24S1_301 + -DPROBING_MARGIN=45 +board_build.rename = firmware-{date}-{time}-E3S1Plus-abl7x7-LA-F1.bin + +[env:STM32F103RE_creality_e3s1plus_abl10x10] +extends = env:STM32F103RE_creality +build_flags = ${STM32F103Rx_creality.build_flags} + -DLASER_FEATURE + -DENDER_MACHINE_OVERRIDE + -DENDER_3S1_PLUS + -DAUTO_BED_LEVELING_BILINEAR + -DGRID_MAX_POINTS_X=10 + -DUSER_STM32F103=1 + -DMOTHERBOARD=BOARD_CREALITY_V24S1_301 + -DPROBING_MARGIN=45 +board_build.rename = firmware-{date}-{time}-E3S1Plus-abl10x10-LA-F1.bin + [env:STM32F103RE_creality_e3s1plus_ubl5x5] extends = env:STM32F103RE_creality build_flags = ${STM32F103Rx_creality.build_flags} @@ -282,6 +336,7 @@ build_flags = ${STM32F103Rx_creality.build_flags} -DENDER_MACHINE_OVERRIDE -DENDER_3S1_PRO -DAUTO_BED_LEVELING_BILINEAR + -DGRID_MAX_POINTS_X=5 -DBLTOUCH_HS_MODE=true -DUSER_STM32F103=1 -DMOTHERBOARD=BOARD_CREALITY_V24S1_301 diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini index 0d8f3b7cff6a..67240f9a5c6c 100644 --- a/ini/stm32f4.ini +++ b/ini/stm32f4.ini @@ -733,6 +733,7 @@ build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DS -DENDER_MACHINE_OVERRIDE -DENDER_3S1_PRO -DAUTO_BED_LEVELING_BILINEAR + -DGRID_MAX_POINTS_X=5 -DBLTOUCH_HS_MODE=true -DUSER_STM32F401=1 -DMOTHERBOARD=BOARD_CREALITY_V24S1_301F4 @@ -748,6 +749,7 @@ build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DS -DENDER_MACHINE_OVERRIDE -DENDER_3S1_PRO -DAUTO_BED_LEVELING_BILINEAR + -DGRID_MAX_POINTS_X=5 -DPERSONAL_BUILD -DBLTOUCH_HS_MODE=true -DUSER_STM32F401=1 @@ -756,6 +758,36 @@ build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DS -DFILAMENT_RUNOUT_SENSOR_DEBUG board_build.rename = firmware-{date}-{time}-E3S1Pro-abl5x5-LA-personal-F4.bin +[env:STM32F401RC_creality_e3s1pro_abl7x7] +extends = env:STM32F401RC_creality +build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DSTM32F4 + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 + -DLASER_FEATURE + -DENDER_MACHINE_OVERRIDE + -DENDER_3S1_PRO + -DAUTO_BED_LEVELING_BILINEAR + -DGRID_MAX_POINTS_X=7 + -DUSER_STM32F401=1 + -DMOTHERBOARD=BOARD_CREALITY_V24S1_301F4 + -DPROBING_MARGIN=45 +board_build.rename = firmware-{date}-{time}-E3S1Pro-abl7x7-LA-F4.bin + +[env:STM32F401RC_creality_e3s1pro_abl10x10] +extends = env:STM32F401RC_creality +build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DSTM32F4 + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 + -DLASER_FEATURE + -DENDER_MACHINE_OVERRIDE + -DENDER_3S1_PRO + -DAUTO_BED_LEVELING_BILINEAR + -DGRID_MAX_POINTS_X=10 + -DUSER_STM32F401=1 + -DMOTHERBOARD=BOARD_CREALITY_V24S1_301F4 + -DPROBING_MARGIN=45 +board_build.rename = firmware-{date}-{time}-E3S1Pro-abl10x10-LA-F4.bin + [env:STM32F401RC_creality_e3s1pro_ubl5x5_personal] extends = env:STM32F401RC_creality build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DSTM32F4 @@ -829,12 +861,43 @@ build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DS -DENDER_MACHINE_OVERRIDE -DENDER_3S1_PLUS -DAUTO_BED_LEVELING_BILINEAR + -DGRID_MAX_POINTS_X=5 -DBLTOUCH_HS_MODE=true -DUSER_STM32F401=1 -DMOTHERBOARD=BOARD_CREALITY_V24S1_301F4 -DPROBING_MARGIN=45 board_build.rename = firmware-{date}-{time}-E3S1Plus-abl5x5-LA-F4.bin +[env:STM32F401RC_creality_e3s1plus_abl7x7] +extends = env:STM32F401RC_creality +build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DSTM32F4 + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 + -DLASER_FEATURE + -DENDER_MACHINE_OVERRIDE + -DENDER_3S1_PLUS + -DAUTO_BED_LEVELING_BILINEAR + -DGRID_MAX_POINTS_X=7 + -DUSER_STM32F401=1 + -DMOTHERBOARD=BOARD_CREALITY_V24S1_301F4 + -DPROBING_MARGIN=45 +board_build.rename = firmware-{date}-{time}-E3S1Plus-abl7x7-LA-F4.bin + +[env:STM32F401RC_creality_e3s1plus_abl10x10] +extends = env:STM32F401RC_creality +build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DSTM32F4 + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 + -DLASER_FEATURE + -DENDER_MACHINE_OVERRIDE + -DENDER_3S1_PLUS + -DAUTO_BED_LEVELING_BILINEAR + -DGRID_MAX_POINTS_X=10 + -DUSER_STM32F401=1 + -DMOTHERBOARD=BOARD_CREALITY_V24S1_301F4 + -DPROBING_MARGIN=45 +board_build.rename = firmware-{date}-{time}-E3S1Plus-abl10x10-LA-F4.bin + [env:STM32F401RC_creality_e3s1plus_ubl5x5] extends = env:STM32F401RC_creality build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DSTM32F4 @@ -890,6 +953,7 @@ build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DS -DENDER_MACHINE_OVERRIDE -DENDER_3S1 -DAUTO_BED_LEVELING_BILINEAR + -DGRID_MAX_POINTS_X=5 -DBLTOUCH_HS_MODE=true -DUSER_STM32F401=1 -DMOTHERBOARD=BOARD_CREALITY_V24S1_301F4