diff --git a/functions b/functions index e8a049414bca2b14b158444dac1b94c2ca90d9be..900377e4f72486f6699ecf736f96adfbc04e92da 160000 --- a/functions +++ b/functions @@ -1 +1 @@ -Subproject commit e8a049414bca2b14b158444dac1b94c2ca90d9be +Subproject commit 900377e4f72486f6699ecf736f96adfbc04e92da diff --git a/intern/docker_esphome/templates/config/esphome_display02.yaml b/intern/docker_esphome/templates/config/esphome_display02.yaml index 7273a514828ea9c395439ce06ab1c8ef9ceb0f01..549c0697c3e162a6527f377e30969c2df911c8da 100644 --- a/intern/docker_esphome/templates/config/esphome_display02.yaml +++ b/intern/docker_esphome/templates/config/esphome_display02.yaml @@ -1,11 +1,10 @@ {% set devicename = "esphome_display02" %} {% include "/includes/ansible.inc.yaml" %} +{% include "/includes/board.esp32-doit-devkit-v1.inc.yaml" %} -{% include "/includes/board.d1_mini.inc.yaml" %} - # force newline + comment: Display Kuehlschrank platformio_options: - upload_speed: 115200 lib_deps: - Wire # Also required by GFX. - SPI # Also required by GFX. @@ -18,7 +17,7 @@ external_components: components: [ obegraensad_panel ] refresh: 0s {% include "/includes/common.inc.yaml" %} -# force newline + on_message: - topic: ESPHome/{{ devicename }}/state/command payload: "ON" @@ -34,25 +33,36 @@ light: name: 'Brightness' id: matrix_light output: matrix_brightness - restore_mode: RESTORE_DEFAULT_ON + restore_mode: ALWAYS_ON output: - - platform: esp8266_pwm + - platform: ledc # Enables brightness control. id: matrix_brightness pin: - number: GPIO14 + number: GPIO25 inverted: True globals: - - id: coords - type: int - restore_value: no - initial_value: '0' - - id: length - type: int - restore_value: no - initial_value: '0' + - id: coords + type: int + restore_value: no + initial_value: '0' + - id: length + type: int + restore_value: no + initial_value: '0' + +binary_sensor: +- platform: gpio + pin: + number: GPIO26 + inverted: true + mode: + input: true + pullup: true + id: button + name: button time: - platform: sntp @@ -95,13 +105,13 @@ text_sensor: - platform: mqtt_subscribe name: "Sensor Stromverbrauch kW" id: sensor_stromverbrauch_kw - topic: ESPHome/esphome_strommesser/sensor/stromverbrauch/state + topic: ESPHome/esphome_status/sensor/stromverbrauch/state display: - platform: obegraensad_panel latch_pin: 12 - clock_pin: 04 - data_pin: 05 + clock_pin: 14 + data_pin: 27 id: my_display pages: - id: Page1 diff --git a/intern/docker_esphome/templates/config/esphome_kuehlschrank.yaml b/intern/docker_esphome/templates/config/esphome_kuehlschrank.yaml index 49592627e4db90bbe7d124ff489a98b9862d55b8..954529f8ecc39b55aae44926acde47c9e2219e77 100644 --- a/intern/docker_esphome/templates/config/esphome_kuehlschrank.yaml +++ b/intern/docker_esphome/templates/config/esphome_kuehlschrank.yaml @@ -1,30 +1,230 @@ {% set devicename = "esphome_kuehlschrank" %} {% include "/includes/ansible.inc.yaml" %} -{% include "/includes/board.d1_mini.inc.yaml" %} +{% include "/includes/board.esp32-doit-devkit-v1.inc.yaml" %} + + on_boot: + - priority: -100 + then: + - light.addressable_set: + id: logo_led + white: 0% + - light.addressable_set: + id: kuehl_led + white: 0% + - priority: -100 + then: + - light.turn_on: + id: logo_led + effect: "Rainbow" + brightness: 100% + - light.turn_on: + id: kuehl_led + effect: "Rainbow" + brightness: 100% + - media_player.volume_set: + id: speaker + volume: 100% {% include "/includes/common.inc.yaml" %} + on_message: + - topic: ESPHome/{{ devicename }}/state/command + payload: "ON" + then: + - light.turn_on: + id: logo_led + effect: "Rainbow" + brightness: 100% + - light.turn_on: + id: kuehl_led + effect: "Rainbow" + brightness: 100% + - topic: ESPHome/{{ devicename }}/state/command + payload: "OFF" + then: + - light.turn_off: logo_led + - light.turn_off: kuehl_led # Dallas DS18B20 dallas: - - pin: 0 - update_interval: 10s +- pin: GPIO32 + update_interval: 10s # Sensor configs sensor: - - - platform: dallas - address: 0x4301143CAC4BAA28 - name: "Kuehlschrank-Temp" - filters: - - sliding_window_moving_average: - window_size: 3 - send_every: 3 - send_first_at: 3 +- platform: dallas + address: 0x4301143CAC4BAA28 + name: "Kuehlschrank-Temp" + filters: + - sliding_window_moving_average: + window_size: 3 + send_every: 3 + send_first_at: 3 binary_sensor: +- platform: gpio + pin: + number: GPIO33 + mode: + input: true + pullup: true + id: kuehlschrank_door + name: Kuehlschrank-Door + on_release: + then: + - light.turn_on: + id: kuehl_led + effect: "Rainbow" + brightness: 100% + - light.addressable_set: + id: kuehl_led + white: 0% + on_press: + then: + - light.turn_on: + id: kuehl_led + effect: "None" + brightness: 100% + - light.addressable_set: + id: kuehl_led + red: 100% + green: 100% + blue: 100% + white: 100% + - media_player.play_media: + id: speaker + media_url: 'http://10.0.0.1/filesrv/usb/nootnoot.mp3' + +light: + - platform: neopixelbus + type: RGBW + variant: SK6812 + id: logo_led + pin: GPIO26 + num_leds: 30 + name: "Liba Logo LEDs" + restore_mode: ALWAYS_ON + method: + type: esp32_rmt + channel: 0 + effects: + - addressable_color_wipe: + - addressable_color_wipe: + name: Color Wipe Effect With Custom Values + colors: + - red: 100% + green: 100% + blue: 100% + num_leds: 3 + - red: 0% + green: 0% + blue: 0% + num_leds: 3 + add_led_interval: 100ms + reverse: false + - addressable_rainbow: + - addressable_rainbow: + name: Rainbow Effect With Custom Values + speed: 2 + width: 8 + - addressable_scan: + - addressable_scan: + name: Scan Effect With Custom Values + move_interval: 100ms + scan_width: 2 + - addressable_random_twinkle: + - addressable_random_twinkle: + name: Random Twinkle Effect With Custom Values + twinkle_probability: 5% + progress_interval: 32ms + - addressable_fireworks: + - addressable_fireworks: + name: Fireworks Effect With Custom Values + update_interval: 32ms + spark_probability: 10% + use_random_color: false + fade_out_rate: 120 + - addressable_color_wipe: + name: BootUp + colors: + - red: 100% + green: 0% + blue: 0% + num_leds: 8 + - red: 0% + green: 0% + blue: 0% + num_leds: 8 + add_led_interval: 100ms + reverse: False + - platform: neopixelbus + type: RGBW + variant: SK6812 + id: kuehl_led + pin: GPIO23 + num_leds: 72 + name: "Kuehl LEDs" + restore_mode: ALWAYS_ON + method: + type: esp32_rmt + channel: 1 + effects: + - addressable_color_wipe: + - addressable_color_wipe: + name: Color Wipe Effect With Custom Values + colors: + - red: 100% + green: 100% + blue: 100% + num_leds: 3 + - red: 0% + green: 0% + blue: 0% + num_leds: 3 + add_led_interval: 100ms + reverse: false + - addressable_rainbow: + - addressable_rainbow: + name: Rainbow Effect With Custom Values + speed: 2 + width: 8 + - addressable_scan: + - addressable_scan: + name: Scan Effect With Custom Values + move_interval: 100ms + scan_width: 2 + - addressable_random_twinkle: + - addressable_random_twinkle: + name: Random Twinkle Effect With Custom Values + twinkle_probability: 5% + progress_interval: 32ms + - addressable_fireworks: + - addressable_fireworks: + name: Fireworks Effect With Custom Values + update_interval: 32ms + spark_probability: 10% + use_random_color: false + fade_out_rate: 120 + - addressable_color_wipe: + name: BootUp + colors: + - red: 100% + green: 0% + blue: 0% + num_leds: 8 + - red: 0% + green: 0% + blue: 0% + num_leds: 8 + add_led_interval: 100ms + reverse: False - - platform: gpio - pin: 4 - id: kuehlschrank_door - name: Kuehlschrank-Door \ No newline at end of file +media_player: + - platform: i2s_audio + name: ESPHome I2S Media Player + id: speaker + dac_type: external + i2s_lrclk_pin: GPIO21 + i2s_dout_pin: GPIO18 + i2s_bclk_pin: GPIO19 + mode: mono diff --git a/intern/docker_esphome/templates/config/esphome_plug01.yaml b/intern/docker_esphome/templates/config/esphome_plug01.yaml index b2f06f8eb640a89a08ee654062c8a3864e749830..a3ec409d823d1d6ec65d00c53baf9d8dd0592e4f 100644 --- a/intern/docker_esphome/templates/config/esphome_plug01.yaml +++ b/intern/docker_esphome/templates/config/esphome_plug01.yaml @@ -2,8 +2,10 @@ {% include "/includes/ansible.inc.yaml" %} {% include "/includes/board.esp01_1m.inc.yaml" %} + + comment: Starroof Lounge {% include "/includes/common.inc.yaml" %} -# force newline + on_message: - topic: ESPHome/{{ devicename }}/state/command payload: "ON" diff --git a/intern/docker_esphome/templates/config/esphome_plug02.yaml b/intern/docker_esphome/templates/config/esphome_plug02.yaml index 2684a64f37667c92511d265c93e230ff78e54eda..0bad6f3dbbb296446aa9fbd491f309f96de4109d 100644 --- a/intern/docker_esphome/templates/config/esphome_plug02.yaml +++ b/intern/docker_esphome/templates/config/esphome_plug02.yaml @@ -2,8 +2,10 @@ {% include "/includes/ansible.inc.yaml" %} {% include "/includes/board.esp01_1m.inc.yaml" %} + + comment: LED Theke {% include "/includes/common.inc.yaml" %} -# force newline + on_message: - topic: ESPHome/{{ devicename }}/state/command payload: "ON" diff --git a/intern/docker_esphome/templates/config/esphome_plug03.yaml b/intern/docker_esphome/templates/config/esphome_plug03.yaml index 89c95ce91493930877932d989ba7b103cf0bca5e..0048c0c3bdf333ad9e3fc5819579a85ef103b29f 100644 --- a/intern/docker_esphome/templates/config/esphome_plug03.yaml +++ b/intern/docker_esphome/templates/config/esphome_plug03.yaml @@ -2,8 +2,10 @@ {% include "/includes/ansible.inc.yaml" %} {% include "/includes/board.esp01_1m.inc.yaml" %} + + comment: Fernseher Lounge {% include "/includes/common.inc.yaml" %} -# force newline + on_message: - topic: ESPHome/{{ devicename }}/state/command payload: "ON" diff --git a/intern/docker_esphome/templates/config/esphome_plug04.yaml b/intern/docker_esphome/templates/config/esphome_plug04.yaml index c31210bd9d28df9f9d941cdb467deec371c7d203..e1471832dfb1af716bb2d8abddf4958bd08a2dc5 100644 --- a/intern/docker_esphome/templates/config/esphome_plug04.yaml +++ b/intern/docker_esphome/templates/config/esphome_plug04.yaml @@ -2,8 +2,10 @@ {% include "/includes/ansible.inc.yaml" %} {% include "/includes/board.esp01_1m.inc.yaml" %} + + comment: Halogen Lounge {% include "/includes/common.inc.yaml" %} -# force newline + on_message: - topic: ESPHome/{{ devicename }}/state/command payload: "ON" diff --git a/intern/docker_esphome/templates/config/esphome_plug05.yaml b/intern/docker_esphome/templates/config/esphome_plug05.yaml index b6cd479286528b1d19e19b6ae6e59867d2b02414..b32bad334db71afe137ae06fdc8b3012079bc7b0 100644 --- a/intern/docker_esphome/templates/config/esphome_plug05.yaml +++ b/intern/docker_esphome/templates/config/esphome_plug05.yaml @@ -2,8 +2,10 @@ {% include "/includes/ansible.inc.yaml" %} {% include "/includes/board.esp01_1m.inc.yaml" %} + + comment: Propaganda Bildschirm {% include "/includes/common.inc.yaml" %} -# force newline + on_message: - topic: ESPHome/{{ devicename }}/state/command payload: "ON" diff --git a/intern/docker_esphome/templates/config/esphome_plug06.yaml b/intern/docker_esphome/templates/config/esphome_plug06.yaml index 95e2dafad337cb39cb0861c7660d42a82f4d590e..c6cb37bf52450f0d8dd29bb9939f35cd5d795ef7 100644 --- a/intern/docker_esphome/templates/config/esphome_plug06.yaml +++ b/intern/docker_esphome/templates/config/esphome_plug06.yaml @@ -2,8 +2,10 @@ {% include "/includes/ansible.inc.yaml" %} {% include "/includes/board.esp01_1m.inc.yaml" %} + + comment: Pixelflut Server Rack {% include "/includes/common.inc.yaml" %} -# force newline + on_message: - topic: ESPHome/{{ devicename }}/state/command payload: "ON" diff --git a/intern/docker_esphome/templates/config/esphome_plug07.yaml b/intern/docker_esphome/templates/config/esphome_plug07.yaml index 7ad6bbc23b2a98869f5a06fbb44377f83d74e639..6155b29f92b7a22f4895d8d62f13e31b7fc40d29 100644 --- a/intern/docker_esphome/templates/config/esphome_plug07.yaml +++ b/intern/docker_esphome/templates/config/esphome_plug07.yaml @@ -2,8 +2,10 @@ {% include "/includes/ansible.inc.yaml" %} {% include "/includes/board.esp01_1m.inc.yaml" %} + + comment: Bullhorn Kuhhorn Muuuuh! {% include "/includes/common.inc.yaml" %} -# force newline + on_message: - topic: ESPHome/{{ devicename }}/state/command payload: "ON" diff --git a/intern/docker_esphome/templates/config/esphome_plug08.yaml b/intern/docker_esphome/templates/config/esphome_plug08.yaml index 424337350e9860eb61082a859999e9c70dae4d12..de646e6b2f8e00734e96ecc969001bee794ea421 100644 --- a/intern/docker_esphome/templates/config/esphome_plug08.yaml +++ b/intern/docker_esphome/templates/config/esphome_plug08.yaml @@ -2,8 +2,10 @@ {% include "/includes/ansible.inc.yaml" %} {% include "/includes/board.esp01_1m.inc.yaml" %} + + comment: 3D Drucker Prusanet {% include "/includes/common.inc.yaml" %} -# force newline + on_message: - topic: ESPHome/{{ devicename }}/state/command payload: "ON" diff --git a/intern/docker_esphome/templates/config/esphome_popcorn.yaml b/intern/docker_esphome/templates/config/esphome_popcorn.yaml index b86b5424cc423467119edc5157245af18d55fdbc..d8f3f4c8de716280fe00100ea641d3617a10af26 100644 --- a/intern/docker_esphome/templates/config/esphome_popcorn.yaml +++ b/intern/docker_esphome/templates/config/esphome_popcorn.yaml @@ -42,7 +42,7 @@ id: status_led range_from: 1 range_to: 1 - red: 100% + red: 50% green: 0% blue: 0% - if: @@ -64,7 +64,7 @@ id: status_led range_from: 2 range_to: 2 - red: 100% + red: 50% green: 0% blue: 0% - if: @@ -86,7 +86,7 @@ id: status_led range_from: 0 range_to: 0 - red: 100% + red: 50% green: 0% blue: 0% - if: @@ -135,7 +135,7 @@ climate: id: pid_heater name: "PID Heater Controller" sensor: pot_sensor - default_target_temperature: 256 + default_target_temperature: 240 heat_output: pot_heater control_parameters: kp: 0.09549 @@ -245,12 +245,12 @@ binary_sensor: - climate.control: id: pid_heater mode: HEAT - target_temperature: 264 + target_temperature: 240 - light.addressable_set: id: status_led range_from: 1 range_to: 1 - red: 100% + red: 50% green: 0% blue: 0% - platform: gpio @@ -279,7 +279,7 @@ binary_sensor: id: status_led range_from: 0 range_to: 0 - red: 100% + red: 50% green: 0% blue: 0% - platform: gpio @@ -308,7 +308,7 @@ binary_sensor: id: status_led range_from: 2 range_to: 2 - red: 100% + red: 50% green: 0% blue: 0% diff --git a/intern/docker_openhab/templates/conf/things/network.things b/intern/docker_openhab/templates/conf/things/network.things index 45214d3de434372a09ae562423261492b62736d2..004ecc5d3c0c9bb0798340466f641593be64dd8b 100644 --- a/intern/docker_openhab/templates/conf/things/network.things +++ b/intern/docker_openhab/templates/conf/things/network.things @@ -1,5 +1,5 @@ // Netzwerk Geräte -network:pingdevice:switch01 [ hostname="192.168.0.100", retry=3, timeout=5000, refreshInterval=10000, uses_arp_ping="no" ] -network:pingdevice:switch02 [ hostname="192.168.0.101", retry=3, timeout=5000, refreshInterval=10000, uses_arp_ping="no" ] +network:pingdevice:switch01 [ hostname="TL-SG3428XMP", retry=3, timeout=5000, refreshInterval=10000, uses_arp_ping="no" ] +network:pingdevice:switch02 [ hostname="TL-SG3452X", retry=3, timeout=5000, refreshInterval=10000, uses_arp_ping="no" ]