Moving to lovelace

2019-02-09 22:43:12 +03:00
parent c1db46839e
commit 246739d538
35 changed files with 135 additions and 307 deletions
@@ -27,7 +27,7 @@ lovelace:
 config:
 discovery:
 system_health:
-  
+
 # Enables support for tracking state changes over time
 recorder: !include configuration/recorder.yaml
 history:
@@ -65,4 +65,5 @@ homekit: !include configuration/homekit/homekit.yaml
 modbus: !include configuration/modbus.yaml

 mysensors: !include configuration/mysensors.yaml
-utility_meter: !include_dir_merge_list configuration/utility_meter
+
+utility_meter: !include_dir_merge_named configuration/utility_meter
@@ -1,68 +0,0 @@
-default_view:
-  view: yes
-  name: Статус
-  icon: mdi:home
-  entities:
-    - group.home
-    - group.mainroom
-    - group.kitchen
-    - group.bath
-    - group.hall
-    - group.balcony
-    - group.outside
-
-sensors:
-  view: yes
-  name: Датчики
-  icon: mdi:nfc
-  entities:
-    - group.motion_sensors
-    - group.water_leak
-    - group.smoke
-    - group.doors
-    - group.water_counters
-    - group.tags
-    - group.presence
-    - group.power
-
-cameras:
-  view: yes
-  name: Камеры
-  icon: mdi:cctv
-  entities:
-    - camera.enterance
-
-alarmclock:
-  view: yes
-  name: Будильники
-  icon: mdi:alarm
-  entities:
-    - group.alarmclock_weekdays
-    - group.alarmclock_weekend
-
-stats:
-  view: yes
-  name: Статистика
-  icon: mdi:chart-areaspline
-  entities:
-    - group.power_stats
-    - group.water_stats
-
-settings:
-  view: yes
-  name: Настройки
-  icon: mdi:settings
-  entities:
-    - group.light_control
-    - group.automation_control
-    - group.reports_control
-    - group.tag_control
-    - group.persons
-
-system:
-  view: yes
-  name: Информация
-  icon: mdi:monitor-multiple
-  entities:
-    - group.os
-    - group.network
@@ -1,6 +0,0 @@
-alarmclock_weekdays:
-  name: Будильник (будни)
-  control: hidden
-  entities:
-    - input_boolean.alarmclock_weekdays
-    - input_datetime.alarmclock_weekdays
@@ -1,6 +0,0 @@
-alarmclock_weekend:
-  name: Будильник (выходные)
-  control: hidden
-  entities:
-    - input_boolean.alarmclock_weekend
-    - input_datetime.alarmclock_weekend
@@ -1,8 +0,0 @@
-balcony:
-  name: Балкон
-  control: hidden
-  entities:
-    - light.yeelight_white_286c07f12bed
-    - light.yeelight_white_f0b429a8d936
-    - sensor.temperature_158d000117d37a
-    - sensor.humidity_158d000117d37a
@@ -1,9 +0,0 @@
-bath:
-  name: Ванная
-  control: hidden
-  entities:
-    - sensor.temperature_158d00012d9ad7
-    - sensor.humidity_158d00012d9ad7
-    - light.bath
-    - light.philips_led
-    - sensor.airfresher_remain
@@ -1,5 +0,0 @@
-hall:
-  name: Прихожая
-  control: hidden
-  entities:
-    - light.hall
@@ -1,12 +0,0 @@
-home:
-  name: Дом
-  control: hidden
-  entities:
-    - alarm_control_panel.ha_alarm
-    - sensor.lux_outside
-    - switch.water_valve
-    - vacuum.xiaomi_vacuum_cleaner
-    - sensor.xiaomi_scale
-    - switch.domofon_open
-    - switch.wifi_socket
-    - switch.yolka
@@ -1,10 +0,0 @@
-kitchen:
-  name: Кухня
-  control: hidden
-  entities:
-    - light.kitchen
-    - switch.kitchen_mini_light
-    - switch.plug_158d0001a68b18
-    - switch.plug_158d0001a68c64
-    - switch.plug_158d0001a4cfb4
-    - switch.xiaomi_miio_switch
@@ -1,15 +0,0 @@
-mainroom:
-  name: Гостиная
-  control: hidden
-  entities:
-    - sensor.temperature_158d0001149b3c
-    - sensor.humidity_158d0001149b3c
-    - light.yeelight_rgb_34ce008fe328
-    - light.yeelight_rgb_286c071065c7
-    - light.yeelight_white_34ce0087ff33
-    - light.yeelight_white_f0b4290e5444
-    - light.yeelight_white_f0b429a8f6df
-    - cover.curtain_158d0002b0c46a
-    - switch.plug_158d0001104a0c
-    - switch.plug_158d00010dd98d
-    - climate.living_room
@@ -1,6 +0,0 @@
-outside:
-  name: Улица
-  control: hidden
-  entities:
-    - sensor.temperature_158d000149c128
-    - sensor.humidity_158d000149c128
@@ -1,7 +0,0 @@
-buttons:
-  name: Кнопки
-  entities:
-    - binary_sensor.switch_158d000102f7e6
-    - binary_sensor.switch_158d00012d5720
-    - binary_sensor.switch_158d0001256810
-    - binary_sensor.switch_158d00013f81a9
@@ -1,17 +0,0 @@
-doors:
-  name: Двери
-  entities:
-    #входная дверь
-    - binary_sensor.door_window_sensor_158d0001130141
-    #дверь ванная
-    - binary_sensor.door_window_sensor_158d000111a469
-    #дверь балкон
-    - binary_sensor.door_window_sensor_158d00010f7e19
-    #дверь гостиная
-    - binary_sensor.door_window_sensor_158d0002254373
-    #дверь кухня
-    - binary_sensor.door_window_sensor_158d0001b77b1b
-    #окно 1
-    - binary_sensor.door_window_sensor_158d0001c0e46d
-    #окно кухня
-    - binary_sensor.door_window_sensor_158d0001e74660
@@ -1,17 +0,0 @@
-motion_sensors:
-  name: Движение
-  entities:
-    #прихожая
-    - binary_sensor.motion_sensor_158d0000e7c7ad
-    - binary_sensor.motion_sensor_158d0002044548
-    #Кухня
-    - binary_sensor.motion_sensor_158d0000fbc664
-    - binary_sensor.motion_sensor_158d0001535c97
-    #Ванна
-    - binary_sensor.motion_sensor_158d0000f9546b
-    - binary_sensor.motion_sensor_158d000165fed5
-    - binary_sensor.motion_sensor_158d0001537e21
-    #Гостиная
-    - binary_sensor.motion_sensor_158d0000f6b2fa
-    - binary_sensor.motion_sensor_158d0001e50ce4
-    - binary_sensor.motion_sensor_158d0001e80f0d
@@ -1,15 +0,0 @@
-power:
-  name: Электропитание
-  entities:
-    - sensor.power_mosenergosbyt_balance
-    - sensor.power_main_total
-    - sensor.power_mosenergosbyt_total
-    - sensor.power_total
-    - sensor.power_voltage
-    - sensor.power_current
-    - sensor.power_frequency
-    - sensor.power_active_power
-    - sensor.power_reactive_power
-    - sensor.power_power_factor
-    - sensor.power_import
-    - sensor.power_export
@@ -1,6 +0,0 @@
-presence:
-  name: Пристутствие
-  entities:
-  - sensor.presence_hall
-  - sensor.presence_kitchen
-  - sensor.presence_balcony
@@ -1,5 +0,0 @@
-smoke:
-  name: Датчики дыма
-  entities:
-  #датчик дыма-кухня
-  - binary_sensor.smoke_sensor_158d00023115ad
@@ -1,8 +0,0 @@
-tags:
-  name: Метки
-  entities:
-  - sensor.tag_mamik_band
-  - sensor.tag_monster_nut
-  - sensor.tag_nut_blue
-  - sensor.tag_nut_white
-  - sensor.tag_nut_guest
@@ -1,8 +0,0 @@
-water_counters:
-  name: Счетчики воды
-  entities:
-    - sensor.epd_balance
-    - sensor.counter_cold
-    - sensor.counter_hot
-    - sensor.counter_mosru_cold
-    - sensor.counter_mosru_hot
@@ -1,9 +0,0 @@
-water_leak:
-  name: Протечка
-  entities:
-    - binary_sensor.water_leak_sensor_158d0001d594fa
-    - binary_sensor.water_leak_sensor_158d0001c34960
-    - binary_sensor.water_leak_sensor_158d0002150c07
-    - binary_sensor.water_leak_sensor_158d0002112b98
-    - binary_sensor.water_leak_sensor_158d0002113158
-    - binary_sensor.water_leak_sensor_158d00023a48f0
@@ -1,9 +0,0 @@
-automation_control:
-  name: Настройки автоматики
-  entities:
-    - input_boolean.presence_control
-    - input_boolean.water_control
-    - input_boolean.water_leak_control
-    - input_boolean.mainroom_climate_control
-    - switch.domofon_mode
-    
@@ -1,8 +0,0 @@
-light_control:
-  name: Контроль света
-  entities:
-    - input_boolean.mainroom_light_control
-    - input_boolean.hall_light_control
-    - input_boolean.bath_light_control
-    - input_boolean.kitchen_light_control
-    - input_boolean.balcony_light_control
@@ -1,8 +0,0 @@
-reports_control:
-  name: Настройки отчетов
-  entities:
-    - input_boolean.security_sensors_report
-    - input_boolean.battery_report
-    - input_boolean.water_counters_report
-    - input_boolean.work_presence_report
-    - input_boolean.lock_report
@@ -1,8 +0,0 @@
-tag_control:
-  name: Метки
-  entities:
-    - input_boolean.tag_mamik_band
-    - input_boolean.tag_monster_nut
-    - input_boolean.tag_nut_blue
-    - input_boolean.tag_nut_white
-    - input_boolean.tag_nut_guest
@@ -1,6 +0,0 @@
-power_stats:
-  name: Статистика электропитания
-  entities:
-    - utility_meter.power_dialy
-    - utility_meter.power_monthly
-    - utility_meter.power_hourly
@@ -1,9 +0,0 @@
-water_stats:
-  name: Статистика потребления воды
-  entities:
-    - utility_meter.counter_cold_hourly
-    - utility_meter.counter_cold_dialy
-    - utility_meter.counter_cold_monthly
-    - utility_meter.counter_hot_hourly
-    - utility_meter.counter_hot_dialy
-    - utility_meter.counter_hot_monthly
@@ -1,6 +0,0 @@
-network:
-  name: Сеть
-  entities:
-    - sensor.speedtest_ping
-    - sensor.speedtest_download
-    - sensor.speedtest_upload
@@ -1,8 +0,0 @@
-os:
-  name: ОС
-  entities:
-    - sensor.processor_use
-    - sensor.memory_free
-    - sensor.swap_use_percent
-    - sensor.disk_use_percent
-    - sensor.ssl_certificate_expiry
@@ -0,0 +1,22 @@
+- platform: template
+  sensors:
+    dishwasher_consumed:
+      friendly_name: "Посудомойка потреблено"
+      unit_of_measurement: 'wH'
+      value_template: "{{ state_attr('switch.plug_158d0001a68c64', 'power_consumed') }}"
+    washer_consumed:
+      friendly_name: "Стиралка потреблено"
+      unit_of_measurement: 'wH'
+      value_template: "{{ state_attr('switch.plug_158d0001a4cfb4', 'power_consumed') }}"
+    tv_consumed:
+      friendly_name: "ТВ потреблено"
+      unit_of_measurement: 'wH'
+      value_template: "{{ state_attr('switch.plug_158d0001104a0c', 'power_consumed') }}"
+    thermopot_consumed:
+      friendly_name: "Термопот потреблено"
+      unit_of_measurement: 'wH'
+      value_template: "{{ state_attr('switch.plug_158d0001a68b18', 'power_consumed') }}"
+    conditioner_consumed:
+      friendly_name: "Кондиционер потреблено"
+      unit_of_measurement: 'wH'
+      value_template: "{{ state_attr('switch.plug_158d00010dd98d', 'power_consumed') }}"
@@ -0,0 +1,9 @@
+conditioner_hourly:
+  source: sensor.conditioner_consumed
+  cycle: hourly
+conditioner_dialy:
+  source: sensor.conditioner_consumed
+  cycle: daily
+conditioner_monthly:
+  source: sensor.conditioner_consumed
+  cycle: monthly
@@ -0,0 +1,9 @@
+dishwasher_hourly:
+  source: sensor.dishwasher_consumed
+  cycle: hourly
+dishwasher_dialy:
+  source: sensor.dishwasher_consumed
+  cycle: daily
+dishwasher_monthly:
+  source: sensor.dishwasher_consumed
+  cycle: monthly
@@ -0,0 +1,9 @@
+thermopot_hourly:
+  source: sensor.thermopot_consumed
+  cycle: hourly
+thermopot_dialy:
+  source: sensor.thermopot_consumed
+  cycle: daily
+thermopot_monthly:
+  source: sensor.thermopot_consumed
+  cycle: monthly
@@ -0,0 +1,9 @@
+tv_hourly:
+  source: sensor.tv_consumed
+  cycle: hourly
+tv_dialy:
+  source: sensor.tv_consumed
+  cycle: daily
+tv_monthly:
+  source: sensor.tv_consumed
+  cycle: monthly
@@ -0,0 +1,9 @@
+washer_hourly:
+  source: sensor.washer_consumed
+  cycle: hourly
+washer_dialy:
+  source: sensor.washer_consumed
+  cycle: daily
+washer_monthly:
+  source: sensor.washer_consumed
+  cycle: monthly
@@ -180,16 +180,73 @@ views:
        entities:
          - input_boolean.alarmclock_weekend
          - input_datetime.alarmclock_weekend
