monster/home-assistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

water action fixes

Browse Source
This commit is contained in:
Your Name
2019-11-06 09:20:11 +03:00
parent 94778c039e
commit 7a32cb74da
24 changed files with 178 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hass/settings/configuration.yaml
+6 -9
View File
@@ -23,6 +23,8 @@ http:
trusted_proxies:
- 172.19.0.0/24
# noolite:
# Enables the frontend
frontend:
lovelace:
@@ -44,11 +46,12 @@ logbook:
# Components
automation: !include_dir_merge_list configuration/automation
apple_tv: !include_dir_merge_list configuration/appletv
alexa: !include configuration/amazon/alexa.yaml
#apple_tv: !include_dir_merge_list configuration/appletv
#alexa: !include configuration/amazon/alexa.yaml
alarm_control_panel: !include_dir_merge_list configuration/alarm_control_panel
binary_sensor: !include_dir_merge_list configuration/binary_sensor
camera: !include_dir_merge_list configuration/camera
fan: !include_dir_merge_list configuration/fan
#climate: !include_dir_merge_list configuration/climate
group: !include_dir_merge_named configuration/group
input_boolean: !include_dir_merge_named configuration/input/input_boolean
@@ -78,10 +81,4 @@ modbus: !include configuration/modbus.yaml
utility_meter: !include_dir_merge_named configuration/utility_meter
speedtestdotnet: !include configuration/speedtest.yaml
yandex_smart_home: !include configuration/alice.yaml
# fan:
# - platform: xiaomi_miio
# host: 192.168.1.14
# token: '411cf70bb69052c0121813388f30e193'
# model: zhimi.airpurifier.mc1
yandex_smart_home: !include configuration/alice.yaml
hass/settings/configuration/fan/purifier.yaml
+4
View File
@@ -0,0 +1,4 @@
- platform: xiaomi_miio
model: zhimi.airpurifier.mc1
host: !secret purifier_ip
token: !secret purifier_key
hass/settings/configuration/light/livingroom.yaml
+4 -6
View File
@@ -1,6 +1,4 @@
# - platform: noolite
# channel: 0
# name: "salt_lamp"
# scan_interval: 60
# type: dimmer
# mode: noolite
# - platform: noolite
# tx_channel: 1
# friendly_name: "salt_lamp"
# dimmable: true
hass/settings/configuration/sensor/purifier.yaml
+7
View File
@@ -0,0 +1,7 @@
- platform: template
sensors:
xiaomi_airpurifier_air_quality_pm25:
friendly_name: "Air quality"
value_template: "{{ state_attr('fan.xiaomi_miio_device', 'aqi') }}"
unit_of_measurement: "μg/m³"
icon_template: "mdi:weather-fog"
hass/settings/configuration/sensor/template/xiaomi_socket_money_cost.yaml
+12
View File
@@ -40,6 +40,10 @@
friendly_name: "Фитолампа в мес."
unit_of_measurement: '₽'
value_template: "{{ (states('sensor.fitolamp_monthly') | float * (states('sensor.power_cost') | float)) | round(2) }}"
server_money_monthly:
friendly_name: "Сервер в мес."
unit_of_measurement: '₽'
value_template: "{{ (states('sensor.server_monthly') | float * (states('sensor.power_cost') | float)) | round(2) }}"
power_money_t1_monthly:
friendly_name: "Т1 в мес."
unit_of_measurement: '₽'
@@ -98,6 +102,10 @@
friendly_name: "Фитолампа в день"
unit_of_measurement: '₽'
value_template: "{{ (states('sensor.fitolamp_daily') | float * (states('sensor.power_cost') | float)) | round(2) }}"
server_money_daily:
friendly_name: "Сервер в день"
unit_of_measurement: '₽'
value_template: "{{ (states('sensor.server_daily') | float * (states('sensor.power_cost') | float)) | round(2) }}"
counter_hot_money_hourly:
friendly_name: "Горячая в час"
@@ -139,3 +147,7 @@
friendly_name: "Фитолампа в час"
unit_of_measurement: '₽'
value_template: "{{ (states('sensor.fitolamp_hourly') | float * (states('sensor.power_cost') | float)) | round(2) }}"
server_money_hourly:
friendly_name: "Сервер в час"
unit_of_measurement: '₽'
value_template: "{{ (states('sensor.server_hourly') | float * (states('sensor.power_cost') | float)) | round(2) }}"
hass/settings/configuration/sensor/template/xiaomi_socket_power_consumed.yaml
+4 -1
View File
@@ -28,4 +28,7 @@
friendly_name: "Фитолампа потреблено"
unit_of_measurement: 'kWh'
value_template: "{{ state_attr('switch.plug_158d0002924779', 'power_consumed') / 1000 }}"
server_consumed:
friendly_name: "Сервер потреблено"
unit_of_measurement: 'kWh'
value_template: "{{ state_attr('switch.plug_158d00026ea017', 'power_consumed') / 1000 }}"
hass/settings/configuration/utility_meter/server.yaml
+9
View File
@@ -0,0 +1,9 @@
server_hourly:
source: sensor.server_consumed
cycle: hourly
server_daily:
source: sensor.server_consumed
cycle: daily
server_monthly:
source: sensor.server_consumed
cycle: monthly
hass/settings/custom_components/noolite.tgz
BIN
View File
Binary file not shown.
hass/settings/ui-lovelace.yaml
+19
View File
@@ -22,14 +22,17 @@ views:
entities:
- sensor.temperature_158d0001149b3c
- sensor.humidity_158d0001149b3c
- sensor.xiaomi_airpurifier_air_quality_pm25
- light.yeelight_color1_34ce008fe328
- light.yeelight_color1_286c071065c7
- light.yeelight_mono1_34ce0087ff33
- light.yeelight_mono1_f0b4290e5444
- light.yeelight_mono1_f0b429a8f6df
# - light.salt_lamp
- cover.curtain_158d0002b0c46a
- switch.plug_158d0001104a0c
- switch.plug_158d00010dd98d
- fan.xiaomi_miio_device
- climate.living_room
- type: entities
title: "Кухня"
@@ -285,6 +288,16 @@ views:
- sensor.fitolamp_money_hourly
- sensor.fitolamp_money_daily
- sensor.fitolamp_money_monthly
- type: entities
title: "Сервер"
show_header_toggle: false
entities:
- sensor.server_hourly
- sensor.server_daily
- sensor.server_monthly
- sensor.server_money_hourly
- sensor.server_money_daily
- sensor.server_money_monthly
- type: entities
title: "Теория трехтарифника"
show_header_toggle: false
@@ -296,6 +309,12 @@ views:
- sensor.power_money_t2_monthly
- sensor.power_money_t3_monthly
- sensor.power_theory_money_monthly
- type: history-graph
title: Качество воздуха
hours_to_show: 80
refresh_interval: 60
entities:
- sensor.xiaomi_airpurifier_air_quality_pm25
- title: "Настройки"
icon: mdi:settings
cards: