andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

1.5.7b

Browse Source
This commit is contained in:
proddy
2019-03-10 15:09:51 +01:00
parent b52794998e
commit 8e62a99417
46 changed files with 6145 additions and 5523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
doc/home_assistant/automations.yaml
View File

@@ -2,7 +2,7 @@
alias: Alert shower time
trigger:
platform: mqtt
topic: home/boiler/showertime
topic: home/ems-esp/showertime
action:
- service: notify.general_notify
data_template:
@@ -13,7 +13,7 @@
alias: Alert shower too long
trigger:
platform: mqtt
topic: home/boiler/command
topic: home/ems-esp/command
payload: 'shower_alarm'
action:
- service: notify.admin_notify
@@ -21,21 +21,21 @@
title: "Shower Alert!"
message: "Shower time exceeded limit"
# when boiler starts send boottime
# when ems-esp starts send boottime
- id: boiler_restart
alias: See if boiler restarts
alias: See if ems-esp restarts
trigger:
platform: mqtt
topic: home/boiler/start
topic: home/ems-esp/start
payload: 'start'
action:
- service: notify.admin_notify
data_template:
title: "boiler has booted"
message: "Boiler"
title: "ems-esp has booted"
message: "EMS-ESP"
- service: mqtt.publish
data_template:
topic: 'home/boiler/start'
topic: 'home/ems-esp/start'
payload: >
{{ now().strftime("%H:%M:%S %-d/%b/%Y") }}

4
doc/home_assistant/binary_sensor.yaml
View File

@@ -1,12 +1,12 @@
- platform: mqtt
name: 'Tap Water'
state_topic: 'home/boiler/tapwater_active'
state_topic: 'home/ems-esp/tapwater_active'
payload_on: "1"
payload_off: "0"
- platform: mqtt
name: 'Heating'
state_topic: 'home/boiler/heating_active'
state_topic: 'home/ems-esp/heating_active'
payload_on: "1"
payload_off: "0"

38
doc/home_assistant/climate.yaml
View File

@@ -1,20 +1,30 @@
- platform: mqtt
name: Thermostat
modes:
- low
- manual
- auto
name: Thermostat
modes:
- low
- manual
- auto
mode_state_topic: "home/boiler/thermostat_data"
current_temperature_topic: "home/boiler/thermostat_data"
temperature_state_topic: "home/boiler/thermostat_data"
mode_state_topic: "home/ems-esp/thermostat_data"
current_temperature_topic: "home/ems-esp/thermostat_data"
temperature_state_topic: "home/ems-esp/thermostat_data"
temperature_command_topic: "home/boiler/thermostat_cmd_temp"
mode_command_topic: "home/boiler/thermostat_cmd_mode"
temperature_command_topic: "home/ems-esp/thermostat_cmd_temp"
mode_command_topic: "home/ems-esp/thermostat_cmd_mode"
mode_state_template: "{{ value_json.thermostat_mode }}"
current_temperature_template: "{{ value_json.thermostat_currtemp }}"
temperature_state_template: "{{ value_json.thermostat_seltemp }}"
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
temp_step: 0.5
- platform: mqtt
name: boiler
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 }}"

BIN
doc/home_assistant/ha.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 107 KiB

2
doc/home_assistant/scripts.yaml
View File

@@ -2,6 +2,6 @@ shower_coldshot:
sequence:
- service: mqtt.publish
data_template:
topic: 'home/boiler/shower_coldshot'
topic: 'home/ems-esp/shower_coldshot'
payload: '1'

55
doc/home_assistant/sensors.yaml
View File

