From 9f20c9f59e6ec9d3cfa58b7c2ede3561d3e448e4 Mon Sep 17 00:00:00 2001
From: Tony Stork <tm24fan8@gmail.com>
Date: Sat, 13 Dec 2025 20:30:29 -0500
Subject: [PATCH] Update to accommodate changes to E's bedroom climate
 automation

home_automation/Home-Assistant-Configs#256
---
 admin_dashboard.yaml  | 261 +++++++++++++++++++++++++-----------------
 main_dashboard.yaml   |   6 +
 mobile_dashboard.yaml |  21 ++--
 3 files changed, 167 insertions(+), 121 deletions(-)

diff --git a/admin_dashboard.yaml b/admin_dashboard.yaml
index d62c136..51b9d83 100644
--- a/admin_dashboard.yaml
+++ b/admin_dashboard.yaml
@@ -919,8 +919,8 @@ views:
             heading: Emma
           - type: entities
             entities:
-              - entity: input_datetime.emma_bedroom_cooling
-                name: Cooling
+              - entity: input_datetime.emma_bedroom_climate
+                name: Climate
               - entity: input_datetime.emma_bedtime
                 name: Bedtime
               - entity: input_datetime.emma_wakeup
@@ -982,112 +982,6 @@ views:
             title: Modes
             show_header_toggle: false
             state_color: true
-          - type: entities
-            entities:
-              - entity: input_number.master_bedroom_aircon_run_threshold
-                name: Run Threshold
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_aircon_run_threshold') |
-                  int %} {% set low = states('sensor.tonights_low_temp') | int
-                  %} {{ 'Threshold Met' if low >= threshold else '' }}
-              - entity: input_number.master_bedroom_aircon_mode_threshold
-                name: Mode Threshold
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_aircon_mode_threshold') |
-                  int %} {% set low = states('sensor.tonights_low_temp') | int
-                  %} {{ 'Threshold Met' if low >= threshold else '' }}
-              - entity: input_number.master_bedroom_auto_cooling_threshold
-                name: MBR Auto Cooling
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_auto_cooling_threshold') |
-                  int %} {% set roomtemp =
-                  states('sensor.master_bedroom_temperature') | int %} {{
-                  'Threshold Met' if roomtemp >= threshold else '' }}
-              - entity: input_number.master_bedroom_mode_switch_threshold
-                name: MBR Mode Switch
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_mode_switch_threshold') |
-                  int %} {% set high = states('sensor.todays_high_temp') | int
-                  %} {{ 'Threshold Met' if high >= threshold else '' }}
-              - entity: input_boolean.master_bedroom_aircon_installed
-                name: Aircon Installed
-              - entity: input_boolean.master_bedroom_climate_protocol
-                name: Climate Automations
-            title: Master Bedroom Aircon
-            visibility:
-              - condition: state
-                entity: input_boolean.master_bedroom_aircon_installed
-                state: 'on'
-            show_header_toggle: false
-            state_color: true
-          - type: entities
-            entities:
-              - entity: input_number.emma_bedroom_aircon_run_threshold
-                name: Run Threshold
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.emma_bedroom_aircon_run_threshold') | int
-                  %} {% set low = states('sensor.tonights_low_temp') | int %} {{
-                  'Threshold Met' if low >= threshold else '' }}
-              - entity: input_number.emma_bedroom_aircon_mode_threshold
-                name: Mode Threshold
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.emma_bedroom_aircon_mode_threshold') |
-                  int %} {% set low = states('sensor.tonights_low_temp') | int
-                  %} {{ 'Threshold Met' if low >= threshold else '' }}
-              - entity: input_number.emma_bedroom_auto_cooling_threshold
-                name: EBR Auto Cooling
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.emma_bedroom_auto_cooling_threshold') |
-                  int %} {% set roomtemp =
-                  states('sensor.emma_bedroom_temperature') | int %} {{
-                  'Threshold Met' if roomtemp >= threshold else '' }}
-              - entity: input_number.emma_bedroom_mode_switch_threshold
-                name: EBR Mode Switch
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.emma_bedroom_mode_switch_threshold') |
-                  int %} {% set high = states('sensor.todays_high_temp') | int
-                  %} {{ 'Threshold Met' if high >= threshold else '' }}
-              - entity: input_boolean.emma_bedroom_aircon_installed
-                name: Aircon Installed
-              - entity: input_boolean.emma_bedroom_heater_installed
-                name: Heater Installed
-              - entity: input_boolean.emma_bedroom_climate_protocol
-                name: Climate Automations
-              - entity: switch.emma_bedroom_climate_watchdog
-                name: Climate Watchdog
-            title: Emma Bedroom Aircon
-            visibility:
-              - condition: state
-                entity: input_boolean.emma_bedroom_aircon_installed
-                state: 'on'
-            show_header_toggle: false
-            state_color: true
-          - type: entities
-            entities:
-              - entity: input_number.master_bedroom_fan_threshold
-                name: MBR Fan
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_fan_threshold') | int %}
-                  {% set low = states('sensor.tonights_low_temp') | int %} {{
-                  'Threshold Met' if low >= threshold else '' }}
-              - entity: input_number.kallen_fan_threshold
-                name: Kallen Fan
-                secondary_info: >
-                  {% set threshold = states('input_number.kallen_fan_threshold')
-                  | int %} {% set low = states('sensor.tonights_low_temp') | int
-                  %} {{ 'Threshold Met' if low >= threshold else '' }}
-            title: Fans
-            show_header_toggle: false
-            state_color: true
           - type: entities
             entities:
               - entity: input_number.hot_day_threshold
