From 31e0e1638589562930b9b86b67029be349afabfd Mon Sep 17 00:00:00 2001 From: Philipp <philipp_ten_brink@web.de> Date: Wed, 2 Nov 2022 19:38:04 +0100 Subject: [PATCH] make ready for redeployment --- .../templates/config/esphome_alarm.yaml | 2 +- .../templates/config/esphome_dach.yaml | 3 +- .../templates/config/esphome_display01.yaml | 42 ++++++++++++------ .../templates/config/esphome_display02.yaml | 43 +++++++++++++------ .../templates/config/esphome_feinstaub01.yaml | 2 +- .../templates/config/esphome_hauptraum.yaml | 3 +- .../config/esphome_holzwerkstatt.yaml | 2 +- .../templates/config/esphome_kamin.yaml | 5 +-- .../config/esphome_kuehlschrank.yaml | 2 +- .../templates/config/esphome_lounge.yaml | 2 +- .../config/esphome_luftfilter01.yaml | 2 +- .../templates/config/esphome_strommesser.yaml | 2 +- .../config/esphome_vortragsraum.yaml | 2 +- 13 files changed, 70 insertions(+), 42 deletions(-) diff --git a/warpsrvint/docker_esphome/templates/config/esphome_alarm.yaml b/warpsrvint/docker_esphome/templates/config/esphome_alarm.yaml index 150b4731..58b5f213 100644 --- a/warpsrvint/docker_esphome/templates/config/esphome_alarm.yaml +++ b/warpsrvint/docker_esphome/templates/config/esphome_alarm.yaml @@ -44,4 +44,4 @@ binary_sensor: on_press: then: - switch.turn_off: sirene - - switch.turn_off: blaulicht + - switch.turn_off: blaulicht \ No newline at end of file diff --git a/warpsrvint/docker_esphome/templates/config/esphome_dach.yaml b/warpsrvint/docker_esphome/templates/config/esphome_dach.yaml index f339d18c..f12834e9 100644 --- a/warpsrvint/docker_esphome/templates/config/esphome_dach.yaml +++ b/warpsrvint/docker_esphome/templates/config/esphome_dach.yaml @@ -65,5 +65,4 @@ sensor: send_first_at: 3 address: 0x77 update_interval: 10s - iir_filter: 16x - + iir_filter: 16x \ No newline at end of file diff --git a/warpsrvint/docker_esphome/templates/config/esphome_display01.yaml b/warpsrvint/docker_esphome/templates/config/esphome_display01.yaml index b1ac4ecc..4cf0cac3 100644 --- a/warpsrvint/docker_esphome/templates/config/esphome_display01.yaml +++ b/warpsrvint/docker_esphome/templates/config/esphome_display01.yaml @@ -14,11 +14,9 @@ - me-no-dev/ESPAsyncTCP external_components: - - source: - type: git - url: https://github.com/Palakis/esphome-frekvens-panel - ref: master - components: [ frekvens_panel ] + - source: github://phiten/esphome-ikea-led-matrix@master + components: [ frekvens_panel ] + refresh: 0s {% include "/includes/common.inc.yaml" %} @@ -31,27 +29,45 @@ light: output: - platform: esp8266_pwm # Enables brightness control. + max_power: 0.05 id: matrix_brightness pin: number: GPIO14 inverted: True -time: - - platform: sntp - id: ntp_time - timezone: 'Europe/Berlin' +globals: + - id: coords + type: int + restore_value: no + initial_value: '0' + - id: length + type: int + restore_value: no + initial_value: '0' + +interval: + - interval: 300ms + then: + lambda: |- + if (id(coords) < -(id(length))) { + id(coords) = 0; + } + else { + id(coords) -= 2; + } font: - file: "04B03.ttf" id: b03 - size: 8 + size: 16 display: - platform: frekvens_panel latch_pin: 12 clock_pin: 04 data_pin: 05 - lambda: |- - auto time = id(ntp_time).now(); - it.printf(0, 0, id(b03), "%d:%d", time.hour, time.minute); + std::string printout=" warpzone"; + int clength = printout.length(); + id(length)=clength*16; + it.print(id(coords), 0, id(b03), printout.c_str());; \ No newline at end of file diff --git a/warpsrvint/docker_esphome/templates/config/esphome_display02.yaml b/warpsrvint/docker_esphome/templates/config/esphome_display02.yaml index 40ef8409..c2c94032 100644 --- a/warpsrvint/docker_esphome/templates/config/esphome_display02.yaml +++ b/warpsrvint/docker_esphome/templates/config/esphome_display02.yaml @@ -14,11 +14,9 @@ - me-no-dev/ESPAsyncTCP external_components: - - source: - type: git - url: https://github.com/Palakis/esphome-frekvens-panel - ref: master - components: [ frekvens_panel ] + - source: github://phiten/esphome-ikea-led-matrix@master + components: [ obegraensad_panel ] + refresh: 0s {% include "/includes/common.inc.yaml" %} @@ -36,22 +34,39 @@ output: number: GPIO14 inverted: True -time: - - platform: sntp - id: ntp_time - timezone: 'Europe/Berlin' +globals: + - id: coords + type: int + restore_value: no + initial_value: '0' + - id: length + type: int + restore_value: no + initial_value: '0' + +interval: + - interval: 300ms + then: + lambda: |- + if (id(coords) < -(id(length))) { + id(coords) = 0; + } + else { + id(coords) -= 2; + } font: - file: "04B03.ttf" id: b03 - size: 8 + size: 16 display: - - platform: frekvens_panel + - platform: obegraensad_panel latch_pin: 12 clock_pin: 04 data_pin: 05 - lambda: |- - auto time = id(ntp_time).now(); - it.printf(0, 0, id(b03), "%d:%d", time.hour, time.minute); + std::string printout=" warpzone"; + int clength = printout.length(); + id(length)=clength*16; + it.print(id(coords), 0, id(b03), printout.c_str());; \ No newline at end of file diff --git a/warpsrvint/docker_esphome/templates/config/esphome_feinstaub01.yaml b/warpsrvint/docker_esphome/templates/config/esphome_feinstaub01.yaml index 0df5c0d3..992eeac3 100644 --- a/warpsrvint/docker_esphome/templates/config/esphome_feinstaub01.yaml +++ b/warpsrvint/docker_esphome/templates/config/esphome_feinstaub01.yaml @@ -14,4 +14,4 @@ uart: sensor: - platform: pm1006 pm_2_5: - name: "feinstaub_2_5" + name: "feinstaub_2_5" \ No newline at end of file diff --git a/warpsrvint/docker_esphome/templates/config/esphome_hauptraum.yaml b/warpsrvint/docker_esphome/templates/config/esphome_hauptraum.yaml index 07403249..bd6e2067 100644 --- a/warpsrvint/docker_esphome/templates/config/esphome_hauptraum.yaml +++ b/warpsrvint/docker_esphome/templates/config/esphome_hauptraum.yaml @@ -66,5 +66,4 @@ sensor: send_first_at: 3 address: 0x77 update_interval: 10s - iir_filter: 16x - + iir_filter: 16x \ No newline at end of file diff --git a/warpsrvint/docker_esphome/templates/config/esphome_holzwerkstatt.yaml b/warpsrvint/docker_esphome/templates/config/esphome_holzwerkstatt.yaml index 084cfacb..0bbb428b 100644 --- a/warpsrvint/docker_esphome/templates/config/esphome_holzwerkstatt.yaml +++ b/warpsrvint/docker_esphome/templates/config/esphome_holzwerkstatt.yaml @@ -79,4 +79,4 @@ sensor: - sliding_window_moving_average: window_size: 3 send_every: 3 - send_first_at: 3 + send_first_at: 3 \ No newline at end of file diff --git a/warpsrvint/docker_esphome/templates/config/esphome_kamin.yaml b/warpsrvint/docker_esphome/templates/config/esphome_kamin.yaml index e2104337..290d886b 100644 --- a/warpsrvint/docker_esphome/templates/config/esphome_kamin.yaml +++ b/warpsrvint/docker_esphome/templates/config/esphome_kamin.yaml @@ -8,7 +8,7 @@ # Dallas DS18B20 dallas: - - pin: D3 + - pin: D4 update_interval: 10s # Sensor configs @@ -30,5 +30,4 @@ sensor: - sliding_window_moving_average: window_size: 3 send_every: 3 - send_first_at: 3 - + send_first_at: 3 \ No newline at end of file diff --git a/warpsrvint/docker_esphome/templates/config/esphome_kuehlschrank.yaml b/warpsrvint/docker_esphome/templates/config/esphome_kuehlschrank.yaml index 0f1ac366..8cb520ba 100644 --- a/warpsrvint/docker_esphome/templates/config/esphome_kuehlschrank.yaml +++ b/warpsrvint/docker_esphome/templates/config/esphome_kuehlschrank.yaml @@ -27,4 +27,4 @@ binary_sensor: - platform: gpio pin: D2 id: kuehlschrank_door - name: Kuehlschrank-Door + name: Kuehlschrank-Door \ No newline at end of file diff --git a/warpsrvint/docker_esphome/templates/config/esphome_lounge.yaml b/warpsrvint/docker_esphome/templates/config/esphome_lounge.yaml index 9add9d42..0c28ad55 100644 --- a/warpsrvint/docker_esphome/templates/config/esphome_lounge.yaml +++ b/warpsrvint/docker_esphome/templates/config/esphome_lounge.yaml @@ -79,4 +79,4 @@ sensor: - sliding_window_moving_average: window_size: 3 send_every: 3 - send_first_at: 3 + send_first_at: 3 \ No newline at end of file diff --git a/warpsrvint/docker_esphome/templates/config/esphome_luftfilter01.yaml b/warpsrvint/docker_esphome/templates/config/esphome_luftfilter01.yaml index 80d1ef82..dffe6ca9 100644 --- a/warpsrvint/docker_esphome/templates/config/esphome_luftfilter01.yaml +++ b/warpsrvint/docker_esphome/templates/config/esphome_luftfilter01.yaml @@ -57,4 +57,4 @@ fan: name: "Luftfilter01" speed_count: 3 speed_command_topic: "ESPHome/esphome_luftfilter01/fan/luftfilter01/speed/command" - command_topic: "ESPHome/esphome_luftfilter01/fan/luftfilter01/speed/on-off" + command_topic: "ESPHome/esphome_luftfilter01/fan/luftfilter01/speed/on-off" \ No newline at end of file diff --git a/warpsrvint/docker_esphome/templates/config/esphome_strommesser.yaml b/warpsrvint/docker_esphome/templates/config/esphome_strommesser.yaml index 0fff5dcd..1b251cf0 100644 --- a/warpsrvint/docker_esphome/templates/config/esphome_strommesser.yaml +++ b/warpsrvint/docker_esphome/templates/config/esphome_strommesser.yaml @@ -30,4 +30,4 @@ sensor: accuracy_decimals: 3 filters: # (800 Impulse / kWh)^-1 = 0.00125kWh - - multiply: 0.00125 + - multiply: 0.00125 \ No newline at end of file diff --git a/warpsrvint/docker_esphome/templates/config/esphome_vortragsraum.yaml b/warpsrvint/docker_esphome/templates/config/esphome_vortragsraum.yaml index 68db8372..7f51d33a 100644 --- a/warpsrvint/docker_esphome/templates/config/esphome_vortragsraum.yaml +++ b/warpsrvint/docker_esphome/templates/config/esphome_vortragsraum.yaml @@ -79,4 +79,4 @@ sensor: - sliding_window_moving_average: window_size: 3 send_every: 3 - send_first_at: 3 + send_first_at: 3 \ No newline at end of file -- GitLab