From 345c9e01d00a2cae3ad2e7e5b56676a20ea8418d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 3 Dec 2019 21:21:18 +0300
Subject: [PATCH] updating configuration

---
 .../settings/apps/sensors/toilet_presence.py  |  7 ++-
 esphome/settings/bath_light.yaml              | 51 +++++++++++++++++++
 esphome/settings/watercontrol.yaml            | 16 +++---
 .../settings/configuration/sensor/toilet.yaml |  8 +--
 .../settings/configuration/sensor/uptime.yaml |  6 ---
 hass/settings/ui-lovelace.yaml                |  2 +-
 6 files changed, 69 insertions(+), 21 deletions(-)
 create mode 100644 esphome/settings/bath_light.yaml

diff --git a/appdaemon/settings/apps/sensors/toilet_presence.py b/appdaemon/settings/apps/sensors/toilet_presence.py
index fd08267..eec970b 100644
--- a/appdaemon/settings/apps/sensors/toilet_presence.py
+++ b/appdaemon/settings/apps/sensors/toilet_presence.py
@@ -30,9 +30,12 @@ class ToiletPresence(hass.Hass):
     self.listen_state(self.distance_changed, self.args['sensor'])
     
   def distance_changed(self, entity, attribute, old, new, kwargs):
-    distance = int(new)
+    if new == 'unknown':
+      return
+    
+    distance = float(new)
     state = ""
-    if (distance > 1100 or distance < 750):
+    if (distance > 1.100 or distance < 0.750):
       self.timers_off()
       self.timers.append(self.run_in(self.run_in_presense_off, self.presence_timeout))
       self.log('re-setting timer for {}s.'.format(self.presence_timeout))
diff --git a/esphome/settings/bath_light.yaml b/esphome/settings/bath_light.yaml
new file mode 100644
index 0000000..f1c552b
--- /dev/null
+++ b/esphome/settings/bath_light.yaml
@@ -0,0 +1,51 @@
+esphome:
+  name: bath_light
+  platform: ESP8266
+  board: esp01_1m
+
+wifi:
+  ssid: !secret wifi_24_name
+  password: !secret wifi_24_pass
+
+  # Enable fallback hotspot (captive portal) in case wifi connection fails
+  ap:
+    ssid: "BathLight Fallback Hotspot"
+    password: !secret esphome_captive_pass
+
+logger:
+
+api:
+  password: !secret esphome_pass
+
+ota:
+  password: !secret esphome_pass
+
+binary_sensor:
+  - platform: gpio
+    pin:
+      number: GPIO14
+      mode: INPUT_PULLUP
+      inverted: True
+    id: button_1
+    on_press:
+      then:
+        - light.toggle: light_1
+
+  - platform: status
+    name: "Bath status"
+
+output:
+  - platform: gpio
+    pin: GPIO12
+    id: relay_1
+
+light:
+  - platform: binary
+    name: "bath"
+    id: light_1
+    output: relay_1
+
+status_led:
+  pin:
+    number: GPIO13
+    inverted: yes
\ No newline at end of file
diff --git a/esphome/settings/watercontrol.yaml b/esphome/settings/watercontrol.yaml
index 732f88b..9daad27 100644
--- a/esphome/settings/watercontrol.yaml
+++ b/esphome/settings/watercontrol.yaml
@@ -30,11 +30,11 @@ globals:
    type: bool
    restore_value: yes
    initial_value: 'true'
- - id: cold_value
+ - id: counter_cold_value
    type: float
    restore_value: yes
    initial_value: '210.29'
- - id: hot_value
+ - id: counter_hot_value
    type: float
    restore_value: yes
    initial_value: '109.74'
@@ -49,7 +49,7 @@ binary_sensor:
       - delayed_off: 100ms
     on_press:
       then:
-        - lambda: 'id(cold_value) += 0.01;'
+        - lambda: 'id(counter_cold_value) += 0.01;'
   
   - platform: gpio
     name: pulse_hot
@@ -60,22 +60,22 @@ binary_sensor:
       - delayed_off: 100ms
     on_press:
       then:
-        - lambda: 'id(hot_value) += 0.01;'
+        - lambda: 'id(counter_hot_value) += 0.01;'
 
 sensor:
   - platform: uptime
     name: "Watercontrol Uptime"
   
   - platform: template
-    name: "counter hot"
+    name: "counter_hot"
     lambda: |-
-      return id(hot_value);
+      return id(counter_hot_value);
     update_interval: 60s
   
   - platform: template
-    name: "counter cold"
+    name: "counter_cold"
     lambda: |-
-      return id(cold_value);
+      return id(counter_cold_value);
     update_interval: 60s
 
   - platform: ultrasonic
diff --git a/hass/settings/configuration/sensor/toilet.yaml b/hass/settings/configuration/sensor/toilet.yaml
index a2c1c94..dd81e9e 100644
--- a/hass/settings/configuration/sensor/toilet.yaml
+++ b/hass/settings/configuration/sensor/toilet.yaml
@@ -1,4 +1,4 @@
-- platform: mqtt
-  state_topic: 'home/bath/bath/distance'
-  name: 'toilet_distance'
-  unit_of_measurement: 'cm'
\ No newline at end of file
+# - platform: mqtt
+#   state_topic: 'home/bath/bath/distance'
+#   name: 'toilet_distance'
+#   unit_of_measurement: 'cm'
\ No newline at end of file
diff --git a/hass/settings/configuration/sensor/uptime.yaml b/hass/settings/configuration/sensor/uptime.yaml
index 8f8fe29..ad1142c 100644
--- a/hass/settings/configuration/sensor/uptime.yaml
+++ b/hass/settings/configuration/sensor/uptime.yaml
@@ -1,9 +1,3 @@
-- platform: mqtt
-  state_topic: 'home/domofon/$uptime'
-  name: 'uptime_domofon'
-- platform: mqtt
-  state_topic: 'home/bath/$uptime'
-  name: 'uptime_bath'
 - platform: mqtt
   state_topic: 'home/kitchen-led/$uptime'
   name: 'uptime_kitchen-led'
diff --git a/hass/settings/ui-lovelace.yaml b/hass/settings/ui-lovelace.yaml
index df185cc..e5c3fe9 100644
--- a/hass/settings/ui-lovelace.yaml
+++ b/hass/settings/ui-lovelace.yaml
@@ -371,7 +371,7 @@ views:
         show_header_toggle: false
         entities:
           - sensor.airfresher_uptime
-          - sensor.uptime_bath
+          - sensor.watercontrol_uptime
           - sensor.domofon_uptime
           - sensor.uptime_kitchen_led
           - sensor.uptime_nest