Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| df047f61fb | |||
| 67a0a03093 | |||
| 8f90ef1cb4 | |||
| 7c3186563a | |||
| 4f6ea199d4 | |||
| f57a7f94fd | |||
| c2060b6495 |
@@ -1393,3 +1393,113 @@
|
|||||||
device_id: 6d1be741876624a70ab5b01b54c6fd6f
|
device_id: 6d1be741876624a70ab5b01b54c6fd6f
|
||||||
entity_id: 621e4377a089b7f5d92c7c9f2cc171a1
|
entity_id: 621e4377a089b7f5d92c7c9f2cc171a1
|
||||||
domain: switch
|
domain: switch
|
||||||
|
- id: '1773000000001'
|
||||||
|
alias: epaperframe - Kalender Events laden
|
||||||
|
description: Ruft alle Events von calendar.privat und calendar.tkrz_kalender für heute und morgen ab und schreibt sie in input_text-Helfer.
|
||||||
|
triggers:
|
||||||
|
# Täglich um 00:01 neu holen
|
||||||
|
- trigger: time
|
||||||
|
at: '00:01:00'
|
||||||
|
id: daily
|
||||||
|
actions:
|
||||||
|
# ── Events für heute (00:00 bis 23:59) holen ──
|
||||||
|
- action: calendar.get_events
|
||||||
|
target:
|
||||||
|
entity_id:
|
||||||
|
- calendar.privat
|
||||||
|
- calendar.tkrz_kalender
|
||||||
|
data:
|
||||||
|
start_date_time: "{{ now().replace(hour=0, minute=0, second=0) }}"
|
||||||
|
end_date_time: "{{ (now().replace(hour=0, minute=0, second=0) + timedelta(days=1)) }}"
|
||||||
|
response_variable: today_evts
|
||||||
|
|
||||||
|
# ── Events für morgen (00:00 bis 23:59) holen ──
|
||||||
|
- action: calendar.get_events
|
||||||
|
target:
|
||||||
|
entity_id:
|
||||||
|
- calendar.privat
|
||||||
|
- calendar.tkrz_kalender
|
||||||
|
data:
|
||||||
|
start_date_time: "{{ (now() + timedelta(days=1)).replace(hour=0, minute=0, second=0) }}"
|
||||||
|
end_date_time: "{{ (now() + timedelta(days=1)).replace(hour=0, minute=0, second=0) + timedelta(days=1) }}"
|
||||||
|
response_variable: tomorrow_evts
|
||||||
|
|
||||||
|
# ── Helper: Events als kompakte Liste formatieren ──
|
||||||
|
|
||||||
|
# Privat heute
|
||||||
|
- set_var:
|
||||||
|
name: fmt_today_privat
|
||||||
|
value: >-
|
||||||
|
{%- set evts = today_evts['calendar.privat']['events'] if 'calendar.privat' in today_evts else [] %}
|
||||||
|
{%- set items = [] %}
|
||||||
|
{%- for e in evts[:5] %}
|
||||||
|
{%- set s = (e['summary'] | default('', true) | string)[:40] if e is mapping and 'summary' in e else '-' %}
|
||||||
|
{%- set st = e['start'] if e is mapping and 'start' in e else '' %}
|
||||||
|
{%- set hhmm = st[11:16] if st|length >= 16 else '??' %}
|
||||||
|
{%- set items = items + [hhmm ~ ' - ' ~ s] %}
|
||||||
|
{%- endfor -%}
|
||||||
|
{{ items | join('│') if items else '-' }}
|
||||||
|
|
||||||
|
# Arbeit heute
|
||||||
|
- set_var:
|
||||||
|
name: fmt_today_arbeit
|
||||||
|
value: >-
|
||||||
|
{%- set evts = today_evts['calendar.tkrz_kalender']['events'] if 'calendar.tkrz_kalender' in today_evts else [] %}
|
||||||
|
{%- set items = [] %}
|
||||||
|
{%- for e in evts[:5] %}
|
||||||
|
{%- set s = (e['summary'] | default('', true) | string)[:40] if e is mapping and 'summary' in e else '-' %}
|
||||||
|
{%- set st = e['start'] if e is mapping and 'start' in e else '' %}
|
||||||
|
{%- set hhmm = st[11:16] if st|length >= 16 else '??' %}
|
||||||
|
{%- set items = items + [hhmm ~ ' - ' ~ s] %}
|
||||||
|
{%- endfor -%}
|
||||||
|
{{ items | join('│') if items else '-' }}
|
||||||
|
|
||||||
|
# Privat morgen
|
||||||
|
- set_var:
|
||||||
|
name: fmt_tomorrow_privat
|
||||||
|
value: >-
|
||||||
|
{%- set evts = tomorrow_evts['calendar.privat']['events'] if 'calendar.privat' in tomorrow_evts else [] %}
|
||||||
|
{%- set items = [] %}
|
||||||
|
{%- for e in evts[:5] %}
|
||||||
|
{%- set s = (e['summary'] | default('', true) | string)[:40] if e is mapping and 'summary' in e else '-' %}
|
||||||
|
{%- set st = e['start'] if e is mapping and 'start' in e else '' %}
|
||||||
|
{%- set hhmm = st[11:16] if st|length >= 16 else '??' %}
|
||||||
|
{%- set items = items + [hhmm ~ ' - ' ~ s] %}
|
||||||
|
{%- endfor -%}
|
||||||
|
{{ items | join('│') if items else '-' }}
|
||||||
|
|
||||||
|
# Arbeit morgen
|
||||||
|
- set_var:
|
||||||
|
name: fmt_tomorrow_arbeit
|
||||||
|
value: >-
|
||||||
|
{%- set evts = tomorrow_evts['calendar.tkrz_kalender']['events'] if 'calendar.tkrz_kalender' in tomorrow_evts else [] %}
|
||||||
|
{%- set items = [] %}
|
||||||
|
{%- for e in evts[:5] %}
|
||||||
|
{%- set s = (e['summary'] | default('', true) | string)[:40] if e is mapping and 'summary' in e else '-' %}
|
||||||
|
{%- set st = e['start'] if e is mapping and 'start' in e else '' %}
|
||||||
|
{%- set hhmm = st[11:16] if st|length >= 16 else '??' %}
|
||||||
|
{%- set items = items + [hhmm ~ ' - ' ~ s] %}
|
||||||
|
{%- endfor -%}
|
||||||
|
{{ items | join('│') if items else '-' }}
|
||||||
|
|
||||||
|
# ── input_text Helfer schreiben ──
|
||||||
|
- action: input_text.set_value
|
||||||
|
target:
|
||||||
|
entity_id: input_text.kalender_heute_privat
|
||||||
|
data:
|
||||||
|
value: "{{ fmt_today_privat }}"
|
||||||
|
- action: input_text.set_value
|
||||||
|
target:
|
||||||
|
entity_id: input_text.kalender_heute_arbeit
|
||||||
|
data:
|
||||||
|
value: "{{ fmt_today_arbeit }}"
|
||||||
|
- action: input_text.set_value
|
||||||
|
target:
|
||||||
|
entity_id: input_text.kalender_morgen_privat
|
||||||
|
data:
|
||||||
|
value: "{{ fmt_tomorrow_privat }}"
|
||||||
|
- action: input_text.set_value
|
||||||
|
target:
|
||||||
|
entity_id: input_text.kalender_morgen_arbeit
|
||||||
|
data:
|
||||||
|
value: "{{ fmt_tomorrow_arbeit }}"
|
||||||
|
|||||||
@@ -49,6 +49,9 @@ sql:
|
|||||||
# calendar integration
|
# calendar integration
|
||||||
calendar: !include calendars.yaml
|
calendar: !include calendars.yaml
|
||||||
|
|
||||||
|
# Helpers for epaperframe calendar display
|
||||||
|
input_text: !include text_helpers.yaml
|
||||||
|
|
||||||
# DB-recorder configuration
|
# DB-recorder configuration
|
||||||
recorder: !include recorder.yaml
|
recorder: !include recorder.yaml
|
||||||
|
|
||||||
|
|||||||
+80
-27
@@ -15,7 +15,7 @@ esphome:
|
|||||||
priority: -10
|
priority: -10
|
||||||
then:
|
then:
|
||||||
- delay: 10s
|
- delay: 10s
|
||||||
- display.page.show: environment # temporary for power page dev
|
- display.page.show: calendar # temporary for power page dev
|
||||||
- component.update: epaper
|
- component.update: epaper
|
||||||
|
|
||||||
esp32:
|
esp32:
|
||||||
@@ -23,10 +23,13 @@ esp32:
|
|||||||
framework:
|
framework:
|
||||||
type: esp-idf
|
type: esp-idf
|
||||||
|
|
||||||
|
network:
|
||||||
|
enable_ipv6: true
|
||||||
|
|
||||||
wifi:
|
wifi:
|
||||||
ssid: "Voltage-legacy"
|
ssid: "Voltage-legacy"
|
||||||
password: !secret voltage_legacy_psk
|
password: !secret voltage_legacy_psk
|
||||||
use_address: epaperframe.home
|
# use_address: epaperframe.home
|
||||||
power_save_mode: high
|
power_save_mode: high
|
||||||
fast_connect: on
|
fast_connect: on
|
||||||
min_auth_mode: WPA2
|
min_auth_mode: WPA2
|
||||||
@@ -234,6 +237,27 @@ text_sensor:
|
|||||||
entity_id: weather.zuhause
|
entity_id: weather.zuhause
|
||||||
id: weather
|
id: weather
|
||||||
|
|
||||||
|
# ── Kalender-Ereignisse (from HA input_text helpers) ──
|
||||||
|
- platform: homeassistant
|
||||||
|
entity_id: sensor.kalender_heute_privat
|
||||||
|
id: kalender_heute_privat
|
||||||
|
internal: true
|
||||||
|
|
||||||
|
- platform: homeassistant
|
||||||
|
entity_id: sensor.kalender_heute_arbeit
|
||||||
|
id: kalender_heute_arbeit
|
||||||
|
internal: true
|
||||||
|
|
||||||
|
- platform: homeassistant
|
||||||
|
entity_id: sensor.kalender_morgen_privat
|
||||||
|
id: kalender_morgen_privat
|
||||||
|
internal: true
|
||||||
|
|
||||||
|
- platform: homeassistant
|
||||||
|
entity_id: sensor.kalender_morgen_arbeit
|
||||||
|
id: kalender_morgen_arbeit
|
||||||
|
internal: true
|
||||||
|
|
||||||
graph:
|
graph:
|
||||||
- id: line_power_graph
|
- id: line_power_graph
|
||||||
sensor: power_total
|
sensor: power_total
|
||||||
@@ -1132,45 +1156,74 @@ display:
|
|||||||
it.image(10, 37, id(c1024_logo));
|
it.image(10, 37, id(c1024_logo));
|
||||||
|
|
||||||
/* ── LEFT PANE: Today ── */
|
/* ── LEFT PANE: Today ── */
|
||||||
int leftX = 0;
|
int leftX = 10;
|
||||||
int leftY = 85; // start below header row
|
int leftY = 70; // start below header row
|
||||||
|
|
||||||
it.print(10 + leftX, 10 + leftY, id(sensor_unit), "Heute");
|
it.print(15 + leftX, 10 + leftY, id(sensor_unit), "Heute");
|
||||||
it.filled_rectangle(64 + leftX, 21 + leftY, 370, 3);
|
it.filled_rectangle(80 + leftX, 21 + leftY, 240, 3);
|
||||||
|
|
||||||
/* Today's date strip */
|
/* Today's date strip */
|
||||||
it.printf(50 + leftX, 50 + leftY, id(big_sensor_font), "%d", today_day);
|
it.printf(50 + leftX, 50 + leftY, id(big_sensor_font), "%d", today_day);
|
||||||
it.printf(130 + leftX, 45 + leftY, id(sub_sensor_font), "%s.", today_weekday_str);
|
it.printf(145 + leftX, 45 + leftY, id(sub_sensor_font), "%s.", today_weekday_str);
|
||||||
it.printf(160 + leftX, 45 + leftY, id(sensor_unit), "%02d.%04d.", today_month, today_year);
|
it.printf(205 + leftX, 45 + leftY, id(sensor_unit), "%02d.%04d.", today_month, today_year);
|
||||||
|
|
||||||
/* Event placeholder row (top) */
|
/* Event lines (Privat / Arbeit) */
|
||||||
int eventOffsetY = 90;
|
int eventOffsetY = 90;
|
||||||
it.print(10 + leftX, 50 + leftY + eventOffsetY, id(mdi_med), TextAlign::BASELINE_LEFT, "");
|
|
||||||
it.print(40 + leftX, 50 + leftY + eventOffsetY, id(sub_sensor_font), "Eintrag 1");
|
|
||||||
|
|
||||||
/* Event placeholder row (bottom) */
|
// Helper lambda: draw one event line at given Y offset with the given text sensor id
|
||||||
it.print(10 + leftX, 85 + leftY + eventOffsetY, id(mdi_med), TextAlign::BASELINE_LEFT, "");
|
// Privat today
|
||||||
it.print(40 + leftX, 85 + leftY + eventOffsetY, id(sub_sensor_font), "Eintrag 2");
|
if (id(kalender_heute_privat).has_state() && !id(kalender_heute_privat).state.empty()) {
|
||||||
|
it.print(10 + leftX, 50 + leftY + eventOffsetY, id(mdi_med), TextAlign::BASELINE_LEFT, "\U0001f32e" );
|
||||||
|
// Split by │ separator and display first line of events
|
||||||
|
auto parts = id(kalender_heute_privat).state.c_str();
|
||||||
|
it.printf(40 + leftX, 50 + leftY + eventOffsetY, id(sub_sensor_font), "%s",
|
||||||
|
id(kalender_heute_privat).state.substr(0, 60).c_str());
|
||||||
|
} else {
|
||||||
|
it.print(10 + leftX, 50 + leftY + eventOffsetY, id(mdi_med), TextAlign::BASELINE_LEFT, "\U0001f32e" );
|
||||||
|
it.printf(40 + leftX, 50 + leftY + eventOffsetY, id(sub_sensor_font), "Kein Termin");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Arbeit today
|
||||||
|
if (id(kalender_heute_arbeit).has_state() && !id(kalender_heute_arbeit).state.empty()) {
|
||||||
|
it.print(10 + leftX, 85 + leftY + eventOffsetY, id(mdi_med), TextAlign::BASELINE_LEFT, "\U0001f32e" );
|
||||||
|
it.printf(40 + leftX, 85 + leftY + eventOffsetY, id(sub_sensor_font), "%s",
|
||||||
|
id(kalender_heute_arbeit).state.substr(0, 60).c_str());
|
||||||
|
} else {
|
||||||
|
it.print(10 + leftX, 85 + leftY + eventOffsetY, id(mdi_med), TextAlign::BASELINE_LEFT, "\U0001f32e" );
|
||||||
|
it.printf(40 + leftX, 85 + leftY + eventOffsetY, id(sub_sensor_font), "Kein Termin");
|
||||||
|
}
|
||||||
|
|
||||||
/* ── RIGHT PANE: Tomorrow ── */
|
/* ── RIGHT PANE: Tomorrow ── */
|
||||||
int rightX = 390;
|
int rightX = 315;
|
||||||
int rightY = 85;
|
int rightY = 70;
|
||||||
|
|
||||||
it.print(10 + rightX, 10 + rightY, id(sensor_unit), "Morgen");
|
it.print(45 + rightX, 10 + rightY, id(sensor_unit), "Morgen");
|
||||||
it.filled_rectangle(64 + rightX, 21 + rightY, 370, 3);
|
it.filled_rectangle(130 + rightX, 21 + rightY, 200, 3);
|
||||||
|
|
||||||
/* Date strip */
|
/* Date strip */
|
||||||
it.printf(50 + rightX, 50 + rightY, id(big_sensor_font), "%d", tomorrow_day);
|
it.printf(50 + rightX, 50 + rightY, id(big_sensor_font), "%d", tomorrow_day);
|
||||||
it.printf(130 + rightX, 45 + rightY, id(sub_sensor_font), "%s.", tomorrow_weekday_str);
|
it.printf(145 + rightX, 45 + rightY, id(sub_sensor_font), "%s.", tomorrow_weekday_str);
|
||||||
it.printf(160 + rightX, 45 + rightY, id(sensor_unit), "%02d.%04d.", tomorrow_month, tomorrow_year);
|
it.printf(205 + rightX, 45 + rightY, id(sensor_unit), "%02d.%04d.", tomorrow_month, tomorrow_year);
|
||||||
|
|
||||||
/* Event placeholder row (top) */
|
/* Event lines (Privat / Arbeit) */
|
||||||
it.print(10 + rightX, 50 + rightY + eventOffsetY, id(mdi_med), TextAlign::BASELINE_LEFT, "");
|
// Privat tomorrow
|
||||||
it.print(40 + rightX, 50 + rightY + eventOffsetY, id(sub_sensor_font), "Eintrag 1");
|
if (id(kalender_morgen_privat).has_state() && !id(kalender_morgen_privat).state.empty()) {
|
||||||
|
it.print(10 + rightX, 50 + rightY + eventOffsetY, id(mdi_med), TextAlign::BASELINE_LEFT, "\U0001f32e" );
|
||||||
/* Event placeholder row (bottom) */
|
it.printf(40 + rightX, 50 + rightY + eventOffsetY, id(sub_sensor_font), "%s",
|
||||||
it.print(10 + rightX, 85 + rightY + eventOffsetY, id(mdi_med), TextAlign::BASELINE_LEFT, "");
|
id(kalender_morgen_privat).state.substr(0, 60).c_str());
|
||||||
it.print(40 + rightX, 85 + rightY + eventOffsetY, id(sub_sensor_font), "Eintrag 2");
|
} else {
|
||||||
|
it.print(10 + rightX, 50 + rightY + eventOffsetY, id(mdi_med), TextAlign::BASELINE_LEFT, "\U0001f32e" );
|
||||||
|
it.printf(40 + rightX, 50 + rightY + eventOffsetY, id(sub_sensor_font), "Kein Termin");
|
||||||
|
}
|
||||||
|
// Arbeit tomorrow
|
||||||
|
if (id(kalender_morgen_arbeit).has_state() && !id(kalender_morgen_arbeit).state.empty()) {
|
||||||
|
it.print(10 + rightX, 85 + rightY + eventOffsetY, id(mdi_med), TextAlign::BASELINE_LEFT, "\U0001f32e" );
|
||||||
|
it.printf(40 + rightX, 85 + rightY + eventOffsetY, id(sub_sensor_font), "%s",
|
||||||
|
id(kalender_morgen_arbeit).state.substr(0, 60).c_str());
|
||||||
|
} else {
|
||||||
|
it.print(10 + rightX, 85 + rightY + eventOffsetY, id(mdi_med), TextAlign::BASELINE_LEFT, "\U0001f32e" );
|
||||||
|
it.printf(40 + rightX, 85 + leftY + eventOffsetY, id(sub_sensor_font), "Kein Termin");
|
||||||
|
}
|
||||||
|
|
||||||
/* FOOTER */
|
/* FOOTER */
|
||||||
it.strftime(614, 380, id(footer_font), TextAlign::BASELINE_RIGHT, "Aktualisiert um %d.%m.%Y %H:%M", id(homeassistant_time).now());
|
it.strftime(614, 380, id(footer_font), TextAlign::BASELINE_RIGHT, "Aktualisiert um %d.%m.%Y %H:%M", id(homeassistant_time).now());
|
||||||
|
|||||||
+28
-2
@@ -139,8 +139,34 @@
|
|||||||
attributes:
|
attributes:
|
||||||
last_reset: '1970-01-01T00:00:00+00:00'
|
last_reset: '1970-01-01T00:00:00+00:00'
|
||||||
- name: internet_speed_out
|
- name: internet_speed_out
|
||||||
|
unique_id: '9519483670667'
|
||||||
state: >
|
state: >
|
||||||
{{ (( states('sensor.wan_out_derivative') | float * 8 / 1000000 ) | round(2)) }}
|
{{ (( states('sensor.wan_out_derivative') | float * 8 / 1000000 ) | round(2)) }}
|
||||||
unit_of_measurement: 'Mbps'
|
unit_of_measurement: 'Mbps'
|
||||||
attributes:
|
|
||||||
last_reset: '1970-01-01T00:00:00+00:00'
|
# ── Kalender-Ereignisse für epaperframe ──
|
||||||
|
# Alle Events werden per Automation (automations.yaml) in input_text Helfer geschrieben.
|
||||||
|
# Diese template sensors lesen nur noch daraus. Das verhindert doppelte Logik und garantiert,
|
||||||
|
# dass sowohl "heute" als auch "morgen" Events mit Titeln, Uhrzeiten und Beschreibungen verfügbar sind.
|
||||||
|
- text_sensor:
|
||||||
|
# ── HEUTE ──
|
||||||
|
- name: "Kalender heute Privat"
|
||||||
|
unique_id: kalender_heute_privat
|
||||||
|
state: "{{ states('input_text.kalender_heute_privat') }}"
|
||||||
|
icon: mdi:calendar-account
|
||||||
|
|
||||||
|
- name: "Kalender heute Arbeit"
|
||||||
|
unique_id: kalender_heute_arbeit
|
||||||
|
state: "{{ states('input_text.kalender_heute_arbeit') }}"
|
||||||
|
icon: mdi:calendar-account
|
||||||
|
|
||||||
|
# ── MORGEN ──
|
||||||
|
- name: "Kalender morgen Privat"
|
||||||
|
unique_id: kalender_morgen_privat
|
||||||
|
state: "{{ states('input_text.kalender_morgen_privat') }}"
|
||||||
|
icon: mdi:calendar-calendar-today
|
||||||
|
|
||||||
|
- name: "Kalender morgen Arbeit"
|
||||||
|
unique_id: kalender_morgen_arbeit
|
||||||
|
state: "{{ states('input_text.kalender_morgen_arbeit') }}"
|
||||||
|
icon: mdi:calendar-calendar-today
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
# Helpers for epaperframe calendar display
|
||||||
|
input_text:
|
||||||
|
- name: "Kalender heute Privat"
|
||||||
|
initial: "-"
|
||||||
|
icon: mdi:calendar-account
|
||||||
|
mode: text
|
||||||
|
- name: "Kalender heute Arbeit"
|
||||||
|
initial: "-"
|
||||||
|
icon: mdi:calendar-account
|
||||||
|
mode: text
|
||||||
|
- name: "Kalender morgen Privat"
|
||||||
|
initial: "-"
|
||||||
|
icon: mdi:calendar-calendar-today
|
||||||
|
mode: text
|
||||||
|
- name: "Kalender morgen Arbeit"
|
||||||
|
initial: "-"
|
||||||
|
icon: mdi:calendar-calendar-today
|
||||||
|
mode: text
|
||||||
Reference in New Issue
Block a user