Add switchable clock display page

esphome/energymonitor.yaml

@@ -118,6 +118,12 @@ font:
     glyphsets:
       - GF_Latin_Kernel
     glyphs: ["äöüÄÖÜß"]
+  - file: "fonts/Roboto-Regular.ttf"
+    id: font_device
+    size: 13
+    glyphsets:
+      - GF_Latin_Kernel
+    glyphs: ["äöüÄÖÜß"]
   - file: "fonts/materialdesignicons-webfont.ttf"
     id: font_icon
     size: 24
@@ -143,6 +149,14 @@ globals:
     type: bool
     restore_value: true
     initial_value: 'false'
+  - id: clock_digital_view
+    type: bool
+    restore_value: true
+    initial_value: 'false'
+  - id: device_usage_view
+    type: int
+    restore_value: true
+    initial_value: '0'
 
 sensor:
   # WiFi signal strength
@@ -170,10 +184,120 @@ sensor:
     id: grid_export_energy_daily
     entity_id: sensor.energy_export_daily
     internal: true
+  - platform: homeassistant
+    id: hallway_fragrance_power
+    entity_id: sensor.flur_raumduft_power
+    internal: true
+  - platform: homeassistant
+    id: cellar_power
+    entity_id: sensor.keller_power
+    internal: true
+  - platform: homeassistant
+    id: sideboard_power
+    entity_id: sensor.kuche_anrichte_power
+    internal: true
+  - platform: homeassistant
+    id: kitchen_music_power
+    entity_id: sensor.kuche_musik_power
+    internal: true
+  - platform: homeassistant
+    id: bedroom_bed_power
+    entity_id: sensor.schlafzimmer_bett_power
+    internal: true
+  - platform: homeassistant
+    id: bedroom_cinema_power
+    entity_id: sensor.schlafzimmer_heimkino_power
+    internal: true
+  - platform: homeassistant
+    id: desk_decoration_power
+    entity_id: sensor.schreibtisch_deko_power
+    internal: true
+  - platform: homeassistant
+    id: desk_power
+    entity_id: sensor.schreibtisch_power
+    internal: true
+  - platform: homeassistant
+    id: server_room_power
+    entity_id: sensor.serverraum_power
+    internal: true
+  - platform: homeassistant
+    id: living_room_cinema_power
+    entity_id: sensor.wohnzimmer_heimkino_power
+    internal: true
+  - platform: homeassistant
+    id: games_cabinet_power
+    entity_id: sensor.wohnzimmer_spieleschrank_power
+    internal: true
+  - platform: homeassistant
+    id: refrigerator_power
+    entity_id: sensor.tz3000_ww6drja5_ts011f_leistung
+    internal: true
+  - platform: homeassistant
+    id: coffee_machine_power
+    entity_id: sensor.kaffeemaschine_leistung_2
+    internal: true
+  - platform: homeassistant
+    id: dryer_power
+    entity_id: sensor.ikea_of_sweden_inspelning_smart_plug_leistung
+    internal: true
+  - platform: homeassistant
+    id: washing_machine_power
+    entity_id: sensor.waschmaschine_leistung
+    internal: true
+  - platform: homeassistant
+    id: arcade_power
+    entity_id: sensor.arcade_automat_leistung
+    internal: true
+  - platform: homeassistant
+    id: dishwasher_power
+    entity_id: sensor.spulmaschine_leistung
+    internal: true
+  - platform: homeassistant
+    id: microwave_power
+    entity_id: sensor.waschetrockner_leistung
+    internal: true
   - platform: wireguard
     latest_handshake:
       name: 'WireGuard Latest Handshake'
 
+script:
+  - id: show_previous_page
+    then:
+      - lambda: id(page_index) = (id(page_index) + 3 - 1) % 3;
+      - component.update: tft
+  - id: toggle_page_mode
+    then:
+      - lambda: |-
+          if (id(page_index) == 0) {
+            id(page_one_gauge_view) = !id(page_one_gauge_view);
+          } else if (id(page_index) == 1) {
+            id(device_usage_view) = (id(device_usage_view) + 1) % 2;
+          } else {
+            id(clock_digital_view) = !id(clock_digital_view);
+          }
+      - component.update: tft
+  - id: show_next_page
+    then:
+      - lambda: id(page_index) = (id(page_index) + 1) % 3;
+      - component.update: tft
+
+button:
+  - platform: template
+    name: "Zurück"
+    icon: mdi:arrow-left
+    on_press:
+      - script.execute: show_previous_page
+  - platform: template
+    name: "Modus"
+    icon: mdi:view-dashboard-outline
+    on_press:
+      - script.execute: toggle_page_mode
+  - platform: template
+    name: "Weiter"
+    icon: mdi:arrow-right
+    on_press:
+      - script.execute: show_next_page
+
 binary_sensor:
   - platform: wireguard
     status:
@@ -181,7 +305,7 @@ binary_sensor:
   - platform: wireguard
     enabled:
       name: 'WireGuard Enabled'
-  # M5Stack Core button B (middle) toggles the alternate gauge view on page one.
+  # M5Stack Core button B (middle) switches the current page's view.
   - platform: gpio
     pin:
       number: GPIO38
@@ -189,9 +313,7 @@ binary_sensor:
       inverted: true
     id: button_middle
     on_press:
-      then:
-        - lambda: id(page_one_gauge_view) = !id(page_one_gauge_view);
-        - component.update: tft
+      - script.execute: toggle_page_mode
 
   # M5Stack Core button A (left). GPIO39 is input-only and has an external pull-up.
   - platform: gpio
@@ -201,10 +323,7 @@ binary_sensor:
       inverted: true
     id: button_left
     on_press:
-      then:
-        - lambda: |-
-            id(page_index) = (id(page_index) + 2 - 1) % 2;
-        - component.update: tft
+      - script.execute: show_previous_page
   # M5Stack Core button C (right). GPIO37 is input-only and has an external pull-up.
   - platform: gpio
     pin:
@@ -213,10 +332,7 @@ binary_sensor:
       inverted: true
     id: button_right
     on_press:
-      then:
-        - lambda: |-
-            id(page_index) = (id(page_index) + 1) % 2;
-        - component.update: tft
+      - script.execute: show_next_page
 
 text_sensor:
   - platform: wireguard
