Updated refresh logic to only rerender calendar, when contents changed.

2026-07-13 15:31:39 +02:00
5 changed files with 98 additions and 139 deletions
@@ -51,6 +51,13 @@ api:
 # Include ArduinoJson support for the compact calendar event feed.
 json:
 # Avoid refreshing the panel when Home Assistant republishes unchanged calendar data.
 globals:
  - id: last_rendered_calendar_entries
    type: std::string
    restore_value: no
    initial_value: '""'
 ota:
  platform: esphome
  password: !secret ota
@@ -222,6 +229,17 @@ text_sensor:
    entity_id: sensor.epaper_kalenderdaten
    attribute: entries
    id: calendar_entries
    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.
  - platform: homeassistant
@@ -243,21 +261,18 @@ time:
          - output.turn_on: power_key
          - delay: 0.5s
          - output.turn_off: power_key
-      # Every 10 minutes
+      # Refresh environmental readings every 10 minutes. The calendar page is
      # redrawn only when its event feed actually changes.
      - seconds: 0
        minutes: /10
        then:
-          - logger.log:
+          - if:
-              level: INFO
+              condition:
-              format: "Timer based screen refresh"
+                display.is_displaying_page: environment
          - component.update: epaper
      - seconds: 10
        minutes: 0
        hours: 0
              then:
                - logger.log:
                    level: INFO
-              format: "Update screen on new day"
+                    format: "Timer based environment screen refresh"
                - component.update: epaper
 # Font definitions
@@ -3,16 +3,16 @@
 substitutions:
  name: m5stack-atom-echo
  friendly_name: M5Stack Atom Echo
  micro_wake_word_model: okay_nabu  # alexa, hey_jarvis, hey_mycroft are also supported
 esphome:
  name: ${name}
-  name_add_mac_suffix: false
+  name_add_mac_suffix: False
  friendly_name: ${friendly_name}
-  min_version: 2025.5.0
+  min_version: 2025.2.0
 esp32:
  board: m5stack-atom
  cpu_frequency: 240MHz
  framework:
    type: esp-idf
@@ -63,17 +63,14 @@ microphone:
    i2s_din_pin: GPIO23
    adc_type: external
    pdm: true
    sample_rate: 16000
    correct_dc_offset: true
 speaker:
  - platform: i2s_audio
    id: echo_speaker
    i2s_dout_pin: GPIO22
    dac_type: external
-    bits_per_sample: 16bit
+    bits_per_sample: 32bit
-    sample_rate: 16000
+    channel: right
    channel: stereo  # The Echo has poor playback audio quality when using mon audio
    buffer_duration: 60ms
 media_player:
@@ -83,6 +80,7 @@ media_player:
    announcement_pipeline:
      speaker: echo_speaker
      format: WAV
    codec_support_enabled: false
    buffer_size: 6000
    volume_min: 0.4
    files:
@@ -93,7 +91,14 @@ media_player:
          condition:
            - microphone.is_capturing:
          then:
-            - script.execute: stop_wake_word
+            - if:
                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:
          id: led
          blue: 100%
@@ -103,18 +108,14 @@ media_player:
          effect: none
    on_idle:
      - script.execute: start_wake_word
      - script.execute: reset_led
 voice_assistant:
  id: va
  micro_wake_word:
  microphone:
  microphone: echo_microphone
    channels: 0
    gain_factor: 4
  media_player: echo_media_player
  noise_suppression_level: 2
  auto_gain: 31dBFS
  volume_multiplier: 2.0
  on_listening:
    - light.turn_on:
        id: led
@@ -138,26 +139,8 @@ voice_assistant:
        brightness: 100%
        effect: none
  on_end:
-    # Handle the "nevermind" case where there is no announcement
+    - delay: 100ms
-    - wait_until:
+    - script.execute: start_wake_word
        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:
    - light.turn_on:
        id: led
@@ -172,9 +155,11 @@ voice_assistant:
    - delay: 2s  # Give the api server time to settle
    - script.execute: start_wake_word
  on_client_disconnected:
-    - script.execute: stop_wake_word
+    - voice_assistant.stop:
    - micro_wake_word.stop:
  on_timer_finished:
-    - script.execute: stop_wake_word
+    - voice_assistant.stop:
    - micro_wake_word.stop:
    - wait_until:
        not:
          microphone.is_capturing:
@@ -250,8 +235,7 @@ script:
    then:
      - if:
          condition:
-            - lambda: |-
+            - lambda: return id(wake_word_engine_location).state == "On device";
                return id(wake_word_engine_location).current_option() == "On device";
            - switch.is_on: use_listen_light
          then:
            - light.turn_on:
@@ -264,8 +248,7 @@ script:
          else:
            - if:
                condition:
-                  - lambda: |-
+                  - lambda: return id(wake_word_engine_location).state != "On device";
                      return id(wake_word_engine_location).current_option() == "On device";
                  - switch.is_on: use_listen_light
                then:
                  - light.turn_on:
@@ -279,41 +262,27 @@ script:
                  - light.turn_off: led
  - id: start_wake_word
    then:
-      - if:
+      - wait_until:
          condition:
          and:
