Compare commits
22
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
333484a89a | ||
|
|
ef2047e268 | ||
|
|
dc6cf4d1af | ||
|
|
302bc3a924 | ||
|
|
73354c4447 | ||
|
|
f35f1eee22 | ||
|
|
31644426fc | ||
|
|
059b6c0a4b | ||
|
|
6a3afd71df | ||
|
|
b7b943e4bf | ||
|
|
195c327ed7 | ||
|
|
22034a86e1 | ||
|
|
81665588a8 | ||
|
|
f956e19d3b | ||
|
|
0a94233a36 | ||
|
|
d23c6a23a3 | ||
|
|
166cc3efd5 | ||
|
|
e358c2cffe | ||
|
|
5d4e8ef40c | ||
|
|
8dc781a6b1 | ||
|
|
6c91cc2d59 | ||
|
|
ba2a56a15b |
+1
-1
@@ -1 +1 @@
|
|||||||
2026.7.2
|
2026.7.4
|
||||||
@@ -0,0 +1,269 @@
|
|||||||
|
substitutions:
|
||||||
|
name: "energymonitor"
|
||||||
|
friendly_name: "Energy Monitor"
|
||||||
|
|
||||||
|
esphome:
|
||||||
|
name: ${name}
|
||||||
|
friendly_name: ${friendly_name}
|
||||||
|
name_add_mac_suffix: false
|
||||||
|
project:
|
||||||
|
name: monitor.energymonitor
|
||||||
|
version: "1.0"
|
||||||
|
on_boot:
|
||||||
|
then:
|
||||||
|
- light.turn_on: display_backlight
|
||||||
|
|
||||||
|
esp32:
|
||||||
|
board: m5stack-core-esp32
|
||||||
|
framework:
|
||||||
|
type: esp-idf
|
||||||
|
|
||||||
|
network:
|
||||||
|
enable_ipv6: true
|
||||||
|
|
||||||
|
wifi:
|
||||||
|
networks:
|
||||||
|
- ssid: "Voltage-legacy"
|
||||||
|
password: !secret voltage_legacy_psk
|
||||||
|
priority: 10
|
||||||
|
- ssid: "Moppelkotze"
|
||||||
|
password: !secret moppelkotze_psk
|
||||||
|
priority: 5
|
||||||
|
- ssid: "TKRZ"
|
||||||
|
password: !secret tkrz_psk
|
||||||
|
priority: 4
|
||||||
|
use_address: 192.168.126.250
|
||||||
|
on_connect:
|
||||||
|
- lambda: id(wifi_connected) = true;
|
||||||
|
on_disconnect:
|
||||||
|
- lambda: id(wifi_connected) = false;
|
||||||
|
power_save_mode: high
|
||||||
|
min_auth_mode: WPA2
|
||||||
|
ap:
|
||||||
|
ssid: "Energymonitor Fallback Hotspot"
|
||||||
|
password: !secret fallback_psk
|
||||||
|
|
||||||
|
captive_portal:
|
||||||
|
|
||||||
|
time:
|
||||||
|
- platform: sntp
|
||||||
|
id: sntp_time
|
||||||
|
timezone: Europe/Berlin
|
||||||
|
servers:
|
||||||
|
- de.pool.ntp.org
|
||||||
|
|
||||||
|
# Values are maintained in secrets.yaml.
|
||||||
|
wireguard:
|
||||||
|
id: energymonitor_wireguard
|
||||||
|
address: !secret energymonitor_wireguard_address
|
||||||
|
netmask: !secret energymonitor_wireguard_netmask
|
||||||
|
private_key: !secret energymonitor_wireguard_private_key
|
||||||
|
peer_endpoint: !secret energymonitor_wireguard_peer_endpoint
|
||||||
|
peer_port: !secret energymonitor_wireguard_peer_port
|
||||||
|
peer_public_key: !secret energymonitor_wireguard_peer_public_key
|
||||||
|
peer_allowed_ips:
|
||||||
|
- !secret energymonitor_wireguard_peer_allowed_ip
|
||||||
|
peer_persistent_keepalive: 25s
|
||||||
|
# Avoid rebooting while the placeholder endpoint is intentionally unreachable.
|
||||||
|
reboot_timeout: 0s
|
||||||
|
|
||||||
|
logger:
|
||||||
|
|
||||||
|
api:
|
||||||
|
id: api_server
|
||||||
|
encryption:
|
||||||
|
key: !secret apikey
|
||||||
|
|
||||||
|
ota:
|
||||||
|
platform: esphome
|
||||||
|
password: !secret ota
|
||||||
|
|
||||||
|
spi:
|
||||||
|
clk_pin: GPIO18
|
||||||
|
mosi_pin: GPIO23
|
||||||
|
|
||||||
|
output:
|
||||||
|
- platform: gpio
|
||||||
|
pin: GPIO32
|
||||||
|
id: display_backlight_output
|
||||||
|
|
||||||
|
light:
|
||||||
|
- platform: binary
|
||||||
|
id: display_backlight
|
||||||
|
name: "Display Backlight"
|
||||||
|
output: display_backlight_output
|
||||||
|
restore_mode: ALWAYS_ON
|
||||||
|
|
||||||
|
font:
|
||||||
|
- file: "fonts/Roboto-Regular.ttf"
|
||||||
|
id: font_small
|
||||||
|
size: 18
|
||||||
|
glyphsets:
|
||||||
|
- GF_Latin_Kernel
|
||||||
|
glyphs: ["äöüÄÖÜß"]
|
||||||
|
- file: "fonts/Roboto-Bold.ttf"
|
||||||
|
id: font_title
|
||||||
|
size: 28
|
||||||
|
glyphsets:
|
||||||
|
- GF_Latin_Kernel
|
||||||
|
glyphs: ["äöüÄÖÜß"]
|
||||||
|
- file: "fonts/Roboto-Bold.ttf"
|
||||||
|
id: font_value
|
||||||
|
size: 52
|
||||||
|
glyphsets:
|
||||||
|
- GF_Latin_Kernel
|
||||||
|
glyphs: ["äöüÄÖÜß"]
|
||||||
|
- file: "fonts/materialdesignicons-webfont.ttf"
|
||||||
|
id: font_icon
|
||||||
|
size: 24
|
||||||
|
glyphs:
|
||||||
|
- "\U000F0306" # mdi:key
|
||||||
|
- "\U000F07D0" # mdi:home-assistant
|
||||||
|
- "\U000F091F" # mdi:wifi-strength-1
|
||||||
|
- "\U000F0922" # mdi:wifi-strength-2
|
||||||
|
- "\U000F0925" # mdi:wifi-strength-3
|
||||||
|
- "\U000F0928" # mdi:wifi-strength-4
|
||||||
|
- "\U000F092D" # mdi:wifi-strength-off
|
||||||
|
|
||||||
|
globals:
|
||||||
|
- id: page_index
|
||||||
|
type: int
|
||||||
|
restore_value: true
|
||||||
|
initial_value: '0'
|
||||||
|
- id: wifi_connected
|
||||||
|
type: bool
|
||||||
|
restore_value: false
|
||||||
|
initial_value: 'false'
|
||||||
|
|
||||||
|
sensor:
|
||||||
|
# WiFi signal strength
|
||||||
|
- platform: wifi_signal
|
||||||
|
name: "WiFi Signalstärke"
|
||||||
|
id: wifisignal
|
||||||
|
update_interval: 10s
|
||||||
|
- platform: homeassistant
|
||||||
|
id: grid_power
|
||||||
|
entity_id: sensor.netzleistung
|
||||||
|
internal: true
|
||||||
|
- platform: homeassistant
|
||||||
|
id: balcony_solar_power
|
||||||
|
entity_id: sensor.balkonkraftwerk_power
|
||||||
|
internal: true
|
||||||
|
- platform: wireguard
|
||||||
|
latest_handshake:
|
||||||
|
name: 'WireGuard Latest Handshake'
|
||||||
|
|
||||||
|
binary_sensor:
|
||||||
|
- platform: wireguard
|
||||||
|
status:
|
||||||
|
name: 'WireGuard Status'
|
||||||
|
- platform: wireguard
|
||||||
|
enabled:
|
||||||
|
name: 'WireGuard Enabled'
|
||||||
|
# M5Stack Core button A (left). GPIO39 is input-only and has an external pull-up.
|
||||||
|
- platform: gpio
|
||||||
|
pin:
|
||||||
|
number: GPIO39
|
||||||
|
mode: INPUT
|
||||||
|
inverted: true
|
||||||
|
id: button_left
|
||||||
|
on_press:
|
||||||
|
then:
|
||||||
|
- lambda: |-
|
||||||
|
id(page_index) = (id(page_index) + 2 - 1) % 2;
|
||||||
|
- component.update: tft
|
||||||
|
# M5Stack Core button C (right). GPIO37 is input-only and has an external pull-up.
|
||||||
|
- platform: gpio
|
||||||
|
pin:
|
||||||
|
number: GPIO37
|
||||||
|
mode: INPUT
|
||||||
|
inverted: true
|
||||||
|
id: button_right
|
||||||
|
on_press:
|
||||||
|
then:
|
||||||
|
- lambda: |-
|
||||||
|
id(page_index) = (id(page_index) + 1) % 2;
|
||||||
|
- component.update: tft
|
||||||
|
|
||||||
|
text_sensor:
|
||||||
|
- platform: wireguard
|
||||||
|
address:
|
||||||
|
name: 'WireGuard Address'
|
||||||
|
|
||||||
|
# M5CORE is the mipi_spi preset for the M5Stack Core's integrated display.
|
||||||
|
display:
|
||||||
|
- platform: mipi_spi
|
||||||
|
id: tft
|
||||||
|
model: M5CORE
|
||||||
|
cs_pin: GPIO14
|
||||||
|
dc_pin: GPIO27
|
||||||
|
reset_pin: GPIO33
|
||||||
|
invert_colors: true
|
||||||
|
update_interval: 1s
|
||||||
|
lambda: |-
|
||||||
|
it.fill(Color::BLACK);
|
||||||
|
|
||||||
|
if (id(sntp_time).now().is_valid()) {
|
||||||
|
it.strftime(234, 10, id(font_small), Color::WHITE, TextAlign::TOP_RIGHT,
|
||||||
|
"%H:%M", id(sntp_time).now());
|
||||||
|
} else {
|
||||||
|
it.printf(234, 10, id(font_small), Color::WHITE, TextAlign::TOP_RIGHT, "--:--");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Native API connectivity; Home Assistant is normally the connected client.
|
||||||
|
const bool home_assistant_online = id(api_server).is_connected();
|
||||||
|
const Color home_assistant_color = home_assistant_online ? Color(64, 255, 64) : Color(255, 80, 80);
|
||||||
|
it.printf(260, 8, id(font_icon), home_assistant_color, TextAlign::TOP_RIGHT, "\U000F07D0");
|
||||||
|
|
||||||
|
// Green means the WireGuard peer is online; red means it is offline.
|
||||||
|
const bool wireguard_online = id(energymonitor_wireguard).is_peer_up();
|
||||||
|
const Color wireguard_color = wireguard_online ? Color(64, 255, 64) : Color(255, 80, 80);
|
||||||
|
it.printf(286, 8, id(font_icon), wireguard_color, TextAlign::TOP_RIGHT, "\U000F0306");
|
||||||
|
|
||||||
|
// Render the requested MDI Wi-Fi strength glyph in green or red when disconnected.
|
||||||
|
const bool wifi_online = id(wifi_connected);
|
||||||
|
const Color wifi_color = wifi_online ? Color(64, 255, 64) : Color(255, 80, 80);
|
||||||
|
const char *wifi_icon = "\U000F092D"; // mdi:wifi-strength-off
|
||||||
|
if (wifi_online) {
|
||||||
|
if (id(wifisignal).has_state()) {
|
||||||
|
const float rssi = id(wifisignal).state;
|
||||||
|
wifi_icon = rssi >= -55 ? "\U000F0928" : rssi >= -67 ? "\U000F0925"
|
||||||
|
: rssi >= -75 ? "\U000F0922" : "\U000F091F";
|
||||||
|
} else {
|
||||||
|
wifi_icon = "\U000F091F";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
it.printf(312, 8, id(font_icon), wifi_color, TextAlign::TOP_RIGHT, "%s", wifi_icon);
|
||||||
|
|
||||||
|
if (id(page_index) == 0) {
|
||||||
|
it.printf(12, 12, id(font_small), Color::WHITE, "Netzleistung");
|
||||||
|
if (id(grid_power).has_state()) {
|
||||||
|
it.printf(308, 32, id(font_value), Color::WHITE, TextAlign::TOP_RIGHT,
|
||||||
|
"%+.0f W", id(grid_power).state);
|
||||||
|
} else {
|
||||||
|
it.printf(308, 42, id(font_value), Color::WHITE, TextAlign::TOP_RIGHT,
|
||||||
|
"-- W");
|
||||||
|
}
|
||||||
|
|
||||||
|
it.printf(12, 99, id(font_small), Color::WHITE, "Balkonkraftwerk");
|
||||||
|
if (id(balcony_solar_power).has_state()) {
|
||||||
|
it.printf(308, 119, id(font_value), Color(255, 215, 0), TextAlign::TOP_RIGHT,
|
||||||
|
"%.0f W", id(balcony_solar_power).state);
|
||||||
|
} else {
|
||||||
|
it.printf(308, 129, id(font_value), Color(255, 215, 0), TextAlign::TOP_RIGHT,
|
||||||
|
"-- W");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
it.printf(160, 45, id(font_title), Color::WHITE, TextAlign::TOP_CENTER,
|
||||||
|
"Weitere Seite");
|
||||||
|
it.printf(160, 95, id(font_small), Color::WHITE, TextAlign::TOP_CENTER,
|
||||||
|
"Für zusätzliche Werte vorbereitet");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Labels correspond to the left (A) and right (C) hardware buttons.
|
||||||
|
it.printf(8, 239, id(font_small), Color::WHITE, TextAlign::BOTTOM_LEFT,
|
||||||
|
"< Zurück");
|
||||||
|
it.printf(312, 239, id(font_small), Color::WHITE, TextAlign::BOTTOM_RIGHT,
|
||||||
|
"Weiter >");
|
||||||
|
it.printf(160, 239, id(font_small), Color::WHITE, TextAlign::BOTTOM_CENTER,
|
||||||
|
"%d / 2", id(page_index) + 1);
|
||||||
@@ -1,7 +1,10 @@
|
|||||||
|
# Device identity shared by ESPHome and Home Assistant.
|
||||||
substitutions:
|
substitutions:
|
||||||
name: epaperframe
|
name: epaperframe
|
||||||
friendly_name: "Info-Dashboard"
|
friendly_name: "Info-Dashboard"
|
||||||
|
|
||||||
|
# Startup selects the default page only after Home Assistant has had time to
|
||||||
|
# provide the sensor states needed by its display lambda.
|
||||||
esphome:
|
esphome:
|
||||||
name: ${name}
|
name: ${name}
|
||||||
friendly_name: ${friendly_name}
|
friendly_name: ${friendly_name}
|
||||||
@@ -18,6 +21,7 @@ esphome:
|
|||||||
- display.page.show: calendar # temporary for power page dev
|
- display.page.show: calendar # temporary for power page dev
|
||||||
- component.update: epaper
|
- component.update: epaper
|
||||||
|
|
||||||
|
# ESP32 target and ESP-IDF build settings for the hardware revision in use.
|
||||||
esp32:
|
esp32:
|
||||||
board: nodemcu-32s
|
board: nodemcu-32s
|
||||||
framework:
|
framework:
|
||||||
@@ -25,6 +29,7 @@ esp32:
|
|||||||
advanced:
|
advanced:
|
||||||
minimum_chip_revision: "3.0"
|
minimum_chip_revision: "3.0"
|
||||||
|
|
||||||
|
# Network access is required for Home Assistant state delivery and OTA updates.
|
||||||
wifi:
|
wifi:
|
||||||
ssid: "Voltage-legacy"
|
ssid: "Voltage-legacy"
|
||||||
password: !secret voltage_legacy_psk
|
password: !secret voltage_legacy_psk
|
||||||
@@ -51,6 +56,13 @@ api:
|
|||||||
# Include ArduinoJson support for the compact calendar event feed.
|
# Include ArduinoJson support for the compact calendar event feed.
|
||||||
json:
|
json:
|
||||||
|
|
||||||
|
# Prevent refreshes when Home Assistant republishes unchanged calendar data.
|
||||||
|
globals:
|
||||||
|
- id: last_rendered_calendar_entries
|
||||||
|
type: std::string
|
||||||
|
restore_value: no
|
||||||
|
initial_value: '""'
|
||||||
|
|
||||||
ota:
|
ota:
|
||||||
platform: esphome
|
platform: esphome
|
||||||
password: !secret ota
|
password: !secret ota
|
||||||
@@ -117,6 +129,7 @@ button:
|
|||||||
- display.page.show_next: epaper
|
- display.page.show_next: epaper
|
||||||
- component.update: epaper
|
- component.update: epaper
|
||||||
|
|
||||||
|
# Numeric telemetry received from Home Assistant for the environment dashboard.
|
||||||
sensor:
|
sensor:
|
||||||
# WiFi signal strength
|
# WiFi signal strength
|
||||||
- platform: wifi_signal
|
- platform: wifi_signal
|
||||||
@@ -194,6 +207,7 @@ sensor:
|
|||||||
entity_id: sensor.radioaktive_strahlungsleistung
|
entity_id: sensor.radioaktive_strahlungsleistung
|
||||||
id: radiation
|
id: radiation
|
||||||
|
|
||||||
|
# Textual Home Assistant state, including the compact calendar payload and quote.
|
||||||
text_sensor:
|
text_sensor:
|
||||||
- platform: homeassistant
|
- platform: homeassistant
|
||||||
name: "Sun Rising ESP"
|
name: "Sun Rising ESP"
|
||||||
@@ -222,6 +236,19 @@ text_sensor:
|
|||||||
entity_id: sensor.epaper_kalenderdaten
|
entity_id: sensor.epaper_kalenderdaten
|
||||||
attribute: entries
|
attribute: entries
|
||||||
id: calendar_entries
|
id: calendar_entries
|
||||||
|
# Refresh the e-paper only for changed agenda data while the calendar page
|
||||||
|
# is visible; Home Assistant may otherwise republish identical JSON.
|
||||||
|
on_value:
|
||||||
|
then:
|
||||||
|
- if:
|
||||||
|
condition:
|
||||||
|
and:
|
||||||
|
- display.is_displaying_page: calendar
|
||||||
|
- lambda: return x != id(last_rendered_calendar_entries);
|
||||||
|
then:
|
||||||
|
- lambda: id(last_rendered_calendar_entries) = x;
|
||||||
|
- component.update: epaper
|
||||||
|
|
||||||
|
|
||||||
# Home Assistant selects one quote per day from its local quote library.
|
# Home Assistant selects one quote per day from its local quote library.
|
||||||
- platform: homeassistant
|
- platform: homeassistant
|
||||||
@@ -230,6 +257,8 @@ text_sensor:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Time drives panel power maintenance, the environment refresh cadence, and the
|
||||||
|
# midnight redraw that advances the calendar and daily quote.
|
||||||
time:
|
time:
|
||||||
- platform: homeassistant
|
- platform: homeassistant
|
||||||
id: homeassistant_time
|
id: homeassistant_time
|
||||||
@@ -243,15 +272,29 @@ time:
|
|||||||
- output.turn_on: power_key
|
- output.turn_on: power_key
|
||||||
- delay: 0.5s
|
- delay: 0.5s
|
||||||
- output.turn_off: power_key
|
- output.turn_off: power_key
|
||||||
# Every 10 minutes
|
# Environmental readings need their regular refresh. Calendar updates are
|
||||||
|
# instead triggered by changed event data while that page is active.
|
||||||
- seconds: 0
|
- seconds: 0
|
||||||
minutes: /10
|
minutes: /10
|
||||||
|
then:
|
||||||
|
- if:
|
||||||
|
condition:
|
||||||
|
display.is_displaying_page: environment
|
||||||
|
then:
|
||||||
|
- logger.log:
|
||||||
|
level: INFO
|
||||||
|
format: "Timer based environment screen refresh"
|
||||||
|
- component.update: epaper
|
||||||
|
- seconds: 10
|
||||||
|
minutes: 0
|
||||||
|
hours: 0
|
||||||
then:
|
then:
|
||||||
- logger.log:
|
- logger.log:
|
||||||
level: INFO
|
level: INFO
|
||||||
format: "Timer based screen refresh"
|
format: "Update screen on new day"
|
||||||
- component.update: epaper
|
- component.update: epaper
|
||||||
|
|
||||||
|
# Visual assets used by both 1-bit e-paper pages.
|
||||||
# Font definitions
|
# Font definitions
|
||||||
font:
|
font:
|
||||||
- file: "fonts/Roboto-Medium.ttf"
|
- file: "fonts/Roboto-Medium.ttf"
|
||||||
@@ -712,17 +755,21 @@ font:
|
|||||||
"", # mdi-alert
|
"", # mdi-alert
|
||||||
]
|
]
|
||||||
|
|
||||||
|
# Binary logo stored in firmware for rendering without network access.
|
||||||
image:
|
image:
|
||||||
- file: "epaperframe/C1024_logo_flat_bw.png"
|
- platform: file
|
||||||
|
file: "epaperframe/C1024_logo_flat_bw.png"
|
||||||
id: c1024_logo
|
id: c1024_logo
|
||||||
type: binary
|
type: binary
|
||||||
resize: 77x40
|
resize: 77x40
|
||||||
invert_alpha: True
|
invert_alpha: true
|
||||||
|
|
||||||
|
# Shared SPI bus for the Waveshare e-paper panel.
|
||||||
spi:
|
spi:
|
||||||
clk_pin: 23
|
clk_pin: 23
|
||||||
mosi_pin: 22
|
mosi_pin: 22
|
||||||
|
|
||||||
|
# The two pages draw directly onto the 640x384 1-bit Waveshare e-paper panel.
|
||||||
display:
|
display:
|
||||||
- platform: waveshare_epaper
|
- platform: waveshare_epaper
|
||||||
id: epaper
|
id: epaper
|
||||||
@@ -734,8 +781,11 @@ display:
|
|||||||
# full_update_every: 30 # not supported on this display
|
# full_update_every: 30 # not supported on this display
|
||||||
update_interval: never
|
update_interval: never
|
||||||
pages:
|
pages:
|
||||||
|
# Environmental telemetry dashboard, refreshed on the 10-minute timer.
|
||||||
- id: environment
|
- id: environment
|
||||||
lambda: |-
|
lambda: |-
|
||||||
|
// Snapshot all Home Assistant values once per render so each panel uses
|
||||||
|
// a consistent set of readings throughout this e-paper refresh.
|
||||||
/* Outdoor */
|
/* Outdoor */
|
||||||
float outdoor_temp = id(temp_outdoor).state;
|
float outdoor_temp = id(temp_outdoor).state;
|
||||||
int outdoor_humid = int(id(humid_outdoor).state);
|
int outdoor_humid = int(id(humid_outdoor).state);
|
||||||
@@ -759,10 +809,11 @@ display:
|
|||||||
float childrensroom_co2 = id(co2_childrensroom).state;
|
float childrensroom_co2 = id(co2_childrensroom).state;
|
||||||
int childrensroom_pm25 = int(id(pm25_childrensroom).state);
|
int childrensroom_pm25 = int(id(pm25_childrensroom).state);
|
||||||
|
|
||||||
|
// Reuse one room widget layout by moving its origin across the two-column grid.
|
||||||
int offsetX = 0;
|
int offsetX = 0;
|
||||||
int offsetY = 0;
|
int offsetY = 0;
|
||||||
|
|
||||||
/* OUTSIDE */
|
/* OUTSIDE: logo, headline, and outdoor sensor summary */
|
||||||
it.print(10, 10, id(sensor_unit), "Umwelt");
|
it.print(10, 10, id(sensor_unit), "Umwelt");
|
||||||
/*
|
/*
|
||||||
Draw the outline of a rectangle with the top left at [86,21],
|
Draw the outline of a rectangle with the top left at [86,21],
|
||||||
@@ -1106,8 +1157,11 @@ display:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Calendar agenda, month grid, and daily quote; redraws when event JSON changes.
|
||||||
- id: calendar
|
- id: calendar
|
||||||
lambda: |-
|
lambda: |-
|
||||||
|
// Use Home Assistant time for all date labels, month calculations, and
|
||||||
|
// the footer, avoiding locale-dependent formatting on the ESP32.
|
||||||
auto now = id(homeassistant_time).now();
|
auto now = id(homeassistant_time).now();
|
||||||
const char *months[] = {"Januar", "Februar", "März", "April", "Mai", "Juni",
|
const char *months[] = {"Januar", "Februar", "März", "April", "Mai", "Juni",
|
||||||
"Juli", "August", "September", "Oktober", "November", "Dezember"};
|
"Juli", "August", "September", "Oktober", "November", "Dezember"};
|
||||||
@@ -1117,6 +1171,8 @@ display:
|
|||||||
const int month = now.month;
|
const int month = now.month;
|
||||||
const int today = now.day_of_month;
|
const int today = now.day_of_month;
|
||||||
|
|
||||||
|
// Date helpers build a Monday-first month grid and ISO-8601 week numbers
|
||||||
|
// without relying on platform-specific C library time functions.
|
||||||
auto days_in_month = [](int calendar_year, int calendar_month) {
|
auto days_in_month = [](int calendar_year, int calendar_month) {
|
||||||
const int days[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
|
const int days[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
|
||||||
if (calendar_month == 2) {
|
if (calendar_month == 2) {
|
||||||
@@ -1156,6 +1212,8 @@ display:
|
|||||||
it.line(10, 55, 355, 55);
|
it.line(10, 55, 355, 55);
|
||||||
it.line(365, 10, 365, 352);
|
it.line(365, 10, 365, 352);
|
||||||
|
|
||||||
|
// Parse the compact JSON attribute produced by Home Assistant. The empty
|
||||||
|
// and error states below ensure a useful screen while data is unavailable.
|
||||||
JsonDocument calendar_doc;
|
JsonDocument calendar_doc;
|
||||||
const DeserializationError calendar_error = deserializeJson(calendar_doc, id(calendar_entries).state.c_str());
|
const DeserializationError calendar_error = deserializeJson(calendar_doc, id(calendar_entries).state.c_str());
|
||||||
JsonArray calendar_days = calendar_doc.as<JsonArray>();
|
JsonArray calendar_days = calendar_doc.as<JsonArray>();
|
||||||
@@ -1177,6 +1235,8 @@ display:
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A date rail occupies the left edge; event rows start alongside it
|
||||||
|
// and stop before the footer rather than overflowing the panel.
|
||||||
const int group_y = agenda_y;
|
const int group_y = agenda_y;
|
||||||
int event_y = group_y;
|
int event_y = group_y;
|
||||||
const int day_number = day["day"] | 0;
|
const int day_number = day["day"] | 0;
|
||||||
@@ -1218,6 +1278,8 @@ display:
|
|||||||
|
|
||||||
|
|
||||||
/* RIGHT TOP: month view, Monday-first with ISO week numbers */
|
/* RIGHT TOP: month view, Monday-first with ISO week numbers */
|
||||||
|
// Draw only the five or six rows this month actually needs so no orphan
|
||||||
|
// week number is rendered beneath shorter months.
|
||||||
char month_title[24];
|
char month_title[24];
|
||||||
snprintf(month_title, sizeof(month_title), "%s %d", months[month - 1], year);
|
snprintf(month_title, sizeof(month_title), "%s %d", months[month - 1], year);
|
||||||
it.printf(502, 18, id(sensor_unit), TextAlign::TOP_CENTER, "%s", month_title);
|
it.printf(502, 18, id(sensor_unit), TextAlign::TOP_CENTER, "%s", month_title);
|
||||||
@@ -1266,6 +1328,7 @@ display:
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* RIGHT BOTTOM: daily quote selected by Home Assistant */
|
/* RIGHT BOTTOM: daily quote selected by Home Assistant */
|
||||||
|
// Wrap on word boundaries into the fixed four-line, inverted quote panel.
|
||||||
it.filled_rectangle(375, 220, 255, 130, COLOR_ON);
|
it.filled_rectangle(375, 220, 255, 130, COLOR_ON);
|
||||||
std::string quote = "Zitat wird geladen.";
|
std::string quote = "Zitat wird geladen.";
|
||||||
if (id(demotivational_quote).has_state() && !id(demotivational_quote).state.empty()) {
|
if (id(demotivational_quote).has_state() && !id(demotivational_quote).state.empty()) {
|
||||||
@@ -1287,7 +1350,7 @@ display:
|
|||||||
while (quote_start < quote.length() && quote[quote_start] == ' ') quote_start++;
|
while (quote_start < quote.length() && quote[quote_start] == ' ') quote_start++;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* FOOTER */
|
/* FOOTER: Footer is shared visual status: render timestamp plus a Wi-Fi-strength glyph. */
|
||||||
it.strftime(614, 380, id(footer_font), TextAlign::BASELINE_RIGHT,
|
it.strftime(614, 380, id(footer_font), TextAlign::BASELINE_RIGHT,
|
||||||
"Aktualisiert um %d.%m.%Y %H:%M", now);
|
"Aktualisiert um %d.%m.%Y %H:%M", now);
|
||||||
|
|
||||||
|
|||||||
@@ -31,3 +31,5 @@ ota:
|
|||||||
password: !secret ota
|
password: !secret ota
|
||||||
|
|
||||||
http_request:
|
http_request:
|
||||||
|
|
||||||
|
captive_portal:
|
||||||
|
|||||||
@@ -31,3 +31,5 @@ ota:
|
|||||||
password: !secret ota
|
password: !secret ota
|
||||||
|
|
||||||
http_request:
|
http_request:
|
||||||
|
|
||||||
|
captive_portal:
|
||||||
|
|||||||
@@ -3,18 +3,20 @@
|
|||||||
substitutions:
|
substitutions:
|
||||||
name: m5stack-atom-echo
|
name: m5stack-atom-echo
|
||||||
friendly_name: M5Stack Atom Echo
|
friendly_name: M5Stack Atom Echo
|
||||||
micro_wake_word_model: okay_nabu # alexa, hey_jarvis, hey_mycroft are also supported
|
|
||||||
|
|
||||||
esphome:
|
esphome:
|
||||||
name: ${name}
|
name: ${name}
|
||||||
name_add_mac_suffix: False
|
name_add_mac_suffix: false
|
||||||
friendly_name: ${friendly_name}
|
friendly_name: ${friendly_name}
|
||||||
min_version: 2025.2.0
|
min_version: 2025.5.0
|
||||||
|
|
||||||
esp32:
|
esp32:
|
||||||
board: m5stack-atom
|
board: m5stack-atom
|
||||||
|
cpu_frequency: 240MHz
|
||||||
framework:
|
framework:
|
||||||
type: esp-idf
|
type: esp-idf
|
||||||
|
advanced:
|
||||||
|
sram1_as_iram: true
|
||||||
|
|
||||||
# Enable Home Assistant API
|
# Enable Home Assistant API
|
||||||
api:
|
api:
|
||||||
@@ -63,14 +65,17 @@ microphone:
|
|||||||
i2s_din_pin: GPIO23
|
i2s_din_pin: GPIO23
|
||||||
adc_type: external
|
adc_type: external
|
||||||
pdm: true
|
pdm: true
|
||||||
|
sample_rate: 16000
|
||||||
|
correct_dc_offset: true
|
||||||
|
|
||||||
speaker:
|
speaker:
|
||||||
- platform: i2s_audio
|
- platform: i2s_audio
|
||||||
id: echo_speaker
|
id: echo_speaker
|
||||||
i2s_dout_pin: GPIO22
|
i2s_dout_pin: GPIO22
|
||||||
dac_type: external
|
dac_type: external
|
||||||
bits_per_sample: 32bit
|
bits_per_sample: 16bit
|
||||||
channel: right
|
sample_rate: 16000
|
||||||
|
channel: stereo # The Echo has poor playback audio quality when using mon audio
|
||||||
buffer_duration: 60ms
|
buffer_duration: 60ms
|
||||||
|
|
||||||
media_player:
|
media_player:
|
||||||
@@ -80,7 +85,6 @@ media_player:
|
|||||||
announcement_pipeline:
|
announcement_pipeline:
|
||||||
speaker: echo_speaker
|
speaker: echo_speaker
|
||||||
format: WAV
|
format: WAV
|
||||||
codec_support_enabled: false
|
|
||||||
buffer_size: 6000
|
buffer_size: 6000
|
||||||
volume_min: 0.4
|
volume_min: 0.4
|
||||||
files:
|
files:
|
||||||
@@ -91,14 +95,7 @@ media_player:
|
|||||||
condition:
|
condition:
|
||||||
- microphone.is_capturing:
|
- microphone.is_capturing:
|
||||||
then:
|
then:
|
||||||
- if:
|
- script.execute: stop_wake_word
|
||||||
condition:
|
|
||||||
lambda: return id(wake_word_engine_location).state == "On device";
|
|
||||||
then:
|
|
||||||
- micro_wake_word.stop:
|
|
||||||
else:
|
|
||||||
- voice_assistant.stop:
|
|
||||||
- script.execute: reset_led
|
|
||||||
- light.turn_on:
|
- light.turn_on:
|
||||||
id: led
|
id: led
|
||||||
blue: 100%
|
blue: 100%
|
||||||
@@ -108,14 +105,18 @@ media_player:
|
|||||||
effect: none
|
effect: none
|
||||||
on_idle:
|
on_idle:
|
||||||
- script.execute: start_wake_word
|
- script.execute: start_wake_word
|
||||||
|
- script.execute: reset_led
|
||||||
|
|
||||||
voice_assistant:
|
voice_assistant:
|
||||||
id: va
|
id: va
|
||||||
microphone: echo_microphone
|
micro_wake_word:
|
||||||
|
microphone:
|
||||||
|
microphone: echo_microphone
|
||||||
|
channels: 0
|
||||||
|
gain_factor: 4
|
||||||
media_player: echo_media_player
|
media_player: echo_media_player
|
||||||
noise_suppression_level: 2
|
noise_suppression_level: 2
|
||||||
auto_gain: 31dBFS
|
auto_gain: 31dBFS
|
||||||
volume_multiplier: 2.0
|
|
||||||
on_listening:
|
on_listening:
|
||||||
- light.turn_on:
|
- light.turn_on:
|
||||||
id: led
|
id: led
|
||||||
@@ -139,8 +140,26 @@ voice_assistant:
|
|||||||
brightness: 100%
|
brightness: 100%
|
||||||
effect: none
|
effect: none
|
||||||
on_end:
|
on_end:
|
||||||
- delay: 100ms
|
# Handle the "nevermind" case where there is no announcement
|
||||||
- script.execute: start_wake_word
|
- wait_until:
|
||||||
|
condition:
|
||||||
|
- media_player.is_announcing:
|
||||||
|
timeout: 0.5s
|
||||||
|
# Restart only mWW if enabled; streaming wake words automatically restart
|
||||||
|
- if:
|
||||||
|
condition:
|
||||||
|
- lambda: |-
|
||||||
|
return id(wake_word_engine_location).current_option() == "On device";
|
||||||
|
then:
|
||||||
|
- wait_until:
|
||||||
|
- and:
|
||||||
|
- not:
|
||||||
|
voice_assistant.is_running:
|
||||||
|
- not:
|
||||||
|
speaker.is_playing:
|
||||||
|
- lambda: id(va).set_use_wake_word(false);
|
||||||
|
- micro_wake_word.start:
|
||||||
|
- script.execute: reset_led
|
||||||
on_error:
|
on_error:
|
||||||
- light.turn_on:
|
- light.turn_on:
|
||||||
id: led
|
id: led
|
||||||
@@ -155,11 +174,9 @@ voice_assistant:
|
|||||||
- delay: 2s # Give the api server time to settle
|
- delay: 2s # Give the api server time to settle
|
||||||
- script.execute: start_wake_word
|
- script.execute: start_wake_word
|
||||||
on_client_disconnected:
|
on_client_disconnected:
|
||||||
- voice_assistant.stop:
|
- script.execute: stop_wake_word
|
||||||
- micro_wake_word.stop:
|
|
||||||
on_timer_finished:
|
on_timer_finished:
|
||||||
- voice_assistant.stop:
|
- script.execute: stop_wake_word
|
||||||
- micro_wake_word.stop:
|
|
||||||
- wait_until:
|
- wait_until:
|
||||||
not:
|
not:
|
||||||
microphone.is_capturing:
|
microphone.is_capturing:
|
||||||
@@ -235,7 +252,8 @@ script:
|
|||||||
then:
|
then:
|
||||||
- if:
|
- if:
|
||||||
condition:
|
condition:
|
||||||
- lambda: return id(wake_word_engine_location).state == "On device";
|
- lambda: |-
|
||||||
|
return id(wake_word_engine_location).current_option() == "On device";
|
||||||
- switch.is_on: use_listen_light
|
- switch.is_on: use_listen_light
|
||||||
then:
|
then:
|
||||||
- light.turn_on:
|
- light.turn_on:
|
||||||
@@ -248,7 +266,8 @@ script:
|
|||||||
else:
|
else:
|
||||||
- if:
|
- if:
|
||||||
condition:
|
condition:
|
||||||
- lambda: return id(wake_word_engine_location).state != "On device";
|
- lambda: |-
|
||||||
|
return id(wake_word_engine_location).current_option() == "On device";
|
||||||
- switch.is_on: use_listen_light
|
- switch.is_on: use_listen_light
|
||||||
then:
|
then:
|
||||||
- light.turn_on:
|
- light.turn_on:
|
||||||
@@ -262,27 +281,41 @@ script:
|
|||||||
- light.turn_off: led
|
- light.turn_off: led
|
||||||
- id: start_wake_word
|
- id: start_wake_word
|
||||||
then:
|
then:
|
||||||
- wait_until:
|
|
||||||
and:
|
|
||||||
- media_player.is_idle:
|
|
||||||
- speaker.is_stopped:
|
|
||||||
- if:
|
- if:
|
||||||
condition:
|
condition:
|
||||||
lambda: return id(wake_word_engine_location).state == "On device";
|
and:
|
||||||
|
- not:
|
||||||
|
- voice_assistant.is_running:
|
||||||
|
- lambda: |-
|
||||||
|
return id(wake_word_engine_location).current_option() == "On device";
|
||||||
then:
|
then:
|
||||||
- voice_assistant.stop
|
- lambda: id(va).set_use_wake_word(false);
|
||||||
- micro_wake_word.stop:
|
|
||||||
- delay: 1s
|
|
||||||
- script.execute: reset_led
|
|
||||||
- script.wait: reset_led
|
|
||||||
- micro_wake_word.start:
|
- micro_wake_word.start:
|
||||||
else:
|
- if:
|
||||||
- if:
|
condition:
|
||||||
condition: voice_assistant.is_running
|
and:
|
||||||
then:
|
- not:
|
||||||
- voice_assistant.stop:
|
- voice_assistant.is_running:
|
||||||
- script.execute: reset_led
|
- lambda: |-
|
||||||
|
return id(wake_word_engine_location).current_option() == "In Home Assistant";
|
||||||
|
then:
|
||||||
|
- lambda: id(va).set_use_wake_word(true);
|
||||||
- voice_assistant.start_continuous:
|
- voice_assistant.start_continuous:
|
||||||
|
- id: stop_wake_word
|
||||||
|
then:
|
||||||
|
- if:
|
||||||
|
condition:
|
||||||
|
lambda: |-
|
||||||
|
return id(wake_word_engine_location).current_option() == "In Home Assistant";
|
||||||
|
then:
|
||||||
|
- lambda: id(va).set_use_wake_word(false);
|
||||||
|
- voice_assistant.stop:
|
||||||
|
- if:
|
||||||
|
condition:
|
||||||
|
lambda: |-
|
||||||
|
return id(wake_word_engine_location).current_option() == "On device";
|
||||||
|
then:
|
||||||
|
- micro_wake_word.stop:
|
||||||
|
|
||||||
switch:
|
switch:
|
||||||
- platform: template
|
- platform: template
|
||||||
@@ -342,7 +375,7 @@ select:
|
|||||||
condition:
|
condition:
|
||||||
lambda: return x == "In Home Assistant";
|
lambda: return x == "In Home Assistant";
|
||||||
then:
|
then:
|
||||||
- micro_wake_word.stop
|
- micro_wake_word.stop:
|
||||||
- delay: 500ms
|
- delay: 500ms
|
||||||
- lambda: id(va).set_use_wake_word(true);
|
- lambda: id(va).set_use_wake_word(true);
|
||||||
- voice_assistant.start_continuous:
|
- voice_assistant.start_continuous:
|
||||||
@@ -351,9 +384,9 @@ select:
|
|||||||
lambda: return x == "On device";
|
lambda: return x == "On device";
|
||||||
then:
|
then:
|
||||||
- lambda: id(va).set_use_wake_word(false);
|
- lambda: id(va).set_use_wake_word(false);
|
||||||
- voice_assistant.stop
|
- voice_assistant.stop:
|
||||||
- delay: 500ms
|
- delay: 500ms
|
||||||
- micro_wake_word.start
|
- micro_wake_word.start:
|
||||||
|
|
||||||
micro_wake_word:
|
micro_wake_word:
|
||||||
on_wake_word_detected:
|
on_wake_word_detected:
|
||||||
@@ -361,4 +394,9 @@ micro_wake_word:
|
|||||||
wake_word: !lambda return wake_word;
|
wake_word: !lambda return wake_word;
|
||||||
vad:
|
vad:
|
||||||
models:
|
models:
|
||||||
- model: ${micro_wake_word_model}
|
- model: okay_nabu
|
||||||
|
id: okay_nabu
|
||||||
|
- model: hey_mycroft
|
||||||
|
id: hey_mycroft
|
||||||
|
- model: hey_jarvis
|
||||||
|
id: hey_jarvis
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
# Source: https://github.com/wildekek/rdtech-esphome
|
||||||
|
|
||||||
substitutions:
|
substitutions:
|
||||||
name: "riden-labornetzteil-18a"
|
name: "riden-labornetzteil-18a"
|
||||||
friendly_name: "Riden Labornetzteil 18A"
|
friendly_name: "Riden Labornetzteil 18A"
|
||||||
@@ -16,6 +18,8 @@ substitutions:
|
|||||||
RD6006_current_maximum: "6"
|
RD6006_current_maximum: "6"
|
||||||
RD6006_current_accuracy: "3"
|
RD6006_current_accuracy: "3"
|
||||||
RD6006_current_multiplier: "0.001"
|
RD6006_current_multiplier: "0.001"
|
||||||
|
RD6006_power_accuracy: "2"
|
||||||
|
RD6006_power_multiplier: "0.01"
|
||||||
|
|
||||||
RD6006P_voltage_maximum: "60"
|
RD6006P_voltage_maximum: "60"
|
||||||
RD6006P_voltage_accuracy: "3"
|
RD6006P_voltage_accuracy: "3"
|
||||||
@@ -23,6 +27,8 @@ substitutions:
|
|||||||
RD6006P_current_maximum: "6"
|
RD6006P_current_maximum: "6"
|
||||||
RD6006P_current_accuracy: "4"
|
RD6006P_current_accuracy: "4"
|
||||||
RD6006P_current_multiplier: "0.0001"
|
RD6006P_current_multiplier: "0.0001"
|
||||||
|
RD6006P_power_accuracy: "3"
|
||||||
|
RD6006P_power_multiplier: "0.001"
|
||||||
|
|
||||||
RD6012_voltage_maximum: "60"
|
RD6012_voltage_maximum: "60"
|
||||||
RD6012_voltage_accuracy: "2"
|
RD6012_voltage_accuracy: "2"
|
||||||
@@ -30,6 +36,8 @@ substitutions:
|
|||||||
RD6012_current_maximum: "12"
|
RD6012_current_maximum: "12"
|
||||||
RD6012_current_accuracy: "2"
|
RD6012_current_accuracy: "2"
|
||||||
RD6012_current_multiplier: "0.01"
|
RD6012_current_multiplier: "0.01"
|
||||||
|
RD6012_power_accuracy: "2"
|
||||||
|
RD6012_power_multiplier: "0.01"
|
||||||
|
|
||||||
RD6018_voltage_maximum: "60"
|
RD6018_voltage_maximum: "60"
|
||||||
RD6018_voltage_accuracy: "2"
|
RD6018_voltage_accuracy: "2"
|
||||||
@@ -37,6 +45,8 @@ substitutions:
|
|||||||
RD6018_current_maximum: "18"
|
RD6018_current_maximum: "18"
|
||||||
RD6018_current_accuracy: "2"
|
RD6018_current_accuracy: "2"
|
||||||
RD6018_current_multiplier: "0.01"
|
RD6018_current_multiplier: "0.01"
|
||||||
|
RD6018_power_accuracy: "2"
|
||||||
|
RD6018_power_multiplier: "0.01"
|
||||||
|
|
||||||
esphome:
|
esphome:
|
||||||
name: $device_name
|
name: $device_name
|
||||||
@@ -45,7 +55,7 @@ esphome:
|
|||||||
name_add_mac_suffix: false
|
name_add_mac_suffix: false
|
||||||
project:
|
project:
|
||||||
name: "wildekek.rd6006-controller"
|
name: "wildekek.rd6006-controller"
|
||||||
version: "1.4.1"
|
version: "1.5"
|
||||||
|
|
||||||
esp8266:
|
esp8266:
|
||||||
board: esp12e
|
board: esp12e
|
||||||
@@ -56,7 +66,7 @@ network:
|
|||||||
wifi:
|
wifi:
|
||||||
ssid: "Voltage-legacy"
|
ssid: "Voltage-legacy"
|
||||||
password: !secret voltage_legacy_psk
|
password: !secret voltage_legacy_psk
|
||||||
#use_address: riden-labornetzteil-18a.home
|
use_address: riden-labornetzteil-18a.home
|
||||||
power_save_mode: high
|
power_save_mode: high
|
||||||
fast_connect: on
|
fast_connect: on
|
||||||
min_auth_mode: WPA2
|
min_auth_mode: WPA2
|
||||||
@@ -152,7 +162,9 @@ sensor:
|
|||||||
on_value:
|
on_value:
|
||||||
then:
|
then:
|
||||||
- lambda: |-
|
- lambda: |-
|
||||||
id(model_name).publish_state(value_accuracy_to_string(x, 0));
|
id(model_name).publish_state(
|
||||||
|
std::to_string(static_cast<uint16_t>(x))
|
||||||
|
);
|
||||||
|
|
||||||
- platform: modbus_controller
|
- platform: modbus_controller
|
||||||
name: "Serial Number"
|
name: "Serial Number"
|
||||||
@@ -213,9 +225,9 @@ sensor:
|
|||||||
unit_of_measurement: "W"
|
unit_of_measurement: "W"
|
||||||
register_type: holding
|
register_type: holding
|
||||||
value_type: U_DWORD
|
value_type: U_DWORD
|
||||||
accuracy_decimals: 2
|
accuracy_decimals: ${${model}_power_accuracy}
|
||||||
filters:
|
filters:
|
||||||
- multiply: 0.01
|
- multiply: ${${model}_power_multiplier}
|
||||||
|
|
||||||
- platform: modbus_controller
|
- platform: modbus_controller
|
||||||
modbus_controller_id: powersupply
|
modbus_controller_id: powersupply
|
||||||
@@ -226,9 +238,9 @@ sensor:
|
|||||||
unit_of_measurement: "V"
|
unit_of_measurement: "V"
|
||||||
register_type: holding
|
register_type: holding
|
||||||
value_type: U_WORD
|
value_type: U_WORD
|
||||||
accuracy_decimals: ${${model}_voltage_accuracy}
|
accuracy_decimals: 2
|
||||||
filters:
|
filters:
|
||||||
- multiply: ${${model}_voltage_multiplier}
|
- multiply: 0.01
|
||||||
|
|
||||||
- platform: modbus_controller
|
- platform: modbus_controller
|
||||||
modbus_controller_id: powersupply
|
modbus_controller_id: powersupply
|
||||||
@@ -266,9 +278,9 @@ sensor:
|
|||||||
unit_of_measurement: "V"
|
unit_of_measurement: "V"
|
||||||
register_type: holding
|
register_type: holding
|
||||||
value_type: U_WORD
|
value_type: U_WORD
|
||||||
accuracy_decimals: ${${model}_voltage_accuracy}
|
accuracy_decimals: 2
|
||||||
filters:
|
filters:
|
||||||
- multiply: ${${model}_voltage_multiplier}
|
- multiply: 0.01
|
||||||
|
|
||||||
- platform: modbus_controller
|
- platform: modbus_controller
|
||||||
name: "Temperature"
|
name: "Temperature"
|
||||||
@@ -437,7 +449,6 @@ number:
|
|||||||
lambda: !lambda return x * ${${model}_voltage_multiplier};
|
lambda: !lambda return x * ${${model}_voltage_multiplier};
|
||||||
write_lambda: !lambda return x * (1/${${model}_voltage_multiplier});
|
write_lambda: !lambda return x * (1/${${model}_voltage_multiplier});
|
||||||
|
|
||||||
|
|
||||||
- platform: modbus_controller
|
- platform: modbus_controller
|
||||||
modbus_controller_id: powersupply
|
modbus_controller_id: powersupply
|
||||||
name: "Over Current Protection"
|
name: "Over Current Protection"
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
# Source: https://github.com/wildekek/rdtech-esphome
|
||||||
|
|
||||||
substitutions:
|
substitutions:
|
||||||
name: "riden-labornetzteil-6a"
|
name: "riden-labornetzteil-6a"
|
||||||
friendly_name: "Riden Labornetzteil 6A"
|
friendly_name: "Riden Labornetzteil 6A"
|
||||||
@@ -16,6 +18,8 @@ substitutions:
|
|||||||
RD6006_current_maximum: "6"
|
RD6006_current_maximum: "6"
|
||||||
RD6006_current_accuracy: "3"
|
RD6006_current_accuracy: "3"
|
||||||
RD6006_current_multiplier: "0.001"
|
RD6006_current_multiplier: "0.001"
|
||||||
|
RD6006_power_accuracy: "2"
|
||||||
|
RD6006_power_multiplier: "0.01"
|
||||||
|
|
||||||
RD6006P_voltage_maximum: "60"
|
RD6006P_voltage_maximum: "60"
|
||||||
RD6006P_voltage_accuracy: "3"
|
RD6006P_voltage_accuracy: "3"
|
||||||
@@ -23,6 +27,8 @@ substitutions:
|
|||||||
RD6006P_current_maximum: "6"
|
RD6006P_current_maximum: "6"
|
||||||
RD6006P_current_accuracy: "4"
|
RD6006P_current_accuracy: "4"
|
||||||
RD6006P_current_multiplier: "0.0001"
|
RD6006P_current_multiplier: "0.0001"
|
||||||
|
RD6006P_power_accuracy: "3"
|
||||||
|
RD6006P_power_multiplier: "0.001"
|
||||||
|
|
||||||
RD6012_voltage_maximum: "60"
|
RD6012_voltage_maximum: "60"
|
||||||
RD6012_voltage_accuracy: "2"
|
RD6012_voltage_accuracy: "2"
|
||||||
@@ -30,6 +36,8 @@ substitutions:
|
|||||||
RD6012_current_maximum: "12"
|
RD6012_current_maximum: "12"
|
||||||
RD6012_current_accuracy: "2"
|
RD6012_current_accuracy: "2"
|
||||||
RD6012_current_multiplier: "0.01"
|
RD6012_current_multiplier: "0.01"
|
||||||
|
RD6012_power_accuracy: "2"
|
||||||
|
RD6012_power_multiplier: "0.01"
|
||||||
|
|
||||||
RD6018_voltage_maximum: "60"
|
RD6018_voltage_maximum: "60"
|
||||||
RD6018_voltage_accuracy: "2"
|
RD6018_voltage_accuracy: "2"
|
||||||
@@ -37,6 +45,8 @@ substitutions:
|
|||||||
RD6018_current_maximum: "18"
|
RD6018_current_maximum: "18"
|
||||||
RD6018_current_accuracy: "2"
|
RD6018_current_accuracy: "2"
|
||||||
RD6018_current_multiplier: "0.01"
|
RD6018_current_multiplier: "0.01"
|
||||||
|
RD6018_power_accuracy: "2"
|
||||||
|
RD6018_power_multiplier: "0.01"
|
||||||
|
|
||||||
esphome:
|
esphome:
|
||||||
name: $device_name
|
name: $device_name
|
||||||
@@ -45,7 +55,7 @@ esphome:
|
|||||||
name_add_mac_suffix: false
|
name_add_mac_suffix: false
|
||||||
project:
|
project:
|
||||||
name: "wildekek.rd6006-controller"
|
name: "wildekek.rd6006-controller"
|
||||||
version: "1.4.1"
|
version: "1.5"
|
||||||
|
|
||||||
esp8266:
|
esp8266:
|
||||||
board: esp12e
|
board: esp12e
|
||||||
@@ -56,7 +66,7 @@ network:
|
|||||||
wifi:
|
wifi:
|
||||||
ssid: "Voltage-legacy"
|
ssid: "Voltage-legacy"
|
||||||
password: !secret voltage_legacy_psk
|
password: !secret voltage_legacy_psk
|
||||||
#use_address: riden-labornetzteil-6a.home
|
use_address: riden-labornetzteil-6a.home
|
||||||
power_save_mode: high
|
power_save_mode: high
|
||||||
fast_connect: on
|
fast_connect: on
|
||||||
min_auth_mode: WPA2
|
min_auth_mode: WPA2
|
||||||
@@ -152,7 +162,9 @@ sensor:
|
|||||||
on_value:
|
on_value:
|
||||||
then:
|
then:
|
||||||
- lambda: |-
|
- lambda: |-
|
||||||
id(model_name).publish_state(value_accuracy_to_string(x, 0));
|
id(model_name).publish_state(
|
||||||
|
std::to_string(static_cast<uint16_t>(x))
|
||||||
|
);
|
||||||
|
|
||||||
- platform: modbus_controller
|
- platform: modbus_controller
|
||||||
name: "Serial Number"
|
name: "Serial Number"
|
||||||
@@ -213,9 +225,9 @@ sensor:
|
|||||||
unit_of_measurement: "W"
|
unit_of_measurement: "W"
|
||||||
register_type: holding
|
register_type: holding
|
||||||
value_type: U_DWORD
|
value_type: U_DWORD
|
||||||
accuracy_decimals: 2
|
accuracy_decimals: ${${model}_power_accuracy}
|
||||||
filters:
|
filters:
|
||||||
- multiply: 0.01
|
- multiply: ${${model}_power_multiplier}
|
||||||
|
|
||||||
- platform: modbus_controller
|
- platform: modbus_controller
|
||||||
modbus_controller_id: powersupply
|
modbus_controller_id: powersupply
|
||||||
@@ -226,9 +238,9 @@ sensor:
|
|||||||
unit_of_measurement: "V"
|
unit_of_measurement: "V"
|
||||||
register_type: holding
|
register_type: holding
|
||||||
value_type: U_WORD
|
value_type: U_WORD
|
||||||
accuracy_decimals: ${${model}_voltage_accuracy}
|
accuracy_decimals: 2
|
||||||
filters:
|
filters:
|
||||||
- multiply: ${${model}_voltage_multiplier}
|
- multiply: 0.01
|
||||||
|
|
||||||
- platform: modbus_controller
|
- platform: modbus_controller
|
||||||
modbus_controller_id: powersupply
|
modbus_controller_id: powersupply
|
||||||
@@ -266,9 +278,9 @@ sensor:
|
|||||||
unit_of_measurement: "V"
|
unit_of_measurement: "V"
|
||||||
register_type: holding
|
register_type: holding
|
||||||
value_type: U_WORD
|
value_type: U_WORD
|
||||||
accuracy_decimals: ${${model}_voltage_accuracy}
|
accuracy_decimals: 2
|
||||||
filters:
|
filters:
|
||||||
- multiply: ${${model}_voltage_multiplier}
|
- multiply: 0.01
|
||||||
|
|
||||||
- platform: modbus_controller
|
- platform: modbus_controller
|
||||||
name: "Temperature"
|
name: "Temperature"
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
# Display contract shared with the ESPHome calendar page: compact German labels,
|
||||||
|
# a bounded number of events, and strings sized for the e-paper layout.
|
||||||
CALENDAR_NAMES = {
|
CALENDAR_NAMES = {
|
||||||
"calendar.tkrz_kalender": "Arbeit",
|
"calendar.tkrz_kalender": "Arbeit",
|
||||||
"calendar.privat": "Privat",
|
"calendar.privat": "Privat",
|
||||||
@@ -9,6 +11,7 @@ MAX_TITLE_LENGTH = 22
|
|||||||
MAX_META_LENGTH = 35
|
MAX_META_LENGTH = 35
|
||||||
|
|
||||||
|
|
||||||
|
# Keep variable event text within the fixed-width e-paper agenda columns.
|
||||||
def shorten(value, maximum):
|
def shorten(value, maximum):
|
||||||
value = (value or "").strip()
|
value = (value or "").strip()
|
||||||
if len(value) <= maximum:
|
if len(value) <= maximum:
|
||||||
@@ -16,11 +19,13 @@ def shorten(value, maximum):
|
|||||||
return value[: maximum - 3].rstrip() + "..."
|
return value[: maximum - 3].rstrip() + "..."
|
||||||
|
|
||||||
|
|
||||||
|
# Convert one Home Assistant calendar event into the small JSON shape consumed
|
||||||
|
# by ESPHome, separating all-day, start-time, end-time, and metadata display data.
|
||||||
def compact_event(event, calendar_name):
|
def compact_event(event, calendar_name):
|
||||||
start = event.get("start", "")
|
start = event.get("start", "")
|
||||||
all_day = "T" not in start
|
all_day = "T" not in start
|
||||||
end = event.get("end", "")
|
end = event.get("end", "")
|
||||||
time = "ganztägig" if all_day else start[11:16]
|
time = "ganzt." if all_day else start[11:16]
|
||||||
end_time = "" if all_day or "T" not in end else end[11:16]
|
end_time = "" if all_day or "T" not in end else end[11:16]
|
||||||
|
|
||||||
location = (event.get("location") or "").split("\n")[0].strip()
|
location = (event.get("location") or "").split("\n")[0].strip()
|
||||||
@@ -37,6 +42,8 @@ def compact_event(event, calendar_name):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Read the calendar.get_events response supplied by the calling template sensor
|
||||||
|
# and collect events under the date on which they should appear in the agenda.
|
||||||
calendar_data = data.get("calendar", {})
|
calendar_data = data.get("calendar", {})
|
||||||
today = str(data.get("now", ""))[:10]
|
today = str(data.get("now", ""))[:10]
|
||||||
events_by_date = {}
|
events_by_date = {}
|
||||||
@@ -62,6 +69,8 @@ for calendar_id, calendar in calendar_data.items():
|
|||||||
compact_event(event, calendar_name)
|
compact_event(event, calendar_name)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Sort day groups and events, put all-day entries first, and cap the payload so
|
||||||
|
# deserializing it stays safe on the ESP32 without PSRAM.
|
||||||
entries = []
|
entries = []
|
||||||
entry_count = 0
|
entry_count = 0
|
||||||
for date in sorted(events_by_date):
|
for date in sorted(events_by_date):
|
||||||
@@ -84,4 +93,5 @@ for date in sorted(events_by_date):
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Return only the normalized agenda payload to the Home Assistant template sensor.
|
||||||
output["entries"] = entries
|
output["entries"] = entries
|
||||||
|
|||||||
+2
-2
@@ -11,7 +11,7 @@
|
|||||||
host: !secret router_ip
|
host: !secret router_ip
|
||||||
community: !secret router_community
|
community: !secret router_community
|
||||||
# baseoid: .1.3.6.1.2.1.31.1.1.1.6.511
|
# baseoid: .1.3.6.1.2.1.31.1.1.1.6.511
|
||||||
baseoid: .1.3.6.1.2.1.2.2.1.10.25
|
baseoid: .1.3.6.1.2.1.2.2.1.10.12
|
||||||
version: 2c
|
version: 2c
|
||||||
unit_of_measurement: "Octets"
|
unit_of_measurement: "Octets"
|
||||||
- platform: snmp
|
- platform: snmp
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
host: !secret router_ip
|
host: !secret router_ip
|
||||||
community: !secret router_community
|
community: !secret router_community
|
||||||
# baseoid: .1.3.6.1.2.1.31.1.1.1.10.511
|
# baseoid: .1.3.6.1.2.1.31.1.1.1.10.511
|
||||||
baseoid: .1.3.6.1.2.1.2.2.1.16.25
|
baseoid: .1.3.6.1.2.1.2.2.1.16.12
|
||||||
version: 2c
|
version: 2c
|
||||||
unit_of_measurement: "Octets"
|
unit_of_measurement: "Octets"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user