@@ -352,11 +468,167 @@ display:
         } else {
           it.printf(gauge_center_x, 169, id(font_title), solar_gauge_color, TextAlign::TOP_CENTER, "-- 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");
+      } else if (id(page_index) == 1) {
+        // Page 2 lists nine consumers at once in two columns; button B changes group.
+        const int device_count = 18;
+        const int usage_group = id(device_usage_view);
+        const int page_start = usage_group * 9;
+        const char *device_names[device_count] = {
+            "Raumduft", "Keller", "Anrichte", "Musik", "Bett", "HK Schlafzimmer",
+            "Deko", "Schreibtisch", "Serverraum", "HK Wohnzimmer", "Spieleschrank",
+            "Kühlschrank", "Kaffeemaschine", "Wäschetrockner", "Waschmaschine", "Arcade",
+            "Spülmaschine", "Mikrowelle"};
+        float device_values[device_count] = {
+            id(hallway_fragrance_power).state, id(cellar_power).state, id(sideboard_power).state,
+            id(kitchen_music_power).state, id(bedroom_bed_power).state, id(bedroom_cinema_power).state,
+            id(desk_decoration_power).state, id(desk_power).state, id(server_room_power).state,
+            id(living_room_cinema_power).state, id(games_cabinet_power).state, id(refrigerator_power).state,
+            id(coffee_machine_power).state, id(dryer_power).state, id(washing_machine_power).state,
+            id(arcade_power).state, id(dishwasher_power).state, id(microwave_power).state};
+        bool device_has_state[device_count] = {
+            id(hallway_fragrance_power).has_state(), id(cellar_power).has_state(), id(sideboard_power).has_state(),
+            id(kitchen_music_power).has_state(), id(bedroom_bed_power).has_state(), id(bedroom_cinema_power).has_state(),
+            id(desk_decoration_power).has_state(), id(desk_power).has_state(), id(server_room_power).has_state(),
+            id(living_room_cinema_power).has_state(), id(games_cabinet_power).has_state(), id(refrigerator_power).has_state(),
+            id(coffee_machine_power).has_state(), id(dryer_power).has_state(), id(washing_machine_power).has_state(),
+            id(arcade_power).has_state(), id(dishwasher_power).has_state(), id(microwave_power).has_state()};
+        Color device_colors[device_count] = {
+            Color(255, 170, 40), Color(69, 189, 255), Color(170, 116, 217), Color(93, 207, 140),
+            Color(238, 112, 112), Color(107, 139, 255), Color(255, 130, 180), Color(122, 204, 174),
+            Color(240, 195, 90), Color(151, 120, 220), Color(91, 189, 193), Color(212, 132, 82),
+            Color(143, 190, 223), Color(233, 106, 142), Color(132, 205, 92), Color(255, 181, 80),
+            Color(111, 167, 229), Color(190, 137, 226)};
+
+        // The title uses the free area to the left of the status indicators.
+        it.printf(12, 10, id(font_device), Color::WHITE, "Geräteverbrauch");
+        for (int display_index = 0; display_index < 9; display_index++) {
+          const int index = page_start + display_index;
+          const int column = display_index % 2;
+          const int row = display_index / 2;
+          const int x = column == 0 ? 12 : 166;
+          const int y = 43 + row * 25;
+          if (device_has_state[index]) {
+            it.printf(x, y, id(font_device), device_colors[index], "%s: %.0f W",
+                      device_names[index], device_values[index]);
+          } else {
+            it.printf(x, y, id(font_device), device_colors[index], "%s: -- W", device_names[index]);
+          }
+        }
+
+        // The stacked bar always represents all 18 consumer devices, not only this view's rows.
+        const int bar_x = 12;
+        const int bar_y = 180;
+        const int bar_width = 296;
+        const int bar_height = 18;
+        float usage_sum = 0.0f;
+        int last_active = -1;
+        for (int index = 0; index < device_count; index++) {
+          if (device_has_state[index] && device_values[index] > 0.0f) {
+            usage_sum += device_values[index];
+            last_active = index;
+          }
+        }
+        it.filled_rectangle(bar_x, bar_y, bar_width, bar_height, Color(42, 42, 42));
+        if (usage_sum > 0.0f) {
+          int cursor_x = bar_x;
+          for (int index = 0; index < device_count; index++) {
+            if (!device_has_state[index] || device_values[index] <= 0.0f) continue;
+            const int segment_width = index == last_active
+                ? bar_x + bar_width - cursor_x
+                : static_cast<int>(device_values[index] * bar_width / usage_sum);
+            if (segment_width > 0) {
+              it.filled_rectangle(cursor_x, bar_y, segment_width, bar_height, device_colors[index]);
+              cursor_x += segment_width;
+            }
+          }
+        }
+      }
+
+      if (id(page_index) == 2) {
+        const auto now = id(sntp_time).now();
+        const Color accent(143, 190, 223);
+        const Color gold(255, 170, 40);
+        const Color muted(55, 65, 80);
+        it.print(12, 10, id(font_device), accent, "Uhr · Berlin");
+        if (!now.is_valid()) {
+          it.print(160, 100, id(font_title), accent, TextAlign::TOP_CENTER, "--:--:--");
+          it.print(160, 190, id(font_small), Color::WHITE, TextAlign::TOP_CENTER,
+                   "Warte auf Zeitsynchronisation");
+        } else {
+          if (!id(clock_digital_view)) {
+            const int cx = 160, cy = 111, radius = 74;
+            const float tau = 6.28318530718f;
+            it.filled_circle(cx, cy, radius, Color(12, 18, 28));
+            it.circle(cx, cy, radius, accent);
+            it.circle(cx, cy, radius - 3, muted);
+            for (int tick = 0; tick < 60; tick++) {
+              const float angle = tick * tau / 60.0f;
+              const int inner = tick % 5 == 0 ? radius - 13 : radius - 8;
+              it.line(cx + lroundf(sinf(angle) * inner), cy - lroundf(cosf(angle) * inner),
+                      cx + lroundf(sinf(angle) * (radius - 5)),
+                      cy - lroundf(cosf(angle) * (radius - 5)),
+                      tick % 5 == 0 ? accent : muted);
+            }
+            it.print(cx, cy - 49, id(font_device), Color::WHITE, TextAlign::CENTER, "12");
+            it.print(cx + 50, cy, id(font_device), Color::WHITE, TextAlign::CENTER, "3");
+            it.print(cx, cy + 49, id(font_device), Color::WHITE, TextAlign::CENTER, "6");
+            it.print(cx - 50, cy, id(font_device), Color::WHITE, TextAlign::CENTER, "9");
+            // Round-ended hands; minutes and hours advance with the seconds.
+            auto hand = [&](float turns, int length, int thickness, Color color) {
+              const float angle = turns * tau;
+              for (int r = 0; r <= length; r++) {
+                it.filled_circle(cx + lroundf(sinf(angle) * r),
+                                 cy - lroundf(cosf(angle) * r), thickness, color);
+              }
+            };
+            hand((now.hour % 12 + now.minute / 60.0f + now.second / 3600.0f) / 12.0f,
+                 34, 3, Color::WHITE);
+            hand((now.minute + now.second / 60.0f) / 60.0f, 51, 2, accent);
+            const float second_angle = now.second * tau / 60.0f;
+            it.line(cx - lroundf(sinf(second_angle) * 12), cy + lroundf(cosf(second_angle) * 12),
+                    cx + lroundf(sinf(second_angle) * 60), cy - lroundf(cosf(second_angle) * 60), gold);
+            it.filled_circle(cx, cy, 4, gold);
+            it.filled_circle(cx, cy, 1, Color::BLACK);
+          } else {
+            // Draw seven-segment digits directly, avoiding an extra font dependency.
+            const uint8_t masks[10] = {0x3F, 0x06, 0x5B, 0x4F, 0x66,
+                                       0x6D, 0x7D, 0x07, 0x7F, 0x6F};
+            const int digits[6] = {now.hour / 10, now.hour % 10, now.minute / 10,
+                                   now.minute % 10, now.second / 10, now.second % 10};
+            const int positions[6] = {17, 61, 121, 165, 225, 269};
+            const int y = 77;
+            for (int digit = 0; digit < 6; digit++) {
+              const int x = positions[digit];
+              const Color lit = digit < 4 ? accent : gold;
+              for (int segment = 0; segment < 7; segment++) {
+                const Color color = (masks[digits[digit]] & (1 << segment))
+                    ? lit : Color(20, 27, 36);
+                const bool horizontal = segment == 0 || segment == 3 || segment == 6;
+                const int sx = horizontal ? x + 6 : x + ((segment == 1 || segment == 2) ? 30 : 0);
+                const int sy = y + (segment == 0 ? 0 : segment == 3 ? 72 : segment == 6 ? 36
+                    : (segment == 1 || segment == 5) ? 6 : 42);
+                // Taper each segment's ends for the classic LED clock shape.
+                for (int stripe = 0; stripe < 6; stripe++) {
+                  const int inset = stripe < 3 ? 2 - stripe : stripe - 3;
+                  if (horizontal)
+                    it.line(sx + inset, sy + stripe, sx + 23 - inset, sy + stripe, color);
+                  else
+                    it.line(sx + stripe, sy + inset, sx + stripe, sy + 29 - inset, color);
+                }
+              }
+            }
+            for (int x : {109, 213}) {
+              it.filled_circle(x, y + 24, 3, accent);
+              it.filled_circle(x, y + 54, 3, accent);
+            }
+            it.line(40, 172, 280, 172, muted);
+          }
+          const char *weekdays[] = {"Sonntag", "Montag", "Dienstag", "Mittwoch",
+                                     "Donnerstag", "Freitag", "Samstag"};
+          it.printf(160, 190, id(font_small), Color::WHITE, TextAlign::TOP_CENTER,
+                    "%s, %02d.%02d.%04d", weekdays[now.day_of_week - 1],
+                    now.day_of_month, now.month, now.year);
+        }
       }
 
       // Labels correspond to the left (A) and right (C) hardware buttons.
