From c24d47c96cf8d0b82a15f3e850c03e7f94957aea Mon Sep 17 00:00:00 2001
From: monster <monster@hass-pc.local>
Date: Fri, 22 Feb 2019 21:46:56 +0300
Subject: [PATCH] updating configuration

---
 appdaemon/settings/apps/notifiers/battery.yaml              | 2 +-
 appdaemon/settings/apps/timers/power_theory.py              | 6 +++---
 .../configuration/group/hidden/presense/presence.yaml       | 6 ++++++
 hass/settings/configuration/sensor/tags/mamik_band.yaml     | 1 -
 hass/settings/configuration/sensor/tags/monster_nut.yaml    | 1 -
 hass/settings/custom_components                             | 1 -
 6 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 hass/settings/configuration/group/hidden/presense/presence.yaml
 delete mode 160000 hass/settings/custom_components

diff --git a/appdaemon/settings/apps/notifiers/battery.yaml b/appdaemon/settings/apps/notifiers/battery.yaml
index 83be96d..06dc926 100644
--- a/appdaemon/settings/apps/notifiers/battery.yaml
+++ b/appdaemon/settings/apps/notifiers/battery.yaml
@@ -6,6 +6,6 @@ sensor_battery_low_report:
   module: battery
   constraint: input_boolean.battery_report
   always_send: 0
-  threshold: 10
+  threshold: 7
   global_dependencies:
     - globals
\ No newline at end of file
diff --git a/appdaemon/settings/apps/timers/power_theory.py b/appdaemon/settings/apps/timers/power_theory.py
index 32860f2..74babbb 100644
--- a/appdaemon/settings/apps/timers/power_theory.py
+++ b/appdaemon/settings/apps/timers/power_theory.py
@@ -25,9 +25,9 @@ class PowerTheory(hass.Hass):
     self.timer_tick(None)
 
   def timer_tick(self, kwargs):
-    t1 = self.time_is_between(self.datetime(), '07:00:00', '10:00:00') or self.time_is_between(self.datetime(), '17:00:00', '21:00:00')
-    t2 = self.time_is_between(self.datetime(), '23:00:00', '07:00:00')
-    t3 = self.time_is_between(self.datetime(), '10:00:00', '17:00:00') or self.time_is_between(self.datetime(), '21:00:00', '23:00:00')
+    t1 = self.time_is_between(self.datetime(), '07:00:00', '09:59:59') or self.time_is_between(self.datetime(), '17:00:00', '20:59:59')
+    t2 = self.time_is_between(self.datetime(), '23:00:00', '06:59:00')
+    t3 = self.time_is_between(self.datetime(), '10:00:00', '16:59:59') or self.time_is_between(self.datetime(), '21:00:00', '22:59:59')
     if t1:
       self.switch_to_tariff('t1')
     if t2:
diff --git a/hass/settings/configuration/group/hidden/presense/presence.yaml b/hass/settings/configuration/group/hidden/presense/presence.yaml
new file mode 100644
index 0000000..03b8690
--- /dev/null
+++ b/hass/settings/configuration/group/hidden/presense/presence.yaml
@@ -0,0 +1,6 @@
+presence:
+  name: Пристутствие
+  entities:
+  - sensor.presence_hall
+  - sensor.presence_kitchen
+  - sensor.presence_balcony
\ No newline at end of file
diff --git a/hass/settings/configuration/sensor/tags/mamik_band.yaml b/hass/settings/configuration/sensor/tags/mamik_band.yaml
index 8e1ad45..a4bc5f1 100644
--- a/hass/settings/configuration/sensor/tags/mamik_band.yaml
+++ b/hass/settings/configuration/sensor/tags/mamik_band.yaml
@@ -1,7 +1,6 @@
 - platform: mqtt_room
   device_id: !secret tag_mamik_band
   name: tag_mamik_band
-  friendly_name: Мама браслет
   state_topic: home/presence
   timeout: 15
   away_timeout: 120
diff --git a/hass/settings/configuration/sensor/tags/monster_nut.yaml b/hass/settings/configuration/sensor/tags/monster_nut.yaml
index e8d429b..81419c9 100644
--- a/hass/settings/configuration/sensor/tags/monster_nut.yaml
+++ b/hass/settings/configuration/sensor/tags/monster_nut.yaml
@@ -1,7 +1,6 @@
 - platform: mqtt_room
   device_id: !secret tag_monster_nut
   name: tag_monster_nut
-  friendly_name: Данил метка
   state_topic: home/presence
   timeout: 15
   away_timeout: 120
diff --git a/hass/settings/custom_components b/hass/settings/custom_components
deleted file mode 160000
index 3987b4d..0000000
--- a/hass/settings/custom_components
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3987b4dd57e13fba2e5f9938c1cf2f48e65447e9