Fix handling of MLB rain delays, close #252

home_automation/HA-NerdFlows#32

.HA_VERSION

@@ -1 +1 @@
-2025.3.3
+2025.6.2

blueprints/automation/Twanne/smart_lux_dimmer.yaml

@@ -1,7 +1,7 @@
 blueprint:
   name: Smart Lux Dimmer
   author: AntonH
-  description: 'Version 4.1
+  description: 'Version 4.3
 
     Switch or dim lights based on the value of a light sensor.
 
@@ -24,7 +24,8 @@ blueprint:
         value?
       selector:
         entity:
-          domain:
+          filter:
+          - domain:
             - sensor
             device_class:
             - illuminance
@@ -81,8 +82,8 @@ blueprint:
           min: 0.0
           max: 100.0
           step: 1.0
-          mode: slider
           unit_of_measurement: '%'
+          mode: slider
     light_value_2:
       name: Brightness at minimum light level
       description: Brightness of the light at minimum ambient light.
@@ -92,8 +93,8 @@ blueprint:
           min: 0.0
           max: 100.0
           step: 1.0
-          mode: slider
           unit_of_measurement: '%'
+          mode: slider
     transition_time:
       name: Transition time
       description: 'The time it takes for the light to transition from the set value
@@ -124,9 +125,9 @@ blueprint:
             value: include_color
           - label: Set temperature
             value: include_temp
-          multiple: false
-          sort: false
           custom_value: false
+          sort: false
+          multiple: false
     light_color:
       name: Light color
       description: Color of the light when between minimum and maximum ambient light
@@ -161,8 +162,8 @@ blueprint:
           min: 0.0
           max: 100.0
           step: 1.0
-          mode: slider
           unit_of_measurement: '%'
+          mode: slider
     light_brightness_under_min:
       name: Brightness when ambient light value under min.
       description: Brightness of the light when the ambient light is lower than the
@@ -173,8 +174,8 @@ blueprint:
           min: 0.0
           max: 100.0
           step: 1.0
-          mode: slider
           unit_of_measurement: '%'
+          mode: slider
     include_color_or_temp_over_under:
       name: Include color or temperature values when outside range
       description: 'Set a color or temperature value for the light when over maximum
@@ -193,9 +194,9 @@ blueprint:
             value: include_color_outside_range
           - label: Set temperature when outside range
             value: include_temp_outside_range
-          multiple: false
-          sort: false
           custom_value: false
+          sort: false
+          multiple: false
     light_color_over_max:
       name: Color when ambient light value over max.
       description: Color of the light when the ambient light is higher than the set
@@ -236,18 +237,25 @@ variables:
   include_brightness_over_under: !input include_brightness_over_under
   include_color_or_temp_over_under: !input include_color_or_temp_over_under
   light_sensor: !input light_sensor_entity
-  maxB: !input max_brightness_value
-  minB: !input min_brightness_value
-  light1: !input light_value_1
-  light2: !input light_value_2
+  max_brightness_value: !input max_brightness_value
+  min_brightness_value: !input min_brightness_value
+  maxB: '{{ max_brightness_value * 2.55 }}'
+  minB: '{{ min_brightness_value * 2.55 }}'
+  light_value_1: !input light_value_1
+  light_value_2: !input light_value_2
+  light1: '{{ light_value_1 * 2.55 }}'
+  light2: '{{ light_value_2 * 2.55 }}'
   slope: '{{ ( light1 - light2 ) / ( maxB - minB ) }}'
   constant: '{{ light1 - ( slope * maxB ) }}'
-trigger:
-  platform: state
+  light_brightness_over_max: !input light_brightness_over_max
+  light_brightness_under_min: !input light_brightness_under_min
+  brightness_over_max_pct: '{{ light_brightness_over_max * 2.55 }}'
+  brightness_under_min_pct: '{{ light_brightness_under_min * 2.55 }}'
+triggers:
+  trigger: state
   entity_id: !input light_sensor_entity
-condition:
-- condition: !input run_conditions
-action:
+conditions: !input run_conditions
+actions:
 - choose:
   - conditions:
     - condition: template
@@ -258,20 +266,20 @@ action:
         - condition: template
           value_template: '{{ include_color_or_temp == "include_no_color_temp" }}'
         sequence:
-        - service: light.turn_on
+        - action: light.turn_on
           data:
             transition: !input transition_time
-            brightness_pct: '{{ (( slope * states(light_sensor)|int ) + constant)|round
+            brightness: '{{ (( slope * states(light_sensor)|int ) + constant)|round
               }}'
           target: !input target_light
       - conditions:
         - condition: template
           value_template: '{{ include_color_or_temp == "include_color" }}'
         sequence:
-        - service: light.turn_on
+        - action: light.turn_on
           data:
             transition: !input transition_time
-            brightness_pct: '{{ (( slope * states(light_sensor)|int ) + constant)|round
+            brightness: '{{ (( slope * states(light_sensor)|int ) + constant)|round
               }}'
             rgb_color: !input light_color
           target: !input target_light
@@ -279,10 +287,10 @@ action:
         - condition: template
           value_template: '{{ include_color_or_temp == "include_temp" }}'
         sequence:
-        - service: light.turn_on
+        - action: light.turn_on
           data:
             transition: !input transition_time
-            brightness_pct: '{{ (( slope * states(light_sensor)|int ) + constant)|round
+            brightness: '{{ (( slope * states(light_sensor)|int ) + constant)|round
               }}'
             color_temp: !input light_temp
           target: !input target_light
@@ -302,20 +310,20 @@ action:
               entity_id: !input light_sensor_entity
               above: !input max_brightness_value
             sequence:
-            - service: light.turn_on
+            - action: light.turn_on
               data:
                 transition: !input transition_time
-                brightness_pct: !input light_brightness_over_max
+                brightness: '{{ brightness_over_max_pct }}'
               target: !input target_light
           - conditions:
             - condition: numeric_state
               entity_id: !input light_sensor_entity
               below: !input min_brightness_value
             sequence:
-            - service: light.turn_on
+            - action: light.turn_on
               data:
                 transition: !input transition_time
-                brightness_pct: !input light_brightness_under_min
+                brightness: '{{ brightness_under_min_pct }}'
               target: !input target_light
           - conditions:
             - condition: numeric_state
@@ -323,10 +331,10 @@ action:
               below: !input max_brightness_value
               above: !input min_brightness_value
             sequence:
-            - service: light.turn_on
+            - action: light.turn_on
               data:
                 transition: !input transition_time
-                brightness_pct: '{{ (( slope * states(light_sensor)|int ) + constant)|round
+                brightness: '{{ (( slope * states(light_sensor)|int ) + constant)|round
                   }}'
               target: !input target_light
       - conditions:
@@ -340,10 +348,10 @@ action:
               entity_id: !input light_sensor_entity
               above: !input max_brightness_value
             sequence:
-            - service: light.turn_on
+            - action: light.turn_on
               data:
                 transition: !input transition_time
-                brightness_pct: !input light_brightness_over_max
+                brightness: '{{ brightness_over_max_pct }}'
                 rgb_color: !input light_color_over_max
               target: !input target_light
           - conditions:
@@ -351,10 +359,10 @@ action:
               entity_id: !input light_sensor_entity
               below: !input min_brightness_value
             sequence:
-            - service: light.turn_on
+            - action: light.turn_on
               data:
                 transition: !input transition_time
-                brightness_pct: !input light_brightness_under_min
+                brightness: '{{ brightness_under_min_pct }}'
                 rgb_color: !input light_color_under_min
               target: !input target_light
           - conditions:
@@ -363,10 +371,10 @@ action:
               below: !input max_brightness_value
               above: !input min_brightness_value
             sequence:
-            - service: light.turn_on
+            - action: light.turn_on
               data:
                 transition: !input transition_time
-                brightness_pct: '{{ (( slope * states(light_sensor)|int ) + constant)|round
+                brightness: '{{ (( slope * states(light_sensor)|int ) + constant)|round
                   }}'
                 rgb_color: !input light_color
               target: !input target_light
@@ -381,10 +389,10 @@ action:
               entity_id: !input light_sensor_entity
               above: !input max_brightness_value
             sequence:
-            - service: light.turn_on
+            - action: light.turn_on
               data:
                 transition: !input transition_time
-                brightness_pct: !input light_brightness_over_max
+                brightness: '{{ brightness_over_max_pct }}'
                 color_temp: !input light_temp_over_max
               target: !input target_light
           - conditions:
@@ -392,10 +400,10 @@ action:
               entity_id: !input light_sensor_entity
               below: !input min_brightness_value
             sequence:
-            - service: light.turn_on
+            - action: light.turn_on
               data:
                 transition: !input transition_time
-                brightness_pct: !input light_brightness_under_min
+                brightness: '{{ brightness_under_min_pct }}'
                 color_temp: !input light_temp_under_min
               target: !input target_light
           - conditions:
@@ -404,10 +412,10 @@ action:
               below: !input max_brightness_value
               above: !input min_brightness_value
             sequence:
-            - service: light.turn_on
+            - action: light.turn_on
               data:
                 transition: !input transition_time
-                brightness_pct: '{{ (( slope * states(light_sensor)|int ) + constant)|round
+                brightness: '{{ (( slope * states(light_sensor)|int ) + constant)|round
                   }}'
                 color_temp: !input light_temp
               target: !input target_light

blueprints/automation/Twanne/smart_lux_dimmer_basic.yaml

@@ -31,9 +31,12 @@ blueprint:
         text: {}
     light_sensor_entity:
       name: Light Sensor
+      description: Which light sensor do you want to use to measure the ambient light
+        value?
       selector:
         entity:
-          domain:
+          filter:
+          - domain:
             - sensor
             device_class:
             - illuminance
@@ -94,15 +97,17 @@ variables:
   light_sensor: !input light_sensor_entity
   maxB: !input max_brightness_value
   minB: !input min_brightness_value
-  light1: !input light_value_1
-  light2: !input light_value_2
+  light_value_1: !input light_value_1
+  light_value_2: !input light_value_2
+  light1: '{{ light_value_1 * 2.55 }}'
+  light2: '{{ light_value_2 * 2.55 }}'
   slope: '{{ ( light1 - light2 ) / ( maxB - minB ) }}'
   constant: '{{ light1 - ( slope * maxB ) }}'
   days: !input schedule_days
-trigger:
-  platform: state
+triggers:
+  trigger: state
   entity_id: !input light_sensor_entity
-condition:
+conditions:
 - condition: numeric_state
   entity_id: !input light_sensor_entity
   above: !input min_brightness_value
@@ -111,9 +116,9 @@ condition:
   before: !input schedule_stop
 - condition: template
   value_template: '{{ now().strftime(''%a'') | lower in days }}'
-action:
-- service: light.turn_on
+actions:
+- action: light.turn_on
   data:
-    brightness_pct: "{% if states(light_sensor)|int > maxB %}\n  0\n{% else %}\n  {{
-      (( slope * states(light_sensor)|int ) + constant)|round }}\n{% endif %}\n"
+    brightness: "{% if states(light_sensor)|int > maxB %}\n  0\n{% else %}\n  {{ ((
+      slope * states(light_sensor)|int ) + constant)|round }}\n{% endif %}\n"
   target: !input target_light

blueprints/automation/Twanne/the_everything_light.yaml

@@ -1,7 +1,7 @@
 blueprint:
   name: The Everything Light
   author: AntonH
-  description: "**Version 2.5**\nThe Everything Light: select any trigger and turn
+  description: "**Version 2.10**\nThe Everything Light: select any trigger and turn
     on your light in multiple ways:\n  - just turn the light on in it's default state\n
     \ - turn it on with a set brightness, color and/or temperature value\n  - turn
     it on dynamically with a brightness value that changes according to an ambient
@@ -61,7 +61,7 @@ blueprint:
         temperature can be set.
 
 
-        - **DYNAMIC MODE**
+        - **DYNAMIC MODE:**
 
         The light will be assigned a brightness value based on the value of a ambient
         light sensor, optionally color or temperature can be set.
@@ -74,15 +74,15 @@ blueprint:
           options:
           - label: DEFAULT MODE
             value: default
-          - label: TOGGLE
+          - label: TOGGLE MODE
             value: toggle
           - label: FIXED  MODE
             value: fixed
           - label: DYNAMIC MODE
             value: dynamic
-          multiple: false
-          sort: false
           custom_value: false
+          sort: false
+          multiple: false
     transition_time:
       name: Transition time (FIXED & DYNAMIC MODE)
       description: "The time it takes for the light to transition to the assigned
@@ -110,9 +110,9 @@ blueprint:
             value: include_color
           - label: Set temperature
             value: include_temperature
-          multiple: false
-          sort: false
           custom_value: false
+          sort: false
+          multiple: false
     light_color:
       name: Light color (FIXED & DYNAMIC MODE)
       description: Color of the light when between minimum and maximum ambient light
@@ -125,22 +125,28 @@ blueprint:
         color_rgb: {}
     light_temperature:
       name: Light temperature (FIXED & DYNAMIC MODE)
-      description: Temperature of the light when between minimum and maximum ambient
+      description: 'Temperature of the light when between minimum and maximum ambient
         light values.
+
+        (not all lights will support all values, please consult your lights spec sheet.)
+
+        '
       default: 2000
       selector:
-        color_temp: {}
+        color_temp:
+          unit: kelvin
+          min: 1500
+          max: 6500
     brightness:
       name: Brightness (FIXED BRIGHTNESS MODE)
       description: Set the brightness value the light needs to turn on at
-      default: 0
+      default: 100
       selector:
         number:
           min: 0.0
           max: 100.0
           step: 1.0
           mode: slider
-          unit_of_measurement: '%'
     light_sensor_entity:
       name: Light Sensor (DYNAMIC MODE)
       description: Which light sensor do you want to use to measure the ambient light
@@ -188,7 +194,6 @@ blueprint:
           max: 100.0
           step: 1.0
           mode: slider
-          unit_of_measurement: '%'
     light_value_2:
       name: Brightness at minimum light level (DYNAMIC MODE)
       description: Brightness of the light at minimum ambient light.
@@ -199,7 +204,6 @@ blueprint:
           max: 100.0
           step: 1.0
           mode: slider
-          unit_of_measurement: '%'
     light_brightness_over_max:
       name: Brightness when ambient light value over max (DYNAMIC MODE)
       description: Brightness of the light when the ambient light is higher than the
@@ -211,19 +215,17 @@ blueprint:
           max: 100.0
           step: 1.0
           mode: slider
-          unit_of_measurement: '%'
     light_brightness_under_min:
       name: Brightness when ambient light value under min (DYNAMIC MODE)
       description: Brightness of the light when the ambient light is lower than the
         set minimum value.
-      default: 100
+      default: 255
       selector:
         number:
           min: 0.0
           max: 100.0
           step: 1.0
           mode: slider
-          unit_of_measurement: '%'
     include_color_or_temp_over_under:
       name: Include color or temperature values when outside range (DYNAMIC MODE)
       description: 'Set a color or temperature value for the light when over maximum
@@ -242,9 +244,9 @@ blueprint:
             value: include_color_outside_range
           - label: Set temperature when outside range
             value: include_temp_outside_range
-          multiple: false
-          sort: false
           custom_value: false
+          sort: false
+          multiple: false
     light_color_over_max:
       name: Color when ambient light value over max (DYNAMIC MODE)
       description: Color of the light when the ambient light is higher than the set
@@ -267,18 +269,32 @@ blueprint:
         color_rgb: {}
     light_temp_over_max:
       name: Temperature when ambient light value over max (DYNAMIC MODE)
-      description: Temperature of the light when the ambient light is higher than
+      description: 'Temperature of the light when the ambient light is higher than
         the set maximum value.
+
+        (not all lights will support all values, please consult your lights spec sheet.)
+
+        '
       default: 2000
       selector:
-        color_temp: {}
+        color_temp:
+          unit: kelvin
+          min: 1500
+          max: 6500
     light_temp_under_min:
       name: Temperature when ambient light value under min (DYNAMIC MODE)
-      description: Temperature of the light when the ambient light is lower than the
-        set minimum value.
+      description: 'Temperature of the light when the ambient light is lower than
+        the set minimum value.
+
+        (not all lights will support all values, please consult your lights spec sheet.)
+
+        '
       default: 2000
       selector:
-        color_temp: {}
+        color_temp:
+          unit: kelvin
+          min: 1500
+          max: 6500
     include_turn_off:
       name: Include light turn off function
       description: 'Select if the light needs to turn back off again and how you want
@@ -307,8 +323,8 @@ blueprint:
             value: trigger
           - label: Staircase function
             value: staircase
-          sort: false
           custom_value: false
+          sort: false
     turn_off_triggers:
       name: Turn off triggers
       description: Triggers that turn the light off
@@ -343,71 +359,75 @@ variables:
   include_color_or_temp: !input include_color_or_temp
   light_color: !input light_color
   light_temperature: !input light_temperature
-  light_brightness: !input brightness
+  brightness: !input brightness
+  light_brightness: '{{ brightness * 2.55 }}'
   light_sensor: !input light_sensor_entity
   maxB: !input max_brightness_value
   minB: !input min_brightness_value
-  light1: !input light_value_1
-  light2: !input light_value_2
+  light_value_1: !input light_value_1
+  light_value_2: !input light_value_2
+  light1: '{{ light_value_1 * 2.55 }}'
+  light2: '{{ light_value_2 * 2.55 }}'
   slope: '{{ ( light1 - light2 ) / ( maxB - minB ) }}'
   constant: '{{ light1 - ( slope * maxB ) }}'
-  dynamic_brightness_pct: "{% if mode == \"dynamic\" %}\n  {{ (( slope * states(light_sensor)|int
+  dynamic_brightness: "{% if mode == \"dynamic\" %}\n  {{ (( slope * states(light_sensor)|int
     ) + constant)|round }}\n{% else %}\n  0\n{% endif %}\n"
   include_color_or_temp_over_under: !input include_color_or_temp_over_under
   light_brightness_over_max: !input light_brightness_over_max
+  brightness_over_max_pct: '{{ light_brightness_over_max * 2.55 }}'
   light_color_over_max: !input light_color_over_max
   light_temp_over_max: !input light_temp_over_max
   light_brightness_under_min: !input light_brightness_under_min
+  brightness_under_min_pct: '{{ light_brightness_under_min * 2.55 }}'
   light_color_under_min: !input light_color_under_min
   light_temp_under_min: !input light_temp_under_min
   include_turn_off: !input include_turn_off
 trigger: !input triggers
-condition:
-- condition: !input run_conditions
-action:
+conditions: !input run_conditions
+actions:
 - choose:
   - conditions: '{{ mode == "toggle" }}'
     sequence:
-    - service: homeassistant.toggle
+    - action: homeassistant.toggle
       target: !input target_light
   - conditions: '{{ mode == "default" }}'
     sequence:
-    - service: homeassistant.turn_on
+    - action: homeassistant.turn_on
       target: !input target_light
   - conditions: '{{ mode == "fixed" }}'
     sequence:
-    - service: light.turn_on
+    - action: light.turn_on
       data: "{% if include_color_or_temp == \"include_color\" %}\n  {{ { \"transition\":