@@ -1140,6 +1034,157 @@ views:
             state_color: true
             title: Weather
         column_span: 1
+      - type: grid
+        cards:
+          - type: heading
+            heading: Master Bedroom Climate Settings
+            heading_style: title
+          - type: entities
+            entities:
+              - entity: input_boolean.master_bedroom_climate_protocol
+                name: Climate Automations
+              - entity: input_boolean.master_bedroom_aircon_installed
+                name: Aircon Installed
+            title: General
+            show_header_toggle: false
+            state_color: true
+          - type: entities
+            entities:
+              - entity: input_number.master_bedroom_fan_threshold
+                name: Fan
+              - entity: input_number.master_bedroom_aircon_run_threshold
+                name: Aircon Run
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.master_bedroom_aircon_run_threshold') |
+                  int %} {% set low = states('sensor.tonights_low_temp') | int
+                  %} {{ 'Threshold Met' if low >= threshold else '' }}
+              - entity: input_number.master_bedroom_aircon_mode_threshold
+                name: Aircon Mode
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.master_bedroom_aircon_mode_threshold') |
+                  int %} {% set low = states('sensor.tonights_low_temp') | int
+                  %} {{ 'Threshold Met' if low >= threshold else '' }}
+              - entity: input_number.master_bedroom_auto_cooling_threshold
+                name: Auto Cooling
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.master_bedroom_auto_cooling_threshold') |
+                  int %} {% set roomtemp =
+                  states('sensor.master_bedroom_temperature') | int %} {{
+                  'Threshold Met' if roomtemp >= threshold else '' }}
+              - entity: input_number.master_bedroom_mode_switch_threshold
+                name: Mode Switch
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.master_bedroom_mode_switch_threshold') |
+                  int %} {% set high = states('sensor.todays_high_temp') | int
+                  %} {{ 'Threshold Met' if high >= threshold else '' }}
+              - entity: input_boolean.master_bedroom_aircon_installed
+                name: Aircon Installed
+            title: Aircon Settings
+            visibility:
+              - condition: state
+                entity: input_boolean.master_bedroom_aircon_installed
+                state: 'on'
+            show_header_toggle: false
+            state_color: true
+      - type: grid
+        cards:
+          - type: heading
+            heading: Kallen Bedroom Climate Settings
+            heading_style: title
+          - type: entities
+            entities:
+              - entity: input_number.kallen_fan_threshold
+                name: Kallen Fan
+                secondary_info: >
+                  {% set threshold = states('input_number.kallen_fan_threshold')
+                  | int %} {% set low = states('sensor.tonights_low_temp') | int
+                  %} {{ 'Threshold Met' if low >= threshold else '' }}
+            title: Fan Settings
+            show_header_toggle: false
+            state_color: true
+      - type: grid
+        cards:
+          - type: heading
+            heading: Emma Bedroom Climate Settings
+            heading_style: title
+          - type: entities
+            entities:
+              - entity: input_boolean.emma_bedroom_climate_protocol
+                name: Climate Automations
+              - entity: input_boolean.emma_bedroom_aircon_installed
+                name: Aircon Installed
+              - entity: input_boolean.emma_bedroom_heater_installed
+                name: Heater Installed
+            show_header_toggle: false
+            state_color: true
+            title: General
+          - type: entities
+            entities:
+              - entity: input_number.emma_bedroom_aircon_run_threshold
+                name: Run Threshold
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.emma_bedroom_aircon_run_threshold') | int
+                  %} {% set low = states('sensor.tonights_low_temp') | int %} {{
+                  'Threshold Met' if low >= threshold else '' }}
+              - entity: input_number.emma_bedroom_aircon_mode_threshold
+                name: Mode Threshold
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.emma_bedroom_aircon_mode_threshold') |
+                  int %} {% set low = states('sensor.tonights_low_temp') | int
+                  %} {{ 'Threshold Met' if low >= threshold else '' }}
+              - entity: input_number.emma_bedroom_auto_cooling_threshold
+                name: EBR Auto Cooling
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.emma_bedroom_auto_cooling_threshold') |
+                  int %} {% set roomtemp =
+                  states('sensor.emma_bedroom_temperature') | int %} {{
+                  'Threshold Met' if roomtemp >= threshold else '' }}
+              - entity: input_number.emma_bedroom_mode_switch_threshold
+                name: EBR Mode Switch
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.emma_bedroom_mode_switch_threshold') |
+                  int %} {% set high = states('sensor.todays_high_temp') | int
+                  %} {{ 'Threshold Met' if high >= threshold else '' }}
+              - entity: switch.emma_bedroom_climate_watchdog
+                name: Climate Watchdog
+            title: Aircon Settings
+            visibility:
+              - condition: state
+                entity: input_boolean.emma_bedroom_aircon_installed
+                state: 'on'
+            show_header_toggle: false
+            state_color: true
+          - type: entities
+            entities:
+              - entity: input_number.emma_bedroom_heater_run_threshold
+                name: Run Threshold
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.emma_bedroom_heater_run_threshold') | int
+                  %} {% set low = states('sensor.tonights_low_temp') | int %} {{
+                  'Threshold Met' if low < threshold else '' }}
+              - entity: input_number.emma_bedroom_heater_shutoff_threshold
+                name: Shutoff Threshold
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.emma_bedroom_heater_shutoff_threshold') |
+                  int %} {% set low = states('sensor.tonights_low_temp') | int
+                  %} {{ 'Threshold Met' if low >= threshold else '' }}
+            title: Heater Settings
+            visibility:
+              - condition: state
+                entity: input_boolean.emma_bedroom_heater_installed
+                state: 'on'
+            show_header_toggle: false
+            state_color: true
       - type: grid
         cards:
           - type: heading