@@ -366,8 +638,11 @@ display:
                 "Weiter >");
       if (id(page_index) == 0) {
         it.printf(160, 239, id(font_small), Color::WHITE, TextAlign::BOTTOM_CENTER,
-                  "Ansicht · 1 / 2");
+                  "Ansicht · 1 / 3");
+      } else if (id(page_index) == 1) {
+        it.printf(160, 239, id(font_small), Color::WHITE, TextAlign::BOTTOM_CENTER,
+                  "Geräte %d / 2", id(device_usage_view) + 1);
       } else {
         it.printf(160, 239, id(font_small), Color::WHITE, TextAlign::BOTTOM_CENTER,
-                  "2 / 2");
+                  "%s · 3 / 3", id(clock_digital_view) ? "Analog" : "Digital");
       }

esphome/lab-ble-proxy.yaml

@@ -27,10 +27,16 @@ esphome:
   includes:
     - lab-ble-proxy.h
   on_boot:
-    priority: 850
-    then:
-      - lambda: |-
-          owon_b35t::core2_axp192_init(id(core2_i2c));
+    - priority: 850
+      then:
+        - lambda: |-
+            owon_b35t::core2_axp192_init(id(core2_i2c));
+    # Start the normal dimming/off cycle after a cold boot as well. The
+    # light component is initialized by this priority, while BLE callbacks
+    # and touch events can still restart the script through wake_backlight.
+    - priority: 600
+      then:
+        - script.execute: backlight_idle
   project:
     name: "custom.lab-ble-proxy-m5stack-core2"
     version: "1.0"