-        transition_time, \"brightness_pct\": light_brightness, \"rgb_color\": light_color
+        transition_time, \"brightness\": light_brightness, \"rgb_color\": light_color
         } }}\n{% elif include_color_or_temp == \"include_temperature\" %}\n  {{ {
-        \"transition\": transition_time, \"brightness_pct\": light_brightness, \"color_temp\":
+        \"transition\": transition_time, \"brightness\": light_brightness, \"color_temp\":
         light_temperature } }}\n{% else %}\n  {{ { \"transition\": transition_time,
-        \"brightness_pct\": light_brightness } }}\n{% endif %}\n"
+        \"brightness\": light_brightness } }}\n{% endif %}\n"
       target: !input target_light
   - conditions: '{{ mode == "dynamic" }}'
     sequence:
-    - service: light.turn_on
+    - action: light.turn_on
       data: "{% if states(light_sensor)|int > maxB %}\n  {% if include_color_or_temp_over_under
         == \"include_color_outside_range\" %}\n    {{ { \"transition\": transition_time,
-        \"brightness_pct\": light_brightness_over_max, \"rgb_color\": light_color_over_max
+        \"brightness\": brightness_over_max_pct, \"rgb_color\": light_color_over_max
         } }}\n  {% elif include_color_or_temp_over_under == \"include_temp_outside_range\"
-        %}\n    {{ { \"transition\": transition_time, \"brightness_pct\": light_brightness_over_max,
+        %}\n    {{ { \"transition\": transition_time, \"brightness\": brightness_over_max_pct,
         \"color_temp\": light_temp_over_max } }}\n  {% else %}\n    {{ { \"transition\":
-        transition_time, \"brightness_pct\": light_brightness_over_max } }}\n  {%
-        endif %}\n{% elif states(light_sensor)|int < minB %}\n  {% if include_color_or_temp_over_under
+        transition_time, \"brightness\": brightness_over_max_pct } }}\n  {% endif
+        %}\n{% elif states(light_sensor)|int < minB %}\n  {% if include_color_or_temp_over_under
         == \"include_color_outside_range\" %}\n    {{ { \"transition\": transition_time,
-        \"brightness_pct\": light_brightness_under_min, \"rgb_color\": light_color_under_min
+        \"brightness\": brightness_under_min_pct, \"rgb_color\": light_color_under_min
         } }}\n  {% elif include_color_or_temp_over_under == \"include_temp_outside_range\"
-        %}\n    {{ { \"transition\": transition_time, \"brightness_pct\": light_brightness_under_min,
+        %}\n    {{ { \"transition\": transition_time, \"brightness\": brightness_under_min_pct,
         \"color_temp\": light_temp_under_min } }}\n  {% else %}\n    {{ { \"transition\":
-        transition_time, \"brightness_pct\": light_brightness_under_min } }}\n  {%
-        endif %}\n{% else %}\n  {% if include_color_or_temp == \"include_color\" %}\n
-        \   {{ { \"transition\": transition_time, \"brightness_pct\": light_brightness,
-        \"rgb_color\": light_color } }}\n  {% elif include_color_or_temp == \"include_temperature\"
-        %}\n    {{ { \"transition\": transition_time, \"brightness_pct\": dynamic_brightness_pct,
+        transition_time, \"brightness\": brightness_under_min_pct } }}\n  {% endif
+        %}\n{% else %}\n  {% if include_color_or_temp == \"include_color\" %}\n    {{
+        { \"transition\": transition_time, \"brightness\": light_brightness, \"rgb_color\":
+        light_color } }}\n  {% elif include_color_or_temp == \"include_temperature\"
+        %}\n    {{ { \"transition\": transition_time, \"brightness\": dynamic_brightness,
         \"color_temp\": light_temperature } }}\n  {% else %}\n    {{ { \"transition\":
-        transition_time, \"brightness_pct\": dynamic_brightness_pct } }}\n  {% endif
-        %}\n{% endif %}\n"
+        transition_time, \"brightness\": dynamic_brightness } }}\n  {% endif %}\n{%
+        endif %}\n"
       target: !input target_light
 - if: !input turn_off_conditions
   then:
@@ -420,11 +440,11 @@ action:
           timeout: !input staircase_duration
         else:
         - delay: !input staircase_duration
-      - service: homeassistant.turn_off
+      - action: homeassistant.turn_off
         target: !input target_light
     - conditions: '{{ "trigger" in include_turn_off and not "staircase" in include_turn_off
         }}'
       sequence:
       - wait_for_trigger: !input turn_off_triggers
-      - service: homeassistant.turn_off
+      - action: homeassistant.turn_off
         target: !input target_light

blueprints/automation/kind3r/cast-and-re-cast-a-lovelace-view-to-a-google-hub.yaml

@@ -10,6 +10,7 @@ blueprint:
       selector:
         entity:
           integration: cast
+          multiple: false
     view:
       name: Lovelace view path
       description: Path of the view to cast. A path has to be defined in your Lovelace
@@ -21,11 +22,11 @@ blueprint:
   source_url: https://community.home-assistant.io/t/cast-and-re-cast-a-lovelace-view-to-a-google-hub/259631
 trigger:
 - platform: state
-  entity_id: !input 'player'
+  entity_id: !input player
   to: 'off'
   for: 00:00:20
 - platform: state
-  entity_id: !input 'player'
+  entity_id: !input player
   to: paused
   for: 00:00:20
 - platform: time_pattern
@@ -38,38 +39,38 @@ action:
     - condition: or
       conditions:
       - condition: state
-        entity_id: !input 'player'
+        entity_id: !input player
         state: 'off'
       - condition: state
-        entity_id: !input 'player'
+        entity_id: !input player
         state: paused
         for: 00:00:20
     sequence:
     - service: media_player.volume_mute
       data:
         is_volume_muted: true
-        entity_id: !input 'player'
+        entity_id: !input player
     - service: media_player.turn_off
       data:
-        entity_id: !input 'player'
+        entity_id: !input player
     - delay:
         seconds: 2
     - service: media_player.turn_on
       data:
-        entity_id: !input 'player'
+        entity_id: !input player
     - service: cast.show_lovelace_view
       data:
-        view_path: !input 'view'
-        dashboard_path: !input 'dashboard'
-        entity_id: !input 'player'
+        view_path: !input view
+        dashboard_path: !input dashboard
+        entity_id: !input player
     - service: cast.show_lovelace_view
       data:
-        view_path: !input 'view'
-        dashboard_path: !input 'dashboard'
-        entity_id: !input 'player'
+        view_path: !input view
+        dashboard_path: !input dashboard
+        entity_id: !input player
     - delay:
         seconds: 10
     - service: media_player.volume_mute
       data:
         is_volume_muted: false
-        entity_id: !input 'player'
+        entity_id: !input player

configuration.yaml

@@ -32,8 +32,16 @@ frontend:
   extra_module_url:
   - /hacsfiles/hass-hue-icons/hass-hue-icons.js
   - /hacsfiles/hass-bha-icons/hass-bha-icons.js
+  - /hacsfiles/material-you-utilities/material-you-utilities.min.js
   javascript_version: latest
 
+panel_custom:
+  - name: material-you-panel
+    url_path: material-you-configuration
+    sidebar_title: Material You Utilities
+    sidebar_icon: mdi:material-design
+    module_url: /hacsfiles/material-you-utilities/material-you-utilities.min.js
+
 http:
   use_x_forwarded_for: true
   trusted_proxies:
@@ -107,6 +115,8 @@ recorder:
       - sensor.*gpu_core_load
       - sensor.portainer*
       - sensor.mosquitto*
+      - sensor.*_rssi
+      - sensor.weatherflow_hub*
     entities:
       - sensor.avg_ping
       - sensor.max_ping
@@ -121,6 +131,8 @@ recorder:
       - sensor.mariadb_database_size
       - sensor.random_joke
       - sensor.bypassed_sensors
+      - sensor.home_tempest_signal_strength
+      - sensor.home_tempest_uptime
   include:
     entities:
       - media_player.living_room_tv
@@ -166,6 +178,8 @@ influxdb:
     entity_globs:
       - binary_sensor.*tamper*
       - light.*screen*
+      - sensor.weatherflow_hub*
+      - sensor.home_tempest*
     entities:
       - sensor.last_boot
       - sensor.date
@@ -178,6 +192,8 @@ influxdb:
       - light.all_lights
       - fan.all_fans
       - sensor.random_joke
+      - sensor.home_tempest_signal_strength
+      - sensor.home_tempest_uptime
   include:
     domains:
       - sun
@@ -347,6 +363,8 @@ prometheus:
     exclude_entity_globs:
       - binary_sensor.*tamper*
       - light.*screen*
+      - sensor.weatherflow_hub*
+      - sensor.home_tempest*
     exclude_entities:
       - sensor.last_boot
       - sensor.date
@@ -359,6 +377,8 @@ prometheus:
       - light.all_lights
       - fan.all_fans
       - sensor.random_joke
+      - sensor.home_tempest_signal_strength
+      - sensor.home_tempest_uptime
     include_domains:
       - sun
       - light

custom_templates/easy_time.jinja

@@ -203,6 +203,8 @@
       'today': 'vandaag',
       'tomorrow': 'morgen',
       'yesterday': 'gisteren',
+      'next': 'volgende',
+      'last': 'afgelopen',
     },
     'days':[
       "maandag",
@@ -226,12 +228,30 @@
       'oktober',
       'november',
       'december',
-    ]
+    ],
+    'time_of_hour':{
+      0: '{hour} uur',
+      1: '1 over {hour}',
+      15: 'kwart over {hour}',
+      30: 'half {hour}',
+      45: 'kwart voor {hour}',
+      59: '1 voor {hour}',
+      'past_hour': '{minute} over {hour}',
+      'to_hour': '{minute} voor {hour}',
+      'to_half_hour': '{minute} voor half {hour}',
+      'past_half_hour': '{minute} over half {hour}',
+      'half_hour': 'half {hour}',
+      'use_twelve': true,
+    },
+    'time_of_day':{
+      'midnight': 'middernacht',
+      'noon': 'middag',
+    },
   },
   'sv':{
     '_language': 'Svenska',
     'and': 'och',
-    'in': 'i',
+    'in': 'om',
     'ago': 'sedan',
     'now': 'nu',
     'lose': 'förlora',
@@ -273,6 +293,7 @@
       'today': 'idag',
       'tomorrow': 'imorgon',
       'yesterday': 'igår',
+      'next': 'nästa',
     },
     'days':[
       "måndag",
@@ -302,7 +323,7 @@
     '_language': 'Deutsch',
     'and': 'und',
     'in': 'in',
-    'ago': 'vor',
+    'ago': 'vor %s',
     'now': 'jetzt',
     'lose': 'Du verlierst',
     'gain': 'Du gewinnst',
@@ -363,7 +384,7 @@
       'Juli',
       'August',
       'September',
-      'October',
+      'Oktober',
       'November',
       'Dezember',
     ]
@@ -623,6 +644,8 @@
       'today': "aujourd'hui",
       'tomorrow': 'demain',
       'yesterday': 'hier',
+      'next': 'prochain',
+      'last': 'dernier',
     },
     'days':[
       "lundi",
@@ -693,6 +716,8 @@
       'today': 'hoy',
       'tomorrow': 'mañana',
       'yesterday': 'ayer',
+      'next': 'el próximo',
+      'last': 'el pasado',
     },
     'days':[
       'lunes',
@@ -711,12 +736,26 @@
       'mayo',
       'junio',
       'julio',
-      'agosto'
+      'agosto',
       'septiembre',
       'octubre',
       'noviembre',
       'diciembre'
-    ]
+    ],
+    'time_of_hour':{
+      0: '{hour} en punto',
+      1: '{hour} y un minuto',
+      15: '{hour} y quarto',
+      30: '{hour} y media',
+      45: '{hour} menos quarto',
+      59: '{hour} menos uno',
+      'past_hour': '{hour} y {minute}',
+      'to_hour': '{hour} menos {minute}',
+    },
+    'time_of_day':{
+      'midnight': 'medianoche',
+      'noon': 'mediodía',
+    },
   },
   'it':{
     '_language': 'Italiano',
@@ -786,7 +825,21 @@
       'ottobre',
       'novembre',
       'dicembre',
-    ]
+    ],
+    'time_of_hour':{
+      0: '{hour}',
+      1: '{hour} e un minuto',
+      15: '{hour} ed un quarto',
+      30: '{hour} e mezzo',
+      45: '15 minuti alle {hour}',
+      59: 'un minuto alle {hour}',
+      'past_hour': '{hour} e {minute}',
+      'to_hour': '{hour} meno {minute}',
+    },
+    'time_of_day':{
+      'midnight': 'mezzanotte',
+      'noon': 'mezzogiorno',
+    }
   },
   'pt':{
     '_language': 'Português',
@@ -865,9 +918,9 @@
     'and': 'i',
     'in': 'u',
     'ago': 'prije',
-    'now': 'sad',
+    'now': 'sada',
     'lose': 'gubiš',
-    'gain': 'dobijaš',
+    'gain': 'dobivaš',
     'time':{
       'format': '24-hr',
       'year': [
@@ -905,8 +958,8 @@
       'today': 'danas',
       'tomorrow': 'sutra',
       'yesterday': 'jučer',
-      'next': 'slijedeći',
-      'last': 'prošli',
+      'next': 'sljedeći',
+      'last': 'protekli',
     },
     'days':[
       "Ponedjeljak",
@@ -1002,12 +1055,436 @@
       'Październik',
       'Listopad',
       'Grudzień',
+    ],
+    'time_of_hour': {
+      0: '{hour}',
+      1: 'minuta po {hour}',
+      15: 'kwadrans po {hour}',
+      30: 'pół godziny po {hour}',
+      45: 'za kwadrans {hour}',
+      59: 'za minutę {hour}',
+      'past_hour': '{minute} po {hour}',
+      'to_hour': '{minute} do {hour}'
+    },
+    'time_of_day': {
+      'midnight': 'północ',
+      'noon': 'południe'
+    }
+  },
+  'ru':{
+    '_language': 'Русский',
+    'and': 'и',
+    'in': 'в',
+    'ago': 'назад',
+    'now': 'сейчас',
+    'lose': 'уменьшение',
+    'gain': 'увеличение',
+    'time':{
+      'format': '24-hr',
+      'year': [
+        'г',
+        'год',
+        'лет',
+      ],
+      'week': [
+        'нед',
+        'неделя',
+        'недель',
+      ],
+      'day': [
+        'д',
+        'день',
+        'дней',
+      ],
+      'hour': [
+        'ч',
+        'час',
+        'часов',
+      ],
+      'minute': [
+        'мин',
+        'минута',
+        'минут',
+      ],
+      'second': [
+        'сек',
+        'секунда',
+        'секунд',
+      ],
+    },
+    'delta':{
+      'today': 'сегодня',
+      'tomorrow': 'завтра',
+      'yesterday': 'вчера',
+      'next': 'следующий',
+      'last': 'последний',
+    },
+    'days':[
+      "Понедельник",
+      "Вторник",
+      "Среда",
+      "Четверг",
+      "Пятница",
+      "Суббота",
+      "Воскресенье",
+    ],
+    'months':[
+      'Январь',
+      'Февраль',
+      'Март',
+      'Апрель',
+      'Май',
+      'Июнь',
+      'Июль',
+      'Август',
+      'Сентябрь',
+      'Октябрь',
+      'Ноябрь',
+      'Декабрь',
+    ],
+    'time_of_hour':{
+      0: '{hour} часов ровно',
+      1: '{hour} и 1 минута',
+      15: '{hour} с четвертью',
+      30: '{hour} с половиной',
+      45: 'без четверти {hour}',
+      59: 'без минуты {hour}',
+      'past_hour': '{hour} и {minute} минут',
+      'to_hour': 'без {minute} минут {hour}',
+    },
+    'time_of_day':{
+      'midnight': 'полночь',
+      'noon': 'полдень',
+    },
+  },
+  'uk':{
+    '_language': 'Українська',
+    'and': 'і',
+    'in': 'в',
+    'ago': 'тому',
+    'now': 'зараз',
+    'lose': 'зменшення',
+    'gain': 'збільшення',
+    'time':{
+      'format': '24-hr',
+      'year': [
+      'р',
+      'рік',
+      'роки',
+      ],
+      'week': [
+      'тиж',
+      'тиждень',
+      'тижні',
+      ],
+      'day': [
+      'д',
+      'день',
+      'дні',
+      ],
+      'hour': [
+      'год',
+      'година',
+      'години',
+      ],
+      'minute': [
+      'хв',
+      'хвилина',
+      'хвилини',
+      ],
+      'second': [
+      'сек',
+      'секунда',
+      'секунди',
+      ],
+    },
+    'delta':{
+      'today': 'сьогодні',
+      'tomorrow': 'завтра',
+      'yesterday': 'вчора',
+      'next': 'наступний',
+      'last': 'останній',
+    },
+    'days':[
+      "Понеділок",
+      "Вівторок",
+      "Середа",
+      "Четвер",
+      "П'ятниця",
+      "Субота",
+      "Неділя",
+    ],
+    'months':[
+      'Січень',
+      'Лютий',
+      'Березень',
+      'Квітень',
+      'Травень',
+      'Червень',
+      'Липень',
+      'Серпень',
+      'Вересень',
+      'Жовтень',
+      'Листопад',
+      'Грудень',
+    ],
+      'time_of_hour':{
+      0: '{hour} годин',
+      1: '{hour} годин(а) одна хвилина',
+      15: 'чверть на {hour}',
+      30: 'пів на {hour}',
+      45: 'за чверть {hour}',
+      59: 'за хвилину {hour}',
+      'past_hour': '{hour} та {minute} хвилин',
+      'to_hour': 'за {minute} хвилин {hour}', 
+    },
+    'time_of_day':{
+      'midnight': 'опівночі',
+      'noon': 'опівдні',
+    },
+    },
+  'zh-Hans':{
+    '_language': '简体中文',
+    'and': '',
+    'in': '',
+    'ago': '之前',
+    'now': '现在',
+    'lose': '失去',
+    'gain': '获得',
+    'time':{
+      'format': '24-hr',
+      'year': [
+        '年',
+        '年',
+        '年',
+      ],
+      'week': [
+        '周',
+        '星期',
+        '星期',
+      ],
+      'day': [
+        '天',
+        '天',
+        '天',
+      ],
+      'hour': [
+        '时',
+        '小时',
+        '小时',
+      ],
+      'minute': [
+        '分',
+        '分钟',
+        '分钟',
+      ],
+      'second': [
+        '秒',
+        '秒',
+        '秒',
+      ],
+    },
+    'delta':{
+      'today': '今天',
+      'tomorrow': '明天',
+      'yesterday': '昨天',
+      'next': '下一个',
+      'last': '上一个',
+    },
+    'days':[
+      "星期一",
+      "星期二",
+      "星期三",
+      "星期四",
+      "星期五",
+      "星期六",
+      "星期日",
+    ],
+    'months':[
+      '一月',
+      '二月',
+      '三月',
+      '四月',
+      '五月',
+      '六月',
+      '七月',
+      '八月',
+      '九月',
+      '十月',
+      '十一月',
+      '十二月',
+    ],
+    'time_of_day':{
+      'midnight': '午夜',
+      'noon': '正午',
+    },
+  },
+  'ko':{
+    '_language':'Korean',
+    'and':'',
+    'in':'후',
+    'ago':'전',
+    'now':'지금',
+    'lose':'감소',
+    'gain':'증가',
+    'time':{
+      'format':'24-hr',
+      'year':[
+        '년',
+        '년',
+        '년',
+      ],
+      'week':[
+        '주',
+        '주',
+        '주',
+      ],
+      'day':[
+        '일',
+        '일',
+        '일',
+      ],
+      'hour':[
+        '시',
+        '시간',
+        '시간',
+      ],
+      'minute':[
+        '분',
+        '분',
+        '분',
+      ],
+      'second':[
+        '초',
+        '초',
+        '초',
+      ],
+    },
+    'delta':{
+      'today':'오늘',
+      'tomorrow':'내일',
+      'yesterday':'어제',
+      'next':'다음',
+      'last':'지난',
+    },
+    'days':[
+      '월요일',
+      '화요일',
+      '수요일',
+      '목요일',
+      '금요일',
+      '토요일',
+      '일요일',
+    ],
+    'months':[
+      '1월',
+      '2월',
+      '3월',
+      '4월',
+      '5월',
+      '6월',
+      '7월',
+      '8월',
+      '9월',
+      '10월',
+      '11월',
+      '12월',
+    ],
+    'time_of_day':{
+      'midnight':'자정',
+      'noon':'정오',
+    },
+  },
+  'cs': {
+    '_language': 'Čeština',
+    'and': 'a',
+    'in': 'za',
+    'ago': 'před %s',
+    'now': 'nyní',
+    'lose': 'ztratit',
+    'gain': 'získat',
+    'time': {
+      'format': '12-hodin',
+      'year': [
+        'rok',
+        'rok',
+        'roky'
+      ],
+      'week': [
+        'týd',
+        'týden',
+        'týdny'
+      ],
+      'day': [
+        'd',
+        'den',
+        'dny'
+      ],
+      'hour': [
+        'hod',
+        'hodina',
+        'hodiny'
+      ],
+      'minute': [
+        'min',
+        'minuta',
+        'minuty'
+      ],
+      'second': [
+        'sek',
+        'sekunda',
+        'sekundy'
       ]
+    },
+    'delta': {
+      'today': 'dnes',
+      'tomorrow': 'zítra',
+      'yesterday': 'včera',
+      'next': 'příští',
+      'last': 'poslední'
+    },
+    'days': [
+      'Pondělí',
+      'Úterý',
+      'Středa',
+      'Čtvrtek',
+      'Pátek',
+      'Sobota',
+      'Neděle'
+    ],
+    'months': [
+      'Leden',
+      'Únor',
+      'Březen',
+      'Duben',
+      'Květen',
+      'Červen',
+      'Červenec',
+      'Srpen',
+      'Září',
+      'Říjen',
+      'Listopad',
+      'Prosinec'
+    ],
+    'time_of_hour': {
+      0: '{hour} hodin',
+      1: 'minuta po {hour}',
+      15: 'čtvrt na {hour}',
+      30: 'půl {hour}',
+      45: 'tři čtvrtě na {hour}',
+      59: 'minuta do {hour}',
+      'past_hour': '{minute} po {hour}',
+      'to_hour': '{minute} do {hour}'
+    },
+    'time_of_day': {
+      'midnight': 'půlnoc',
+      'noon': 'poledne'
+    }
   }
 } %}
 
 {# DO NOT MODIFY BELOW THIS LINE #}
-
+{% set valid_entity_id_pattern = '^(?!.+__)(?!_)[\\da-z_]+(?<!_)\\.(?!_)[\\da-z_]+(?<!_)$' %}
 {% set _bad_value = '?' %}
 {% set _durations = {
   'year': 31536000,
@@ -1091,10 +1568,10 @@
 {%- endmacro -%}
 
 {%- macro _check_for_duration_sensor(input) %}
-{%- if input is string and input | regex_search('^(?!.+__)(?!_)[\da-z_]+(?<!_)\.(?!_)[\da-z_]+(?<!_)$') and input.startswith('sensor') and states[input] is not none and states[input].attributes.device_class is defined and states[input].attributes.unit_of_measurement is defined -%}
+{%- if input is string and input | regex_search(valid_entity_id_pattern) and input.startswith('sensor') and states[input] is not none and states[input].attributes.device_class is defined and states[input].attributes.unit_of_measurement is defined -%}
   {%- set obj = states[input] -%}
-  {%- set divisor = _duration_sensor.get(obj.attributes.unit_of_measurement) -%}
-  {{- (obj.state | float / divisor) | string | as_timedelta -}}
+  {%- set multiplier = _duration_sensor.get(obj.attributes.unit_of_measurement) -%}
+  {{- (obj.state | float * multiplier) | string | as_timedelta -}}
 {%- else %}
   {{- '' -}}
 {%- endif -%}
@@ -1116,7 +1593,7 @@
 {#- assume time as string or entity_id -#}
 {%- elif input is string and input not in ['', 'None'] -%}
   {#- if entity_id -#}
-  {%- if input | regex_search('^(?!.+__)(?!_)[\da-z_]+(?<!_)\.(?!_)[\da-z_]+(?<!_)$') -%}
+  {%- if input | regex_search(valid_entity_id_pattern) -%}
     {%- if attribute is not none and attribute is string -%}
       {{- _to_datetime(state_attr(input, attribute), None) -}}
     {%- elif input.startswith('input_datetime') and is_state_attr(input, 'has_date', False) -%}
@@ -1201,7 +1678,7 @@
   {%- set index = values.index(values | first | default) %}
   {%- for item in values[index:] %}
     {%- set duration = _durations.get(item, 1) %}
-    {%- set period = _periods.get(item, 1) %}
+    {%- set period = _periods.get(item, 0) %}
     {%- set value = ((seconds // duration) % (period if period else duration)) | int %}
     {%- if value > 0 or raw %}
       {%- if ns.ret | length == 0 %}
@@ -1252,8 +1729,8 @@
 {%- endmacro %}
 
 {%- macro _time_between(func, input1, attr1, utc1, input2, attr2, utc2) -%}
-{%- set t1 = _to_datetime(input1, attr1, utc1) | as_datetime -%}
-{%- set t2 = _to_datetime(input2, attr2, utc2) | as_datetime -%}
+{%- set t1 = _to_datetime(input1, attr1, utc1) | as_datetime | as_local -%}
+{%- set t2 = _to_datetime(input2, attr2, utc2) | as_datetime | as_local -%}
 {%- if t1 is not none and t2 is not none -%}
   {{- func(t1, t2) -}}
 {%- else -%}
@@ -1320,16 +1797,19 @@
 {%- if uptime %}
   {%- set value = _delta_seconds(now(), uptime) | int %}
   {%- set seconds = value | abs %}
-  {%- set future = value / seconds > 0 %}
+  {%- set current = value == 0 %}
+  {%- set future = not current and value / seconds > 0 %}
   {%- set items = _just_time(seconds, language, values, biggest, short=short, floor=floor) %}
-  {%- if future %}
+  {%- if current %}
+    {{- items }}
+  {%- elif future %}
     {{- translate('in', language=language) }} {{ items }}
   {%- else %}
     {%- set t = translate('ago', language=language) %}
     {%- if '%s' in t %}
-      {{ t % items }}
+      {{- t % items }}
     {%- else %}
-      {{- items }} {{ translate('ago', language=language) }}
+      {{- items }} {{ t }}
     {%- endif %}
   {%- endif %}
 {%- else %}
@@ -1411,6 +1891,16 @@
 {{- _next_weekday(weekday, -7) }}
 {%- endmacro %}
 
+{%- macro nearest_day(weekday) %}
+{%- set today_timestamp = as_timestamp(today_at())|int %}
+{%- set this_weekday_timestamp = as_timestamp(this_weekday(weekday))|int %}
+{%- if today_timestamp <  this_weekday_timestamp %}
+  {{- _next_weekday(weekday, 0) }}
+{%- else %}
+  {{- _next_weekday(weekday, 7) }}
+{%- endif %}
+{%- endmacro %}
+
 {%- macro days_in_month(month=None) %}
 {%- set today = today_at() %}
 {%- set input = month if month is not none else today.month %}
@@ -1527,30 +2017,36 @@
 {%- endif -%}
 {%- endmacro -%}
 
-{%- macro month(month=None, language=None) %}
+{%- macro month(month=None, language=None, short=False) %}
 {%- if month is datetime %}
 {%- set idx = month.month - 1 %}
 {%- elif month is integer and month > 0 %}
 {%- set idx = (month - 1) % 12 %}
+{%- elif month | regex_match(valid_entity_id_pattern) %}
+{%- set idx = (states(month) | as_datetime | as_local).month - 1 %}
 {%- else %}
 {%- set idx = now().month - 1 %}
 {%- endif %}
-{{- translate('months', index=idx, language=language) }}
+{%- set ret = translate('months', index=idx, language=language) %}
+{{- ret[:3] if short else ret }}
 {%- endmacro %}
 
-{%- macro weekday(weekday=None, language=None) %}
+{%- macro weekday(weekday=None, language=None, short=False) %}
 {%- if weekday is datetime %}
 {%- set idx = weekday.weekday() %}
 {%- elif weekday is integer and weekday > 0 %}
 {%- set idx = (weekday - 1) % 7 %}
+{%- elif weekday | regex_match(valid_entity_id_pattern) %}
+{%- set idx = (states(weekday) | as_datetime | as_local).weekday() %}
 {%- else %}
 {%- set idx = now().weekday() %}
 {%- endif %}
-{{- translate('days', index=idx, language=language) }}
+{%- set ret = translate('days', index=idx, language=language) %}
+{{- ret[:3] if short else ret }}
 {%- endmacro %}
 
 {%- macro count_the_days(input, attr, utc=False) %}
-{%- set input = _to_datetime(input, attr, utc) | as_datetime %}
+{%- set input = _to_datetime(input, attr, utc) | as_datetime | as_local %}
 {%- set midnight = today_at() %}
 {{- (input - midnight).days }}
 {%- endmacro %}
@@ -1561,7 +2057,7 @@
 {%- set ns = namespace(days=[]) %}
 {%- for i in range(-7, 14) %}
   {%- set prefix = translate('delta', 'last', language=language) ~ ' ' if i < -1 else translate('delta', 'next', language=language)  ~ ' ' if i > 6 else '' %}
-  {%- set ns.days = ns.days + [ (i | string, prefix ~  _days.get(i, weekday(midnight.weekday() + i + 1, language))) ] %}
+  {%- set ns.days = ns.days + [ (i | string, prefix ~  _days.get(i, weekday(midnight.weekday() + (i % 7) + 1, language))) ] %}
 {%- endfor %}
 {%- set collection = dict.from_keys(ns.days) %}
 {%- set days = count_the_days(input, attr, utc) %}
@@ -1577,7 +2073,7 @@
     {%- if '%s' in t %}
       {{- t % ret }}
     {%- else %}
-      {{- ret }} {{ translate('ago', language=language) }}
+      {{- ret }} {{ t }}
     {%- endif %}
   {%- endif %}
 {%- endif %}
@@ -1586,16 +2082,20 @@
 {%- macro hour(hour, language=None) %}
 {%- if hour is datetime %}
   {%- set hour = hour.hour %}
+{%- elif hour | regex_match(valid_entity_id_pattern) %}
+  {%- set hour = (states(hour) | as_datetime | as_local).hour %}
 {%- endif %}
 {%- set _12 = not (hour % 12) %}
 {%- set _24 = not (hour % 24) %}
-{%- set _12hr = translate('time','format') == '12-hr' %}
-{%- if _12 and _24 and _12hr %}
+{%- set use_twelve = translate('time_of_day', 'use_twelve', language=language, fallback=false) %}
+{%- set _12hr = translate('time','format', language=language) == '12-hr' %}
+{%- if _12 and _24 and _12hr and not use_twelve %}
   {{- translate('time_of_day', 'midnight', language=language) }}
-{%- elif _12 and _12hr %}
+{%- elif _12 and _12hr and not use_twelve %}
   {{- translate('time_of_day', 'noon', language=language) }}
 {%- else %}
-  {{- hour % 12 if _12hr else hour }}
+  {%- set ret = hour % 12 if _12hr else hour %}
+  {{- 12 if ret == 0 and use_twelve else ret }}
 {%- endif %}
 {%- endmacro %}
 
@@ -1617,7 +2117,22 @@
   {%- set hour_phrase = hour(this_hour, language=language) %}
   {%- set minute_phrase = _phrase('minute', 60 * this_minute, language, True, True) if this_minute % 5 else this_minute | string %}
 {%- endif %}
-{%- if this_minute in [0, 1, 15, 30, 45, 59] %}
+{%- set this_config = translate('time_of_hour', language=language) %}
+{%- if (16 <= this_minute <= 29 and 'to_half_hour' in this_config) or (31 <= this_minute <= 44 and 'past_half_hour' in this_config) or (this_minute == 30 and 'half_hour' in this_config) %}
+  {%- set hour_phrase = hour(this_hour + 1, language=language) %}
+  {%- if 16 <= this_minute <= 29 %}
+    {%- set minute_calc = 30 - this_minute %}
+    {%- set fmat = translate('time_of_hour', 'to_half_hour', language=language) %}
+    {%- set minute_phrase = _phrase('minute', 60 * minute_calc, language, True, True) if this_minute % 5 else minute_calc | string %}
+  {%- elif 31 <= this_minute <= 44 %}
+    {%- set minute_calc = this_minute - 30 %}
+    {%- set fmat = translate('time_of_hour', 'past_half_hour', language=language) %}
+    {%- set minute_phrase = _phrase('minute', 60 * minute_calc, language, True, True) if this_minute % 5 else minute_calc | string %}
+  {%- else %}
+    {%- set minute_calc = None %}
+    {%- set fmat = translate('time_of_hour', 'half_hour', language=language) %}
+  {%- endif %}
+{%- elif this_minute in [0, 1, 15, 30, 45, 59] %}
   {%- if hour_phrase in ['noon', 'midnight'] and this_minute == 0 %}
     {%- set fmat = '{hour}' %}
   {%- else %}

custom_templates/relative_time_plus.jinja

@@ -1,234 +1,358 @@
 {#
   set phrases to be used in the relative_time_period macro
-  one list item per language, each time fraction contains a list with the singular, plural and abbriviated phrase 
+  one list item per language, each time fraction contains a list with the short and several long forms of time units
   combine contains the text to combine the last time fraction, and error the text to display on wrong date input
+  Plural forms for languages: https://www.gnu.org/software/gettext/manual/gettext.html#Plural-forms
+  asian: ja, vi, ko
+  english: en, de, nl, sv, da, no, nb, nn, fo, es, pt, it, bg, el, fi, et, he, eo, hu, tr, ca
+  french: pt_BR, fr
+  latvian: lv
+  irish: ga
+  romanian: ro
+  lithuanian: lv
+  russian: ru, uk, be, sr, hr
+  slovak: cs, sk
+  polish: pl
+  slovenian: sl
+  arabic: ar
 #}
 {%- set _time_period_phrases = [
   {
     'language': 'en',
+    'plural_form': 'english',
     'phrases': {
-      'year': ['year', 'years', 'yr'],
-      'month': ['month', 'months', 'mth'],
-      'week': ['week', 'weeks', 'wk'],
-      'day': ['day', 'days', 'day'],
-      'hour': ['hour', 'hours', 'hr'],
-      'minute': ['minute', 'minutes', 'min'],
-      'second': ['second', 'seconds', 'sec'],
-      'millisecond': ['millisecond', 'milliseconds', 'ms'],
+      'year': ['yr', 'year', 'years'],
+      'month': ['mth', 'month', 'months'],
+      'week': ['wk', 'week', 'weeks'],
+      'day': ['day', 'day', 'days'],
+      'hour': ['hr', 'hour', 'hours'],
+      'minute': ['min', 'minute', 'minutes'],
+      'second': ['sec', 'second', 'seconds'],
+      'millisecond': ['ms', 'millisecond', 'milliseconds'],
       'combine': 'and',
       'error': 'Invalid date',
     }
   },
   {
     'language': 'pl',
+    'plural_form': 'polish',
     'phrases': {
-      'year': ['rok', 'lat', 'r'],
-      'month': ['miesiąc', 'miesięcy', 'msc'],
-      'week': ['tydzień', 'tygodni', 'tyg'],
-      'day': ['dzień', 'dni', 'dzień'],
-      'hour': ['godzina', 'godzin', 'godz'],
-      'minute': ['minuta', 'minut', 'min'],
-      'second': ['sekunda', 'sekund', 'sek'],
-      'millisecond': ['milisekunda', 'milisekund', 'ms'],
+      'year': ['r', 'rok', 'lata', 'lat'],
+      'month': ['msc', 'miesiąc', 'miesiące', 'miesięcy'],
+      'week': ['tyg', 'tydzień', 'tygodnie', 'tygodni'],
+      'day': ['dzień', 'dzień', 'dni', 'dni'],
+      'hour': ['godz', 'godzina', 'godziny', 'godzin'],
+      'minute': ['min', 'minuta', 'minuty', 'minut'],
+      'second': ['sek', 'sekunda', 'sekundy', 'sekund'],
+      'millisecond': ['ms', 'milisekunda', 'milisekundy', 'milisekund'],
       'combine': 'i',
       'error': 'Niepoprawna data',
     }
   },
   {
     'language': 'fr',
+    'plural_form': 'french',
     'phrases': {
-      'year': ['année', 'années', 'an'],
+      'year': ['an', 'année', 'années'],
       'month': ['mois', 'mois', 'mois'],
-      'week': ['semaine', 'semaines', 'sem'],
-      'day': ['jour', 'jours', 'j'],
-      'hour': ['heure', 'heures', 'h'],
-      'minute': ['minute', 'minutes', 'min'],
-      'second': ['seconde', 'secondes', 'sec'],
-      'millisecond': ['milliseconde', 'millisecondes', 'ms'],
+      'week': ['sem', 'semaine', 'semaines'],
+      'day': ['j', 'jour', 'jours'],
+      'hour': ['h', 'heure', 'heures'],
+      'minute': ['min', 'minute', 'minutes'],
+      'second': ['sec', 'seconde', 'secondes'],
+      'millisecond': ['ms', 'milliseconde', 'millisecondes'],
       'combine': 'et',
       'error': 'Date non valide',
     }
   },
   {
     'language': 'it',
+    'plural_form': 'english',
     'phrases': {
-      'year': ['anno', 'anni', 'aa'],
-      'month': ['mese', 'mesi', 'mm'],
-      'week': ['settimana', 'settimane', 'set'],
-      'day': ['giorno', 'giorni', 'gg'],
-      'hour': ['ora', 'ore', 'h'],
-      'minute': ['minuto', 'minuti', 'min'],
-      'second': ['secondo', 'secondi', 'sec'],
-      'millisecond': ['millisecondo', 'millisecondi', 'ms'],
+      'year': ['aa', 'anno', 'anni'],
+      'month': ['mm', 'mese', 'mesi'],
+      'week': ['set', 'settimana', 'settimane'],
+      'day': ['gg', 'giorno', 'giorni'],
+      'hour': ['h', 'ora', 'ore'],
+      'minute': ['min', 'minuto', 'minuti'],
+      'second': ['sec', 'secondo', 'secondi'],
+      'millisecond': ['ms', 'millisecondo', 'millisecondi'],
       'combine': 'e',
       'error': 'Data non valida',
     }
   },
   {
     'language': 'nb',
+    'plural_form': 'english',
     'phrases': {
       'year': ['år', 'år', 'år'],
-      'month': ['måned', 'måneder', 'mnd'],
-      'week': ['uke', 'uker', 'u'],
-      'day': ['dag', 'dager', 'd'],
-      'hour': ['time', 'timer', 't'],
-      'minute': ['minutt', 'minutter', 'min'],
-      'second': ['sekund', 'sekunder', 'sek'],
-      'millisecond': ['millisekund', 'millisekunder', 'ms'],
+      'month': ['mnd', 'måned', 'måneder'],
+      'week': ['u', 'uke', 'uker'],
+      'day': ['d', 'dag', 'dager'],
+      'hour': ['t', 'time', 'timer'],
+      'minute': ['min', 'minutt', 'minutter'],
+      'second': ['sek', 'sekund', 'sekunder'],
+      'millisecond': ['ms', 'millisekund', 'millisekunder'],
       'combine': 'og',
       'error': 'Ugyldig dato',
     }
   },
   {
     'language': 'nl',
+    'plural_form': 'english',
     'phrases': {
-      'year': ['jaar', 'jaar', 'jr'],
-      'month': ['maand', 'maanden', 'mnd'],
-      'week': ['week', 'weken', 'wk'],
-      'day': ['dag', 'dagen', 'dg'],
-      'hour': ['uur', 'uur', 'u'],
-      'minute': ['minuut', 'minuten', 'min'],
-      'second': ['seconde', 'seconden', 'sec'],
-      'millisecond': ['milliseconde', 'milliseconden', 'ms'],
+      'year': ['jr', 'jaar', 'jaar'],
+      'month': ['mnd', 'maand', 'maanden'],
+      'week': ['wk', 'week', 'weken'],
+      'day': ['dg', 'dag', 'dagen'],
+      'hour': ['u', 'uur', 'uur'],
+      'minute': ['min', 'minuut', 'minuten'],
+      'second': ['sec', 'seconde', 'seconden'],
+      'millisecond': ['ms', 'milliseconde', 'milliseconden'],
       'combine': 'en',
       'error': 'Ongeldige datum',
     }
   },
   {
     'language': 'nn',
+    'plural_form': 'english',
     'phrases': {
       'year': ['år', 'år', 'år'],
-      'month': ['månad', 'månader', 'mnd'],
-      'week': ['veke', 'veker', 'v'],
-      'day': ['dag', 'dagar', 'd'],
-      'hour': ['time', 'timar', 't'],
-      'minute': ['minutt', 'minutt', 'min'],
-      'second': ['sekund', 'sekund', 'sek'],
-      'millisecond': ['millisekund', 'millisekund', 'ms'],
+      'month': ['mnd', 'månad', 'månader'],
+      'week': ['v', 'veke', 'veker'],
+      'day': ['d', 'dag', 'dagar'],
+      'hour': ['t', 'time', 'timar'],
+      'minute': ['min', 'minutt', 'minutt'],
+      'second': ['sek', 'sekund', 'sekund'],
+      'millisecond': ['ms', 'millisekund', 'millisekund'],
       'combine': 'og',
       'error': 'Ugyldig dato',
     }
   },
   {
     'language': 'de',
+    'plural_form': 'english',
     'phrases': {
-      'year': ['Jahr', 'Jahre', 'J.'],
-      'month': ['Monat', 'Monate', 'M.'],
-      'week': ['Woche', 'Wochen', 'Wo.'],
-      'day': ['Tag', 'Tage', 'Tg.'],
-      'hour': ['Stunde', 'Stunden', 'Std.'],
-      'minute': ['Minute', 'Minuten', 'Min.'],
-      'second': ['Sekunde', 'Sekunden', 'Sek.'],
-      'millisecond': ['Millisekunde', 'Millisekunden', 'ms'],
+      'year': ['J.', 'Jahr', 'Jahre'],
+      'month': ['M.', 'Monat', 'Monate'],
+      'week': ['Wo.', 'Woche', 'Wochen'],
+      'day': ['Tg.', 'Tag', 'Tage'],
+      'hour': ['Std.', 'Stunde', 'Stunden'],
+      'minute': ['Min.', 'Minute', 'Minuten'],
+      'second': ['Sek.', 'Sekunde', 'Sekunden'],
+      'millisecond': ['ms', 'Millisekunde', 'Millisekunden'],
       'combine': 'und',
       'error': 'Falsches Datum',
     }
   },
   {
     'language': 'pt',
+    'plural_form': 'english',
     'phrases': {
-      'year': ['ano', 'anos', 'aa'],
-      'month': ['mês', 'meses', 'mm'],
-      'week': ['semana', 'semanas', 'sem'],
-      'day': ['dia', 'dias', 'd'],
-      'hour': ['hora', 'horas', 'h'],
-      'minute': ['minuto', 'minutos', 'min'],
-      'second': ['segundo', 'segundos', 'seg'],
-      'millisecond': ['millissegundo', 'millissegundos', 'ms'],
+      'year': ['aa', 'ano', 'anos'],
+      'month': ['mm', 'mês', 'meses'],
+      'week': ['sem', 'semana', 'semanas'],
+      'day': ['d', 'dia', 'dias'],
+      'hour': ['h', 'hora', 'horas'],
+      'minute': ['min', 'minuto', 'minutos'],
+      'second': ['seg', 'segundo', 'segundos'],
+      'millisecond': ['ms', 'millissegundo', 'millissegundos'],
       'combine': 'e',
       'error': 'Data Inválida',
     }
   },
   {
     'language': 'dk',
+    'plural_form': 'english',
     'phrases': {
       'year': ['år', 'år', 'år'],
-      'month': ['måned', 'måneder', 'mnd'],
-      'week': ['uge', 'uger', 'uge'],
-      'day': ['dag', 'dage', 'dag'],
-      'hour': ['time', 'timer', 't.'],
-      'minute': ['minut', 'minuter', 'min.'],
-      'second': ['sekund', 'sekunder', 'sek.'],
-      'millisecond': ['millisekund', 'millisekunder', 'ms.'],
+      'month': ['mnd', 'måned', 'måneder'],
+      'week': ['uge', 'uge', 'uger'],
+      'day': ['dag', 'dag', 'dage'],
+      'hour': ['t.', 'time', 'timer'],
+      'minute': ['min.', 'minut', 'minuter'],
+      'second': ['sek.', 'sekund', 'sekunder'],
+      'millisecond': ['ms.', 'millisekund', 'millisekunder'],
       'combine': 'og',
       'error': 'Ugyldig dato',
     }
   },
   {
     'language': 'sv',
+    'plural_form': 'english',
     'phrases': {
       'year': ['år', 'år', 'år'],
-      'month': ['månad', 'månader', 'mån'],
-      'week': ['vecka', 'veckor', 'v'],
-      'day': ['dag', 'dagar', 'dag'],
-      'hour': ['timme', 'timmar', 'tim'],
-      'minute': ['minut', 'minuter', 'min'],
-      'second': ['sekund', 'sekunder', 'sek'],
-      'millisecond': ['millisekund', 'millisekunder', 'ms'],
+      'month': ['mån', 'månad', 'månader'],
+      'week': ['v', 'vecka', 'veckor'],
+      'day': ['dag', 'dag', 'dagar'],
+      'hour': ['tim', 'timme', 'timmar'],
+      'minute': ['min', 'minut', 'minuter'],
+      'second': ['sek', 'sekund', 'sekunder'],
+      'millisecond': ['ms', 'millisekund', 'millisekunder'],
       'combine': 'och',
       'error': 'Ogiltigt datum',
     }
   },
   {
     'language': 'cs',
+    'plural_form': 'slovak',
     'phrases': {
-      'year': ['rok', 'roky', 'rok'],
-      'month': ['měsíc', 'měsíce', 'měs'],
-      'week': ['týden', 'týdny', 'týd'],
-      'day': ['den', 'dny', 'd'],
-      'hour': ['hodina', 'hodiny', 'hod'],
-      'minute': ['minuta', 'minuty', 'min'],
-      'second': ['sekunda', 'sekundy', 'sek'],
-      'millisecond': ['millisekunda', 'millisekundy', 'ms'],
+      'year': ['rok', 'rok', 'roky', 'let'],
+      'month': ['měs', 'měsíc', 'měsíce', 'měsíců'],
+      'week': ['týd', 'týden', 'týdny', 'týdnů'],
+      'day': ['d', 'den', 'dny', 'dní'],
+      'hour': ['hod', 'hodina', 'hodiny', 'hodin'],
+      'minute': ['min', 'minuta', 'minuty', 'minut'],
+      'second': ['sek', 'sekunda', 'sekundy', 'sekund'],
+      'millisecond': ['ms', 'millisekunda', 'millisekundy', 'millisekund'],
       'combine': 'a',
-      'error': 'špatný datum'
+      'error': 'špatné datum'
     }
   },
   {
     'language': 'fi',
+    'plural_form': 'english',
     'phrases': {
-      'year': ['vuosi', 'vuotta', 'v'],
-      'month': ['kuukausi', 'kuukautta', 'kk'],
-      'week': ['viikko', 'viikkoa', 'vk'],
-      'day': ['päivä', 'päivää', 'pv'],
-      'hour': ['tunti', 'tuntia', 't'],
-      'minute': ['minuutti', 'minuuttia', 'min'],
-      'second': ['sekunti', 'sekuntia', 's'],
-      'millisecond': ['millisekunti', 'millisekuntia', 'ms'],
+      'year': ['v', 'vuosi', 'vuotta'],
+      'month': ['kk', 'kuukausi', 'kuukautta'],
+      'week': ['vk', 'viikko', 'viikkoa'],
+      'day': ['pv', 'päivä', 'päivää'],
+      'hour': ['t', 'tunti', 'tuntia'],
+      'minute': ['min', 'minuutti', 'minuuttia'],
+      'second': ['s', 'sekunti', 'sekuntia'],
+      'millisecond': ['ms', 'millisekunti', 'millisekuntia'],
       'combine': 'ja',
       'error': 'Väärä päivämäärä',
     }
   },
   {
     'language': 'ru',
+    'plural_form': 'russian',
     'phrases': {
-      'year': ['год', 'года', 'г'],
-      'month': ['месяц', 'месяцы', 'м'],
-      'week': ['неделя', 'недели', 'н'],
-      'day': ['день', 'дни', 'д'],
-      'hour': ['час', 'часы', 'ч'],
-      'minute': ['минута', 'минут', 'м'],
-      'second': ['секунд', 'секунды', 'с'],
-      'millisecond': ['милисекунд', 'милисекунды', 'мс'],
+      'year': ['г', 'год', 'года', 'лет'],
+      'month': ['м', 'месяц', 'месяца', 'месяцев'],
+      'week': ['н', 'неделя', 'недели', 'недель'],
+      'day': ['д', 'день', 'дня', 'дней'],
+      'hour': ['ч', 'час', 'часа', 'часов'],
+      'minute': ['м', 'минута', 'минуты', 'минут'],
+      'second': ['с', 'секунда', 'секунды', 'секунд'],
+      'millisecond': ['мс', 'миллисекунда', 'миллисекунды', 'миллисекунд'],
       'combine': 'и',
       'error': 'Неверная дата',
     }
   },
   {
     'language': 'uk',
+    'plural_form': 'russian',
     'phrases': {
-      'year': ['рік', 'років', 'р'],
-      'month': ['місяць', 'місяців', 'м'],
-      'week': ['тиждень', 'тижнів', 'тижд'],
-      'day': ['день', 'днів', 'дн'],
-      'hour': ['годину', 'годин', 'год'],
-      'minute': ['хвилину', 'хвилин', 'хв'],
-      'second': ['секунду', 'секунд', 'сек'],
-      'millisecond': ['мілісекунду', 'мілісекунд', 'мсек'],
+      'year': ['р', 'рік', 'роки', 'років'],
+      'month': ['м', 'місяць', 'місяці', 'місяців'],
+      'week': ['тижд', 'тиждень', 'тижні', 'тижнів'],
+      'day': ['дн', 'день', 'дні', 'днів'],
+      'hour': ['год', 'година', 'години', 'годин'],
+      'minute': ['хв', 'хвилина', 'хвилини', 'хвилин'],
+      'second': ['сек', 'секунда', 'секунди', 'секунд'],
+      'millisecond': ['мсек', 'мілісекунда', 'мілісекунди', 'мілісекунд'],
       'combine': 'та',
       'error': 'Недійсна дата',
     }
   },
+  {
+    'language': 'bg',
+    'plural_form': 'english',
+    'phrases': {
+      'year': ['г', 'година', 'години'],
+      'month': ['м', 'месец', 'месеца'],
+      'week': ['седм', 'седмица', 'седмици'],
+      'day': ['д', 'ден', 'дни'],
+      'hour': ['ч', 'час', 'часа'],
+      'minute': ['м', 'минута', 'минути'],
+      'second': ['с', 'секунда', 'секунди'],
+      'millisecond': ['мс', 'милисекунда', 'милисекунди'],
+      'combine': 'и',
+      'error': 'Невалидна дата',
+    }
+  },
+  {
+    'language': 'vi',
+    'plural_form': 'asian',
+    'phrases': {
+      'year': ['y', 'năm'],
+      'month': ['m', 'tháng'],
+      'week': ['w', 'tuần'],
+      'day': ['d', 'ngày'],
+      'hour': ['h', 'giờ'],
+      'minute': ['m', 'phút', 'phút'],
+      'second': ['s', 'giây'],
+      'millisecond': ['ms', 'mili giây'],
+      'combine': 'và',
+      'error': 'Ngày không hợp lệ',
+    }
+  },
+  {
+    'language': 'es',
+    'plural_form': 'english',
+    'phrases': {
+      'year': ['a', 'año', 'años'],
+      'month': ['m', 'mes', 'meses'],
+      'week': ['sem', 'semana', 'semanas'],
+      'day': ['d', 'día', 'días'],
+      'hour': ['h', 'hora', 'horas'],
+      'minute': ['min', 'minuto', 'minutos'],
+      'second': ['s', 'segundo', 'segundos'],
+      'millisecond': ['ms', 'milisegundo', 'milisegundos'],
+      'combine': 'y',
+      'error': 'Fecha inválida',
+    }
+  },
+  {
+    'language': 'he',
+    'plural_form': 'english',
+    'phrases': {
+      'year': ['שנה', 'שנה', 'שנים'],
+      'month': ['חודש', 'חודש', 'חודשים'],
+      'week': ['שבוע', 'שבוע', 'שבועות'],
+      'day': ['יום', 'יום', 'ימים'],
+      'hour': ['שעה', 'שעה', 'שעות'],
+      'minute': ['דקה', 'דקה', 'דקות'],
+      'second': ['שניה', 'שניה', 'שניות'],
+      'millisecond': ['מילי', 'מילישניה', 'מילישניות'],
+      'combine': 'ו',
+      'error': 'תאריך לא חוקי',
+    }
+  },
+  {
+    'language': 'hu',
+    'plural_form': 'english',
+    'phrases': {
+      'year': ['é', 'év', 'év'],
+      'month': ['hó', 'hónap', 'hónap'],
+      'week': ['hét', 'hét', 'hét'],
+      'day': ['n', 'nap', 'nap'],
+      'hour': ['ó', 'óra', 'óra'],
+      'minute': ['p', 'perc', 'perc'],
+      'second': ['mp', 'másodperc', 'másodperc'],
+      'millisecond': ['ms', 'ezredmásodperc', 'ezredmásodperc'],
+      'combine': 'és',
+      'error': 'Érvénytelen dátum',
+    }
+  },
+  {
+    'language': 'tr',
+    'plural_form': 'english',
+    'phrases': {
+      'year': ['yıl', 'yıl', 'yıl'],
+      'month': ['ay', 'ay', 'ay'],
+      'week': ['hf', 'hafta', 'hafta'],
+      'day': ['gün', 'gün', 'gün'],
+      'hour': ['sa', 'saat', 'saat'],
+      'minute': ['dk', 'dakika', 'dakika'],
+      'second': ['sn', 'saniye', 'saniye'],
+      'millisecond': ['ms', 'milisaniye', 'milisaniye'],
+      'combine': 've',
+      'error': 'Geçersiz tarih',
+    }
+  },
 ] -%}
 
 {# macro to convert the abbreviated input for the not_use and always_show lists to the full time part names #}
@@ -256,6 +380,8 @@
     {%- set compare_date = compare_date if compare_date is datetime else compare_date | as_datetime('invalid') -%}
     {%- set time = time | bool(true) -%}
     {%- set parts = [parts | int(1), always_show | count] | max -%} 
+  {# create namespace to store debug data #}
+    {%- set debug = namespace(debug="") -%}
   {# 1: check if date input is correct #}
     {%- if date is datetime and compare_date is datetime -%}
     {# convert date input to local or date only #}
@@ -354,7 +480,7 @@
           {%- set first = keys | select('in', always_show | default([], true) + [first]) | first -%}
           {%- set to_use = keys[keys.index(first):] -%}
           {%- set to_output = to_use[:parts] -%}
-          {%- set last = to_output | last  |default('millisecond') -%}
+          {%- set last = dur.items() | selectattr('0', 'in', to_output) | map(attribute='0') | list | last | default('millisecond') -%}
         {# 3: check if there is anything left to use #}
           {%- if to_use -%}
             {%- set to_output = to_use[:parts] -%}
@@ -365,9 +491,10 @@
               {%- set to_reject = to_use | reject('in', to_output) | reject('in', always_show) | list -%}
               {%- set not_use = not_use + to_output[as_check*-1:] + to_reject -%}
               {%- set to_output = to_output | reject('in', not_use) | list  + always_show -%}
-              {%- set to_output = keys | select('in', to_output) | list -%}
+              {%- set to_output = keys | select('in', to_output) | list + ['extra']-%}
               {%- set output = time_split(date, parts, compare_date, not_use, always_show, time, round_mode) | from_json -%}
             {%- endif -%}
+
           {# apply round if needed #}
             {%- if round_mode in ['common', 'ceil'] and last != 'millisecond' -%}
               {# determine first and last item with data #}
@@ -376,22 +503,59 @@
                 {%- set remain_part = remain / dur[last] -%}
                 {%- set to_round = 1 if remain_part >= 0.5 and round_mode == 'common' else remain_part | round(0, round_mode) -%}
                 {%- set sec_to_add = ((dur[last] + (dur.day if last in  ['year', 'month'] else 1) - remain) | round(0, 'ceil') * to_round) / 1000 -%}
-                {%- set round_mode = 'floor' -%}
                 {%- set date_max = [compare_date, date] | max + timedelta(seconds=sec_to_add) -%}
                 {%- set date_min = [compare_date, date] | min -%}
-                {%- set output = time_split(date_max, parts, date_min, not_use, always_show, time, round_mode) | from_json -%}
+                {%- set output = time_split(date_max, parts, date_min, not_use, always_show, time, 'floor') | from_json -%}
+                {%- set output = dict(output.items() | selectattr('0', 'in', do_use)) -%}
+                {%- set keys = output.keys() | list -%}
+                {%- set with_value = output.items() | rejectattr('1', 'eq', 0) | map(attribute='0') | list -%}
+                {%- set first = with_value | first | default('millisecond') -%}
+                {%- set first = keys | select('in', always_show | default([], true) + [first]) | first -%}
+                {%- set to_use = keys[keys.index(first):] -%}
+                {%- set to_output = to_use[:parts] -%}
             {%- endif -%}
           {# output result #}
             {%- set zero_values = output.items() | selectattr('1', 'eq', 0) | map(attribute='0') | list -%}
             {%- set reject_list = zero_values | reject('in', always_show) | list -%}
-            {{- dict(output.items() | selectattr('0', 'in', to_output) | rejectattr('0', 'in', reject_list)) | default({always_return: 0}, true) | to_json -}}
-          {%- else -%} {{- dict(error='No time parts left to output') | to_json -}}
+            {{- dict(output.items() | selectattr('0', 'in', to_output) | rejectattr('0', 'in', reject_list), **dict(debug=debug.debug) if debug.debug else dict()) | default({always_return: 0}, true) | to_json-}}
+          {%- else -%} {{- dict(error='No time parts left to output') -}}
           {%- endif -%} {# 3 #}
       {%- endif -%} {# 2 #} 
-    {%- else -%} {{- dict(error='Invalid date input') | to_json -}}
+    {%- else -%} {{- dict(error='Invalid date input')-}}
     {%- endif -%} {# 1 #}
 {%- endmacro -%}
 
+{# macro for determining the time unit variant depending on the language #}
+{%- macro plural(number=0, rule='english') -%}
+  {%- set mod100 = number % 100 -%}
+  {%- set mod10 = number % 10 -%}
+  {%- set form = 1 -%}
+  {%- if rule == 'english' -%}
+    {%- set form = 1 if number == 1 else 2 -%}
+  {%- elif rule == 'french' -%}
+    {%- set form = 1 if number <= 1 else 2 -%}
+  {%- elif rule == 'latvian' -%}
+    {%- set form = 1 if (mod10 == 1 and mod100 != 11) else 2 if number != 0 else 3 -%}
+  {%- elif rule == 'irish' -%}
+    {%- set form = 1 if number == 1 else 2 if number == 2 else 3 -%}
+  {%- elif rule == 'romanian' -%}
+    {%- set form = 1 if number == 1 else 2 if (number == 0 or (mod100 > 0 and mod100 < 20 )) else 3 -%}
+  {%- elif rule == 'lithuanian' -%}
+    {%- set form = 1 if (mod10 == 1 and mod100 != 11) else 2 if (mod10 >= 2 and (mod100 < 10 or mod100 >= 20)) else 3 -%}
+  {%- elif rule == 'russian' -%}
+    {%- set form = 1 if (mod10 == 1 and mod100 != 11) else 2 if (mod10 >= 2 and mod10 <= 4 and (mod100 < 10 or mod100 >= 20)) else 3 -%}
+  {%- elif rule == 'slovak' -%}
+    {%- set form = 1 if number == 1 else 2 if (number >= 2 and number <= 4) else 3 -%}
+  {%- elif rule == 'polish' -%}
+    {%- set form = 1 if number == 1 else 2 if (mod10 >= 2 and mod10 <= 4 and (mod100 < 10 or mod100 >= 20)) else 3 -%}
+  {%- elif rule == 'slovenian' -%}
+    {%- set form = 1 if mod100 == 1 else 2 if mod100 == 2 else 3 if (mod100 == 3 or mod100 == 4) else 4 -%}
+  {%- elif rule == 'arabic' -%}
+    {%- set form = 1 if number == 0 else 2 if number == 1 else 3 if number == 2 else 4 if (mod100 >= 3 and mod100 <= 10) else 5 if mod100 >= 11 else 6 -%}
+  {%- endif -%}
+  {{- form -}}
+{%- endmacro -%}
+
 {# macro to output a timedelta in a readable format #}
 {%- macro relative_time_plus(date, parts=1, abbr=false, language='en', compare_date=now(), not_use=['millisecond'], always_show=[], time=true, round_mode='floor') -%}
   {#- select correct phrases bases on language input #}
@@ -399,6 +563,7 @@
     {%- set languages = phrases | map(attribute='language') | list -%}
     {%- set language = iif(language in languages, language, 'en') -%}
     {%- set phr = phrases | selectattr('language', 'eq', language) | map(attribute='phrases') | list | first -%}
+    {%- set plural_form = phrases | selectattr('language', 'eq', language) | map(attribute='plural_form') | list | first -%}
     {%- set abbr = abbr | bool(false) -%}
   {# split timedelta #}
     {%- set time_parts = time_split(date, parts, compare_date, not_use, always_show, time, round_mode) | from_json -%}
@@ -409,9 +574,9 @@
     {# convert to phrases #}
       {%- set ns = namespace(phrases=[]) -%}
       {%- for i in time_parts.keys()  -%}
-        {%- set phr_abbr = phr[i][2] -%}
-        {%- set phr_verb = phr[i][1] if time_parts[i] != 1 else phr[i][0] -%}
-        {%- set phrase = '{} {}'.format(time_parts[i], phr_abbr if abbr else phr_verb) -%} 
+        {%- set plural_variant = plural(time_parts[i], plural_form) | int -%}
+        {%- set phr_form = phr[i][0] if abbr else phr[i][plural_variant] -%}
+        {%- set phrase = '{} {}'.format(time_parts[i], phr_form) -%}
         {%- set ns.phrases = ns.phrases + [phrase] -%}
       {%- endfor -%}
     {#- join phrases in a string, using phr.combine for the last item #}

custom_templates/sports.jinja

@@ -12,12 +12,56 @@
 {% endif %}
 {% endmacro %}
 
+{% macro period_str(team) %}
+{% if state_attr(team,'league') in ['NFL','NCAAF'] %}
+  quarter
+{% elif state_attr(team,'league') == 'MLB' %}
+  inning
+{% else %}
+  period
+{% endif %}
+{% endmacro %}
+
+{% macro sports_clock(team) %}
+  {% macro data() %}
+  {% set period_str = period_str(team) %}
+  {% set game_clock = state_attr(team,'clock') | lower %}
+  {% if state_attr(team,'league') == 'MLB' %}
+    {% if 'rain delay' in game_clock %}
+      {# Handle cases like "Rain Delay, Top 1st" #}
+      {% set status, inning = game_clock.split(',', 1) %}
+      {% set inning_parts = inning.split(' ') %}
+      in a {{ status | trim }} in the {{ inning_parts[1] ~ ' of the ' ~ inning_parts[2] }} {{ period_str }}
+    {% else %}
+      {% set inning_parts = game_clock.split(' ') %}
+      in the {{ inning_parts[0] ~ ' of the ' ~ inning_parts[1] ~ ' ' ~ period_str }}
+    {% endif %}
+  {% else %}
+    {% if ' - ' in game_clock %}
+      {% set clock_time, quarter = game_clock.split(' - ') %}
+      {% if quarter == 'ot' %}
+        with {{ clock_time ~ ' remaining in overtime' }}
+      {% else %}
+        with {{ clock_time ~ ' remaining in the ' ~ quarter ~ ' ' ~ period_str }}
+      {% endif %}
+    {% endif %}
+  {% endif %}
+  {% endmacro %}
+{{ cleanup(data()) }}
+{% endmacro %}
+
 {% macro sports_pregame(team) %}
   {% macro data() %}
+  {% if state_attr(team,'opponent_name') %}
+    {% set opponent_name = state_attr(team, 'opponent_name') %}
+    {% if opponent_name.endswith(' St') %}
+      {% set opponent_name = opponent_name | replace(' St', ' State') %}
+    {% endif %}
+  {% endif %}
   {% if is_state(team,'PRE') %}
     {% set date = state_attr(team,'date') | as_timestamp | timestamp_custom('%m-%d') %}
     {% if date == now().strftime('%m-%d') %}
-      The {{ state_attr(team,'friendly_name') }} will be playing today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} at {{ state_attr(team,'venue') }}. 
+      The {{ state_attr(team,'friendly_name') }} will be playing today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} at {{ state_attr(team,'venue') }}. 
       {{ sports_str(team,'start') }} is at {{ state_attr(team,'date') | as_timestamp | timestamp_custom('%I:%M %p') }}. 
     {% endif %}
   {% endif %}
@@ -27,6 +71,12 @@
 
 {% macro sports_main(team) %}
   {% macro data() %}
+  {% if state_attr(team,'opponent_name') %}
+    {% set opponent_name = state_attr(team, 'opponent_name') %}
+    {% if opponent_name.endswith(' St') %}
+      {% set opponent_name = opponent_name | replace(' St', ' State') %}
+    {% endif %}
+  {% endif %}
   {% if is_state(team,'POST') %}
     {% set date = state_attr(team,'date') | as_timestamp | timestamp_custom('%m-%d') %}
     {% set yday = (as_timestamp(now()) - (24*3600)) | timestamp_custom('%m-%d') %}
@@ -34,11 +84,11 @@
       {% if state_attr(team,'clock') in ['postponed','Postponed'] %}
         The {{ state_attr(team,'friendly_name') }} had their game postponed today, and it will be played at a later date. 
       {% elif (state_attr(team,'team_score') | int) == state_attr(team,'opponent_score') | int %}
-        The {{ state_attr(team,'friendly_name') }} tied in their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} tied in their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
       {% elif state_attr(team,'team_winner') == true %}
-        The {{ state_attr(team,'friendly_name') }} won their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} won their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
       {% elif state_attr(team,'opponent_winner') == true %}
-        The {{ state_attr(team,'friendly_name') }} lost their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} lost their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }}. 
       {% endif %}
       {% if state_attr(team,'clock') not in ['postponed','Postponed'] %}
         This brings their record to {{ state_attr(team,'team_record') | replace("-"," and ") }} on the season. 
@@ -47,11 +97,11 @@
       {% if state_attr(team,'clock') in ['postponed','Postponed'] %}
         The {{ state_attr(team,'friendly_name') }} had their game postponed yesterday, and it will be played at a later date. 
       {% elif (state_attr(team,'team_score') | int) == state_attr(team,'opponent_score') | int %}
-        The {{ state_attr(team,'friendly_name') }} tied in their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} tied in their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
       {% elif state_attr(team,'team_winner') == true %}
-        The {{ state_attr(team,'friendly_name') }} won their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} won their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
       {% elif state_attr(team,'opponent_winner') == true %}
-        The {{ state_attr(team,'friendly_name') }} lost their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} lost their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }}. 
       {% endif %}
       {% if state_attr(team,'clock') not in ['postponed','Postponed'] %}
         This brings their record to {{ state_attr(team,'team_record') | replace("-"," and ") }} on the season. 
@@ -59,11 +109,11 @@
     {% endif %}
   {% elif is_state(team,'IN') %}
     {% if (state_attr(team,'team_score') | int) == (state_attr(team,'opponent_score') | int) %}
-      The {{ state_attr(team,'friendly_name') }} are currently tied in their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} with a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
+      The {{ state_attr(team,'friendly_name') }} are currently tied in their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} with a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }} {{ sports_clock(team) }}.
     {% elif (state_attr(team,'team_score') | int) > (state_attr(team,'opponent_score') | int) %}
-      The {{ state_attr(team,'friendly_name') }} are currently winning their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} with a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
+      The {{ state_attr(team,'friendly_name') }} are currently winning their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} with a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }} {{ sports_clock(team) }}. 
     {% else %}
-      The {{ state_attr(team,'friendly_name') }} are currently losing their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} with a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }}. 
+      The {{ state_attr(team,'friendly_name') }} are currently losing their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} with a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }} {{ sports_clock(team) }}. 
     {% endif %}
   {% endif %}
   {% endmacro %}

custom_templates/status.jinja

@@ -474,11 +474,10 @@
     {% endif %}
     {% if is_state('input_boolean.kallen_alternate_pickup','on') %}
       {{ states('input_text.kallen_pickup') }} will be picking Collin up from school today.
-    {% else %}
-      Pickup today will be at {{ input_datetime_read('input_datetime.kallen_school_day_end') | trim }}.
       {% if is_state('input_boolean.kallen_school_early_release','on') %}
-        And It is early release!
+        Today is an early release day!
       {% endif %}
+      Pickup today will be at {{ input_datetime_read('input_datetime.kallen_school_day_end') | trim }}.
     {% endif %}
     {% if states('sensor.windows_open') | int > 0 %}
       'I detect that there are windows open. Make sure you close them before you leave, or else the security system will not arm. '
@@ -544,11 +543,12 @@
         {% endif %}
         {% if is_state('input_boolean.kallen_alternate_pickup','on') %}
           {{ states('input_text.kallen_pickup') }} will be picking him up from school today.
-        {% elif is_state('input_boolean.kallen_school_early_release','on') %}
+          {% if is_state('input_boolean.kallen_school_early_release','on') %}
             The school is on an early release schedule, pickup is at {{ input_datetime_read('input_datetime.kallen_school_day_end') | trim }}.
           {% else %}
             His pickup time is {{ input_datetime_read('input_datetime.kallen_school_day_end') | trim }}.
           {% endif %}
+        {% endif %}
       {% else %}
         {{ identKallen }} has school at {{ input_datetime_read('input_datetime.kallen_school_day_start') | trim }} today.
       {% endif %}

custom_templates/weather.jinja

@@ -19,15 +19,15 @@
   {% if type in ['alerts','full'] %}
     {% if is_state('input_boolean.tornado_alarm','on') %}
       We are under a tornado warning. If you are not already in shelter, you should be. Get on it!
-      {% if state_attr('binary_sensor.tornado_warning','confirmed' == true) %}
+      {% if state_attr('binary_sensor.tornado_warning','confirmed') == true %}
         A tornado has been confirmed in the area. Please take shelter immediately!
       {% endif %}
     {% elif is_state('binary_sensor.severe_thunderstorm_warning','on') %}
       We are under a severe thunderstorm warning.
-      {% if state_attr('binary_sensor.severe_thunderstorm_warning','tornado_possible' == true) %}
+      {% if state_attr('binary_sensor.severe_thunderstorm_warning','tornado_possible') == true %}
         The incoming storm has the potential to produce a tornado, so please pay attention and prepare to take shelter!
       {% endif %}
-      {% if state_attr('binary_sensor.severe_thunderstorm_warning','considerable_destructive' == true) %}
+      {% if state_attr('binary_sensor.severe_thunderstorm_warning','considerable_destructive') == true %}
         This storm has the potential to cause considerable damage. Please take shelter and stay safe!
       {% endif %}
     {% elif states('sensor.weatheralerts_active_alerts') > '0' and method != 'dashboard' %}
@@ -39,9 +39,24 @@
           There is lightning in the area. Nearest strike is {{ ltgdist }} miles away.
       {% endif %}
       {% if is_state('binary_sensor.raining','on') %}
+        {% if states('sensor.home_tempest_cloud_sensors_precipitation_intensity') not in ['unavailable','unknown','no_rain'] %}
+          {% set intensity = states('sensor.home_tempest_cloud_sensors_precipitation_intensity') %}
+          {% if intensity == 'very_light' %}
+            There is currently a very light drizzle falling.
+          {% elif intensity == 'light' %}
+            There is currently light rain falling. Front porch windows should be okay, but other windows should be closed.
+          {% elif intensity == 'moderate' %}
+            It is raining pretty good outside, you should probably make sure all windows are closed.
+          {% elif intensity in ['heavy','very_heavy'] %}
+            There is heavy rain falling, please make sure all doors and windows are closed at this time.
+          {% elif intensity == 'extreme' %}
+            It is raining extremely hard outside. Make sure all doors and windows are closed, and I recommend staying inside until it calms down. Perhaps check for roof leaks as well.
+          {% endif %}
+        {% else %}
           It is currently raining. Make sure all doors and windows are closed!
         {% endif %}
       {% endif %}
+    {% endif %}
     {% if state_attr('weather.iron_nerd_weather_station','visibility') | int < 3 %}
       Caution: Current outdoor visibility is {{ state_attr('weather.iron_nerd_weather_station','visibility') }} miles.
     {% endif %}
@@ -60,15 +75,15 @@
     {% endif %}
     {% if is_state('input_boolean.tornado_alarm','on') %}
       "We are under a tornado warning. If you are not already in shelter, you should be. Get on it! "
-      {% if state_attr('binary_sensor.tornado_warning','confirmed' == true) %}
+      {% if state_attr('binary_sensor.tornado_warning','confirmed') == true %}
         "A tornado has been confirmed in the area. Please take shelter immediately! "
       {% endif %}
     {% elif is_state('binary_sensor.severe_thunderstorm_warning','on') %}
       "We are under a severe thunderstorm warning. "
-      {% if state_attr('binary_sensor.severe_thunderstorm_warning','tornado_possible' == true) %}
+      {% if state_attr('binary_sensor.severe_thunderstorm_warning','tornado_possible') == true %}
         "The incoming storm has the potential to produce a tornado, so please pay attention and prepare to take shelter! "
       {% endif %}
-      {% if state_attr('binary_sensor.severe_thunderstorm_warning','considerable_destructive' == true) %}
+      {% if state_attr('binary_sensor.severe_thunderstorm_warning','considerable_destructive') == true %}
         "This storm has the potential to cause considerable damage. Please take shelter and stay safe! "
       {% endif %}
     {% elif is_state('input_boolean.tornado_watch','on') %}
@@ -90,6 +105,42 @@
       "The nearest lightning strike is {{ ltgdist }} miles away. "
     {% endif %}
     {% if is_state('binary_sensor.raining','on') %}
+      {% if states('sensor.home_tempest_cloud_sensors_precipitation_intensity') not in ['unavailable','unknown','no_rain'] %}
+        {% set intensity = states('sensor.home_tempest_cloud_sensors_precipitation_intensity') %}
+        {% if intensity == 'very_light' %}
+          {{ [
+            "There is currently a very light drizzle falling. ",
+            "It is drizzling outside, but it is not too bad. ",
+            "The sky is spitting on us. That's not very nice, but a mild inconvenience at most. "
+          ] | random }}
+        {% elif intensity == 'light' %}
+          {{ [
+            "There is currently light rain falling. ",
+            "It is raining lightly outside, but it is not too bad. ",
+            "It kinda wainin outside, but just a little. "
+          ] | random }}
+          "Front porch windows should be okay, but other windows should be closed. "
+        {% elif intensity == 'moderate' %}
+          {{ [
+            "It is raining pretty good outside, you should probably make sure all windows are closed. ",
+            "It is raining at a decent rate outside, please make sure all windows are closed. "
+            "If you look outside, you will see that it wainin. "
+          ] | random }}
+        {% elif intensity in ['heavy','very_heavy'] %}
+          {{ [
+            "There is heavy rain falling, please make sure all doors and windows are closed at this time. ",
+            "It is raining heavily outside, please make sure all doors and windows are closed. ",
+            "It wainin sideways! Please make sure all doors and windows are closed. "
+          ] | random }}
+        {% elif intensity == 'extreme' %}
+          {{ [
+            "It is raining extremely hard outside. ",
+            "There is a torrential downpour outside. ",
+            "Holy crap, I have never seen it rain this hard before. "
+          ] | random }}
+          "Make sure all doors and windows are closed, and I recommend staying inside until it calms down. Perhaps check for roof leaks as well. "
+        {% endif %}
+      {% else %}
         {{ [
           "I have looked outside and determined that it is raining. ",
           "If you look outside the window, you will notice, it wainin. ",
@@ -97,6 +148,7 @@
           "There appears to be excessive moisture currently falling from the sky. Plan accordingly. ",
         ] | random }}
       {% endif %}
+    {% endif %}
     {% if (state_attr('weather.iron_nerd_weather_station','visibility') | int ) < 3 %}
       {{ [
         "It is foggy outside, please exercise caution when driving. ",

input_select.yaml

@@ -11,6 +11,7 @@ report_type:
   options:
     - Bug Report
     - New Idea
+    - Adjustment
   initial: Bug Report
   icon: mdi:bug
 select_testing:

packages/announcements.yaml

@@ -239,6 +239,9 @@ script:
   server_maintenance_annc:
     alias: Server Maintenance Announcement
     sequence:
+    - service: input_boolean.turn_on
+      target:
+        entity_id: input_boolean.server_maintenance
     - service: script.status_annc
       data:
         who: "{{ who|default('everywhere') }}"
@@ -248,6 +251,9 @@ script:
   server_maintenance_done_annc:
     alias: Server Maintenance Done Announcement
     sequence:
+    - service: input_boolean.turn_off
+      target:
+        entity_id: input_boolean.server_maintenance
     - service: script.status_annc
       data:
         who: "{{ who|default('everywhere') }}"

packages/climate.yaml

@@ -1,14 +1,14 @@
 template:
   - binary_sensor:
-    - name: Emma Aircon - Compressor
+    - name: Emma Bedroom Aircon - Compressor
       unique_id: 21bcbb62-823c-43ff-8c2c-26e940324ee6
-      state: "{{ states('sensor.emma_air_conditioner_power') | int > 150 }}"
-      availability: "{{ states('fan.emma_air_conditioner') not in ['unknown','unavailable'] }}"
+      state: "{{ states('sensor.emma_bedroom_aircon_power') | int > 150 }}"
+      availability: "{{ states('climate.emma_bedroom_aircon') not in ['unknown','unavailable'] }}"
       device_class: running
-    - name: Emma Aircon - Fan
+    - name: Emma Bedroom Aircon - Fan
       unique_id: 9e3054cf-8f7e-4fef-9da4-5b2f2bc99c9d
-      state: "{{ states('sensor.emma_air_conditioner_power') | int > 20 }}"
-      availability: "{{ states('fan.emma_air_conditioner') not in ['unknown','unavailable'] }}"
+      state: "{{ states('sensor.emma_bedroom_aircon_power') | int > 20 }}"
+      availability: "{{ states('climate.emma_bedroom_aircon') not in ['unknown','unavailable'] }}"
       device_class: running
     - name: Master Bedroom Aircon - Compressor
       unique_id: 87051957-1dbc-4d65-b138-e8469728f58f
@@ -116,16 +116,6 @@ template:
       unique_id: 2ce31844-b115-42b8-8213-feccf24e236c
       state: "{{ state_attr('climate.master_bedroom_aircon','temperature') | float }}"
       availability: "{{ states('climate.master_bedroom_aircon') not in ['unavailable','unknown'] }}"
-    - name: "Master Bedroom Eco Mode"
-      unique_id: edf36e23-adcf-4506-80eb-a14f4ea2fce0
-      state: "{{ is_state_attr('climate.master_bedroom_aircon','preset_mode','eco') }}"
-      icon: >-
-        {% if is_state_attr('climate.master_bedroom_aircon','preset_mode','eco') %}
-          mdi:home-lightning-bolt
-        {% else %}
-          mdi:home-lightning-bolt-outline
-        {% endif %}
-      availability: "{{ states('climate.master_bedroom_aircon') not in ['unavailable','unknown'] }}"
     - name: "Master Bedroom Aircon Fan Mode"
       unique_id: c0e4f9ba-0c6c-4673-9a75-13f253f2f2e8
       state: "{{ state_attr('climate.master_bedroom_aircon','fan_mode') }}"
@@ -142,6 +132,26 @@ template:
           mdi:fan-off
         {% endif %}
       availability: "{{ states('climate.master_bedroom_aircon') not in ['unavailable','unknown'] }}"
+    - name: "Emma Bedroom Target Temp"
+      unique_id: b81152a1-d4d9-4e3e-8a78-6039de2884ad
+      state: "{{ state_attr('climate.emma_bedroom_aircon','temperature') | float }}"
+      availability: "{{ states('climate.emma_bedroom_aircon') not in ['unavailable','unknown'] }}"
+    - name: "Emma Bedroom Aircon Fan Mode"
+      unique_id: d678eb2e-be5b-4626-913d-fc1e32941ead
+      state: "{{ state_attr('climate.emma_bedroom_aircon','fan_mode') }}"
+      icon: >
+        {% if is_state_attr('climate.emma_bedroom_aircon','fan_mode','Auto') %}
+          mdi:fan-auto
+        {% elif is_state_attr('climate.emma_bedroom_aircon','fan_mode','Low') %}
+          mdi:fan-speed-1
+        {% elif is_state_attr('climate.emma_bedroom_aircon','fan_mode','Medium') %}
+          mdi:fan-speed-2
+        {% elif is_state_attr('climate.emma_bedroom_aircon','fan_mode','High') %}
+          mdi:fan-speed-3
+        {% else %}
+          mdi:fan-off
+        {% endif %}
+      availability: "{{ states('climate.emma_bedroom_aircon') not in ['unavailable','unknown'] }}"
     - name: Living Room Average Temperature
       unique_id: c4a901a6-87e2-4257-b60b-2944be8fdf04
       state: >
@@ -187,16 +197,17 @@ input_boolean:
   master_bedroom_climate_protocol:
     name: Master Bedroom Climate Protocol
     icon: mdi:lightbulb-night
+  emma_bedroom_climate_protocol:
+    name: Emma Bedroom Climate Protocol
+    icon: mdi:lightbulb-night
   kallen_bedtime_protocol:
     name: Kallen Bedtime Protocol
     icon: mdi:lightbulb-night
 
-  # Turn on when master bedroom air conditioner is installed, turn off in winter when we take it out, for smarter automations
+  # Turn on when air conditioners are installed, turn off in winter when we take them out
   master_bedroom_aircon_installed:
     name: Master Bedroom Aircon Installed
     icon: mdi:tools
-
-  # Same thing, but for Emma's bedroom air conditioner
   emma_bedroom_aircon_installed:
     name: Emma Bedroom Aircon Installed
     icon: mdi:tools
@@ -205,6 +216,9 @@ input_boolean:
   master_bedroom_cooling_on:
     name: Master Bedroom Cooling On
     icon: mdi:snowflake
+  emma_bedroom_cooling_on:
+    name: Emma Bedroom Cooling On
+    icon: mdi:snowflake
 
   # Activated if the day will be excessively hot. For use with automations for daytime climate control.
   hot_day:
@@ -247,6 +261,7 @@ input_select:
     name: Scheduled Climate Mode - Emma Bedroom
     options:
       - AC
+      - Fan
       - Heat
       - White Noise
       - N/A
@@ -309,13 +324,55 @@ input_number:
     step: 1
     unit_of_measurement: °F
     icon: mdi:thermometer
-  emma_aircon_threshold:
-    name: Emma Aircon Threshold
+  emma_bedroom_daytime_temp:
+    name: Emma Bedroom Daytime Temp
+    min: 65
+    max: 80
+    step: 1
+    unit_of_measurement: °F
+    icon: mdi:thermometer
+  emma_bedroom_night_temp:
+    name: Emma Bedroom Night Temp
+    min: 65
+    max: 80
+    step: 1
+    unit_of_measurement: °F
+    icon: mdi:thermometer
+  emma_bedroom_bedtime_temp:
+    name: Emma Bedroom Bedtime Temp
+    min: 65
+    max: 80
+    step: 1
+    unit_of_measurement: °F
+    icon: mdi:thermometer
+  emma_bedroom_aircon_run_threshold:
+    name: Emma Bedroom Aircon Run Threshold
     min: 40
     max: 80
     step: 1
     unit_of_measurement: °F
     icon: mdi:thermometer
+  emma_bedroom_aircon_mode_threshold:
+    name: Emma Bedroom Aircon Mode Threshold
+    min: 40
+    max: 80
+    step: 1
+    unit_of_measurement: °F
+    icon: mdi:thermometer
+  emma_bedroom_fan_threshold:
+    name: Emma Bedroom Fan Threshold
+    min: 30
+    max: 70
+    step: 1
+    unit_of_measurement: °F
+    icon: mdi:thermometer
+  emma_bedroom_auto_cooling_threshold:
+    name: Emma Bedroom Auto Cooling Threshold
+    min: 70
+    max: 90
+    step: 1
+    unit_of_measurement: °F
+    icon: mdi:thermometer
   kallen_fan_threshold:
     name: Kallen Fan Threshold
     min: 40

packages/custom_weather.yaml

@@ -3,6 +3,7 @@ weather:
     name: "Iron Nerd Weather Station"
     condition_template: >
       {% set stations = [
+        states.weather.home_tempest_forecast_home,
         states.weather.home,
         states.weather.kdfi_daynight,
         states.weather.iron_nerd_studios,
@@ -12,6 +13,7 @@ weather:
       {{ states(result) }}
     temperature_template: >
       {% set temps = [
+        states.sensor.home_tempest_temperature,
         states.sensor.home_temperature,
         states.sensor.kdfi_temperature,
         states.sensor.pirateweather_temperature,
@@ -20,8 +22,28 @@ weather:
       {% set sensor = temps | selectattr('state','ne','unavailable') | selectattr('state','ne','unknown') | map(attribute='entity_id') | list | first %}
       {{ states(sensor) | float }}
     temperature_unit: °F
+    dew_point_template: >
+      {% set dewpoints = [
+        states.sensor.home_tempest_dew_point,
+        states.sensor.home_dew_point,
+        states.sensor.kdfi_dew_point,
+        states.sensor.pirateweather_dew_point,
+        states.sensor.openweathermap_dew_point
+        ] %}
+        {% set sensor = dewpoints | selectattr('state','ne','unavailable') | selectattr('state','ne','unknown') | map(attribute='entity_id') | list | first %}
+        {{ states(sensor) | float }}
+    apparent_temperature_template: >
+      {% set apparent_temps = [
+        states.sensor.home_tempest_feels_like,
+        states.sensor.home_temperature_feels_like,
+        states.sensor.pirateweather_apparent_temperature,
+        states.sensor.stratton_ave_apparent_temperature
+      ] %}
+      {% set sensor = apparent_temps | selectattr('state','ne','unavailable') | selectattr('state','ne','unknown') | map(attribute='entity_id') | list | first %}
+      {{ states(sensor) | float }}
     humidity_template: >
       {% set humidity = [
+        states.sensor.home_tempest_humidity,
         states.sensor.home_relative_humidity,
         states.sensor.kdfi_relative_humidity,
         states.sensor.pirateweather_humidity,
@@ -40,12 +62,14 @@ weather:
       {{ forecasts | selectattr('forecast','defined') | map(attribute='forecast') | list | first }}
     forecast_hourly_template: >
       {% set forecasts = [
-        states.sensor.weather_com_hourly_weather_forecast,
+        states.sensor.weather_com_hourly_weather_forecast.attributes,
         states.sensor.pirateweather_hourly_weather_forecast.attributes
       ] %}
       {{ forecasts | selectattr('forecast','defined') | map(attribute='forecast') | list | first }}
     pressure_template: >
       {% set pressures = [
+        states.sensor.home_tempest_local_slp,
+        states.sensor.home_tempest_cloud_sensors_sea_level_pressure,
         states.sensor.home_pressure,
         states.sensor.kdfi_barometric_pressure
       ] %}
@@ -92,6 +116,7 @@ weather:
     name: "Iron Nerd Weather Station - Hourly"
     condition_template: >
       {% set stations = [
+        states.weather.home_tempest_forecast_home,
         states.weather.home,
         states.weather.tomorrow_io_stratton_ave_hourly,
         states.weather.iron_nerd_studios,
@@ -102,6 +127,7 @@ weather:
       {{ states(result) }}
     temperature_template: >
       {% set temps = [
+        states.sensor.home_tempest_temperature,
         states.sensor.home_temperature,
         states.sensor.kdfi_temperature,
         states.sensor.pirateweather_temperature,
@@ -110,8 +136,28 @@ weather:
       {% set sensor = temps | selectattr('state','ne','unavailable') | selectattr('state','ne','unknown') | map(attribute='entity_id') | list | first %}
       {{ states(sensor) | float }}
     temperature_unit: °F
+    dew_point_template: >
+      {% set dewpoints = [
+        states.sensor.home_tempest_dew_point,
+        states.sensor.home_dew_point,
+        states.sensor.kdfi_dew_point,
+        states.sensor.pirateweather_dew_point,
+        states.sensor.openweathermap_dew_point
+        ] %}
+        {% set sensor = dewpoints | selectattr('state','ne','unavailable') | selectattr('state','ne','unknown') | map(attribute='entity_id') | list | first %}
+        {{ states(sensor) | float }}
+    apparent_temperature_template: >
+      {% set apparent_temps = [
+        states.sensor.home_tempest_feels_like,
+        states.sensor.home_temperature_feels_like,
+        states.sensor.pirateweather_apparent_temperature,
+        states.sensor.stratton_ave_apparent_temperature
+      ] %}
+      {% set sensor = apparent_temps | selectattr('state','ne','unavailable') | selectattr('state','ne','unknown') | map(attribute='entity_id') | list | first %}
+      {{ states(sensor) | float }}
     humidity_template: >
       {% set humidity = [
+        states.sensor.home_tempest_humidity,
         states.sensor.home_relative_humidity,
         states.sensor.kdfi_relative_humidity,
         states.sensor.pirateweather_humidity,
@@ -121,13 +167,15 @@ weather:
       {{ states(result) | float }}
     forecast_hourly_template: >
       {% set forecasts = [
-        states.sensor.weather_com_hourly_weather_forecast,
+        states.sensor.weather_com_hourly_weather_forecast.attributes,
         states.weather.tomorrow_io_stratton_ave_hourly.attributes,
         states.sensor.pirateweather_hourly_weather_forecast.attributes
       ] %}
       {{ forecasts | selectattr('forecast','defined') | map(attribute='forecast') | list | first }}
     pressure_template: >
       {% set pressures = [
+        states.sensor.home_tempest_local_slp,
+        states.sensor.home_tempest_cloud_sensors_sea_level_pressure,
         states.sensor.home_pressure,
         states.sensor.kdfi_barometric_pressure
       ] %}
@@ -322,6 +370,60 @@ sensor:
   #     days: 7
 
 template:
+  - trigger:
+    - platform: time_pattern
+      minutes: /15
+    - platform: state
+      entity_id: weather.home_tempest_forecast_home
+    - platform: homeassistant
+      event: start
+    action:
+    - service: weather.get_forecasts
+      data:
+        type: daily
+      target:
+        entity_id: weather.home_tempest_forecast_home
+      response_variable: daily
+    - variables:
+        today: "{{ daily['weather.home_tempest_forecast_home'].forecast[0] }}"
+    sensor:
+    - name: Weatherflow Daily Weather Forecast
+      unique_id: 2c70c4ee-7f7f-42b4-ad40-90ce2b6c6d77
+      state: "{{ now().isoformat() }}"
+      attributes:
+        forecast: "{{ daily['weather.home_tempest_forecast_home'].forecast }}"
+    - name: Weatherflow High
+      unique_id: 296b4361-459a-48e7-9793-c003b88fcdef
+      state: "{{ today.temperature }}"
+      unit_of_measurement: °F
+    - name: Weatherflow Low
+      unique_id: 61c344be-33d3-4e1d-8d0d-277c2b850c0d
+      state: "{{ today.templow }}"
+      unit_of_measurement: °F
+    - name: Weatherflow Rain Chance Today
+      unique_id: ab0327ff-f20f-4d16-aeb5-78682b3e2397
+      state: "{{ today.precipitation_probability }}"
+      unit_of_measurement: "%"
+  - trigger:
+    - platform: time_pattern
+      minutes: /15
+    - platform: state
+      entity_id: weather.home_tempest_forecast_home
+    - platform: homeassistant
+      event: start
+    action:
+    - service: weather.get_forecasts
+      data:
+        type: hourly
+      target:
+        entity_id: weather.home_tempest_forecast_home
+      response_variable: hourly
+    sensor:
+    - name: Weatherflow Hourly Weather Forecast
+      unique_id: aa0b368c-ea23-4514-a697-e122353eb76d
+      state: "{{ now().isoformat() }}"
+      attributes:
+        forecast: "{{ hourly['weather.home_tempest_forecast_home'].forecast }}"
   - trigger:
     - platform: time_pattern
       minutes: /15
@@ -668,10 +770,10 @@ template:
           {% endif %}
     - name: "Lightning Warning"
       unique_id: edaddfc4-f7f0-4d75-aada-a2c588afe029
-      state: "{{ states('sensor.blitzortung_lightning_counter') | int > 0 }}"
+      state: "{{ states('sensor.home_tempest_cloud_sensors_lightning_strikes_last_hour') | int > 0 }}"
       device_class: safety
       attributes:
-        current_strikes: "{{ states('sensor.blitzortung_lightning_counter') | int }}"
+        current_strikes: "{{ states('sensor.home_tempest_cloud_sensors_lightning_strikes_last_hour') | int }}"
       icon: "{{ 'mdi:flash-alert' if states('sensor.blitzortung_lightning_counter') | int > 0 else 'mdi:flash-outline'}}"
     - name: "Audible Weather Alerts Allowed"
       unique_id: 03851823-32d5-44c1-af42-256fcd922069
@@ -701,52 +803,57 @@ template:
     - name: Raining
       unique_id: 232b43a4-4598-4315-ab76-42348c11e6ff
       state: >
-        {{ states('sensor.total_rain_sensors') | int > 1 }}
-      icon: "{{ 'mdi:weather-rainy' if states('sensor.total_rain_sensors') | int > 1 else 'mdi:weather-cloudy' }}"
+        {{ states('sensor.home_tempest_precipitation_intensity') | float > 0 or
+            states('sensor.home_tempest_precipitation_type') in ['rain','hail','rain_hail'] or
+            states('sensor.home_tempest_cloud_sensors_precipitation_description') in ['rain','heavy_rain'] or
+            is_state('binary_sensor.home_tempest_cloud_binary_sensors_is_raining','on') }}
+      icon: "{{ 'mdi:weather-rainy' if this.state == 'on' else 'mdi:weather-cloudy' }}"
   - sensor:
-    - name: Total Rain Sensors
-      unique_id: b7c2e709-8f5c-4263-aa1d-fa8280afcddb
-      unit_of_measurement: 'sensors'
-      state: >
-        {% set sensors = [
-          states.sensor.pirateweather_precip,
-          states.sensor.openweathermap_precipitation_kind,
-          states.sensor.tomorrow_io_stratton_ave_precipitation_type
-        ] %}
-        {% set numeric_sensors = [
-          states.sensor.stratton_ave_precipitation
-        ] %}
-        {% set c1 = sensors | selectattr('state','eq','rain') | list | count %}
-        {% set c2 = numeric_sensors | map(attribute='state') | map('float') | select('gt',0) | list | count %}
-        {{ (c1 + c2) | int }}
+    # - name: Total Rain Sensors
+    #   unique_id: b7c2e709-8f5c-4263-aa1d-fa8280afcddb
+    #   unit_of_measurement: 'sensors'
+    #   state: >
+    #     {% set sensors = [
+    #       states.sensor.home_tempest_precipitation_type,
+    #       states.sensor.pirateweather_precip,
+    #       states.sensor.openweathermap_precipitation_kind,
+    #       states.sensor.tomorrow_io_stratton_ave_precipitation_type
+    #     ] %}
+    #     {% set numeric_sensors = [
+    #       states.sensor.home_tempest_precipitation_intensity,
+    #       states.sensor.stratton_ave_precipitation
+    #     ] %}
+    #     {% set c1 = sensors | selectattr('state','eq','rain') | list | count %}
+    #     {% set c2 = numeric_sensors | map(attribute='state') | map('float') | select('gt',0) | list | count %}
+    #     {{ (c1 + c2) | int }}
     - name: Current Forecast
       unique_id: c0faea33-2ac3-40f1-8558-584c3f5d6b16
       icon: mdi:weather-sunny
       state: >-
-          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
+          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
           {{ forecast.condition }}
       attributes:
         high_temp: >-
-          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
+          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
           {{ forecast.temperature }}
         overnight_low: >-
-          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
+          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
           {{ forecast.templow }}
         wind_bearing: >-
-          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
+          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
           {{ forecast.wind_bearing }}
         wind_speed: >-
-          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
+          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
           {{ forecast.wind_speed }}
         precipitation: >-
           {% if state_attr('weather.iron_nerd_weather_station','precipitation') %}
             {% set forecast = state_attr('weather.iron_nerd_weather_station','forecast')[0] %}
           {% else %}
-            {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
+            {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
           {% endif %}
           {{ forecast.precipitation }}
         friendly: >-
-          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
+          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
           {{ forecast.condition | replace("partlycloudy","partly cloudy") }}
     - name: Current Forecast Detail
       unique_id: e5ae9864-70b5-402c-9d2f-c4d6a10085df
@@ -861,23 +968,23 @@ template:
       unique_id: a8ae26b0-ed26-4568-bb2b-f7c72707b009
       icon: mdi:weather-sunny
       state: >-
-          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[1] %}
+          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[1] %}
           {{ forecast.condition }}
       attributes:
         high_temp: >-
-          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[1] %}
+          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[1] %}
           {{ forecast.temperature }}
         overnight_low: >-
-          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[1] %}
+          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[1] %}
           {{ forecast.templow }}
         wind_bearing: >-
-          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[1] %}
+          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[1] %}
           {{ forecast.wind_bearing }}
         wind_speed: >-
-          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[1] %}
+          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[1] %}
           {{ forecast.wind_speed }}
         precipitation: >-
-          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[1] %}
+          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[1] %}
           {{ forecast.precipitation }}
     - name: Tomorrow Forecast Detail
       unique_id: 21374ed0-80d1-49ba-817d-3e93eb3865e4
@@ -1182,7 +1289,7 @@ template:
       unit_of_measurement: '°F'
       device_class: temperature
       state: >-
-        {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
+        {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
         {% if is_number(forecast.temperature) %}
           {{ forecast.temperature }}
         {% else %}
@@ -1193,14 +1300,14 @@ template:
       unit_of_measurement: '°F'
       device_class: temperature
       state: >-
-        {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[2] %}
+        {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[2] %}
         {{ forecast.temperature }}
     - name: "Tonight's Low Temp"
       unique_id: 8ddc55b6-4728-4897-a32f-90be970f744b
       unit_of_measurement: '°F'
       device_class: temperature
       state: >-
-        {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
+        {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
         {{ forecast.templow }}
     - name: "Clothing Forecast"
       unique_id: 8ed2684b-d0ad-402c-bc3c-340cb9b2437a
@@ -1461,8 +1568,8 @@ template:
       unit_of_measurement: '°F'
       state: >
         {% set ns = namespace(temps=[]) %}
-        {% set x = state_attr('sensor.weather_com_hourly_weather_forecast','forecast')  | count %}
-        {% set pd = state_attr('sensor.weather_com_hourly_weather_forecast','forecast') %}
+        {% set x = state_attr('sensor.weatherflow_hourly_weather_forecast','forecast')  | count %}
+        {% set pd = state_attr('sensor.weatherflow_hourly_weather_forecast','forecast') %}
         {% for i in range(0,x) %}
           {% set hr = as_timestamp(as_local(as_datetime(pd[i].datetime))) | timestamp_custom('%H') | int %}
           {% if hr in range(21,24) or hr in range(0,8) %}

packages/dashboards.yaml

@@ -0,0 +1,11 @@
+template:
+  - trigger:
+      - trigger: event
+        event_type: bubble_card_update_modules
+    sensor:
+      - name: "Bubble Card Modules"
+        state: "saved"
+        icon: "mdi:puzzle"
+        attributes:
+          modules: "{{ trigger.event.data.modules }}"
+          last_updated: "{{ trigger.event.data.last_updated }}"

packages/emmalynn.yaml

@@ -257,6 +257,9 @@ automation:
               time: >
                 {% from 'time.jinja' import current_time %}
                 {{ current_time('time',24) }}
+          - service: input_boolean.turn_off
+            target:
+              entity_id: input_boolean.emma_awake
       - conditions:
         - condition: trigger
           id: bedtime-timer-finished
@@ -281,6 +284,9 @@ automation:
               datetime: >
                 {% from 'time.jinja' import current_time %}
                 {{ current_time('time',24) }}
+          - service: input_boolean.turn_off
+            target:
+              entity_id: input_boolean.emma_awake
 
   - id: e59f638a-519f-4619-bf7d-b13251b3a374
     alias: Emma Meds Handler
@@ -804,14 +810,9 @@ script:
             datetime: >
               {% from 'time.jinja' import set_datetime %}
               {{ set_datetime(0,5) }}
-      - if:
-        - condition: state
-          entity_id: binary_sensor.basement_occupied
-          state: 'on'
-        then:
       - service: script.speech_engine
         data:
-            who: basement
+          who: common
           type: normal
           message: Emma has awoken, so it is time to make your way upstairs now
       - service: input_datetime.set_datetime
@@ -898,26 +899,3 @@ script:
       - service: input_boolean.turn_off
         target:
           entity_id: input_boolean.white_noise_emma_bedroom
-      - if:
-        - condition: state
-          entity_id: fan.emma_air_conditioner
-          state: 'on'
-        then:
-        - service: script.turn_on
-          target:
-            entity_id: script.emma_aircon_shutoff
-
-  emma_aircon_shutoff:
-    alias: 'Emma Air Conditioner Shutoff'
-    mode: restart
-    description: 'Attempt to shut off air conditioner after compressor stops running'
-    sequence:
-    - wait_template: "{{ is_state('binary_sensor.emma_aircon_compressor','off') }}"
-      timeout:
-        minutes: 15
-      continue_on_timeout: true
-    - delay:
-        seconds: 5
-    - service: fan.turn_off
-      target:
-        entity_id: fan.emma_air_conditioner

packages/integrations.yaml

@@ -31,8 +31,7 @@ tts:
     region_name: 'us-east-1'
     text_type: ssml
     voice: Joanna
-    cache: true
-    engine: neural
+    engine: generative
 
 conversation:
 

packages/lighting_and_scenes.yaml

@@ -44,6 +44,9 @@ input_boolean:
   adaptive_lighting_adjustments:
     name: Adaptive Lighting Adjustments
     icon: mdi:knob
+  sunset_lights_triggered:
+    name: Sunset Lights Triggered
+    icon: mdi:weather-sunset
 
 input_number:
   upstairs_bathroom_motion_off_delay:
@@ -207,6 +210,21 @@ input_number:
     step: 5
     unit_of_measurement: lx
     icon: mdi:sun-wireless
+  front_porch_lux_threshold:
+    name: Front Porch Lux Threshold
+    min: 0
+    max: 2000
+    step: 5
+    mode: box
+    unit_of_measurement: lx
+    icon: mdi:sun-wireless
+  sunset_lights_outdoor_lux_threshold:
+    name: Sunset Lights Outdoor Lux Threshold
+    min: 0
+    max: 10000
+    step: 100
+    unit_of_measurement: lx
+    icon: mdi:sun-wireless
 
   # Settings for adaptive adjustments
   daytime_colortemp_front_porch:
@@ -489,6 +507,7 @@ input_select:
       - Evening Mode
       - Night Mode
       - Bright Mode
+      - Reading Mode
       - Reset
     initial: Select
     icon: mdi:desk
@@ -653,6 +672,25 @@ template:
           {% endif %}
       device_class: problem
       delay_on: "00:00:10"
+    - name: Light Switch Issue
+      unique_id: 381e8038-ea96-474c-92ec-d1296dc1369e
+      state: >
+        {% set lights = states.light.upstairs_bathroom_lights,
+                        states.light.hallway_overhead,
+                        states.light.downstairs_bathroom_lights,
+                        states.light.living_room_lights,
+                        states.light.front_porch_light %}
+        {% set issues = lights | selectattr('state','eq','unavailable') | list | count %}
+        {{ issues > 0 }}
+      attributes:
+        issues: >
+          {% set lights = states.light.upstairs_bathroom_lights,
+                          states.light.hallway_overhead,
+                          states.light.downstairs_bathroom_lights,
+                          states.light.living_room_lights,
+                          states.light.front_porch_light %}
+          {% set ids = lights | selectattr('state','eq','unavailable') | map(attribute='attributes.friendly_name') | list %}
+          {{ ids | join(', ') }}
   - sensor:
     - name: "Basement Studio Lights - Brightness Actual"
       unique_id: dee4dc84-a6a0-4150-903e-5b8bd436d962

packages/notify.yaml

@@ -198,6 +198,57 @@ input_number:
     step: 0.05
     icon: mdi:knob
 
+template:
+  - sensor:
+    - name: "Basement Echo Dot Volume"
+      state: >
+        {% if is_state('input_boolean.give_me_darkness','on') %}
+          {{ states('input_number.basement_echo_dot_night_volume') }}
+        {% else %}
+          {{ states('input_number.basement_echo_dot_day_volume') }}
+        {% endif %}
+      icon: mdi:volume-high
+    - name: "Basement Google Speaker Volume"
+      state: >
+        {% if is_state('input_boolean.give_me_darkness','on') %}
+          {{ states('input_number.basement_google_speaker_night_volume') }}
+        {% else %}
+          {{ states('input_number.basement_google_speaker_day_volume') }}
+        {% endif %}
+      icon: mdi:volume-high
+    - name: "Living Room Echo Dot Volume"
+      state: >
+        {% if is_state('input_boolean.give_me_darkness','on') %}
+          {{ states('input_number.living_room_echo_dot_night_volume') }}
+        {% else %}
+          {{ states('input_number.living_room_echo_dot_day_volume') }}
+        {% endif %}
+      icon: mdi:volume-high
+    - name: "Master Bedroom Echo Dot Volume"
+      state: >
+        {% if is_state('input_boolean.give_me_darkness','on') or is_state('binary_sensor.people_sleeping','on') %}
+          {{ states('input_number.master_bedroom_echo_dot_night_volume') }}
+        {% else %}
+          {{ states('input_number.master_bedroom_echo_dot_day_volume') }}
+        {% endif %}
+      icon: mdi:volume-high
+    - name: "Kallen Bedroom Google Speaker Volume"
+      state: >
+        {% if is_state('input_boolean.give_me_darkness','on') or is_state('input_boolean.kallen_sleeping','on') %}
+          {{ states('input_number.kallen_bedroom_google_speaker_night_volume') }}
+        {% else %}
+          {{ states('input_number.kallen_bedroom_google_speaker_day_volume') }}
+        {% endif %}
+      icon: mdi:volume-high
+    - name: "Emma Bedroom Google Speaker Volume"
+      state: >
+        {% if is_state('input_boolean.give_me_darkness','on') or is_state('input_boolean.emma_sleeping','on') %}
+          {{ states('input_number.emma_bedroom_google_speaker_night_volume') }}
+        {% else %}
+          {{ states('input_number.emma_bedroom_google_speaker_day_volume') }}
+        {% endif %}
+      icon: mdi:volume-high
+
 # Amazon Polly Sensors to see last message and location of audible notification
 mqtt:
   sensor:
@@ -325,24 +376,14 @@ script:
         - condition: template
           value_template: >
             {% set current = state_attr('media_player.basement_echo_dot','volume_level') | float %}
-            {% set night = states('input_number.basement_echo_dot_night_volume') | float %}
-            {% set day = states('input_number.basement_echo_dot_day_volume') | float %}
-            {% if is_state('input_boolean.give_me_darkness','on') %}
-              {{ current != night }}
-            {% else %}
-              {{ current != day }}
-            {% endif %}
+            {% set expected = states('sensor.basement_echo_dot_volume') | float %}
+            {{ current != expected }}
         then:
         - service: media_player.volume_set
           target:
             entity_id: media_player.basement_echo_dot
           data:
-            volume_level: >
-              {% if is_state('input_boolean.give_me_darkness','on') %}
-                {{ states('input_number.basement_echo_dot_night_volume') }}
-              {% else %}
-                {{ states('input_number.basement_echo_dot_day_volume') }}
-              {% endif %}
+            volume_level: "{{ states('sensor.basement_echo_dot_volume') }}"
 # Basement Google Speaker
     - if:
       - condition: and
@@ -373,24 +414,14 @@ script:
         - condition: template
           value_template: >
             {% set current = state_attr('media_player.basement_google_speaker','volume_level') | float %}
-            {% set night = states('input_number.basement_google_speaker_night_volume') | float %}
-            {% set day = states('input_number.basement_google_speaker_day_volume') | float %}
-            {% if is_state('input_boolean.give_me_darkness','on') %}
-              {{ current != night }}
-            {% else %}
-              {{ current != day }}
-            {% endif %}
+            {% set expected = states('sensor.basement_google_speaker_volume') | float %}
+            {{ current != expected }}
         then:
         - service: media_player.volume_set
           target:
             entity_id: media_player.basement_google_speaker
           data:
-            volume_level: >
-              {% if is_state('input_boolean.give_me_darkness','on') %}
-                {{ states('input_number.basement_google_speaker_night_volume') }}
-              {% else %}
-                {{ states('input_number.basement_google_speaker_day_volume') }}
-              {% endif %}
+            volume_level: "{{ states('sensor.basement_google_speaker_volume') }}"
       - service: media_player.volume_mute
         target:
           entity_id: media_player.basement_google_speaker
@@ -405,24 +436,14 @@ script:
         - condition: template
           value_template: >
             {% set current = state_attr('media_player.living_room_echo_dot','volume_level') | float %}
-            {% set night = states('input_number.living_room_echo_dot_night_volume') | float %}
-            {% set day = states('input_number.living_room_echo_dot_day_volume') | float %}
-            {% if is_state('input_boolean.give_me_darkness','on') %}
-              {{ current != night }}
-            {% else %}
-              {{ current != day }}
-            {% endif %}
+            {% set expected = states('sensor.living_room_echo_dot_volume') | float %}
+            {{ current != expected }}
         then:
         - service: media_player.volume_set
           target:
             entity_id: media_player.living_room_echo_dot
           data:
-            volume_level: >
-              {% if is_state('input_boolean.give_me_darkness','on') %}
-                {{ states('input_number.living_room_echo_dot_night_volume') }}
-              {% else %}
-                {{ states('input_number.living_room_echo_dot_day_volume') }}
-              {% endif %}
+            volume_level: "{{ states('sensor.living_room_echo_dot_volume') }}"
 # Master Bedroom Echo Dot
     - if:
       - condition: state
@@ -435,24 +456,14 @@ script:
         - condition: template
           value_template: >
             {% set current = state_attr('media_player.master_bedroom_echo_dot','volume_level') | float %}
-            {% set night = states('input_number.master_bedroom_echo_dot_night_volume') | float %}
-            {% set day = states('input_number.master_bedroom_echo_dot_day_volume') | float %}
-            {% if is_state('input_boolean.give_me_darkness','on') %}
-              {{ current != night }}
-            {% else %}
-              {{ current != day }}
-            {% endif %}
+            {% set expected = states('sensor.master_bedroom_echo_dot_volume') | float %}
+            {{ current != expected }}
         then:
         - service: media_player.volume_set
           target:
             entity_id: media_player.master_bedroom_echo_dot
           data:
-            volume_level: >
-              {% if is_state('input_boolean.give_me_darkness','on') %}
-                {{ states('input_number.master_bedroom_echo_dot_night_volume') }}
-              {% else %}
-                {{ states('input_number.master_bedroom_echo_dot_day_volume') }}
-              {% endif %}
+            volume_level: "{{ states('sensor.master_bedroom_echo_dot_volume') }}"
 # Kallen Bedroom Speaker
     - if:
       - condition: and
@@ -483,24 +494,14 @@ script:
         - condition: template
           value_template: >
             {% set current = state_attr('media_player.kallen_bedroom_google_speaker','volume_level') | float %}
-            {% set night = states('input_number.kallen_bedroom_google_speaker_night_volume') | float %}
-            {% set day = states('input_number.kallen_bedroom_google_speaker_day_volume') | float %}
-            {% if is_state('input_boolean.give_me_darkness','on') %}
-              {{ current != night }}
-            {% else %}
-              {{ current != day }}
-            {% endif %}
+            {% set expected = states('sensor.kallen_bedroom_google_speaker_volume') | float %}
+            {{ current != expected }}
         then:
         - service: media_player.volume_set
           target:
             entity_id: media_player.kallen_bedroom_google_speaker
           data:
-            volume_level: >
-              {% if is_state('input_boolean.give_me_darkness','on') %}
-                {{ states('input_number.kallen_bedroom_google_speaker_night_volume') }}
-              {% else %}
-                {{ states('input_number.kallen_bedroom_google_speaker_day_volume') }}
-              {% endif %}
+            volume_level: "{{ states('sensor.kallen_bedroom_google_speaker_volume') }}"
       - service: media_player.volume_mute
         target:
           entity_id: media_player.kallen_bedroom_google_speaker
@@ -536,24 +537,14 @@ script:
         - condition: template
           value_template: >
             {% set current = state_attr('media_player.emma_bedroom_google_speaker','volume_level') | float %}
-            {% set night = states('input_number.emma_bedroom_google_speaker_night_volume') | float %}
-            {% set day = states('input_number.emma_bedroom_google_speaker_day_volume') | float %}
-            {% if is_state('input_boolean.give_me_darkness','on') %}
-              {{ current != night }}
-            {% else %}
-              {{ current != day }}
-            {% endif %}
+            {% set expected = states('sensor.emma_bedroom_google_speaker_volume') | float %}
+            {{ current != expected }}
         then:
         - service: media_player.volume_set
           target:
             entity_id: media_player.emma_bedroom_google_speaker
           data:
-            volume_level: >
-              {% if is_state('input_boolean.give_me_darkness','on') %}
-                {{ states('input_number.emma_bedroom_google_speaker_night_volume') }}
-              {% else %}
-                {{ states('input_number.emma_bedroom_google_speaker_day_volume') }}
-              {% endif %}
+            volume_level: "{{ states('sensor.kallen_bedroom_google_speaker_volume') }}"
       - service: media_player.volume_mute
         target:
           entity_id: media_player.emma_bedroom_google_speaker
@@ -980,33 +971,7 @@ script:
               - critical
     variables:
       voice: "{{ states('input_select.jarvis_voice') }}"
-      groupname: >-
-        {% if who == 'kids_bedrooms' %}
-          kids_bedroom_speakers
-        {% elif who == 'all_bedrooms' %}
-          all_bedroom_speakers
-        {% elif who == 'basement' and is_state('input_boolean.studio_quiet','on') %}
-          alexa_no_basement
-        {% else %}
-          {{ who }}
-        {% endif %}
     sequence:
-      - service: script.get_room_speakers
-        data:
-          room: "{{ who }}"
-        response_variable: "get_room_speakers"
-      - choose:
-        - conditions: "{{ who in ['everywhere','Everywhere'] }}"
-          sequence:
-          - service: script.get_all_speakers
-            response_variable: "get_all_speakers"
-        - conditions: "{{ get_room_speakers.jarvis_tts == 'group' }}"
-          sequence:
-          - service: script.get_group_speakers
-            data:
-              group: "{{ who }}"
-            response_variable: "get_group_speakers"
-      # Need to figure out whether to do this part here, or in alexa/jarvis voice scripts, or both
       - service: mqtt.publish
         data:
           topic: 'house/polly/lastmsg'
@@ -1050,13 +1015,44 @@ script:
       - service: >-
           {% if voice == 'nabu' %}
             script.nabu_voice      
-          {% elif get_room_services.jarvis_tts in ['group','alexa'] %}
+          {% elif who in ['living_room_echo_dot', 'media_player.living_room_echo_dot','living_room','Living Room Echo Dot','Living Room']  %}
+            script.alexa_voice
+          {% elif who in ['kallen_bedroom','Kallen Bedroom']  %}
+            {% if is_state('input_boolean.kallen_sleeping','on') and type not in ['critical','Critical'] %}
               script.alexa_voice
             {% else %}
               script.jarvis_voice
             {% endif %}
+          {% elif who in ['emma_bedroom','Emma Bedroom'] %}
+            {% if is_state('input_boolean.emma_sleeping','on') and type not in ['critical','Critical'] %}
+              script.alexa_voice
+            {% else %}
+              script.jarvis_voice
+            {% endif %}
+          {% elif who in ['master_bedroom','master_bedroom_echo_dot','media_player.master_bedroom_echo_dot','Master Bedroom Echo Dot','Master Bedroom']  %}
+            script.alexa_voice
+          {% elif who in ['kids_bedrooms','Kids Bedrooms'] %}
+            script.jarvis_voice
+          {% elif who in ['all_bedrooms','All Bedrooms'] %}
+            script.alexa_voice
+          {% elif who in ['Basement','basement','basement_echo_dot','media_player.basement_echo_dot','Basement Echo Dot']  %}
+            script.alexa_voice
+          {% elif who in ['Basement Google','basement_google'] %}
+            {% if is_state('input_boolean.studio_quiet','on') %}
+              script.alexa_voice
+            {% else %}
+              script.jarvis_voice
+            {% endif %}
+          {% elif who in ['Common Areas','common','common_areas'] %}
+            script.alexa_voice
+          {% elif who in ['alexa_everywhere','Alexa Everywhere'] %}
+            script.alexa_voice
+          {% elif who in ['Everywhere','everywhere'] %}
+            script.alexa_voice
+          {% else %}
+            script.alexa_voice
+          {% endif %}
         data:
-          # Work on where this redirect logic should go
           who: >
             {% if who in ['living_room_echo_dot', 'media_player.living_room_echo_dot','living_room','Living Room Echo Dot','Living Room']  %}
               living_room
@@ -1133,7 +1129,7 @@ script:
           type: '{{ type }}'
       - if:
         - condition: template
-          value_template: "{{ get_room_speakers.jarvis_tts == 'group' and get_group_speakers.google is defined }}"
+          value_template: "{{ who in ['Everywhere','everywhere','all_bedrooms','All Bedrooms','kids_bedrooms','Kids Bedrooms'] }}"
         then:
         - service: script.jarvis_voice
           data:
@@ -1232,11 +1228,9 @@ script:
       data:
         message: >
           <voice name="{{ voice }}">
-          <amazon:auto-breaths>
           <prosody rate="fast">
           {{ message }}
           </prosody>
-          </amazon:auto-breaths>
           </voice>
         target: >
           {% if who in ['living_room_echo_dot', 'media_player.living_room_echo_dot','living_room'] %}
@@ -1323,55 +1317,36 @@ script:
             media_player.basement_google_speaker
           {% endif %}
         volume_level: >-
-          {% set numbers_night = [
-            states.input_number.emma_bedroom_google_speaker_night_volume.state,
-            states.input_number.kallen_bedroom_google_speaker_night_volume.state
+          {% set numbers = [
+            states.sensor.emma_bedroom_google_speaker_volume.state,
+            states.sensor.kallen_bedroom_google_speaker_volume.state
           ] %}
-          {% set numbers_day = [
-            states.input_number.emma_bedroom_google_speaker_day_volume.state,
-            states.input_number.kallen_bedroom_google_speaker_day_volume.state
-          ] %}
-          {% set kidsgroup_night = numbers_night | list | min | float %}
-          {% set kidsgroup_day = numbers_day | list | max | float %}
+          {% set kidsgroup = numbers | list | min | float %}
           {% if type in ['critical'] %}
             1.0
-          {% elif is_state('input_boolean.give_me_darkness','on') %}
+          {% else %}
             {% if who in ['Everywhere','everywhere','kids_bedrooms','all_bedrooms'] %}
               {% if is_state('input_boolean.emma_sleeping','on') and is_state('input_boolean.kallen_sleeping','off') %}
-                {{ states('input_number.kallen_bedroom_google_speaker_night_volume') }}
+                {{ states('sensor.kallen_bedroom_google_speaker_volume') }}
               {% elif is_state('input_boolean.kallen_sleeping','on') and is_state('input_boolean.emma_sleeping','off') %}
-                {{ states('input_number.emma_bedroom_google_speaker_night_volume') }}
+                {{ states('sensor.emma_bedroom_google_speaker_volume') }}
               {% else %}
-                {{ kidsgroup_night }}
+                {{ kidsgroup }}
               {% endif %}
             {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker'] %}
-              {{ states('input_number.kallen_bedroom_google_speaker_night_volume') }}
+              {{ states('sensor.kallen_bedroom_google_speaker_volume') }}
             {% elif who in ['emma_bedroom','media_player.emma_bedroom_google_speaker'] %}
-              {{ states('input_number.emma_bedroom_google_speaker_night_volume') }}
+              {{ states('sensor.emma_bedroom_google_speaker_volume') }}
             {% elif who in ['Basement Google','basement_google'] %}
-              {{ states('input_number.basement_google_speaker_night_volume') }}
+              {{ states('sensor.basement_google_speaker_volume') }}
             {% else %}
+              {% if is_state('input_boolean.give_me_darkness','on') %}
                 0.3
-            {% endif %}
-          {% else %}
-            {% if who in ['Everywhere','everywhere','kids_bedrooms','all_bedrooms'] %}
-              {% if is_state('input_boolean.emma_sleeping','on') and is_state('input_boolean.kallen_sleeping','off') %}
-                {{ states('input_number.kallen_bedroom_google_speaker_day_volume') }}
-              {% elif is_state('input_boolean.kallen_sleeping','on') and is_state('input_boolean.emma_sleeping','off') %}
-                {{ states('input_number.emma_bedroom_google_speaker_day_volume') }}
-              {% else %}
-                {{ kidsgroup_day }}
-              {% endif %}
-            {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker'] %}
-              {{ states('input_number.kallen_bedroom_google_speaker_day_volume') }}
-            {% elif who in ['emma_bedroom','media_player.emma_bedroom_google_speaker'] %}
-              {{ states('input_number.emma_bedroom_google_speaker_day_volume') }}
-            {% elif who in ['Basement Google','basement_google'] %}
-              {{ states('input_number.basement_google_speaker_day_volume') }}
               {% else %}
                 0.6
               {% endif %}
             {% endif %}
+          {% endif %}
     - service: tts.amazon_polly_say
       data:
         entity_id: >-

packages/powercalc.yaml

@@ -17,8 +17,8 @@ sensor:
     entity_id: switch.tina_desktop
     power_sensor_id: sensor.tina_desktop_power
   - platform: powercalc
-    entity_id: fan.emma_air_conditioner
-    power_sensor_id: sensor.emma_air_conditioner_power
+    entity_id: switch.emma_bedroom_aircon
+    power_sensor_id: sensor.emma_bedroom_aircon_power
   - platform: powercalc
     entity_id: switch.master_bedroom_aircon
     power_sensor_id: sensor.master_bedroom_aircon_power

packages/presence.yaml

@@ -613,7 +613,6 @@ automation:
               target:
                 entity_id:
                   - fan.kallen_bedroom_fan
-                  - fan.emma_air_conditioner
           - service: button.press
             target:
               entity_id: button.master_bedroom_climate_reset

packages/scheduling.yaml

@@ -418,21 +418,14 @@ script:
           entity_id: input_datetime.daily_briefing
           data:
             time: >
-              {% from 'time.jinja' import time_from_calendar %}
-              {% if is_state('input_boolean.kallen_school_today','on') %}
-                {% if is_state('input_boolean.kallen_alternate_pickup','on') or is_state('input_boolean.kallen_btb','on') %}
-                  15:30
-                {% else %}
-                  {{ time_from_calendar('calendar.kallen_school_days','end_time','set','subtract',1) }}
-                {% endif %}
-              {% elif is_state('input_boolean.kallen_school_today','off') and is_state('input_boolean.work_today','off') %}
-                15:30
-              {% else %}
+              {% if is_state('input_boolean.kallen_school_today','off') and is_state('input_boolean.work_today','on') %}
                 {% if (state_attr('input_datetime.tina_workday_end','timestamp')) > 61200 %}
                   16:00
                 {% else %}
                   {{ (state_attr('input_datetime.tina_workday_end', 'timestamp') + 3600) | timestamp_custom('%H:%M', false) }}
                 {% endif %}
+              {% else %}
+                15:30
               {% endif %}
       - if:
         - condition: state
@@ -561,18 +554,7 @@ script:
         - service: input_datetime.set_datetime
           entity_id: input_datetime.master_bedroom_wakeup
           data:
-            time: >
-              {% if is_state('input_boolean.kallen_school_today','on') %}
-                {% if is_state('input_boolean.kallen_alternate_pickup','on') or is_state('input_boolean.kallen_btb','on') %}
-                  16:30
-                {% elif is_state('input_boolean.kallen_school_early_release','on') %}
-                  12:30
-                {% else %}
-                  13:00
-                {% endif %}
-              {% else %}
-                16:30
-              {% endif %}
+            time: "16:30"
       - delay:
           milliseconds: 500
       - service: input_datetime.set_datetime
@@ -618,22 +600,17 @@ script:
           data:
             time: >
               {% set low = states('sensor.overnight_lowest_temperature') | int %}
+              {% set high = states('sensor.todays_high_temp') | int %}
               {% set kallen_bedtime = state_attr('input_datetime.kallen_bedtime','timestamp') | int %}
-              {% set cutoff = 81000 %}
-              {% if is_state('input_boolean.hot_day','on') and is_state('binary_sensor.kallen_school_tomorrow','on') %}
-                {{ (kallen_bedtime - 3600) | timestamp_custom('%H:%M',false) }}
-              {% elif is_state('input_boolean.hot_day','on') and is_state('binary_sensor.kallen_school_tomorrow','off') %}
-                {{ kallen_bedtime | timestamp_custom('%H:%M',false) }}
-              {% elif 56 <= low <= 60 %}
-                22:30
-              {% elif low > 60 %}
-                {% if kallen_bedtime < cutoff %}
-                  {{ kallen_bedtime | timestamp_custom('%H:%M',false) }}
+              {% set kallen_fantime = state_attr('input_datetime.kallen_fan','timestamp') | int %}
+              {% set bedroom_hot = is_state('binary_sensor.kallen_bedroom_hot','on') %}
+              {% set cutoff = 81000 %} {# Cutoff time is 22:30 #}
+              {% if is_state('input_boolean.hot_day','on') or bedroom_hot == true %}
+                {{ (kallen_fantime - 3600) | timestamp_custom('%H:%M',false) }}
+              {% elif low >= 56 or high >= 75 %}
+                {{ (kallen_bedtime - 1800) | timestamp_custom('%H:%M',false) }}
               {% else %}
-                  21:30
-                {% endif %}
-              {% else %}
-                00:00
+                {{ kallen_bedtime | timestamp_custom('%H:%M',false) }}
               {% endif %}
         - service: input_datetime.set_datetime
           entity_id: input_datetime.master_bedroom_fan
@@ -642,11 +619,11 @@ script:
               {% set low = states('sensor.overnight_lowest_temperature') | int %}
               {% set high = states('sensor.todays_high_temp') | int %}
               {% if low > 60 or is_state('input_boolean.hot_day','on') %}
-                00:00
-              {% elif 50 <= low <= 60 %}
                 01:00
-              {% elif low >= states('input_number.master_bedroom_fan_threshold') | int and high > 60 %}
+              {% elif 50 <= low <= 60 %}
                 02:00
+              {% elif low >= states('input_number.master_bedroom_fan_threshold') | int and high > 60 %}
+                03:00
               {% else %}
                 06:00
               {% endif %}
@@ -732,11 +709,16 @@ script:
             entity_id: input_select.scheduled_climate_mode_emma_bedroom
           data:
             option: >
-              {% if is_state('input_boolean.emma_bedroom_aircon_installed','on') %}
-                {% if (states('sensor.overnight_lowest_temperature') | int) >= (states('input_number.emma_aircon_threshold') | int) %}
+              {% set low = states('sensor.overnight_lowest_temperature') | int %}
+              {% set run_threshold = states('input_number.emma_bedroom_aircon_run_threshold') | int %}
+              {% set mode_threshold = states('input_number.emma_bedroom_aircon_mode_threshold') | int %}
+              {% if is_state('input_boolean.emma_bedroom_aircon_installed','off') %}
+                White Noise
+              {% elif low >= run_threshold %}
+                {% if low >= mode_threshold %}
                   AC
                 {% else %}
-                  White Noise
+                  Fan
                 {% endif %}
               {% else %}
                 White Noise
@@ -750,11 +732,11 @@ script:
               {% set low = states('sensor.overnight_lowest_temperature') | int %}
               {% set bedtime = state_attr('input_datetime.emma_bedtime','timestamp') | int %}
               {% if is_state('input_boolean.hot_day','on') %}
-                {{ (bedtime - 7200) | timestamp_custom('%H:%M',false) }}
-              {% elif high >= 80 or low >= 60 %}
                 {{ (bedtime - 5400) | timestamp_custom('%H:%M',false) }}
-              {% else %}
+              {% elif high >= 80 or low >= 60 %}
                 {{ (bedtime - 3600) | timestamp_custom('%H:%M',false) }}
+              {% else %}
+                {{ (bedtime - 1800) | timestamp_custom('%H:%M',false) }}
               {% endif %}
       - service: input_boolean.turn_on
         target:

packages/sports.yaml

@@ -106,7 +106,7 @@ template:
       unique_id: 2987ae95-f55d-4994-b9dd-018278d2f5ad
       state: >
         {% from 'sports.jinja' import sports_inhibit %}
-        {{ state_attr('sensor.minnesota_twins','opponent_abbr') in ['CLE','LAD'] or sports_inhibit('sensor.minnesota_twins') }}
+        {{ sports_inhibit('sensor.minnesota_twins') }}
     - name: Minnesota Twins Event Today
       unique_id: 30055cb3-d259-4cef-90e1-7dea0a5cb439
       state: >
@@ -116,7 +116,7 @@ template:
       unique_id: b0980d47-d762-4f23-97b1-9e88da729d8f
       state: >
         {% from 'sports.jinja' import sports_inhibit %}
-        {{ sports_inhibit('sensor.cleveland_guardians') }}
+        {{ state_attr('sensor.cleveland_guardians','opponent_abbr') in ['MIN','LAD'] or sports_inhibit('sensor.cleveland_guardians') }}
     - name: Cleveland Guardians Event Today
       unique_id: 985a7b2c-9ebd-4a2e-8ee2-2ab5359310e0
       state: >
@@ -126,7 +126,7 @@ template:
       unique_id: 2c6aae6e-eff6-46e5-bee9-311f9bbc0c0e
       state: >
         {% from 'sports.jinja' import sports_inhibit %}
-        {{ state_attr('sensor.los_angeles_dodgers','opponent_abbr') in ['CLE'] or sports_inhibit('sensor.los_angeles_dodgers') }}
+        {{ state_attr('sensor.los_angeles_dodgers','opponent_abbr') in ['MIN'] or sports_inhibit('sensor.los_angeles_dodgers') }}
     - name: Los Angeles Dodgers Event Today
       unique_id: 7c2bd060-ea2c-4b81-8af7-3e6b9b3c639d
       state: >

packages/sysmon.yaml

@@ -1,3 +1,8 @@
+input_boolean:
+  server_maintenance:
+    name: Server Maintenance
+    icon: mdi:wrench-clock
+
 input_select:
   log_level:
     name: Log Level
@@ -63,25 +68,25 @@ template:
   - binary_sensor:
     - name: Tony Desktop On
       unique_id: 82ce673a-96ad-4af5-a8d1-be9ca9fa9c36
-      state: "{{ states('sensor.tony_desktop_power') | int > 10 }}"
+      state: "{{ states('sensor.tony_desktop_power') | int > 25 }}"
       device_class: running
       attributes:
         power_usage: "{{ states('sensor.tony_desktop_power') | int }}W"
     - name: Tina Desktop On
       unique_id: 8484dbd4-2fae-4368-a4bc-d1bdc09e003f
-      state: "{{ states('sensor.tina_desktop_power') | int > 10 }}"
+      state: "{{ states('sensor.tina_desktop_power') | int > 25 }}"
       device_class: running
       attributes:
         power_usage: "{{ states('sensor.tina_desktop_power') | int }}W"
     - name: Kallen Desktop On
       unique_id: ccc25d75-4915-449d-9b2e-09ad14ffac29
-      state: "{{ states('sensor.kallen_desktop_power') | int > 10 }}"
+      state: "{{ states('sensor.kallen_desktop_power') | int > 25 }}"
       device_class: running
       attributes:
         power_usage: "{{ states('sensor.kallen_desktop_power') | int }}W"
     - name: Basement Server On
       unique_id: e6df7d98-d3ba-4e01-bae2-2ebafc8d78d6
-      state: "{{ states('sensor.basement_server_power') | int > 10 }}"
+      state: "{{ states('sensor.basement_server_power') | int > 25 }}"
       device_class: running
       attributes:
         power_usage: "{{ states('sensor.basement_server_power') | int }}W"

packages/variables.yaml

@@ -1,126 +0,0 @@
-script:
-  get_room_speakers:
-    alias: Get Room Speakers
-    sequence:
-    - variables:
-        room_services: >-
-          {% if room in areas() %}
-            {% set alexa_speaker = states.media_player | 
-                selectattr('entity_id', 'in', area_entities(room)) |
-                rejectattr('attributes.last_called', 'undefined') |
-                selectattr('entity_id', 'search', 'echo_dot') |
-                map(attribute='entity_id') |
-              list | first %}
-  
-            {% set google_speaker = states.media_player | 
-                selectattr('entity_id', 'in', area_entities(room)) |
-                rejectattr('attributes.device_class', 'undefined') |
-                selectattr('attributes.device_class', 'search', '(speaker)') | 
-                selectattr('entity_id', 'search', 'google') |
-                map(attribute='entity_id') |
-              list | first %}
-  
-            {% set tts = "alexa" if alexa_speaker is defined else "google" %}
-          {% else %}
-            {% set tts = "group" %}
-          {% endif %}
-          {"area":"{{room}}","alexa_speaker":"{{alexa_speaker|default({}) }}","jarvis_tts":"{{tts|default("google") }}","google_speaker":"{{google_speaker|default({}) }}"}
-    - stop: "Services acquired"
-      response_variable: "get_room_speakers"
-
-  get_group_speakers:
-    alias: Get Group Speakers
-    sequence:
-    - variables:
-        get_group_speakers: >-
-          {% set speakers = expand('group.' + group) | map(attribute='entity_id') | list | join(',') %}
-          {% set alexa_speakers = expand('group.' + group) | 
-              rejectattr('attributes.last_called', 'undefined') |
-              selectattr('entity_id', 'search', 'echo_dot') |
-              map(attribute='entity_id') |
-            list | join(',') %}
-          {% set google_speakers = expand('group.' + group) |
-              rejectattr('attributes.device_class', 'undefined') |
-              selectattr('attributes.device_class', 'search', '(speaker)') | 
-              selectattr('entity_id', 'search', 'google') |
-              map(attribute='entity_id') |
-            list | join(',') %}
-          {"alexa":"{{alexa_speakers|default({})}}","google":"{{google_speakers|default({})}}"}
-    - stop: "Speakers acquired"
-      response_variable: "get_group_speakers"
-
-  get_echo_dots:
-    alias: Get Echo Dots
-    sequence:
-    - variables:
-        get_echo_dots: >-
-          {% if group is defined %}
-            {% set speakers = expand('group.' + group) %}
-          {% else %}
-            {% set speakers = states.media_player %}
-          {% endif %}
-          {% set echo_dots = speakers |
-            rejectattr('attributes.last_called', 'undefined') |
-            selectattr('entity_id', 'search', 'echo_dot') |
-            map(attribute='entity_id') |
-          list | join(',') %}
-          {"speakers":"{{echo_dots}}"}
-    - stop: "Echo Dots acquired"
-      response_variable: "get_echo_dots"
-
-  get_google_speakers:
-    alias: Get Google Speakers
-    sequnce:
-    - variables:
-        get_google_speakers: >-
-          {% if group is defined %}
-            {% set speakers = expand('group.' + group) %}
-          {% else %}
-            {% set speakers = states.media_player %}
-          {% endif %}
-          {% set google_speaker = speakers |
-              rejectattr('attributes.device_class', 'undefined') |
-              selectattr('attributes.device_class', 'search', '(speaker)') | 
-              selectattr('entity_id', 'search', 'google') |
-              map(attribute='entity_id') |
-            list | join(',') %}
-          {"speakers":"{{google_speaker}}"}
-    - stop: "Google speakers acquired"
-      response_variable: "get_google_speakers"
-
-  get_all_speakers:
-    alias: Get All Speakers
-    sequence:
-    - variables: >-
-        get_speakers:
-        {% set alexa_speaker = states.media_player |
-            rejectattr('attributes.last_called', 'undefined') |
-            selectattr('entity_id', 'search', 'echo_dot') |
-            map(attribute='entity_id')
-          %}
-
-        {% set google_speaker = states.media_player |
-            rejectattr('attributes.device_class', 'undefined') |
-            selectattr('attributes.device_class', 'search', '(speaker)') | 
-            selectattr('entity_id', 'search', 'google') |
-            map(attribute='entity_id')
-          %}
-        {% set alexa_list = alexa_speaker | list | join(',') %}
-        {% set google_list = google_speaker | list | join(',') %}
-        {% set all_speakers = alexa_list + ',' + google_list %}
-        {"all_speakers":"{{all_speakers}}"}
-
-  get_room_lights:
-    alias: Get Room Lights
-    sequence:
-    - variables:
-        area: >
-          {{ room }}
-        entities: >
-          {% set lights = states.light |
-            selectattr('entity_id', 'in', area_entities(area)) |
-            map(attribute='entity_id') |
-            list | join(',') %}
-          {"lights":"{{lights}}"}
-    - stop: "Lights acquired"
-      response_variable: "entities"

readme.md

@@ -2,11 +2,9 @@ # Tony's Home Assistant Configs
 
 Just a place to track my work on my personal Home Assistant configuration, and learn as I go. Maybe also TRY to keep myself a little bit more organized ;)
 
-## New location for Node-RED flows
+## Node-RED flows
 
-I have recently started using the Node-RED Projects feature, which makes version control for my flows a LOT easier than it was before.
-
-With this change, the Node-RED flows are now in their own repo. They can be found at [HA-NerdFlows](https://github.com/tm24fan8/HA-NerdFlows).
+My Node-RED flows can be found at [HA-NerdFlows](https://gitea.nerdhomeinc.com/home_automation/HA-NerdFlows). Additionally, code used in function nodes in my Node-RED flows can be found at [HA-NerdFlows-Functions](https://gitea.nerdhomeinc.com/home_automation/HA-NerdFlows-Functions).
 
 ## Attributions
 
@@ -34,7 +32,6 @@ ## HACS Components
 - [Node-RED Companion](https://github.com/zachowj/hass-node-red)
 - [Holidays](https://github.com/bruxy70/Holidays)
 - [Twitch Helix](https://github.com/Radioh/ha_twitch_helix)
-- [Local Tuya](https://github.com/rospogrigio/localtuya)
 - [Pirate Weather](https://github.com/alexander0042/pirate-weather-ha)
 - [Holidays](https://github.com/bruxy70/Holidays)
 - [Thermal Comfort](https://github.com/dolezsa/thermal_comfort)
@@ -42,7 +39,7 @@ ## HACS Components
 - [HASS.Agent Media Player](https://github.com/LAB02-Research/HASS.Agent-MediaPlayer)
 - [Music Assistant](https://github.com/music-assistant/hass-music-assistant)
 - [Blitzortung Lightning Detector](https://github.com/mrk-its/homeassistant-blitzortung)
-- [Midea Air Conditioning](https://github.com/mill1000/midea-ac-py)
+- [Midea Air Conditioning](https://github.com/wuwentao/midea_ac_lan)
 - [WeatherAPI](https://github.com/iprak/weatherapi)
 - [Browser Mod](https://github.com/thomasloven/hass-browser_mod)
 - [Watchman](https://github.com/dummylabs/thewatchman)
@@ -50,7 +47,6 @@ ## HACS Components
 - [PyScript](https://github.com/custom-components/pyscript)
 - [Hass Animated Scenes](https://github.com/chazzu/hass-animated-scenes)
 - [Jokes](https://github.com/LaggAt/ha-jokes)
-- [Google Photos](https://github.com/Daanoz/ha-google-photos)
 - [Uptime Kuma](https://github.com/meichthys/uptime_kuma)
 - [Jellyfin](https://github.com/koying/jellyfin_ha)
 - [Sonoff LAN](https://github.com/AlexxIT/SonoffLAN)
@@ -58,6 +54,9 @@ ## HACS Components
 - [Govee LAN Control](https://github.com/wez/govee-lan-hass)
 - [Discord Game](https://github.com/LordBoos/discord_game)
 - [Versatile Thermostat](https://github.com/jmcollin78/versatile_thermostat)
+- [GasBuddy](https://github.com/firstof9/ha-gasbuddy)
+- [Union Pacific Big Boy Tracker](https://github.com/jheizer/up_4014_tracker)
+- [WeatherFlow Forecast](https://github.com/briis/weatherflow_forecast)
 
 </details>
 
@@ -70,22 +69,19 @@ ## HACS Lovelace Cards
 
 - [Bubble Card](https://github.com/Clooos/Bubble-Card) Backbone of the new mobile dashboard
 - [Config Template Card](https://github.com/iantrich/config-template-card)
-- [Decluttering Card](https://github.com/custom-cards/decluttering-card)
-- [Card Tools](https://github.com/thomasloven/lovelace-card-tools) (required for various other cards)
+- [Streamline Card](https://github.com/brunosabot/streamline-card)
 - [Layout Card](https://github.com/thomasloven/lovelace-layout-card)
 - [Scheduler Card](https://github.com/nielsfaber/scheduler-card) (required for Scheduler component)
 - [Horizon Card](https://github.com/rejuvenate/lovelace-horizon-card)
 - [Lovelace Home Feed Card](https://github.com/gadgetchnnel/lovelace-home-feed-card)
 - [Mini Graph Card](https://github.com/kalkih/mini-graph-card)
 - [Battery State Card](https://github.com/maxwroc/battery-state-card)
-- [Compass Card](https://github.com/tomvanswam/compass-card)
 - [Flipdown Timer Card](https://github.com/pmongloid/flipdown-timer-card)
 - [Atomic Calendar Revive](https://github.com/totaldebug/atomic-calendar-revive)
 - [Plotly Graph Card](https://github.com/dbuezas/lovelace-plotly-graph-card)
 - [Mushroom](https://github.com/piitaya/lovelace-mushroom)
 - [Apexcharts Card](https://github.com/RomRider/apexcharts-card)
 - [Auto Entities Card](https://github.com/thomasloven/lovelace-auto-entities)
-- [Slider Button Card](https://github.com/custom-cards/slider-button-card)
 - [Weather Radar Card](https://github.com/Makin-Things/weather-radar-card)
 - [Stack In Card](https://github.com/custom-cards/stack-in-card)
 - [Paper Buttons Row](https://github.com/jcwillox/lovelace-paper-buttons-row)
@@ -93,32 +89,24 @@ ## HACS Lovelace Cards
 - [Multiple Entity Row](https://github.com/benct/lovelace-multiple-entity-row)
 - [Weather Card](https://github.com/bramkragten/weather-card)
 - [Template Entity Row](https://github.com/thomasloven/lovelace-template-entity-row)
-- [Canvas Gauge Card](https://github.com/custom-cards/canvas-gauge-card)
-- [Datetime Card](https://github.com/a-p-z/datetime-card)
 - [Waze Travel Time](https://github.com/r-renato/ha-card-waze-travel-time)
 - [Fold Entity Row](https://github.com/thomasloven/lovelace-fold-entity-row)
-- [Slider Entity Row](https://github.com/thomasloven/lovelace-slider-entity-row)
 - [Room Card](https://github.com/marcokreeft87/room-card)
 - [Simple Thermostat Card](https://github.com/nervetattoo/simple-thermostat)
 - [Clock Weather Card](https://github.com/pkissling/clock-weather-card)
 - [Tabbed Card](https://github.com/kinghat/tabbed-card)
 - [HA Team Tracker Card](https://github.com/vasqued2/ha-teamtracker-card)
 - [Banner Card](https://github.com/nervetattoo/banner-card)
-- [Lovelace Lock Card](https://github.com/CyrisXD/love-lock-card)
 - [Card Templater](https://github.com/gadgetchnnel/lovelace-card-templater)
-- [Energy Overview Card](https://github.com/Sese-Schneider/ha-energy-overview-card)
 - [Button Card](https://github.com/custom-cards/button-card)
 - [Number Box Card](https://github.com/htmltiger/numberbox-card)
 - [Restriction Card](https://github.com/iantrich/restriction-card)
 - [Timer Bar Card](https://github.com/rianadon/timer-bar-card)
-- [Minimalistic Area Card](https://github.com/junalmeida/homeassistant-minimalistic-area-card)
 - [Sankey Chart Card](https://github.com/MindFreeze/ha-sankey-chart)
 - [Hourly Weather Card](https://github.com/decompil3d/lovelace-hourly-weather)
 - [Formula One Card](https://github.com/marcokreeft87/formulaone-card)
 - [UV Index Card](https://github.com/t1gr0u/uv-index-card)
-- [Github Flexi Card](https://github.com/maxwroc/github-flexi-card)
 - [Windrose Card](https://github.com/aukedejong/lovelace-windrose-card)
-- [Swipe Card](https://github.com/bramkragten/swipe-card)
 - [Meteoalarm Card](https://github.com/MrBartusek/MeteoalarmCard)
 - [Weather Chart Card](https://github.com/mlamberts78/weather-chart-card)
 - [Comfortable Environment Card](https://github.com/argaar/comfortable-environment-card)
@@ -135,6 +123,16 @@ ## AppDaemon Apps
 
 </details>
 
+## Custom Jinja2 Templates/Macros
+
+<details>
+<summary>Click here</summary>
+
+- [Easy Time](https://github.com/Petro31/easy-time-jinja)
+- [Relative Time](https://github.com/TheFes/relative-time-plus)
+
+</details>
+
 ## Themes/Icons
 
 <details>
@@ -146,5 +144,6 @@ ## Themes/Icons
 - [BHA Icon Pack](https://github.com/hulkhaugen/hass-bha-icons)
 - [Custom Icons Library](https://github.com/Mariusthvdb/custom-icons)
 - [FontAwesome](https://github.com/thomasloven/hass-fontawesome)
+- [Material Symbols](https://github.com/beecho01/material-symbols)
 
 </details>

scenes.yaml

@@ -1210,14 +1210,23 @@
       min_mireds: 153
       max_mireds: 500
       effect_list:
-      - None
+      - 'off'
       - candle
       - fire
       - prism
+      - sparkle
+      - opal
+      - glisten
+      - underwater
+      - cosmos
+      - sunbeam
+      - enchant
+      - sunrise
+      - sunset
       supported_color_modes:
       - color_temp
       - xy
-      effect: None
+      effect: 'off'
       color_mode: xy
       brightness: 179
       color_temp_kelvin:
@@ -1244,14 +1253,23 @@
       min_mireds: 153
       max_mireds: 500
       effect_list:
-      - None
+      - 'off'
       - candle
       - fire
       - prism
+      - sparkle
+      - opal
+      - glisten
+      - underwater
+      - cosmos
+      - sunbeam
+      - enchant
+      - sunrise
+      - sunset
       supported_color_modes:
       - color_temp
       - xy
-      effect: None
+      effect: 'off'
       color_mode: xy
       brightness: 255
       color_temp_kelvin:
@@ -1278,10 +1296,13 @@
       min_mireds: 153
       max_mireds: 500
       effect_list:
-      - None
+      - 'off'
       - candle
       - fire
       - prism
+      - sparkle
+      - opal
+      - glisten
       supported_color_modes:
       - color_temp
       - xy
@@ -1342,14 +1363,23 @@
       min_mireds: 153
       max_mireds: 500
       effect_list:
-      - None
+      - 'off'
       - candle
       - fire
       - prism
+      - sparkle
+      - opal
+      - glisten
+      - underwater
+      - cosmos
+      - sunbeam
+      - enchant
+      - sunrise
+      - sunset
       supported_color_modes:
       - color_temp
       - xy
-      effect: None
+      effect: 'off'
       color_mode: xy
       brightness: 255
       color_temp_kelvin:
@@ -1376,14 +1406,23 @@
       min_mireds: 153
       max_mireds: 500
       effect_list:
-      - None
+      - 'off'
       - candle
       - fire
       - prism
+      - sparkle
+      - opal
+      - glisten
+      - underwater
+      - cosmos
+      - sunbeam
+      - enchant
+      - sunrise
+      - sunset
       supported_color_modes:
       - color_temp
       - xy
-      effect: None
+      effect: 'off'
       color_mode: xy
       brightness: 255
       color_temp_kelvin:
@@ -1441,14 +1480,17 @@
       min_mireds: 153
       max_mireds: 500
       effect_list:
-      - None
+      - 'off'
       - candle
       - fire
       - prism
+      - sparkle
+      - opal
+      - glisten
       supported_color_modes:
       - color_temp
       - xy
-      effect: None
+      effect: 'off'
       color_mode: xy
       brightness: 204
       color_temp_kelvin:

scripts.yaml

@@ -854,6 +854,12 @@ adaptive_on_first_floor:
 adaptive_on_second_floor:
   alias: Adaptive on Second Floor
   sequence:
+  - action: switch.turn_on
+    metadata: {}
+    data: {}
+    target:
+      entity_id: switch.adaptive_lighting_stairwell
+    alias: Turn on adaptive lighting in stairwell
   - if:
     - condition: state
       entity_id: light.hallway_overhead
@@ -1441,16 +1447,42 @@ evening_on_second_floor:
 goodnight_in_basement:
   alias: Goodnight in Basement
   sequence:
-  - service: light.turn_off
-    target:
+  - target:
       area_id:
       - basement_studio
       - furnace_room
     data: {}
-  - service: fan.turn_off
-    target:
+    action: light.turn_off
+    alias: Turn lights off
+  - target:
       entity_id: fan.basement_fan
     data: {}
+    action: fan.turn_off
+    alias: Turn fan off
+  - delay:
+      hours: 0
+      minutes: 0
+      seconds: 3
+      milliseconds: 0
+  - action: switch.turn_off
+    metadata: {}
+    data: {}
+    target:
+      entity_id: switch.adaptive_lighting_sleep_mode_basement_studio
+    alias: Turn off sleep mode
+  - action: switch.turn_on
+    metadata: {}
+    data: {}
+    target:
+      entity_id: switch.adaptive_lighting_basement_studio
+    alias: Turn on adaptive lighting
+  - action: input_text.set_value
+    metadata: {}
+    data:
+      value: Adaptive
+    target:
+      entity_id: input_text.basement_studio_selected_scene
+    alias: Reset selected scene text
 goodnight_on_first_floor:
   alias: Goodnight on First Floor
   sequence:
@@ -1544,14 +1576,14 @@ day_mode_in_tina_desk:
   alias: Day Mode in Tina Desk
   sequence:
   - parallel:
-    - service: light.turn_on
-      target:
+    - target:
         entity_id: light.tina_lamp_top
       data: {}
-    - service: light.turn_off
-      target:
+      action: light.turn_on
+    - target:
         entity_id: light.tina_lamp_side
       data: {}
+      action: light.turn_off
   - wait_template: '{{ is_state(''light.tina_lamp_side'',''off'') }}'
     timeout:
       seconds: 15
@@ -1561,52 +1593,57 @@ day_mode_in_tina_desk:
     - condition: state
       entity_id: switch.adaptive_lighting_tina_lamp
       state: 'off'
-      alias: If switch is off
+      alias: If adaptive lighting is off
     then:
-    - service: switch.turn_on
+    - alias: Turn on adaptive lighting
       data: {}
       target:
-        entity_id: switch.adaptive_lighting_tina_lamp
-      alias: Turn on the switch
+        entity_id:
+        - switch.adaptive_lighting_tina_lamp
+        - switch.adaptive_lighting_adapt_brightness_tina_lamp
+        - switch.adaptive_lighting_adapt_color_tina_lamp
+      action: switch.turn_on
     else:
     - alias: Apply adaptive lighting
-      service: adaptive_lighting.apply
       data:
         entity_id: switch.adaptive_lighting_tina_lamp
         adapt_brightness: true
         adapt_color: true
+      action: adaptive_lighting.apply
   mode: restart
   icon: mdi:palette
 evening_mode_in_tina_desk:
   alias: Evening Mode in Tina Desk
   sequence:
   - alias: Turn on lamp
-    service: light.turn_on
     data: {}
     target:
       entity_id:
       - light.tina_lamp_top
       - light.tina_lamp_side
+    action: light.turn_on
   - alias: Apply adaptive lighting to lamp
     if:
     - condition: state
       entity_id: switch.adaptive_lighting_tina_lamp
       state: 'off'
-      alias: If switch is off
+      alias: If adaptive lighting is off
     then:
-    - service: switch.turn_on
+    - alias: Turn on adaptive lighting
       data: {}
       target:
-        entity_id: switch.adaptive_lighting_tina_lamp
-      alias: Turn on the switch
+        entity_id:
+        - switch.adaptive_lighting_tina_lamp
+        - switch.adaptive_lighting_adapt_brightness_tina_lamp
+        - switch.adaptive_lighting_adapt_color_tina_lamp
+      action: switch.turn_on
     else:
-    - service: adaptive_lighting.apply
+    - alias: Apply adaptive lighting
       data:
         entity_id: switch.adaptive_lighting_tina_lamp
         adapt_brightness: true
         adapt_color: true
-        turn_on_lights: true
-      alias: Apply adaptive lighting
+      action: adaptive_lighting.apply
   mode: restart
   icon: mdi:palette
 night_mode_in_tina_desk:
@@ -2476,25 +2513,26 @@ kallen_morning_meds:
 kallen_night_meds:
   alias: Kallen Night Meds
   sequence:
-  - service: counter.increment
+  - alias: Increment night reminder counter
     metadata: {}
     data: {}
-    alias: Increment night reminder counter
-  - service: script.text_notify
-    data:
+    action: counter.increment
+    target:
+      entity_id: counter.kallen_night_meds_reminder_count
+  - data:
       type: alert
       who: all
       message: clear_notification
       tag: kallen-night-meds
     alias: Clear previous night notification
+    action: script.text_notify
   - delay:
       hours: 0
       minutes: 0
       seconds: 5
       milliseconds: 0
   - parallel:
-    - service: script.text_notify
-      data:
+    - data:
         who: "{% if states('person.christina_stork') in ['Bob Evans','BobEvans'] %}\n
           \ tony\n{% else %}\n  parents\n{% endif %}\n"
         type: alert
@@ -2507,8 +2545,8 @@ kallen_night_meds:
         - action: KALLEN_NIGHT_MEDS_SKIPPED
           title: Skip
       alias: Send to parents
+      action: script.text_notify
     - alias: Send to Kallen
-      service: script.text_notify
       data:
         who: kallen
         type: alert
@@ -2520,6 +2558,7 @@ kallen_night_meds:
           title: Taken
         - action: KALLEN_NIGHT_MEDS_SKIPPED
           title: Skip
+      action: script.text_notify
     alias: Send text notifications
   icon: mdi:medication
   mode: restart
@@ -2972,35 +3011,7 @@ emma_sleep:
       option: Adaptive
     alias: Set lights to adaptive
     action: input_select.select_option
-  - alias: Select climate mode
-    choose:
-    - conditions:
-      - alias: AC
-        condition: and
-        conditions:
-        - condition: state
-          entity_id: input_select.scheduled_climate_mode_emma_bedroom
-          state: AC
-          alias: Scheduled mode is AC
-        - condition: state
-          entity_id: fan.emma_air_conditioner
-          state: 'off'
-          alias: Air conditioner is not already on
-      sequence:
-      - target:
-          entity_id: fan.emma_air_conditioner
-        data: {}
-        alias: Turn on air conditioner
-        action: fan.turn_on
-      - data:
-          who: parents
-          title: Emma Climate Schedule
-          message: The air conditioner in Emma's Bedroom has been activated.
-          type: normal
-          tag: emma-climate
-        alias: Send AC notification
-        action: script.text_notify
-    - conditions:
+  - if:
     - alias: White Noise
       condition: and
       conditions:
@@ -3012,7 +3023,7 @@ emma_sleep:
         entity_id: input_boolean.white_noise_emma_bedroom
         state: 'off'
         alias: White Noise is not already on
-      sequence:
+    then:
     - target:
         entity_id: input_boolean.white_noise_emma_bedroom
       data: {}
@@ -3026,15 +3037,7 @@ emma_sleep:
         tag: emma-climate
       alias: Send white noise notification
       action: script.text_notify
-    default:
-    - data:
-        who: parents
-        title: Emma Climate Schedule
-        message: No option selected for Emma's climate mode. No devices will be activated.
-        type: normal
-        tag: emma-climate
-      alias: Send notification that no climate mode is selected
-      action: script.text_notify
+    alias: Select climate mode
   icon: mdi:lightbulb-night
   mode: restart
 tina_morning_meds:
@@ -3561,3 +3564,41 @@ tina_tylenol:
   icon: mdi:medication
   max: 10
   description: ''
+reading_mode_in_tina_desk:
+  sequence:
+  - action: switch.turn_off
+    metadata: {}
+    data: {}
+    target:
+      entity_id: switch.adaptive_lighting_adapt_brightness_tina_lamp
+    alias: Turn off adaptive brightness, leave adaptive color on
+  - alias: Turn on lamp
+    action: light.turn_on
+    metadata: {}
+    data:
+      brightness_pct: 100
+    target:
+      entity_id: light.tina_desk_lights
+  - alias: Apply adaptive lighting to lamp
+    if:
+    - condition: state
+      entity_id: switch.adaptive_lighting_tina_lamp
+      state: 'off'
+      alias: If switch is off
+    then:
+    - data: {}
+      target:
+        entity_id: switch.adaptive_lighting_tina_lamp
+      alias: Turn on the switch
+      action: switch.turn_on
+    else:
+    - alias: Apply adaptive lighting
+      data:
+        entity_id: switch.adaptive_lighting_tina_lamp
+        adapt_color: true
+        turn_on_lights: true
+        adapt_brightness: false
+      action: adaptive_lighting.apply
+  alias: Reading Mode in Tina Desk
+  description: ''
+  icon: mdi:palette

sensors/house_stats.yaml

@@ -168,7 +168,7 @@
     unit_of_measurement: ''
     state: >-
       {% set compressors = [
-        states.binary_sensor.emma_aircon_compressor,
+        states.binary_sensor.emma_bedroom_aircon_compressor,
         states.binary_sensor.master_bedroom_aircon_compressor
       ] %}
       {{ compressors | selectattr('state','eq','on') | list | count | int }}
@@ -177,7 +177,7 @@
     unit_of_measurement: ''
     state: >-
       {% set fans = [
-        states.binary_sensor.emma_aircon_fan,
+        states.binary_sensor.emma_bedroom_aircon_fan,
         states.binary_sensor.master_bedroom_aircon_fan
       ] %}
       {{ fans | selectattr('state','eq','on') | list | count | int }}
@@ -196,11 +196,7 @@
     unit_of_measurement: ''
     state: >-
       {% set climate = states.climate | selectattr('state','ne','off') | rejectattr('state','eq','unavailable') | rejectattr('state','eq','unknown') | list | count | int %}
-      {% set fans = [
-        states.fan.emma_air_conditioner
-      ] %}
-      {% set fans_on = fans | selectattr('state','eq','on') | list | count | int %}
-      {{ climate + fans_on | int }}
+      {{ climate | int }}
   - name: Climate Devices Running
     unique_id: 3c61c756-2934-4294-8085-7d3855b692dd
     unit_of_measurement: ''

templates/speech/kallen_morning_briefing.yaml

@@ -98,12 +98,7 @@
           {% endif %}
           {% if is_state('input_boolean.kallen_alternate_pickup','on') %}
             Today, you will be picked up from school by {{ states('input_text.kallen_pickup') }}.
-          {% elif is_state('input_boolean.work_today','off') %}
-            Today, you will be picked up from school by your parents.
-          {% else %}
-            Today, you will be picked up from school by your dad.
           {% endif %}
-          <s>Pickup today will be at {{ input_datetime_read('input_datetime.kallen_school_day_end') }}</s>
           {% if count_the_days('input_datetime.school_last_day') | int == 0 -%}
             But today is the last day of School! 
           {%- endif %}

templates/speech/nightly_briefing.yaml

@@ -71,9 +71,13 @@
       {% else %}
         "Collin's room will be left alone, as he is spending the night elsewhere tonight. "
       {% endif %}
-      {% if states('input_select.scheduled_climate_mode_emma_bedroom') != 'N/A' %}
-        {% if is_state('input_select.scheduled_climate_mode_emma_bedroom','AC') and is_state('fan.emma_air_conditioner','off') %}
-          "Emma's air conditioner will be activated at {{ input_datetime_read('input_datetime.emma_bedroom_cooling') }}. "
+      {% if states('input_select.scheduled_climate_mode_emma_bedroom_aircon') != 'N/A' %}
+        {% if is_state('input_select.scheduled_climate_mode_emma_bedroom_aircon','AC') and is_state('input_boolean.hot_day','on') %}
+          "Today was a hot day, so Emma's bedroom air conditioner will start cooling a bit earlier tonight at {{ input_datetime_read('input_datetime.emma_bedroom_cooling') }}. "
+        {% elif is_state('input_select.scheduled_climate_mode_emma_bedroom_aircon','AC') %}
+          "Emma's bedroom air conditioner will start cooling at {{ input_datetime_read('input_datetime.emma_bedroom_cooling') }}. "
+        {% elif is_state('input_select.scheduled_climate_mode_emma_bedroom_aircon','Fan') %}
+          "Emma's bedroom air conditioner will activate fan only mode at {{ input_datetime_read('input_datetime.emma_bedroom_cooling') }}. "
         {% elif is_state('input_select.scheduled_climate_mode_emma_bedroom','White Noise') and is_state('input_boolean.white_noise_emma_bedroom','off') %}
           "Emma's white noise generator will activate at {{ input_datetime_read('input_datetime.emma_bedtime') }}. "
         {% endif %}

templates/speech/welcome_home.yaml

@@ -91,8 +91,21 @@
               {% endif %}
             {% endif %}
         {% endif %}
-        {% if is_state('input_boolean.emma_bedroom_aircon_installed','on') and is_state('fan.emma_air_conditioner','on') %}
-          "Emma's air conditioner is {{ states('fan.emma_air_conditioner') }}. "
+        {% if is_state('input_boolean.emma_bedroom_aircon_installed','on') %}
+          "the temperature in Emma's bedroom is {{ states('sensor.emma_bedroom_temperature') | int }} degrees. "
+            {% if not is_state('climate.emma_bedroom_aircon','off') %}
+              {% if is_state('climate.emma_bedroom_aircon','cool') %}
+                "and Emma's bedroom air conditioner is set for cooling to {{ state_attr('climate.emma_bedroom_aircon','temperature') }} degrees. "
+              {% elif is_state('climate.emma_bedroom_aircon','fan_only') %}
+                "and Emma's bedroom air conditioner is in fan only mode. "
+              {% elif is_state('climate.emma_bedroom_aircon','dry') %}
+                "and Emma's bedroom air conditioner is moonlighting as a dehumidifier. "
+              {% elif is_state('climate.emma_bedroom_aircon','auto') %}
+                "and Emma's bedroom air conditioner is making its own decisions. Be afraid, be very afraid. "
+              {% else %}
+                "and Emma's bedroom air conditioner is currently not speaking to me. Was it something I said? "
+              {% endif %}
+            {% endif %}
         {% endif %}
       {% endif %}
     </p>
@@ -115,7 +128,7 @@
         "Tina has work today. "
       {% endif %}
       {% if is_state('input_boolean.kallen_at_school','on') %}
-        "Collin is at school right now. His pickup time will be at {{ input_datetime_read('input_datetime.kallen_school_day_end') }}. "
+        "Collin is at school right now. His school day ends at {{ input_datetime_read('input_datetime.kallen_school_day_end') }}. "
       {% elif is_state('input_boolean.kallen_school_today','on') %}
         "Collin has school today. "
       {% endif %}