diff --git a/garten_bus_controller.yaml b/garten_bus_controller.yaml index f32a792..1625f33 100644 --- a/garten_bus_controller.yaml +++ b/garten_bus_controller.yaml @@ -49,11 +49,13 @@ ethernet: power_pin: GPIO12 uart: - - id: "uart_dmx" - rx_pin: 0 - tx_pin: 1 # the pin where the transmission happens connected to tx (not reversed) - stop_bits: 2 - baud_rate: 250000 + #- id: "uart_dmx" + #rx_pin: 0 + #tx_pin: + #number: 1 # the pin where the transmission happens connected to tx (not reversed) + #allow_other_uses: true + #stop_bits: 2 + #baud_rate: 250000 - id: uart_relays rx_pin: 2 tx_pin: 3 @@ -200,54 +202,14 @@ packages: # skip_updates: true -dmx512: - id: dmx1 - uart_id: uart_dmx - tx_pin: 1 - uart_num: 0 - periodic_update: true - -output: - - platform: dmx512 - channel: 1 - universe: dmx1 - id: pool_licht_r - - platform: dmx512 - channel: 2 - universe: dmx1 - id: pool_licht_g - - platform: dmx512 - channel: 3 - universe: dmx1 - id: pool_licht_b - - platform: dmx512 - channel: 4 - universe: dmx1 - id: magnolie_links_r - - platform: dmx512 - channel: 5 - universe: dmx1 - id: magnolie_links_g - - platform: dmx512 - channel: 6 - universe: dmx1 - id: magnolie_links_b -light: - - platform: rgb - name: pool_licht - red: pool_licht_r - green: pool_licht_g - blue: pool_licht_b - default_transition_length: 0s - restore_mode: RESTORE_DEFAULT_OFF - - platform: rgb - name: magnolie_links - red: magnolie_links_r - green: magnolie_links_g - blue: magnolie_links_b - default_transition_length: 0s - restore_mode: RESTORE_DEFAULT_OFF - +#dmx512: +# id: dmx1 +# uart_id: uart_dmx +# tx_pin: +# number: 1 +# allow_other_uses: true +# uart_num: 0 +# periodic_update: true # ----------------------- Oxilife ------------------------------ diff --git a/garten_rs485_controller1.yaml b/garten_rs485_controller1.yaml index a09e37b..3096272 100644 --- a/garten_rs485_controller1.yaml +++ b/garten_rs485_controller1.yaml @@ -84,7 +84,26 @@ sensor: accuracy_decimals: 2 filters: - multiply: 0.01 - + - platform: modbus_controller + modbus_controller_id: "modbus_sensing_device" + address: 0x00 + register_type: holding + value_type: U_WORD + name: "Zisterne Füllstand" + force_new_range: true + state_class: measurement + icon: mdi:water + unit_of_measurement: "%" + accuracy_decimals: 0 + filters: + - calibrate_linear: + method: least_squares + datapoints: + - 126 -> 0.0 + - 274 -> 100.0 + - exponential_moving_average: + alpha: 0.1 + send_every: 3 #------------------- DMX 1 ----------------------- diff --git a/garten_rs485_controller2.yaml b/garten_rs485_controller2.yaml index 0c1516f..d90f910 100644 --- a/garten_rs485_controller2.yaml +++ b/garten_rs485_controller2.yaml @@ -12,7 +12,7 @@ api: key: !secret api_encryption_key # Enable logging -#logger: +logger: ethernet: type: LAN8720 @@ -39,104 +39,221 @@ external_components: uart: - - id: "uart_dmx1" - rx_pin: 2 - tx_pin: 4 # the pin where the transmission happens connected to tx (not reversed) - stop_bits: 2 - baud_rate: 250000 + #- id: "uart_dmx1" + # rx_pin: 2 + # tx_pin: 4 # the pin where the transmission happens connected to tx (not reversed) + # stop_bits: 2 + # baud_rate: 250000 - id: "uart_dmx2" rx_pin: 17 tx_pin: 5 stop_bits: 2 baud_rate: 250000 - - id: "uart_dmx3" - rx_pin: 14 - tx_pin: 15 - stop_bits: 2 - baud_rate: 250000 + #- id: "uart_dmx3" + # rx_pin: 14 + # tx_pin: 15 + # stop_bits: 2 + # baud_rate: 250000 #------------------- DMX 1 ----------------------- dmx512: - - id: dmx1 - uart_id: uart_dmx1 - tx_pin: 4 - uart_num: 0 - periodic_update: true + #- id: dmx1 + # uart_id: uart_dmx1 + # tx_pin: 4 + # uart_num: 0 + # periodic_update: true + # force_full_frames: true + # #update_interval: 100 + # custom_break_len: 176 - id: dmx2 uart_id: uart_dmx2 tx_pin: 5 uart_num: 1 periodic_update: true - - id: dmx3 - uart_id: uart_dmx3 - tx_pin: 15 - uart_num: 2 - periodic_update: true + #custom_break_len: 176 + #custom_break_len: 176 + #- id: dmx3 + # uart_id: uart_dmx3 + # tx_pin: 15 + # uart_num: 2 + # periodic_update: true output: - platform: dmx512 - channel: 10 - universe: dmx1 - id: test_dmx_c1_light04_r + channel: 1 + universe: dmx2 + id: pool_licht_r - platform: dmx512 - channel: 11 - universe: dmx1 - id: test_dmx_c1_light04_g + channel: 2 + universe: dmx2 + id: pool_licht_g - platform: dmx512 - channel: 12 - universe: dmx1 - id: test_dmx_c1_light04_b + channel: 3 + universe: dmx2 + id: pool_licht_b + + - platform: dmx512 + channel: 4 + universe: dmx2 + id: magnolie_links_r + - platform: dmx512 + channel: 5 + universe: dmx2 + id: magnolie_links_g + - platform: dmx512 + channel: 6 + universe: dmx2 + id: magnolie_links_b + + - platform: dmx512 + channel: 7 + universe: dmx2 + id: magnolie_rechts_r + - platform: dmx512 + channel: 8 + universe: dmx2 + id: magnolie_rechts_g + - platform: dmx512 + channel: 9 + universe: dmx2 + id: magnolie_rechts_b + - platform: dmx512 channel: 10 universe: dmx2 - id: test_dmx_c2_light04_r + id: suedseite1_r - platform: dmx512 channel: 11 universe: dmx2 - id: test_dmx_c2_light04_g + id: suedseite1_g - platform: dmx512 channel: 12 universe: dmx2 - id: test_dmx_c2_light04_b + id: suedseite1_b + - platform: dmx512 - channel: 10 - universe: dmx3 - id: test_dmx_c3_light04_r + channel: 13 + universe: dmx2 + id: suedseite2_r - platform: dmx512 - channel: 11 - universe: dmx3 - id: test_dmx_c3_light04_g + channel: 14 + universe: dmx2 + id: suedseite2_g - platform: dmx512 - channel: 12 - universe: dmx3 - id: test_dmx_c3_light04_b + channel: 15 + universe: dmx2 + id: suedseite2_b + + - platform: dmx512 + channel: 16 + universe: dmx2 + id: suedseite3_r + - platform: dmx512 + channel: 17 + universe: dmx2 + id: suedseite3_g + - platform: dmx512 + channel: 18 + universe: dmx2 + id: suedseite3_b + + - platform: dmx512 + channel: 19 + universe: dmx2 + id: suedseite4_r + - platform: dmx512 + channel: 20 + universe: dmx2 + id: suedseite4_g + - platform: dmx512 + channel: 21 + universe: dmx2 + id: suedseite4_b + + - platform: dmx512 + channel: 22 + universe: dmx2 + id: suedseite5_r + - platform: dmx512 + channel: 23 + universe: dmx2 + id: suedseite5_g + - platform: dmx512 + channel: 24 + universe: dmx2 + id: suedseite5_b + + - platform: dmx512 + channel: 25 + universe: dmx2 + id: suedseite6_r + - platform: dmx512 + channel: 26 + universe: dmx2 + id: suedseite6_g + - platform: dmx512 + channel: 27 + universe: dmx2 + id: suedseite6_b light: - platform: rgb - name: test_dmx_light04_controller2_uart1 - red: test_dmx_c1_light04_r - green: test_dmx_c1_light04_g - blue: test_dmx_c1_light04_b - default_transition_length: 0s + name: pool_licht + red: pool_licht_r + green: pool_licht_g + blue: pool_licht_b restore_mode: RESTORE_DEFAULT_OFF - platform: rgb - name: test_dmx_light04_controller2_uart2 - red: test_dmx_c2_light04_r - green: test_dmx_c2_light04_g - blue: test_dmx_c2_light04_b - default_transition_length: 0s + name: magnolie_links + red: magnolie_links_r + green: magnolie_links_g + blue: magnolie_links_b restore_mode: RESTORE_DEFAULT_OFF - platform: rgb - name: test_dmx_light04_controller2_uart3 - red: test_dmx_c3_light04_r - green: test_dmx_c3_light04_g - blue: test_dmx_c3_light04_b - default_transition_length: 0s + name: magnolie_rechts + red: magnolie_rechts_r + green: magnolie_rechts_g + blue: magnolie_rechts_b + restore_mode: RESTORE_DEFAULT_OFF + - platform: rgb + name: suedseite1 + red: suedseite1_r + green: suedseite1_g + blue: suedseite1_b + restore_mode: RESTORE_DEFAULT_OFF + - platform: rgb + name: suedseite2 + red: suedseite2_r + green: suedseite2_g + blue: suedseite2_b + restore_mode: RESTORE_DEFAULT_OFF + - platform: rgb + name: suedseite3 + red: suedseite3_r + green: suedseite3_g + blue: suedseite3_b + restore_mode: RESTORE_DEFAULT_OFF + - platform: rgb + name: suedseite4 + red: suedseite4_r + green: suedseite4_g + blue: suedseite4_b + restore_mode: RESTORE_DEFAULT_OFF + - platform: rgb + name: suedseite5 + red: suedseite5_r + green: suedseite5_g + blue: suedseite5_b + restore_mode: RESTORE_DEFAULT_OFF + - platform: rgb + name: suedseite6 + red: suedseite6_r + green: suedseite6_g + blue: suedseite6_b restore_mode: RESTORE_DEFAULT_OFF - # Light1: 1, 2,3 # Light2: 4, 5, 6 # Light3: 7, 8, 9 # Light4: 10, 11, 12 -# Light5: 13, 14, 16 \ No newline at end of file +# LiGht5: 13, 14, 15 \ No newline at end of file diff --git a/led_controller_gartenhaus.yaml b/led_controller_gartenhaus.yaml index e225b5e..2a44bb6 100644 --- a/led_controller_gartenhaus.yaml +++ b/led_controller_gartenhaus.yaml @@ -91,13 +91,13 @@ light: id: gartenhaus_wandlicht name: Gartenhaus Wandlicht pin: 3 - num_leds: 300 + num_leds: 305 is_rgbw: true rmt_channel: 0 effects: - addressable_rainbow: name: Regenbogen - width: 300 + width: 305 - addressable_color_wipe: name: Wipe colors: