Merge branch 'master' into external_measured_room_sensor

.github/workflows/esphome-parallel.yaml

@@ -49,7 +49,7 @@ jobs:
           cp -R esphome/travis_secrets.yaml.txt esphome/common/secrets.yaml
           cp -R esphome/travis_secrets.yaml.txt esphome/secrets.yaml
       - name: Compile all ESPHome ${{matrix.file}}
-        uses: esphome/build-action@v1
+        uses: esphome/build-action@v2
         with:
           version: stable
           yaml_file: ${{matrix.file}}
@@ -74,7 +74,7 @@ jobs:
           cp -R esphome/travis_secrets.yaml.txt esphome/common/secrets.yaml
           cp -R esphome/travis_secrets.yaml.txt esphome/secrets.yaml
       - name: Compile all ESPHome ${{matrix.file}}
-        uses: esphome/build-action@v1
+        uses: esphome/build-action@v2
         with:
           version: beta
           yaml_file: ${{matrix.file}}
@@ -99,7 +99,7 @@ jobs:
           cp -R esphome/travis_secrets.yaml.txt esphome/common/secrets.yaml
           cp -R esphome/travis_secrets.yaml.txt esphome/secrets.yaml
       - name: Compile all ESPHome ${{matrix.file}}
-        uses: esphome/build-action@v1
+        uses: esphome/build-action@v2
         with:
           version: dev
           yaml_file: ${{matrix.file}}

.remarkignore

@@ -1 +1,2 @@
 www/lovelace-auto-entities/
+custom_components/hwam_stove/

README.md

@@ -7,3 +7,10 @@ My Home-Assistant configuration.
 An amalgamation of various examples and sources around the internet, with my own bodging holding it together.
 
 Deployed through the use of docker-compose and the service description at https://github.com/kylegordon/ha-stack
+
+
+### HWAM Stove Notes
+
+Basic REST and template sensors can be used, such as those described at https://github.com/peterczarlarsen-ha/hwam/blob/main/configure.yaml
+
+In this instance, the hwam_stove custom component is imported from https://github.com/mvn23/hwam_stove

blueprints/automation/homeassistant/better_thermostat_away_mode.yaml

@@ -0,0 +1,62 @@
+---
+blueprint:
+  name: Better Thermostat Away mode
+  description: Set BT Thermostats to Away mode if house is unoccupied.
+  domain: automation
+  # source_url: https://github.com/KartoffelToby/better_thermostat/blob/master/blueprints/away_mode.yaml
+  input:
+    occupancy_sensor:
+      name: Occupancy
+      selector:
+        entity:
+          domain: binary_sensor
+
+    thermostat_target:
+      name: Thermostats
+      selector:
+        target:
+          device:
+            integration: better_thermostat
+          entity:
+            integration: better_thermostat
+            domain: climate
+
+    away_temp:
+      name: Away Temperature
+      description: The target temperature when away
+      default: 15
+      selector:
+        number:
+          min: 5
+          max: 35
+          unit_of_measurement: °C
+
+mode: queued
+max_exceeded: silent
+
+trigger:
+  - platform: state
+    entity_id: !input occupancy_sensor
+    from: "on"
+    to: "off"
+    for:
+      minutes: 5
+  - platform: state
+    entity_id: !input occupancy_sensor
+    from: "off"
+    to: "on"
+condition: []
+action:
+  - if:
+      - condition: state
+        entity_id: !input occupancy_sensor
+        state: "off"
+    then:
+      - service: better_thermostat.set_temp_target_temperature
+        data:
+          temperature: !input away_temp
+        target: !input thermostat_target
+    else:
+      - service: better_thermostat.restore_saved_target_temperature
+        data: {}
+        target: !input thermostat_target

blueprints/night_mode.yaml → blueprints/automation/homeassistant/better_thermostat_night_mode.yaml

@@ -1,8 +1,9 @@
+---
 blueprint:
   name: Better Thermostat Night mode
   description: Set BT Thermostats to night mode if Schedule event is active.
   domain: automation
-  source_url: https://github.com/KartoffelToby/better_thermostat/blob/master/blueprints/night_mode.yaml
+  source_url: https://github.com/KartoffelToby/better_thermostat/blob/master/blueprints/night_mode.yaml  # yamllint disable-line rule:line-length
   input:
     night_times_schedule:
       name: Schedule helper
@@ -23,7 +24,7 @@ blueprint:
     night_temp:
       name: Night Temperature
       description: The target temperature at night
-      default: 18
+      default: 17
       selector:
         number:
           min: 5

climate.yaml

@@ -1,14 +1,18 @@
 - platform: generic_thermostat
-  name: House
+  unique_id: rest_of_house_thermostat
+  name: Rest of House Thermostat
   heater: input_boolean.call_for_rad_heat
-  target_sensor: sensor.house_average_temperature
+  precision: 0.5
+  target_sensor: sensor.rest_of_house_average_temperature
+  target_temp_step: 0.5
   min_temp: 10
   max_temp: 25
   away_temp: 15
   cold_tolerance: 0.2
   hot_tolerance: 0.2
 
 - platform: generic_thermostat
+  unique_id: hot_water_thermostat
   name: Hot Water
   heater: switch.boiler_valve_controls_relay_1
   target_sensor: sensor.hot_tank_temperature

configuration.yaml

@@ -52,7 +52,7 @@ homeassistant:
         icon: mdi:water-percent
     sensor.house_average_humidity:
         icon: mdi:water-percent
-    sensor.house_average_temperature:
+    sensor.rest_of_house_average_temperature:
         icon: mdi:thermometer
     sensor.next_bin:
       icon: mdi:delete-empty
@@ -241,6 +241,8 @@ input_select: !include_dir_named input_select
 input_boolean: !include_dir_named input_boolean
 script: !include_dir_merge_named scripts/
 
+hwam_stove: !include hwam_stove.yaml
+
 utility_meter:
   quarter_hourly_energy:
     source: sensor.energy_spent

custom_components/alexa_media/.translations

@@ -0,0 +1 @@
+translations