esphome & home assistant cleanup

intern/docker_esphome/templates/config/esphome_plug05.yaml

@@ -66,6 +66,13 @@ sensor:
       id: "${plug_name}_Wattage"
     change_mode_every: 8
     update_interval: 10s
+  - platform: total_daily_energy
+    name: ${plug_name}_Energy
+    power_id: "${plug_name}_Wattage"
+
+# Enable time for energy monitoring
+time:
+  - platform: sntp
     
 output:
   # Relay state led

intern/docker_esphome/templates/config/esphome_plug06.yaml

@@ -66,6 +66,13 @@ sensor:
       id: "${plug_name}_Wattage"
     change_mode_every: 8
     update_interval: 10s
+  - platform: total_daily_energy
+    name: ${plug_name}_Energy
+    power_id: "${plug_name}_Wattage"
+
+# Enable time for energy monitoring
+time:
+  - platform: sntp
     
 output:
   # Relay state led

intern/docker_esphome/templates/config/esphome_plug07.yaml

@@ -66,7 +66,14 @@ sensor:
       id: "${plug_name}_Wattage"
     change_mode_every: 8
     update_interval: 10s
-    
+  - platform: total_daily_energy
+    name: ${plug_name}_Energy
+    power_id: "${plug_name}_Wattage"
+
+# Enable time for energy monitoring
+time:
+  - platform: sntp
+
 output:
   # Relay state led
   - platform: esp8266_pwm

intern/docker_esphome/templates/config/esphome_plug08.yaml

@@ -66,6 +66,13 @@ sensor:
       id: "${plug_name}_Wattage"
     change_mode_every: 8
     update_interval: 10s
+  - platform: total_daily_energy
+    name: ${plug_name}_Energy
+    power_id: "${plug_name}_Wattage"
+
+# Enable time for energy monitoring
+time:
+  - platform: sntp
     
 output:
   # Relay state led

intern/docker_esphome/templates/config/esphome_status.yaml

@@ -17,7 +17,8 @@ sensor:
         input: true
         pullup: true
     unit_of_measurement: 'kW'
-    name: 'Stromverbrauch'
+    device_class: "power"
+    name: esphome_status_Power
     # Herausfilterung von fehlerhaften Impulsen < 20ms
     internal_filter: 20ms
     # Genauigkeit auf 1 Watt
@@ -28,20 +29,11 @@ sensor:
     # Totaler Stromverbrauch seitdem der ESP läuft
     # Eventuell noch abändern auf Stromverbrauch Heute / Woche / Monat und reset durch time (sntp?)
     total:
-      name: "Strom total"
+      device_class: "energy"
+      name: esphome_status_Energy
       unit_of_measurement: "kWh"
       # Genauigkeit auf 1 Watt
       accuracy_decimals: 3
       filters:
         # (800 Impulse / kWh)^-1 = 0.00125kWh
         - multiply: 0.00125
-binary_sensor:
-  - platform: gpio
-    pin: 
-      number: GPIO12
-      mode:
-        input: true
-        pullup: true
-      inverted: true
-    name: "warpzone Status"
-    device_class: presence

intern/docker_esphome/templates/config/esphome_vortragsraum.yaml

@@ -79,4 +79,4 @@ sensor:
       - sliding_window_moving_average:
           window_size: 3
           send_every: 3
-          send_first_at: 3
+          send_first_at: 3
\ No newline at end of file

intern/docker_esphome/templates/includes/common.inc.yaml

-
 # WiFi settings 
 wifi:
   ssid: "Internet-of-Shit"
@@ -25,8 +24,8 @@ logger:
 web_server:
 #  local: true
 
-# Activates prometheus /metrics endpoint
-prometheus:
+# Activates api for home assistant
+api:
 
 # MQTT config 
 mqtt:

intern/docker_esphome/templates/includes/common_info.inc.yaml

@@ -27,8 +27,8 @@ logger:
 web_server:
 #  local: true
 
-# Activates prometheus /metrics endpoint
-prometheus:
+# Activates api for home assistant
+api:
 
 # MQTT config 
 mqtt:

intern/docker_homeassistant/templates/config/configuration.yaml

@@ -104,9 +104,9 @@ sensor:
       - 'date'
       - 'date_time'
 
-automation zonenstatus:
+automation ansible:
   # set zonenstatus
-  - alias: zonenstatus_set
+  - alias: ANSIBLE_zonenstatus_set
     description: Speichert Zonenstatus in einem Helper
     trigger:
       - platform: state
@@ -145,7 +145,7 @@ automation zonenstatus:
     mode: single
 
   # send zonenstatus to MQTT, REST
-  - alias: zonenstatus_send_MQTT_REST
+  - alias: ANSIBLE_zonenstatus_send_MQTT_REST
     description: Sendet den Zonenstatus per MQTT und REST für Shutdown und SpaceAPI
     trigger:
     - platform: time_pattern
@@ -178,7 +178,7 @@ automation zonenstatus:
     mode: single
 
   # send zonenstatus to telegram
-  - alias: zonenstatus_send_telegram
+  - alias: ANSIBLE_zonenstatus_send_telegram
     description: Sendet den Zonenstatus per Telegram-Bot
     trigger:
       - platform: state