From 8da6a3d84da2dfab7db7a03ca9cc4fa52c4d323b Mon Sep 17 00:00:00 2001
From: lade <laurent.deleers@gmail.com>
Date: Sun, 2 Oct 2022 16:24:54 +0200
Subject: [PATCH] updated config

---
 espsalon.yaml | 19 ++++++++++---------
 espwater.yaml | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/espsalon.yaml b/espsalon.yaml
index 381d996..13d8d8e 100644
--- a/espsalon.yaml
+++ b/espsalon.yaml
@@ -8,15 +8,15 @@ logger:
 
 # Enable Home Assistant API
 api:
-  password: "feelhome123"
+  password: !secret api_secret
 
 ota:
-  password: "feelhome123"
+  password: !secret ota_key
 
 wifi:
-  ssid: "lauIOT"
-  password: "superiot1"
-  domain: .home.cabestan.be
+  ssid:     !secret wireless_ssid
+  password: !secret wireless_key
+  domain:   !secret wireless_domain
 
   # Enable fallback hotspot (captive portal) in case wifi connection fails
   ap:
@@ -39,18 +39,18 @@ time:
     id: esptime
     timezone: "Europe/Brussels"
     on_time:
-      - seconds: /1
+      - seconds: /2
         then:
           - display.page.show_next: saloon_display
 
 font:
-  - file: "Roboto-Black.ttf"
+  - file: "fonts/Roboto/Roboto-Black.ttf"
     id: my_font_16
     size: 16
-  - file: "Roboto-Black.ttf"
+  - file: "fonts/Roboto/Roboto-Black.ttf"
     id: my_font_14
     size: 14
-  - file: "materialdesignicons-webfont.ttf"
+  - file: "fonts/materialdesignicons-webfont.ttf"
     id: icons_14
     size: 14
     glyphs:
@@ -125,6 +125,7 @@ display:
   - platform: ssd1306_i2c
     model: "SSD1306 128x64"
     reset_pin: D0
+    update_interval: 2s
     address: 0x3C
     id: saloon_display
     rotation: 90
diff --git a/espwater.yaml b/espwater.yaml
index d912d45..3d89379 100644
--- a/espwater.yaml
+++ b/espwater.yaml
@@ -25,9 +25,12 @@ web_server:
   port: 80
 
 mqtt:
-  broker: hass20.home.cabestan.be
-  username: espsalon
-  password: sala45224
+  #  broker: hass20.home.cabestan.be
+  broker: domotic.home.cabestan.be
+    # username: espsalon
+  username: espwater
+    #  password: sala45224
+  password: r5h4r65h4
   on_message:
     topic: espwater/set_total_drop
     qos: 0
@@ -35,7 +38,7 @@ mqtt:
       lambda: |-
         // sprintf(id(lcd_line1),"|%s|%u|",x.c_str(),atol(x.c_str()));
         id(drops_absolute) = atol(x.c_str())*4;
-        sprintf(id(lcd_line1),"Set Total:%u",id(drops_absolute)/4);
+        sprintf(id(lcd_line1),"Set Total:%lu",id(drops_absolute)/4);
 
 globals:
   # - id: software_version
@@ -61,7 +64,7 @@ globals:
   - id: lcd_line2
     type: char[17]
     restore_value: no
-    initial_value: "{'v','e','r',':',' ','0','.','4','0','\0'}"
+    initial_value: "{'v','e','r',':',' ','0','.','4','1','\0'}"
 
 time:
   - platform: sntp
@@ -147,6 +150,8 @@ sensor:
     lambda: |-
       return id(drops_today)/4;
     update_interval: 60s  
+    state_class: measurement
+    #last_reset: 1970-01-01T00:00:00+00:00
 
 binary_sensor:
   - platform: gpio