changes to MQTT topics

doc/home assistant/climate.yaml

@@ -1,37 +1,39 @@
- - platform: mqtt
-   name: Thermostat
-   modes:
-     - "auto"
-     - "heat"
-     - "off"
+- platform: mqtt
+  name: Thermostat
+  modes:
+    - "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_topic: "home/ems-esp/thermostat_data1"
-   current_temperature_topic: "home/ems-esp/thermostat_data1"
-   temperature_state_topic: "home/ems-esp/thermostat_data1"
+  mode_state_template: "{{ value_json.hc1.mode }}"
+  current_temperature_template: "{{ value_json.hc1.currtemp }}"
+  temperature_state_template: "{{ value_json.hc1.seltemp }}"
+   
+  temp_step: 0.5
+  
+- platform: mqtt
+  name: boiler
+  modes:
+    - "auto"
+    - "off"
+  min_temp: 40
+  max_temp: 60
+  temp_step: 1
+  
+  current_temperature_topic: "home/ems-esp/boiler_data"
+  temperature_state_topic: "home/ems-esp/boiler_data"
+  mode_state_topic: "home/ems-esp/boiler_data"
 
-   temperature_command_topic: "home/ems-esp/thermostat_cmd_temp1"
-   mode_command_topic: "home/ems-esp/thermostat_cmd_mode1"
+  current_temperature_template: "{{ value_json.wWCurTmp }}"
+  temperature_state_template: "{{ value_json.wWSelTemp }}"
+  mode_state_template: "{% if value_json.wWActivated == 'off' %} off {% else %} auto {% endif %}"
 
-   mode_state_template: "{{ value_json.thermostat_mode }}"
-   current_temperature_template: "{{ value_json.thermostat_currtemp }}"
-   temperature_state_template: "{{ value_json.thermostat_seltemp }}"
-
-   temp_step: 0.5
-
- - platform: mqtt
-   name: boiler
-   modes:
-     - "auto"
-     - "off"
-   min_temp: 40
-   max_temp: 60
-   temp_step: 1
-   current_temperature_topic: "home/ems-esp/boiler_data"
-   temperature_state_topic: "home/ems-esp/boiler_data"
-   temperature_command_topic: "home/ems-esp/boiler_cmd_wwtemp"
-   current_temperature_template: "{{ value_json.wWCurTmp }}"
-   temperature_state_template: "{{ value_json.wWSelTemp }}"
-   mode_state_template: "{% if value_json.wWActivated == 'off' %} off {% else %} auto {% endif %}"
-   mode_state_topic: "home/ems-esp/boiler_data"
-   mode_command_topic: "home/ems-esp/wwactivated"
-   
+  temperature_command_topic: "home/ems-esp/boiler_cmd_wwtemp"
+  mode_command_topic: "home/ems-esp/boiler_cmd_wwactivated"
+  

doc/home assistant/script.yaml

@@ -1,7 +1,8 @@
+# ems-esp
 shower_coldshot:
   sequence:
     - service: mqtt.publish
       data_template:
-        topic: 'home/ems-esp/shower_coldshot'
-        payload: '1'
-
+        topic: 'home/ems-esp/generic_cmd'
+        payload: '{cmd:"coldshot"}'
+        

doc/home assistant/switch.yaml

@@ -1,20 +1,20 @@
+# EMS-ESP
 - platform: mqtt
   name: "Shower Timer"
-  state_topic: "home/ems-esp/shower_timer"
-  command_topic: "home/ems-esp/shower_timer"
-  payload_on: "1"
-  payload_off: "0"
-  optimistic: false
-  qos: 1
-  retain: false
+  state_topic: "home/ems-esp/shower_data"
+  value_template: "{{ value_json.timer }}"
+  command_topic: "home/ems-esp/shower_data"
+  payload_on: '{"timer":"1"}'
+  payload_off: '{"timer":"0"}'
+  state_on: "1"
+  state_off: "0"
 
 - platform: mqtt
   name: "Long Shower Alert"
-  state_topic: "home/ems-esp/shower_alert"
-  command_topic: "home/ems-esp/shower_alert"
-  payload_on: "1"
-  payload_off: "0"
-  optimistic: false
-  qos: 1
-  retain: false
-
+  state_topic: "home/ems-esp/shower_data"
+  value_template: "{{ value_json.alert }}"
+  command_topic: "home/ems-esp/shower_data"
+  payload_on: '{"alert":"1"}'
+  payload_off: '{"alert":"0"}'
+  state_on: "1"
+  state_off: "0"

doc/home assistant/ui-lovelace.yaml

@@ -56,7 +56,7 @@ views:
             - sensor.current_room_temperature
             - sensor.dark_sky_temperature
         - type: thermostat
-          entity: climate.thermostat
+          entity: climate.thermostat_hc1
         - type: thermostat
           name: WarmWater
           entity: climate.boiler