-
  - title: "Статистика"
    icon: mdi:chart-areaspline
-    cards: []
-
+    cards:
+      - type: entities
+        title: "Электроэнер\
+          гия"
+        show_header_toggle: true
+        entities:
+          - sensor.power_dialy
+          - sensor.power_monthly
+          - sensor.power_hourly
+      - type: entities
+        title: "Горячая вода"
+        show_header_toggle: true
+        entities:
+          - sensor.counter_hot_hourly
+          - sensor.counter_hot_dialy
+          - sensor.counter_hot_monthly
+      - type: entities
+        title: "Холодная вод\
+          а"
+        show_header_toggle: true
+        entities:
+          - sensor.counter_cold_hourly
+          - sensor.counter_cold_dialy
+          - sensor.counter_cold_monthly
+      - type: entities
+        title: "Посудомойка"
+        show_header_toggle: true
+        entities:
+          - sensor.dishwasher_dialy
+          - sensor.dishwasher_monthly
+          - sensor.dishwasher_hourly
+      - type: entities
+        title: "Стиралка"
+        show_header_toggle: true
+        entities:
+          - sensor.washer_dialy
+          - sensor.washer_monthly
+          - sensor.washer_hourly
+      - type: entities
+        title: "Телевизор"
+        show_header_toggle: true
+        entities:
+          - sensor.tv_dialy
+          - sensor.tv_monthly
+          - sensor.tv_hourly
+      - type: entities
+        title: "Термопот"
+        show_header_toggle: true
+        entities:
+          - sensor.thermopot_dialy
+          - sensor.thermopot_monthly
+          - sensor.thermopot_hourly
+      - type: entities
+        title: "Кондиционер"
+        show_header_toggle: true
+        entities:
+          - sensor.conditioner_dialy
+          - sensor.conditioner_monthly
+          - sensor.conditioner_hourly
  - title: "Настройки"
    icon: mdi:settings
    cards:
      - type: entities
-        title: "Контроль света"
+        title: "Контроль све\
+          та"
        show_header_toggle: true
        entities:
          - input_boolean.mainroom_light_control
@@ -198,7 +255,8 @@ views:
          - input_boolean.kitchen_light_control
          - input_boolean.balcony_light_control
      - type: entities
-        title: "Настройки автоматики"
+        title: "Настройки ав\
+          томатики"
        show_header_toggle: true
        entities:
          - input_boolean.presence_control
@@ -207,7 +265,8 @@ views:
          - input_boolean.mainroom_climate_control
          - switch.domofon_mode
      - type: entities
-        title: "Настройки отчетов"
+        title: "Настройки от\
+          четов"
        show_header_toggle: true
        entities:
          - input_boolean.security_sensors_report