-              - not:
+            - media_player.is_idle:
-                  - voice_assistant.is_running:
+            - speaker.is_stopped:
              - lambda: |-
                  return id(wake_word_engine_location).current_option() == "On device";
          then:
            - lambda: id(va).set_use_wake_word(false);
            - micro_wake_word.start:
      - if:
          condition:
-            and:
+            lambda: return id(wake_word_engine_location).state == "On device";
              - not:
                  - voice_assistant.is_running:
              - 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:
  - 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:
            - voice_assistant.stop
            - micro_wake_word.stop:
            - delay: 1s
            - script.execute: reset_led
            - script.wait: reset_led
            - micro_wake_word.start:
          else:
            - if:
                condition: voice_assistant.is_running
                then:
                  - voice_assistant.stop:
                  - script.execute: reset_led
            - voice_assistant.start_continuous:
 switch:
  - platform: template
@@ -373,7 +342,7 @@ select:
          condition:
            lambda: return x == "In Home Assistant";
          then:
-            - micro_wake_word.stop:
+            - micro_wake_word.stop
            - delay: 500ms
            - lambda: id(va).set_use_wake_word(true);
            - voice_assistant.start_continuous:
@@ -382,9 +351,9 @@ select:
            lambda: return x == "On device";
          then:
            - lambda: id(va).set_use_wake_word(false);
-            - voice_assistant.stop:
+            - voice_assistant.stop
            - delay: 500ms
-            - micro_wake_word.start:
+            - micro_wake_word.start
 micro_wake_word:
  on_wake_word_detected:
@@ -392,9 +361,4 @@ micro_wake_word:
        wake_word: !lambda return wake_word;
  vad:
  models:
-    - model: okay_nabu
+    - model: ${micro_wake_word_model}
      id: okay_nabu
    - model: hey_mycroft
      id: hey_mycroft
    - model: hey_jarvis
      id: hey_jarvis
@@ -1,5 +1,3 @@
 # Source: https://github.com/wildekek/rdtech-esphome
 substitutions:
  name: "riden-labornetzteil-18a"
  friendly_name: "Riden Labornetzteil 18A"
@@ -18,8 +16,6 @@ substitutions:
  RD6006_current_maximum: "6"
  RD6006_current_accuracy: "3"
  RD6006_current_multiplier: "0.001"
  RD6006_power_accuracy: "2"
  RD6006_power_multiplier: "0.01"
  RD6006P_voltage_maximum: "60"
  RD6006P_voltage_accuracy: "3"
@@ -27,8 +23,6 @@ substitutions:
  RD6006P_current_maximum: "6"
  RD6006P_current_accuracy: "4"
  RD6006P_current_multiplier: "0.0001"
  RD6006P_power_accuracy: "3"
  RD6006P_power_multiplier: "0.001"
  RD6012_voltage_maximum: "60"
  RD6012_voltage_accuracy: "2"
@@ -36,8 +30,6 @@ substitutions:
  RD6012_current_maximum: "12"
  RD6012_current_accuracy: "2"
  RD6012_current_multiplier: "0.01"
  RD6012_power_accuracy: "2"
  RD6012_power_multiplier: "0.01"
  RD6018_voltage_maximum: "60"
  RD6018_voltage_accuracy: "2"
@@ -45,8 +37,6 @@ substitutions:
  RD6018_current_maximum: "18"
  RD6018_current_accuracy: "2"
  RD6018_current_multiplier: "0.01"
  RD6018_power_accuracy: "2"
  RD6018_power_multiplier: "0.01"
 esphome:
  name: $device_name
@@ -55,7 +45,7 @@ esphome:
  name_add_mac_suffix: false
  project:
    name: "wildekek.rd6006-controller"
-    version: "1.5"
+    version: "1.4.1"
 esp8266:
  board: esp12e
@@ -66,7 +56,7 @@ network:
 wifi:
  ssid: "Voltage-legacy"
  password: !secret voltage_legacy_psk
-  use_address: riden-labornetzteil-18a.home  
+  #use_address: riden-labornetzteil-18a.home  
  power_save_mode: high
  fast_connect: on
  min_auth_mode: WPA2
@@ -159,10 +149,10 @@ sensor:
    register_type: holding
    value_type: U_WORD
    accuracy_decimals: 0
-#    on_value:
+    on_value:
-#      then:
+      then:
-#        - lambda: |-
+        - lambda: |-
-#            id(model_name).publish_state(value_accuracy_to_string(x, 0));
+            id(model_name).publish_state(value_accuracy_to_string(x, 0));
  - platform: modbus_controller
    name: "Serial Number"
@@ -223,9 +213,9 @@ sensor:
    unit_of_measurement: "W"
    register_type: holding
    value_type: U_DWORD
-    accuracy_decimals: ${${model}_power_accuracy}
+    accuracy_decimals: 2
    filters:
-      - multiply: ${${model}_power_multiplier}
+      - multiply: 0.01
  - platform: modbus_controller
    modbus_controller_id: powersupply
@@ -236,9 +226,9 @@ sensor:
    unit_of_measurement: "V"
    register_type: holding
    value_type: U_WORD
