From 92225ac259d8c0f65602ae60da9320aadd8b13d8 Mon Sep 17 00:00:00 2001 From: AdamV3D Date: Sat, 4 Mar 2023 21:06:46 +0000 Subject: [PATCH 1/2] White LED configuration option added --- boards/btt-manta-e3ez/config.cfg | 2 ++ boards/btt-manta-m4p/config.cfg | 2 ++ boards/btt-manta-m8p/config.cfg | 2 ++ boards/btt-octopus-11-407/config.cfg | 2 ++ boards/btt-octopus-11/config.cfg | 2 ++ boards/btt-octopus-pro-429/config.cfg | 2 ++ boards/btt-octopus-pro-446/config.cfg | 2 ++ boards/btt-octopus-pro-h723/config.cfg | 2 ++ boards/btt-skr-14-turbo/config.cfg | 2 ++ boards/btt-skr-2-407/config.cfg | 2 ++ boards/btt-skr-2-429/config.cfg | 2 ++ boards/btt-skr-3-ez/config.cfg | 2 ++ boards/btt-skr-3/config.cfg | 2 ++ boards/btt-skr-mini-e3-30/config.cfg | 3 +++ boards/btt-skr-pro-12/config.cfg | 2 ++ boards/fysetc-cheetah-v2/config.cfg | 2 ++ boards/fysetc-spider/config.cfg | 2 ++ templates/v-core-3-printer.template.cfg | 5 +++++ templates/v-core-pro-printer.template.cfg | 4 ++++ templates/v-minion-printer.template.cfg | 5 +++++ templates/voron-v01-printer.template.cfg | 4 ++++ templates/voron-v24-printer.template.cfg | 5 +++++ 22 files changed, 58 insertions(+) diff --git a/boards/btt-manta-e3ez/config.cfg b/boards/btt-manta-e3ez/config.cfg index 41e3611c..4ad55fe0 100644 --- a/boards/btt-manta-e3ez/config.cfg +++ b/boards/btt-manta-e3ez/config.cfg @@ -23,6 +23,8 @@ aliases: # Bed heater heater_bed_heating_pin=PB2, heater_bed_sensor_pin=PA3, +# LEDs + white_led_pin=PB10, ## Expansion ports # EXP1 header diff --git a/boards/btt-manta-m4p/config.cfg b/boards/btt-manta-m4p/config.cfg index b49d2785..c1bc988f 100644 --- a/boards/btt-manta-m4p/config.cfg +++ b/boards/btt-manta-m4p/config.cfg @@ -22,6 +22,8 @@ aliases: # Bed heater heater_bed_heating_pin=PD8, heater_bed_sensor_pin=PC4 , +# LEDs +# white_led_pin= not supported (insufficient pins) ## Expansion ports # EXP1 header diff --git a/boards/btt-manta-m8p/config.cfg b/boards/btt-manta-m8p/config.cfg index 4daa63dd..4e8a1d9f 100644 --- a/boards/btt-manta-m8p/config.cfg +++ b/boards/btt-manta-m8p/config.cfg @@ -25,6 +25,8 @@ aliases: # Bed heater heater_bed_heating_pin=PB7, heater_bed_sensor_pin=PA0 , +# LEDs +# white_led_pin=PE5, (z3_enable_pin conflict) ## Expansion ports # EXP1 header diff --git a/boards/btt-octopus-11-407/config.cfg b/boards/btt-octopus-11-407/config.cfg index 5a8c0b73..30bdeb65 100644 --- a/boards/btt-octopus-11-407/config.cfg +++ b/boards/btt-octopus-11-407/config.cfg @@ -25,6 +25,8 @@ aliases: # Bed heater heater_bed_heating_pin=PA1, heater_bed_sensor_pin=PF3, +# LEDs + white_led_pin=PD13, ## Expansion ports # EXP1 header diff --git a/boards/btt-octopus-11/config.cfg b/boards/btt-octopus-11/config.cfg index 5adbcb39..8441a6ff 100644 --- a/boards/btt-octopus-11/config.cfg +++ b/boards/btt-octopus-11/config.cfg @@ -25,6 +25,8 @@ aliases: # Bed heater heater_bed_heating_pin=PA1, heater_bed_sensor_pin=PF3, +# LEDs + white_led_pin=PD13, ## Expansion ports # EXP1 header diff --git a/boards/btt-octopus-pro-429/config.cfg b/boards/btt-octopus-pro-429/config.cfg index 2308ed78..bca1156f 100644 --- a/boards/btt-octopus-pro-429/config.cfg +++ b/boards/btt-octopus-pro-429/config.cfg @@ -25,6 +25,8 @@ aliases: # Bed heater heater_bed_heating_pin=PA1, heater_bed_sensor_pin=PF3, +# LEDs + white_led_pin=PD13, ## Expansion ports # EXP1 header diff --git a/boards/btt-octopus-pro-446/config.cfg b/boards/btt-octopus-pro-446/config.cfg index 7d50f920..ebe2f518 100644 --- a/boards/btt-octopus-pro-446/config.cfg +++ b/boards/btt-octopus-pro-446/config.cfg @@ -25,6 +25,8 @@ aliases: # Bed heater heater_bed_heating_pin=PA1, heater_bed_sensor_pin=PF3, +# LEDs + white_led_pin=PD13, ## Expansion ports # EXP1 header diff --git a/boards/btt-octopus-pro-h723/config.cfg b/boards/btt-octopus-pro-h723/config.cfg index 455a2569..5d0ef873 100644 --- a/boards/btt-octopus-pro-h723/config.cfg +++ b/boards/btt-octopus-pro-h723/config.cfg @@ -25,6 +25,8 @@ aliases: # Bed heater heater_bed_heating_pin=PA1, heater_bed_sensor_pin=PF3, +# LEDs + white_led_pin=PD13, ## Expansion ports # EXP1 header diff --git a/boards/btt-skr-14-turbo/config.cfg b/boards/btt-skr-14-turbo/config.cfg index 6e5b1deb..34109b5e 100644 --- a/boards/btt-skr-14-turbo/config.cfg +++ b/boards/btt-skr-14-turbo/config.cfg @@ -23,6 +23,8 @@ aliases: # Bed heater heater_bed_heating_pin=P2.5, heater_bed_sensor_pin=P0.25, +# LEDs + white_led_pin=2.4, ## Expansion ports # EXP1 header diff --git a/boards/btt-skr-2-407/config.cfg b/boards/btt-skr-2-407/config.cfg index 370dfe38..f081d3b6 100644 --- a/boards/btt-skr-2-407/config.cfg +++ b/boards/btt-skr-2-407/config.cfg @@ -23,6 +23,8 @@ aliases: # Bed heater heater_bed_heating_pin=PD7, heater_bed_sensor_pin=PA1, +# LEDs + white_led_pin=PB4, ## Expansion ports # EXP1 header diff --git a/boards/btt-skr-2-429/config.cfg b/boards/btt-skr-2-429/config.cfg index fcbb2293..15741fa6 100644 --- a/boards/btt-skr-2-429/config.cfg +++ b/boards/btt-skr-2-429/config.cfg @@ -23,6 +23,8 @@ aliases: # Bed heater heater_bed_heating_pin=PD7, heater_bed_sensor_pin=PA1, +# LEDs + white_led_pin=PB4, ## Expansion ports # EXP1 header diff --git a/boards/btt-skr-3-ez/config.cfg b/boards/btt-skr-3-ez/config.cfg index 583f8785..7369e30b 100644 --- a/boards/btt-skr-3-ez/config.cfg +++ b/boards/btt-skr-3-ez/config.cfg @@ -23,6 +23,8 @@ aliases: # Bed heater heater_bed_heating_pin=PD7, heater_bed_sensor_pin=PA1, +# LEDs + white_led_pin=PB4, ## Expansion ports # EXP1 header diff --git a/boards/btt-skr-3/config.cfg b/boards/btt-skr-3/config.cfg index eaaafe74..3fc08825 100644 --- a/boards/btt-skr-3/config.cfg +++ b/boards/btt-skr-3/config.cfg @@ -23,6 +23,8 @@ aliases: # Bed heater heater_bed_heating_pin=PD7, heater_bed_sensor_pin=PA1, +# LEDs + white_led_pin=PB4, ## Expansion ports # EXP1 header diff --git a/boards/btt-skr-mini-e3-30/config.cfg b/boards/btt-skr-mini-e3-30/config.cfg index 31fc3887..a4bfb130 100644 --- a/boards/btt-skr-mini-e3-30/config.cfg +++ b/boards/btt-skr-mini-e3-30/config.cfg @@ -56,6 +56,9 @@ aliases: # PS-ON header PS_ON_1=, PS_ON_2=PC13 + + # LEDs + #white_led_pin= not supported (insufficient pins), [mcu] baud: 250000 diff --git a/boards/btt-skr-pro-12/config.cfg b/boards/btt-skr-pro-12/config.cfg index 363dfbbe..fb6eec3f 100644 --- a/boards/btt-skr-pro-12/config.cfg +++ b/boards/btt-skr-pro-12/config.cfg @@ -23,6 +23,8 @@ aliases: # Bed heater heater_bed_heating_pin=PD12, heater_bed_sensor_pin=PF3, +# LEDs + white_led_pin=PD14, ## Expansion ports # EXP1 header diff --git a/boards/fysetc-cheetah-v2/config.cfg b/boards/fysetc-cheetah-v2/config.cfg index 1dc418ba..42706031 100644 --- a/boards/fysetc-cheetah-v2/config.cfg +++ b/boards/fysetc-cheetah-v2/config.cfg @@ -22,6 +22,8 @@ aliases: # Bed heater heater_bed_heating_pin=PC7, heater_bed_sensor_pin=PC5, +# LEDs +# white_led_pin=not supported (insufficient pins), ## Expansion ports diff --git a/boards/fysetc-spider/config.cfg b/boards/fysetc-spider/config.cfg index 64673ca5..f0701d83 100644 --- a/boards/fysetc-spider/config.cfg +++ b/boards/fysetc-spider/config.cfg @@ -23,6 +23,8 @@ aliases: # Bed heater heater_bed_heating_pin=PB4, heater_bed_sensor_pin=PC3, +# LEDs + white_led_pin=PD3, ## Expansion ports # taken from https://github.com/KevinOConnor/klipper/blob/master/config/generic-fysetc-spider.cfg diff --git a/templates/v-core-3-printer.template.cfg b/templates/v-core-3-printer.template.cfg index 01494eb1..9aefcd97 100644 --- a/templates/v-core-3-printer.template.cfg +++ b/templates/v-core-3-printer.template.cfg @@ -199,6 +199,11 @@ variable_pause_print_park_in: "back" # Set the speed for travel moves in RatOS Macros in mm/s. variable_macro_travel_speed: 300 +############################################################################################################# +### LIGHTING CONFIGURATION +############################################################################################################# +#[include white_led.cfg] + ############################################################################################################# ### PRINTER CONFIGURATION diff --git a/templates/v-core-pro-printer.template.cfg b/templates/v-core-pro-printer.template.cfg index 354b6036..5c975cc3 100644 --- a/templates/v-core-pro-printer.template.cfg +++ b/templates/v-core-pro-printer.template.cfg @@ -203,6 +203,10 @@ variable_pause_print_park_in: "back" # Set the speed for travel moves in RatOS Macros in mm/s. variable_macro_travel_speed: 300 +############################################################################################################# +### LIGHTING CONFIGURATION +############################################################################################################# +#[include white_led.cfg] ############################################################################################################# ### PRINTER CONFIGURATION diff --git a/templates/v-minion-printer.template.cfg b/templates/v-minion-printer.template.cfg index 53323217..3b5ee0fe 100644 --- a/templates/v-minion-printer.template.cfg +++ b/templates/v-minion-printer.template.cfg @@ -206,6 +206,11 @@ variable_pause_print_park_in: "front" # Set the speed for travel moves in RatOS Macros in mm/s. variable_macro_travel_speed: 300 +############################################################################################################# +### LIGHTING CONFIGURATION +############################################################################################################# +#[include white_led.cfg] + ############################################################################################################# ### PRINTER CONFIGURATION diff --git a/templates/voron-v01-printer.template.cfg b/templates/voron-v01-printer.template.cfg index f097f9e7..2a4a78c3 100644 --- a/templates/voron-v01-printer.template.cfg +++ b/templates/voron-v01-printer.template.cfg @@ -197,6 +197,10 @@ variable_pause_print_park_in: "back" # Set the speed for travel moves in RatOS Macros in mm/s. variable_macro_travel_speed: 300 +############################################################################################################# +### LIGHTING CONFIGURATION +############################################################################################################# +#[include white_led.cfg] ############################################################################################################# ### PRINTER CONFIGURATION diff --git a/templates/voron-v24-printer.template.cfg b/templates/voron-v24-printer.template.cfg index 94d37ad1..d3fd0d93 100644 --- a/templates/voron-v24-printer.template.cfg +++ b/templates/voron-v24-printer.template.cfg @@ -231,6 +231,11 @@ variable_pause_print_park_in: "back" # Set the speed for travel moves in RatOS Macros in mm/s. variable_macro_travel_speed: 300 +############################################################################################################# +### LIGHTING CONFIGURATION +############################################################################################################# +#[include white_led.cfg] + ############################################################################################################# ### PRINTER CONFIGURATION From e5449869490341538d47fb30d0d444da75cd8192 Mon Sep 17 00:00:00 2001 From: AdamV3D Date: Sat, 4 Mar 2023 21:11:49 +0000 Subject: [PATCH 2/2] corrected include path and created caselight macro --- lighting/white_led.cfg | 10 ++++++++++ templates/v-core-3-printer.template.cfg | 2 +- templates/v-core-pro-printer.template.cfg | 2 +- templates/v-minion-printer.template.cfg | 2 +- templates/voron-v01-printer.template.cfg | 2 +- templates/voron-v24-printer.template.cfg | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 lighting/white_led.cfg diff --git a/lighting/white_led.cfg b/lighting/white_led.cfg new file mode 100644 index 00000000..6943f97b --- /dev/null +++ b/lighting/white_led.cfg @@ -0,0 +1,10 @@ +# WARNING. DO NOT EDIT THIS FILE. +# To override settings from this file, you can copy and paste the relevant +# sections into your printer.cfg and change it there. + +[output_pin caselight] +pin: white_led_pin +pwm:true +shutdown_value: 0 +value:0.3 +cycle_time: 0.0025 \ No newline at end of file diff --git a/templates/v-core-3-printer.template.cfg b/templates/v-core-3-printer.template.cfg index 9aefcd97..4290f7ac 100644 --- a/templates/v-core-3-printer.template.cfg +++ b/templates/v-core-3-printer.template.cfg @@ -202,7 +202,7 @@ variable_macro_travel_speed: 300 ############################################################################################################# ### LIGHTING CONFIGURATION ############################################################################################################# -#[include white_led.cfg] +#[include RATOS/lighting/white_led.cfg] ############################################################################################################# diff --git a/templates/v-core-pro-printer.template.cfg b/templates/v-core-pro-printer.template.cfg index 5c975cc3..ba21b0fb 100644 --- a/templates/v-core-pro-printer.template.cfg +++ b/templates/v-core-pro-printer.template.cfg @@ -206,7 +206,7 @@ variable_macro_travel_speed: 300 ############################################################################################################# ### LIGHTING CONFIGURATION ############################################################################################################# -#[include white_led.cfg] +#[include RATOS/lighting/white_led.cfg] ############################################################################################################# ### PRINTER CONFIGURATION diff --git a/templates/v-minion-printer.template.cfg b/templates/v-minion-printer.template.cfg index 3b5ee0fe..5589c0b6 100644 --- a/templates/v-minion-printer.template.cfg +++ b/templates/v-minion-printer.template.cfg @@ -209,7 +209,7 @@ variable_macro_travel_speed: 300 ############################################################################################################# ### LIGHTING CONFIGURATION ############################################################################################################# -#[include white_led.cfg] +#[include RATOS/lighting/white_led.cfg] ############################################################################################################# diff --git a/templates/voron-v01-printer.template.cfg b/templates/voron-v01-printer.template.cfg index 2a4a78c3..2577fb18 100644 --- a/templates/voron-v01-printer.template.cfg +++ b/templates/voron-v01-printer.template.cfg @@ -200,7 +200,7 @@ variable_macro_travel_speed: 300 ############################################################################################################# ### LIGHTING CONFIGURATION ############################################################################################################# -#[include white_led.cfg] +#[include RATOS/lighting/white_led.cfg] ############################################################################################################# ### PRINTER CONFIGURATION diff --git a/templates/voron-v24-printer.template.cfg b/templates/voron-v24-printer.template.cfg index d3fd0d93..0262a0a3 100644 --- a/templates/voron-v24-printer.template.cfg +++ b/templates/voron-v24-printer.template.cfg @@ -234,7 +234,7 @@ variable_macro_travel_speed: 300 ############################################################################################################# ### LIGHTING CONFIGURATION ############################################################################################################# -#[include white_led.cfg] +#[include RATOS/lighting/white_led.cfg] #############################################################################################################