@@ -1,132 +1,138 @@
- platform: mqtt
state_topic: 'home/boiler/thermostat_data'
state_topic: 'home/ems-esp/thermostat_data'
name: 'Current Room Temperature'
unit_of_measurement: '°C'
value_template: "{{ value_json.thermostat_currtemp }}"
- platform: mqtt
state_topic: 'home/boiler/thermostat_data'
state_topic: 'home/ems-esp/thermostat_data'
name: 'Current Set Temperature'
unit_of_measurement: '°C'
value_template: "{{ value_json.thermostat_seltemp }}"
- platform: mqtt
state_topic: 'home/boiler/thermostat_data'
state_topic: 'home/ems-esp/thermostat_data'
name: 'Current Mode'
value_template: "{{ value_json.thermostat_mode }}"
# last time boiler was started
# last time esp-esp was started
- platform: template
sensors:
boiler_boottime:
value_template: '{{ as_timestamp(states.automation.see_if_boiler_restarts.attributes.last_triggered) | timestamp_custom("%H:%M:%S %d/%m/%y") }}'
- platform: mqtt
state_topic: 'home/boiler/showertime'
state_topic: 'home/ems-esp/showertime'
name: 'Last shower duration'
force_update: true
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Tap Water'
value_template: '{{ value_json.tapwaterActive }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Heating'
value_template: '{{ value_json.heatingActive }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Warm Water selected temperature'
unit_of_measurement: '°C'
value_template: '{{ value_json.wWSelTemp }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Warm Water tapwater flow rate'
unit_of_measurement: 'l/min'
value_template: '{{ value_json.wWCurFlow }}'
- platform: mqtt
state_topic: 'home/ems-esp/boiler_data'
name: 'Warm Water current temperature'
unit_of_measurement: '°C'
value_template: '{{ value_json.wWCurTmp }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Warm Water activated'
value_template: '{{ value_json.wWActivated }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Warm Water 3-way valve'
value_template: '{{ value_json.wWHeat }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Current flow temperature'
unit_of_measurement: '°C'
value_template: '{{ value_json.curFlowTemp }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Return temperature'
unit_of_measurement: '°C'
value_template: '{{ value_json.retTemp }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Gas'
value_template: '{{ value_json.burnGas }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Boiler pump'
value_template: '{{ value_json.heatPmp }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Fan'
value_template: '{{ value_json.fanWork }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Ignition'
value_template: '{{ value_json.ignWork }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Circulation pump'
value_template: '{{ value_json.wWCirc }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Burner max power'
unit_of_measurement: '%'
value_template: '{{ value_json.selBurnPow }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Burner max power'
unit_of_measurement: '%'
value_template: '{{ value_json.selBurnPow }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Burner current power'
unit_of_measurement: '%'
value_template: '{{ value_json.curBurnPow }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'System Pressure'
unit_of_measurement: 'bar'
value_template: '{{ value_json.sysPress }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Boiler temperature'
unit_of_measurement: '°C'
value_template: '{{ value_json.boilTemp }}'
- platform: mqtt
state_topic: 'home/boiler/boiler_data'
state_topic: 'home/ems-esp/boiler_data'
name: 'Pump modulation'
unit_of_measurement: '%'
value_template: '{{ value_json.pumpMod }}'
@@ -137,7 +143,6 @@
value_template: '{{ as_timestamp(states.sensor.last_shower_duration.last_updated) | int | timestamp_custom("%-I:%M %P on %a %-d %b") }}'
boiler_updated:
# value_template: '{{ (as_timestamp(now()) - as_timestamp(states.sensor.boiler_temperature.last_updated)) | int | timestamp_custom("%-M min %-S seconds ago") }}'
value_template: '{{ as_timestamp(states.sensor.boiler_temperature.last_updated) | timestamp_custom("%H:%M on %d/%b") }}'

8
doc/home_assistant/switches.yaml
View File

@@ -1,7 +1,7 @@
- platform: mqtt
name: "Shower Timer"
state_topic: "home/boiler/shower_timer"
command_topic: "home/boiler/shower_timer"
state_topic: "home/ems-esp/shower_timer"
command_topic: "home/ems-esp/shower_timer"
payload_on: "1"
payload_off: "0"
optimistic: false
@@ -10,8 +10,8 @@
- platform: mqtt
name: "Long Shower Alert"
state_topic: "home/boiler/shower_alert"
command_topic: "home/boiler/shower_alert"
state_topic: "home/ems-esp/shower_alert"
command_topic: "home/ems-esp/shower_alert"
payload_on: "1"
payload_off: "0"
optimistic: false

19
doc/home_assistant/ui-lovelace.yaml
View File

@@ -13,7 +13,8 @@ views:
- sensor.warm_water_selected_temperature
- sensor.warm_water_current_temperature
- sensor.warm_water_activated
- sensor.warm_water_3way_valve
- sensor.warm_water_3_way_valve
- sensor.warm_water_tapwater_flow_rate
- type: divider
- sensor.boiler_temperature
- sensor.return_temperature
@@ -38,16 +39,15 @@ views:
- type: divider
- sensor.last_shower_duration
- sensor.showertime_time
- type: custom:button-card
color: auto
- type: entity-button
icon: mdi:shower-head
name: send a cold shot of shower water
style:
- text-transform: none
- color: rgb(28, 128, 199)
- font-weight: bold
entity: script.shower_coldshot
show_state: false
tap_action:
action: call-service
service: script.turn_on
service_data:
entity_id: script.shower_coldshot
- type: vertical-stack
cards:
@@ -57,3 +57,6 @@ views:
- sensor.dark_sky_temperature
- type: thermostat
entity: climate.thermostat
- type: thermostat
name: WarmWater
entity: climate.boiler