-    accuracy_decimals: 2
+    accuracy_decimals: ${${model}_voltage_accuracy}
    filters:
-      - multiply: 0.01
+      - multiply: ${${model}_voltage_multiplier}
  - platform: modbus_controller
    modbus_controller_id: powersupply
@@ -276,9 +266,9 @@ sensor:
    unit_of_measurement: "V"
    register_type: holding
    value_type: U_WORD
-    accuracy_decimals: 2
+    accuracy_decimals: ${${model}_voltage_accuracy}
    filters:
-      - multiply: 0.01
+      - multiply: ${${model}_voltage_multiplier}
  - platform: modbus_controller
    name: "Temperature"
@@ -1,5 +1,3 @@
 # Source: https://github.com/wildekek/rdtech-esphome
 substitutions:
  name: "riden-labornetzteil-6a"
  friendly_name: "Riden Labornetzteil 6A"
@@ -18,8 +16,6 @@ substitutions:
  RD6006_current_maximum: "6"
  RD6006_current_accuracy: "3"
  RD6006_current_multiplier: "0.001"
  RD6006_power_accuracy: "2"
  RD6006_power_multiplier: "0.01"
  RD6006P_voltage_maximum: "60"
  RD6006P_voltage_accuracy: "3"
@@ -27,8 +23,6 @@ substitutions:
  RD6006P_current_maximum: "6"
  RD6006P_current_accuracy: "4"
  RD6006P_current_multiplier: "0.0001"
  RD6006P_power_accuracy: "3"
  RD6006P_power_multiplier: "0.001"
  RD6012_voltage_maximum: "60"
  RD6012_voltage_accuracy: "2"
@@ -36,8 +30,6 @@ substitutions:
  RD6012_current_maximum: "12"
  RD6012_current_accuracy: "2"
  RD6012_current_multiplier: "0.01"
  RD6012_power_accuracy: "2"
  RD6012_power_multiplier: "0.01"
  RD6018_voltage_maximum: "60"
  RD6018_voltage_accuracy: "2"
@@ -45,8 +37,6 @@ substitutions:
  RD6018_current_maximum: "18"
  RD6018_current_accuracy: "2"
  RD6018_current_multiplier: "0.01"
  RD6018_power_accuracy: "2"
  RD6018_power_multiplier: "0.01"
 esphome:
  name: $device_name
@@ -66,7 +56,7 @@ network:
 wifi:
  ssid: "Voltage-legacy"
  password: !secret voltage_legacy_psk
-  use_address: riden-labornetzteil-6a.home  
+  #use_address: riden-labornetzteil-6a.home  
  power_save_mode: high
  fast_connect: on
  min_auth_mode: WPA2
@@ -159,10 +149,10 @@ sensor:
    register_type: holding
    value_type: U_WORD
    accuracy_decimals: 0
-#    on_value:
+    on_value:
-#      then:
+      then:
-#        - lambda: |-
+        - lambda: |-
-#            id(model_name).publish_state(value_accuracy_to_string(x, 0));
+            id(model_name).publish_state(value_accuracy_to_string(x, 0));
  - platform: modbus_controller
    name: "Serial Number"
@@ -223,9 +213,9 @@ sensor:
    unit_of_measurement: "W"
    register_type: holding
    value_type: U_DWORD
-    accuracy_decimals: ${${model}_power_accuracy}
+    accuracy_decimals: 2
    filters:
-      - multiply: ${${model}_power_multiplier}
+      - multiply: 0.01
  - platform: modbus_controller
    modbus_controller_id: powersupply
@@ -236,9 +226,9 @@ sensor:
    unit_of_measurement: "V"
    register_type: holding
    value_type: U_WORD
-    accuracy_decimals: 2
+    accuracy_decimals: ${${model}_voltage_accuracy}
    filters:
-      - multiply: 0.01
+      - multiply: ${${model}_voltage_multiplier}
  - platform: modbus_controller
    modbus_controller_id: powersupply
@@ -276,9 +266,9 @@ sensor:
    unit_of_measurement: "V"
    register_type: holding
    value_type: U_WORD
-    accuracy_decimals: 2
+    accuracy_decimals: ${${model}_voltage_accuracy}
    filters:
-      - multiply: 0.01
+      - multiply: ${${model}_voltage_multiplier}
  - platform: modbus_controller
    name: "Temperature"
@@ -11,7 +11,7 @@
    host: !secret router_ip
    community: !secret router_community
 #    baseoid: .1.3.6.1.2.1.31.1.1.1.6.511
-    baseoid: .1.3.6.1.2.1.2.2.1.10.12
+    baseoid: .1.3.6.1.2.1.2.2.1.10.25
    version: 2c
    unit_of_measurement: "Octets"
  - platform: snmp
@@ -20,7 +20,7 @@
    host: !secret router_ip
    community: !secret router_community
 #    baseoid: .1.3.6.1.2.1.31.1.1.1.10.511
-    baseoid: .1.3.6.1.2.1.2.2.1.16.12
+    baseoid: .1.3.6.1.2.1.2.2.1.16.25
    version: 2c
    unit_of_measurement: "Octets"