From 0b0b053501944382b9adbf666401ee6900345023 Mon Sep 17 00:00:00 2001 From: Christian Elberfeld <elberfeld@web.de> Date: Sun, 23 Oct 2022 00:23:06 +0200 Subject: [PATCH] Display konfigurationen --- warpsrvint/docker_esphome/tasks/main.yml | 13 ----------- .../templates/config/esphome_display01.yaml | 21 +++++++++--------- .../templates/config/esphome_display02.yaml | 22 +++++++++---------- 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/warpsrvint/docker_esphome/tasks/main.yml b/warpsrvint/docker_esphome/tasks/main.yml index 71e6e8a2..c7cb76e5 100644 --- a/warpsrvint/docker_esphome/tasks/main.yml +++ b/warpsrvint/docker_esphome/tasks/main.yml @@ -51,19 +51,6 @@ - webserver-v1.min.css - webserver-v1.min.js -- name: download config includes files (frekvens module) - get_url: - url: "https://raw.githubusercontent.com/Palakis/esphome-frekvens-panel/master/components/frekvens_panel/{{ item }}" - dest: "{{ basedir }}/config/components/frekvens_panel/{{ item }}" - with_items: - - __init__.py - - display.py - - frekvens-driver.cpp - - frekvens-driver.h - - frekvens-panel.cpp - - frekvens-panel.h - - - name: "stop {{ servicename }} docker" docker_compose: project_src: "{{ basedir }}" diff --git a/warpsrvint/docker_esphome/templates/config/esphome_display01.yaml b/warpsrvint/docker_esphome/templates/config/esphome_display01.yaml index 49d4cea1..b1ac4ecc 100644 --- a/warpsrvint/docker_esphome/templates/config/esphome_display01.yaml +++ b/warpsrvint/docker_esphome/templates/config/esphome_display01.yaml @@ -7,20 +7,21 @@ platformio_options: upload_speed: 115200 lib_deps: - - me-no-dev/ESPAsyncTCP - - adafruit/Adafruit GFX Library # Required for FrekvensPanel. - - Adafruit BusIO # Required by GFX Library. - Wire # Also required by GFX. - SPI # Also required by GFX. - -{% include "/includes/common.inc.yaml" %} - + - adafruit/Adafruit BusIO # Required by GFX Library. + - adafruit/Adafruit GFX Library # Required for FrekvensPanel. + - me-no-dev/ESPAsyncTCP external_components: - source: - type: local - path: . - + type: git + url: https://github.com/Palakis/esphome-frekvens-panel + ref: master + components: [ frekvens_panel ] + +{% include "/includes/common.inc.yaml" %} + light: - platform: monochromatic name: 'Brightness' @@ -38,7 +39,7 @@ output: time: - platform: sntp id: ntp_time - timezone: 'Europe/Paris' + timezone: 'Europe/Berlin' font: - file: "04B03.ttf" diff --git a/warpsrvint/docker_esphome/templates/config/esphome_display02.yaml b/warpsrvint/docker_esphome/templates/config/esphome_display02.yaml index a2cbf058..40ef8409 100644 --- a/warpsrvint/docker_esphome/templates/config/esphome_display02.yaml +++ b/warpsrvint/docker_esphome/templates/config/esphome_display02.yaml @@ -3,25 +3,25 @@ {% include "/includes/ansible.inc.yaml" %} {% include "/includes/board.d1_mini.inc.yaml" %} - + # force newline platformio_options: upload_speed: 115200 lib_deps: - - me-no-dev/ESPAsyncTCP - - adafruit/Adafruit GFX Library # Required for FrekvensPanel. - - Adafruit BusIO # Required by GFX Library. - Wire # Also required by GFX. - SPI # Also required by GFX. + - adafruit/Adafruit BusIO # Required by GFX Library. + - adafruit/Adafruit GFX Library # Required for FrekvensPanel. + - me-no-dev/ESPAsyncTCP +external_components: + - source: + type: git + url: https://github.com/Palakis/esphome-frekvens-panel + ref: master + components: [ frekvens_panel ] {% include "/includes/common.inc.yaml" %} - -external_components: - - source: - type: local - path: /config/components/frekvens_panel/ - light: - platform: monochromatic name: 'Brightness' @@ -39,7 +39,7 @@ output: time: - platform: sntp id: ntp_time - timezone: 'Europe/Paris' + timezone: 'Europe/Berlin' font: - file: "04B03.ttf" -- GitLab