10 Commits

6 changed files with 223 additions and 89 deletions
+72 -7
View File
@@ -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,11 +21,15 @@ 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:
type: esp-idf type: esp-idf
advanced:
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
@@ -49,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
@@ -115,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
@@ -192,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"
@@ -220,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
@@ -228,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
@@ -241,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: then:
- logger.log: - logger.log:
level: INFO level: INFO
format: "Timer based screen refresh" format: "Timer based environment screen refresh"
- component.update: epaper
- seconds: 10
minutes: 0
hours: 0
then:
- logger.log:
level: INFO
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"
@@ -710,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
@@ -732,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);
@@ -757,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],
@@ -1104,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"};
@@ -1115,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) {
@@ -1154,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>();
@@ -1175,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;
@@ -1216,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);
@@ -1264,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()) {
@@ -1285,11 +1350,11 @@ 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);
/* WiFi Signal Strenght */ /* WiFi Signal strength */
if(id(wifisignal).has_state()) { if(id(wifisignal).has_state()) {
int x = 630; int x = 630;
int y = 384; int y = 384;
+77 -41
View File
@@ -3,16 +3,16 @@
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
@@ -63,14 +63,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 +83,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 +93,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 +103,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
micro_wake_word:
microphone:
microphone: echo_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 +138,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 +172,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 +250,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 +264,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 +279,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: voice_assistant.is_running condition:
and:
- not:
- voice_assistant.is_running:
- lambda: |-
return id(wake_word_engine_location).current_option() == "In Home Assistant";
then: then:
- voice_assistant.stop: - lambda: id(va).set_use_wake_word(true);
- script.execute: reset_led
- 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 +373,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 +382,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 +392,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
+21 -10
View File
@@ -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"
+21 -9
View File
@@ -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"
+11 -1
View File
@@ -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
View File
@@ -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"