1.9.4 - Merge remote-tracking branch 'origin/dev'

doc/home assistant/climate.yaml

@@ -4,14 +4,16 @@
     - "auto"
     - "heat"
     - "off"
+    
   mode_command_topic: "home/ems-esp/thermostat_cmd_mode1"
   temperature_command_topic: "home/ems-esp/thermostat_cmd_temp1"
    
   mode_state_topic: "home/ems-esp/thermostat_data"
   current_temperature_topic: "home/ems-esp/thermostat_data"
   temperature_state_topic: "home/ems-esp/thermostat_data"
+  
+  mode_state_template: "{% if value_json.hc1.mode in ['manual', 'day'] %} heat {% elif value_json.hc1.mode in ['night', 'off'] %} off {% else %} auto {% endif %}"
 
-  mode_state_template: "{{ value_json.hc1.mode }}"
   current_temperature_template: "{{ value_json.hc1.currtemp }}"
   temperature_state_template: "{{ value_json.hc1.seltemp }}"
    

doc/home assistant/sensor.yaml

@@ -20,16 +20,6 @@
 
   # boiler
 
-- platform: mqtt
-  state_topic: 'home/ems-esp/boiler_data'
-  name: 'Tap Water'
-  value_template: '{{ value_json.tapwaterActive }}'
-
-- platform: mqtt
-  state_topic: 'home/ems-esp/boiler_data'
-  name: 'Heating'
-  value_template: '{{ value_json.heatingActive }}'
-
 - platform: mqtt
   state_topic: 'home/ems-esp/boiler_data'
   name: 'Warm Water selected temperature'

doc/home assistant/ui-lovelace.yaml

@@ -1,20 +1,26 @@
-title: Home
-views:
-  
-  - title: Heating
+  - id: ems-esp_id0
+    title: Heating
     cards:
-      - type: entities
+      - id: ems-esp_id1
+        type: glance
+        entities:
+          - entity: binary_sensor.tap_water
+            icon: mdi:fire
+          - entity: binary_sensor.heating
+            icon: mdi:radiator
+      - id: ems-esp_id2
+        type: entities
         title: Boiler
         show_header_toggle: false
         entities:
           - sensor.boiler_boottime
           - sensor.boiler_updated
+          - sensor.ems_esp_status
           - type: divider
           - sensor.warm_water_selected_temperature
           - sensor.warm_water_current_temperature
           - sensor.warm_water_activated
           - sensor.warm_water_3_way_valve
-          - sensor.warm_water_tapwater_flow_rate
           - type: divider
           - sensor.boiler_temperature
           - sensor.return_temperature
@@ -27,36 +33,43 @@ views:
           - sensor.system_pressure
           - sensor.burner_max_power
           - sensor.burner_current_power
-          
-      - type: vertical-stack
+
+      - id: ems-esp_id3
+        type: vertical-stack
         cards:
-        - type: entities
-          title: Shower Monitor
-          show_header_toggle: false
-          entities:
-            - switch.shower_timer
-            - switch.long_shower_alert
-            - type: divider
-            - sensor.last_shower_duration
-            - sensor.showertime_time
-        - type: entity-button
-          icon: mdi:shower-head
-          name: send a cold shot of shower water
-          entity: script.shower_coldshot
-          tap_action:
-            action: call-service
-            service: script.turn_on
-            service_data:
-              entity_id: script.shower_coldshot
+          - type: entities
+            title: Shower Monitor
+            show_header_toggle: false
+            entities:
+              - switch.shower_timer
+              - switch.long_shower_alert
+              - type: divider
+              - sensor.last_shower_duration
+              - sensor.showertime_time
+          - type: entity-button
+            icon: mdi:shower-head
+            name: send a cold shot of shower water
+            entity: script.shower_coldshot
+            tap_action:
+              action: call-service
+              service: script.turn_on
+              service_data:
+                entity_id: script.shower_coldshot
+                
+          - type: history-graph
+            entities:
+              - sensor.ems_esp_wifi
+              - sensor.ems_esp_freemem
             
-      - type: vertical-stack
-        cards:       
-        - type: history-graph
-          entities:
-            - sensor.current_room_temperature
-            - sensor.dark_sky_temperature
-        - type: thermostat
-          entity: climate.thermostat
-        - type: thermostat
-          name: WarmWater
-          entity: climate.boiler
+      - id: ems-esp_id4
+        type: vertical-stack
+        cards:
+          - type: history-graph
+            entities:
+              - sensor.pc_room_sensor_temperature
+              - sensor.current_room_temperature
+              - sensor.dark_sky_temperature
+          - type: thermostat
+            entity: climate.thermostat
+          - type: thermostat
+            entity: climate.boiler