diff --git a/main_dashboard.yaml b/main_dashboard.yaml
index cd427af..4d9baf7 100644
--- a/main_dashboard.yaml
+++ b/main_dashboard.yaml
@@ -3552,6 +3552,9 @@ views:
             users:
               - f387a983651a4321a7411ff8cf36f949
               - c3909d27048140729f002aaef0391775
+          - condition: state
+            entity: input_boolean.master_bedroom_aircon_installed
+            state: ''
       - type: grid
         cards:
           - type: heading
@@ -3595,6 +3598,9 @@ views:
             users:
               - f387a983651a4321a7411ff8cf36f949
               - c3909d27048140729f002aaef0391775
+          - condition: state
+            entity: input_boolean.emma_bedroom_aircon_installed
+            state: 'on'
       - type: grid
         cards:
           - type: heading
diff --git a/mobile_dashboard.yaml b/mobile_dashboard.yaml
index 369f196..824cd5a 100644
--- a/mobile_dashboard.yaml
+++ b/mobile_dashboard.yaml
@@ -6385,22 +6385,24 @@ views:
                   - c3909d27048140729f002aaef0391775
           - type: entities
             entities:
+              - entity: input_number.master_bedroom_fan_threshold
+                name: Fan
               - entity: input_number.master_bedroom_aircon_run_threshold
-                name: Run Threshold
+                name: Aircon Run
                 secondary_info: >
                   {% set threshold =
                   states('input_number.master_bedroom_aircon_run_threshold') |
                   int %} {% set low = states('sensor.tonights_low_temp') | int
                   %} {{ 'Threshold Met' if low >= threshold else '' }}
               - entity: input_number.master_bedroom_aircon_mode_threshold
-                name: Mode Threshold
+                name: Aircon Mode
                 secondary_info: >
                   {% set threshold =
                   states('input_number.master_bedroom_aircon_mode_threshold') |
                   int %} {% set low = states('sensor.tonights_low_temp') | int
                   %} {{ 'Threshold Met' if low >= threshold else '' }}
               - entity: input_number.master_bedroom_auto_cooling_threshold
-                name: MBR Auto Cooling
+                name: Auto Cooling
                 secondary_info: >
                   {% set threshold =
                   states('input_number.master_bedroom_auto_cooling_threshold') |
@@ -6408,19 +6410,12 @@ views:
                   states('sensor.master_bedroom_temperature') | int %} {{
                   'Threshold Met' if roomtemp >= threshold else '' }}
               - entity: input_number.master_bedroom_mode_switch_threshold
-                name: MBR Mode Switch
+                name: Mode Switch
                 secondary_info: >
                   {% set threshold =
                   states('input_number.master_bedroom_mode_switch_threshold') |
                   int %} {% set high = states('sensor.todays_high_temp') | int
                   %} {{ 'Threshold Met' if high >= threshold else '' }}
-              - entity: input_number.master_bedroom_fan_threshold
-                name: MBR Fan
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_fan_threshold') | int %}
-                  {% set low = states('sensor.tonights_low_temp') | int %} {{
-                  'Threshold Met' if low >= threshold else '' }}
               - entity: input_boolean.master_bedroom_aircon_installed
                 name: Aircon Installed
               - entity: input_boolean.master_bedroom_climate_protocol
@@ -6494,8 +6489,8 @@ views:
             entities:
               - entity: input_select.scheduled_climate_mode_emma_bedroom
                 name: Scheduled Mode
-              - entity: input_datetime.emma_bedroom_cooling
-                name: Cooling
+              - entity: input_datetime.emma_bedroom_climate
+                name: Climate
               - entity: input_boolean.emma_bedroom_climate_override
                 name: Climate Schedule Override
             state_color: true