From d704ac9555cc0716a092f5b2924d86ca44b0c074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Boisselier?= Date: Sun, 7 May 2023 16:27:56 +0000 Subject: [PATCH] merged the default toolhead overrides to their MCU templates --- install.sh | 3 +- .../toolhead/BTT_EBB36-42_v1.0.cfg | 33 ++++++++++++++++++ .../toolhead/BTT_EBB36-42_v1.1.cfg | 33 ++++++++++++++++++ .../toolhead/BTT_EBB36-42_v1.2.cfg | 33 ++++++++++++++++++ .../mcu_defaults/toolhead/BTT_SB2209_v1.0.cfg | 33 ++++++++++++++++++ .../mcu_defaults/toolhead/BTT_SB2240_v1.0.cfg | 33 ++++++++++++++++++ .../toolhead/Mellow_SB2040_v1.cfg | 33 ++++++++++++++++++ .../toolhead/Mellow_SHT36-42_v1.x.cfg | 33 ++++++++++++++++++ .../toolhead/Mellow_SHT36_v2.x.cfg | 33 ++++++++++++++++++ .../toolhead/overrides/default.cfg | 34 ------------------- 10 files changed, 265 insertions(+), 36 deletions(-) delete mode 100644 user_templates/mcu_defaults/toolhead/overrides/default.cfg diff --git a/install.sh b/install.sh index 61861b388..b3a6af6bb 100755 --- a/install.sh +++ b/install.sh @@ -164,8 +164,7 @@ function install_mcu_templates { # If the user selected a file, copy its content into the mcu.cfg file filename=$(basename "${file_list[$((toolhead_template-1))]}") cat "${FRIX_CONFIG_PATH}/user_templates/mcu_defaults/toolhead/$filename" >> ${USER_CONFIG_PATH}/mcu.cfg - cat "${FRIX_CONFIG_PATH}/user_templates/mcu_defaults/toolhead/overrides/default.cfg" >> ${USER_CONFIG_PATH}/overrides.cfg - printf "[CONFIG] Template '$filename' inserted into your mcu.cfg and default overrides added to your overrides.cfg user files\n\n" + printf "[CONFIG] Template '$filename' inserted into your mcu.cfg user file\n\n" else printf "[CONFIG] No toolhead template selected. Skip and continuing...\n\n" fi diff --git a/user_templates/mcu_defaults/toolhead/BTT_EBB36-42_v1.0.cfg b/user_templates/mcu_defaults/toolhead/BTT_EBB36-42_v1.0.cfg index 4fe0f1d2c..dfc036c32 100644 --- a/user_templates/mcu_defaults/toolhead/BTT_EBB36-42_v1.0.cfg +++ b/user_templates/mcu_defaults/toolhead/BTT_EBB36-42_v1.0.cfg @@ -30,5 +30,38 @@ aliases: ADXL_CS=MCU_SPI2_CS , ADXL_SCLK=MCU_SPI2_SCLK , ADXL_MISO=MCU_SPI2_MISO , ADXL_MOSI=MCU_SPI2_MOSI , + +#----------------------------------------# +# BTT EBB36/42 v1.0 pins remapping # +#----------------------------------------# + +# These pins overrides are automatically added when you select a CANbus +# toolhead MCU during the installation process. They should provide a +# good base to work with. Feel free to adapt to your board if needed! + +[extruder] +step_pin: toolhead:E_STEP +dir_pin: toolhead:E_DIR +enable_pin: !toolhead:E_ENABLE +heater_pin: toolhead:E_HEATER +sensor_pin: toolhead:E_TEMPERATURE + +[probe] +pin: ^toolhead:PROBE_INPUT + +[fan] +pin: toolhead:PART_FAN + +[heater_fan hotend_fan] +pin: toolhead:E_FAN + +## Uncomment the following line if not using sensorless homing +## and having the X endstop plugged to the toolhead MCU +# [stepper_x] +# endstop_pin: ^toolhead:X_STOP + +[neopixel status_leds] +pin: toolhead:STATUS_NEOPIXEL + [tmc2209 extruder] uart_pin: toolhead:E_TMCUART diff --git a/user_templates/mcu_defaults/toolhead/BTT_EBB36-42_v1.1.cfg b/user_templates/mcu_defaults/toolhead/BTT_EBB36-42_v1.1.cfg index 9126c4b79..19bae5717 100644 --- a/user_templates/mcu_defaults/toolhead/BTT_EBB36-42_v1.1.cfg +++ b/user_templates/mcu_defaults/toolhead/BTT_EBB36-42_v1.1.cfg @@ -30,5 +30,38 @@ aliases: ADXL_CS=MCU_SPI2_CS , ADXL_SCLK=MCU_SPI2_SCLK , ADXL_MISO=MCU_SPI2_MISO , ADXL_MOSI=MCU_SPI2_MOSI , + +#----------------------------------------# +# BTT EBB36/42 v1.1 pins remapping # +#----------------------------------------# + +# These pins overrides are automatically added when you select a CANbus +# toolhead MCU during the installation process. They should provide a +# good base to work with. Feel free to adapt to your board if needed! + +[extruder] +step_pin: toolhead:E_STEP +dir_pin: toolhead:E_DIR +enable_pin: !toolhead:E_ENABLE +heater_pin: toolhead:E_HEATER +sensor_pin: toolhead:E_TEMPERATURE + +[probe] +pin: ^toolhead:PROBE_INPUT + +[fan] +pin: toolhead:PART_FAN + +[heater_fan hotend_fan] +pin: toolhead:E_FAN + +## Uncomment the following line if not using sensorless homing +## and having the X endstop plugged to the toolhead MCU +# [stepper_x] +# endstop_pin: ^toolhead:X_STOP + +[neopixel status_leds] +pin: toolhead:STATUS_NEOPIXEL + [tmc2209 extruder] uart_pin: toolhead:E_TMCUART diff --git a/user_templates/mcu_defaults/toolhead/BTT_EBB36-42_v1.2.cfg b/user_templates/mcu_defaults/toolhead/BTT_EBB36-42_v1.2.cfg index 2a4ac3b95..b46d62884 100644 --- a/user_templates/mcu_defaults/toolhead/BTT_EBB36-42_v1.2.cfg +++ b/user_templates/mcu_defaults/toolhead/BTT_EBB36-42_v1.2.cfg @@ -30,5 +30,38 @@ aliases: ADXL_CS=MCU_SPI2_CS , ADXL_SCLK=MCU_SPI2_SCLK , ADXL_MISO=MCU_SPI2_MISO , ADXL_MOSI=MCU_SPI2_MOSI , + +#----------------------------------------# +# BTT EBB36/42 v1.2 pins remapping # +#----------------------------------------# + +# These pins overrides are automatically added when you select a CANbus +# toolhead MCU during the installation process. They should provide a +# good base to work with. Feel free to adapt to your board if needed! + +[extruder] +step_pin: toolhead:E_STEP +dir_pin: toolhead:E_DIR +enable_pin: !toolhead:E_ENABLE +heater_pin: toolhead:E_HEATER +sensor_pin: toolhead:E_TEMPERATURE + +[probe] +pin: ^toolhead:PROBE_INPUT + +[fan] +pin: toolhead:PART_FAN + +[heater_fan hotend_fan] +pin: toolhead:E_FAN + +## Uncomment the following line if not using sensorless homing +## and having the X endstop plugged to the toolhead MCU +# [stepper_x] +# endstop_pin: ^toolhead:X_STOP + +[neopixel status_leds] +pin: toolhead:STATUS_NEOPIXEL + [tmc2209 extruder] uart_pin: toolhead:E_TMCUART diff --git a/user_templates/mcu_defaults/toolhead/BTT_SB2209_v1.0.cfg b/user_templates/mcu_defaults/toolhead/BTT_SB2209_v1.0.cfg index ae8b45f04..aca7e39a7 100644 --- a/user_templates/mcu_defaults/toolhead/BTT_SB2209_v1.0.cfg +++ b/user_templates/mcu_defaults/toolhead/BTT_SB2209_v1.0.cfg @@ -31,5 +31,38 @@ aliases: ADXL_CS=MCU_SPI2_CS , ADXL_SCLK=MCU_SPI2_CLK , ADXL_MISO=MCU_SPI2_MISO , ADXL_MOSI=MCU_SPI2_MOSI , MAX31865_NSS=MCU_SPI1_NSS , MAX31865_CLK=MCU_SPI1_CLK , MAX31865_MOSI=MCU_SPI1_MOSI , MAX31865_MISO = MCU_SPI1_MISO , + +#----------------------------------------# +# BTT SB2209 v1.0 pins remapping # +#----------------------------------------# + +# These pins overrides are automatically added when you select a CANbus +# toolhead MCU during the installation process. They should provide a +# good base to work with. Feel free to adapt to your board if needed! + +[extruder] +step_pin: toolhead:E_STEP +dir_pin: toolhead:E_DIR +enable_pin: !toolhead:E_ENABLE +heater_pin: toolhead:E_HEATER +sensor_pin: toolhead:E_TEMPERATURE + +[probe] +pin: ^toolhead:PROBE_INPUT + +[fan] +pin: toolhead:PART_FAN + +[heater_fan hotend_fan] +pin: toolhead:E_FAN + +## Uncomment the following line if not using sensorless homing +## and having the X endstop plugged to the toolhead MCU +# [stepper_x] +# endstop_pin: ^toolhead:X_STOP + +[neopixel status_leds] +pin: toolhead:STATUS_NEOPIXEL + [tmc2209 extruder] uart_pin: toolhead:E_TMCUART diff --git a/user_templates/mcu_defaults/toolhead/BTT_SB2240_v1.0.cfg b/user_templates/mcu_defaults/toolhead/BTT_SB2240_v1.0.cfg index f011cb71e..99e17a0f8 100644 --- a/user_templates/mcu_defaults/toolhead/BTT_SB2240_v1.0.cfg +++ b/user_templates/mcu_defaults/toolhead/BTT_SB2240_v1.0.cfg @@ -31,6 +31,39 @@ aliases: ADXL_CS=MCU_SPI2_CS , ADXL_SCLK=MCU_SPI2_CLK , ADXL_MISO=MCU_SPI2_MISO , ADXL_MOSI=MCU_SPI2_MOSI , MAX31865_NSS=MCU_SPI1_NSS , MAX31865_CLK=MCU_SPI1_CLK , MAX31865_MOSI=MCU_SPI1_MOSI , MAX31865_MISO = MCU_SPI1_MISO , + +#----------------------------------------# +# BTT SB2240 v1.0 pins remapping # +#----------------------------------------# + +# These pins overrides are automatically added when you select a CANbus +# toolhead MCU during the installation process. They should provide a +# good base to work with. Feel free to adapt to your board if needed! + +[extruder] +step_pin: toolhead:E_STEP +dir_pin: toolhead:E_DIR +enable_pin: !toolhead:E_ENABLE +heater_pin: toolhead:E_HEATER +sensor_pin: toolhead:E_TEMPERATURE + +[probe] +pin: ^toolhead:PROBE_INPUT + +[fan] +pin: toolhead:PART_FAN + +[heater_fan hotend_fan] +pin: toolhead:E_FAN + +## Uncomment the following line if not using sensorless homing +## and having the X endstop plugged to the toolhead MCU +# [stepper_x] +# endstop_pin: ^toolhead:X_STOP + +[neopixel status_leds] +pin: toolhead:STATUS_NEOPIXEL + # Since ADXL shares pins with the SPI interface of the TMC, it must be set up here, since different pin aliases must not resolve to the same pin [tmc2240 extruder] cs_pin: toolhead:MCU_MOTOR_SPI_NSS diff --git a/user_templates/mcu_defaults/toolhead/Mellow_SB2040_v1.cfg b/user_templates/mcu_defaults/toolhead/Mellow_SB2040_v1.cfg index 60bdfe5f6..d6859d3fd 100644 --- a/user_templates/mcu_defaults/toolhead/Mellow_SB2040_v1.cfg +++ b/user_templates/mcu_defaults/toolhead/Mellow_SB2040_v1.cfg @@ -30,5 +30,38 @@ aliases: ADXL_CS=MCU_ADXL_CS , ADXL_SCLK=MCU_ADXL_SCK , ADXL_MOSI=MCU_ADXL_MOSI , ADXL_MISO=MCU_ADXL_MISO , + +#----------------------------------------# +# Mellow SB2040 v1 pins remapping # +#----------------------------------------# + +# These pins overrides are automatically added when you select a CANbus +# toolhead MCU during the installation process. They should provide a +# good base to work with. Feel free to adapt to your board if needed! + +[extruder] +step_pin: toolhead:E_STEP +dir_pin: toolhead:E_DIR +enable_pin: !toolhead:E_ENABLE +heater_pin: toolhead:E_HEATER +sensor_pin: toolhead:E_TEMPERATURE + +[probe] +pin: ^toolhead:PROBE_INPUT + +[fan] +pin: toolhead:PART_FAN + +[heater_fan hotend_fan] +pin: toolhead:E_FAN + +## Uncomment the following line if not using sensorless homing +## and having the X endstop plugged to the toolhead MCU +# [stepper_x] +# endstop_pin: ^toolhead:X_STOP + +[neopixel status_leds] +pin: toolhead:STATUS_NEOPIXEL + [tmc2209 extruder] uart_pin: toolhead:E_TMCUART diff --git a/user_templates/mcu_defaults/toolhead/Mellow_SHT36-42_v1.x.cfg b/user_templates/mcu_defaults/toolhead/Mellow_SHT36-42_v1.x.cfg index bb26958d8..86799b122 100644 --- a/user_templates/mcu_defaults/toolhead/Mellow_SHT36-42_v1.x.cfg +++ b/user_templates/mcu_defaults/toolhead/Mellow_SHT36-42_v1.x.cfg @@ -31,5 +31,38 @@ aliases: ADXL_CS=MCU_ADXL , + +#----------------------------------------# +# Mellow SHT36/42 v1.x pins remapping # +#----------------------------------------# + +# These pins overrides are automatically added when you select a CANbus +# toolhead MCU during the installation process. They should provide a +# good base to work with. Feel free to adapt to your board if needed! + +[extruder] +step_pin: toolhead:E_STEP +dir_pin: toolhead:E_DIR +enable_pin: !toolhead:E_ENABLE +heater_pin: toolhead:E_HEATER +sensor_pin: toolhead:E_TEMPERATURE + +[probe] +pin: ^toolhead:PROBE_INPUT + +[fan] +pin: toolhead:PART_FAN + +[heater_fan hotend_fan] +pin: toolhead:E_FAN + +## Uncomment the following line if not using sensorless homing +## and having the X endstop plugged to the toolhead MCU +# [stepper_x] +# endstop_pin: ^toolhead:X_STOP + +[neopixel status_leds] +pin: toolhead:STATUS_NEOPIXEL + [tmc2209 extruder] uart_pin: toolhead:E_TMCUART diff --git a/user_templates/mcu_defaults/toolhead/Mellow_SHT36_v2.x.cfg b/user_templates/mcu_defaults/toolhead/Mellow_SHT36_v2.x.cfg index 8c63110f0..d88590135 100644 --- a/user_templates/mcu_defaults/toolhead/Mellow_SHT36_v2.x.cfg +++ b/user_templates/mcu_defaults/toolhead/Mellow_SHT36_v2.x.cfg @@ -30,5 +30,38 @@ aliases: ADXL_CS=MCU_ADXL , + +#----------------------------------------# +# Mellow SHT36 v2.x pins remapping # +#----------------------------------------# + +# These pins overrides are automatically added when you select a CANbus +# toolhead MCU during the installation process. They should provide a +# good base to work with. Feel free to adapt to your board if needed! + +[extruder] +step_pin: toolhead:E_STEP +dir_pin: toolhead:E_DIR +enable_pin: !toolhead:E_ENABLE +heater_pin: toolhead:E_HEATER +sensor_pin: toolhead:E_TEMPERATURE + +[probe] +pin: ^toolhead:PROBE_INPUT + +[fan] +pin: toolhead:PART_FAN + +[heater_fan hotend_fan] +pin: toolhead:E_FAN + +## Uncomment the following line if not using sensorless homing +## and having the X endstop plugged to the toolhead MCU +# [stepper_x] +# endstop_pin: ^toolhead:X_STOP + +[neopixel status_leds] +pin: toolhead:STATUS_NEOPIXEL + [tmc2209 extruder] uart_pin: toolhead:E_TMCUART diff --git a/user_templates/mcu_defaults/toolhead/overrides/default.cfg b/user_templates/mcu_defaults/toolhead/overrides/default.cfg deleted file mode 100644 index 2741338eb..000000000 --- a/user_templates/mcu_defaults/toolhead/overrides/default.cfg +++ /dev/null @@ -1,34 +0,0 @@ - -#-------------------------# -# TOOLHEAD MCU board # -#-------------------------# - -# Those overrides are automatically added when you select a CANbus -# toolhead MCU during the installation process. They should provide a -# good base to work with. Feel free to adapt to your board if needed! - -[extruder] -step_pin: toolhead:E_STEP -dir_pin: toolhead:E_DIR -enable_pin: !toolhead:E_ENABLE -heater_pin: toolhead:E_HEATER -sensor_pin: toolhead:E_TEMPERATURE - -[probe] -pin: ^toolhead:PROBE_INPUT - -[fan] -pin: toolhead:PART_FAN - -[heater_fan hotend_fan] -pin: toolhead:E_FAN - -## Uncomment the following line if not using sensorless homing -## and having the X endstop plugged to the toolhead MCU -# [stepper_x] -# endstop_pin: ^toolhead:X_STOP - -[neopixel status_leds] -pin: toolhead:STATUS_NEOPIXEL - -