From 81cbc498704ca0dc9a902374f4ba3ab3308a8d75 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan@faked.org>
Date: Sat, 28 May 2022 15:35:54 +0200
Subject: [PATCH] clean up Nous A1T template and rename stuff for displayed
 order

---
 base.yaml             |  1 +
 include/nous_a1t.yaml | 27 ++++++++++++++-------------
 propbox.yaml          | 26 +++++++++++++-------------
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/base.yaml b/base.yaml
index 0dec1a5..f8623a3 100644
--- a/base.yaml
+++ b/base.yaml
@@ -43,6 +43,7 @@ web_server:
   # include_internal: true
 
 prometheus:
+  # include_internal: true
 
 sensor:
   - platform: wifi_signal
diff --git a/include/nous_a1t.yaml b/include/nous_a1t.yaml
index 8fb21ef..342f586 100644
--- a/include/nous_a1t.yaml
+++ b/include/nous_a1t.yaml
@@ -9,7 +9,7 @@ time:
 
 light:
   - platform: status_led
-    id: "led_status"
+    id: led_status
     pin:
       number: GPIO13
       inverted: true
@@ -17,18 +17,18 @@ light:
 binary_sensor:
   # toggle relay on/off
   - platform: gpio
-    id: "button_state"
+    id: button_state
     pin:
       number: GPIO00
       mode: INPUT_PULLUP
     on_press:
-      - switch.toggle: "power"
+      - switch.toggle: power
 
 switch:
   - platform: template
     name: "Power"
     optimistic: true
-    id: "power"
+    id: power
     lambda: |-
       if (id(relay).state) {
         return true;
@@ -36,19 +36,19 @@ switch:
         return false;
       }
     turn_on_action:
-      - switch.turn_on: "relay"
-      - light.turn_on: "led_status"
+      - switch.turn_on: relay
+      - light.turn_on: led_status
     turn_off_action:
-      - switch.turn_off: "relay"
-      - light.turn_off: "led_status"
+      - switch.turn_off: relay
+      - light.turn_off: led_status
   - platform: gpio
     id: relay
     pin: GPIO14
 
 sensor:
   - platform: total_daily_energy
-    name: "Electric Consumption [kWh]"
-    power_id: "nous_a1t_watt"
+    name: "Daily Consumption"
+    power_id: watt
     filters:
       # Multiplication factor from W to kW is 0.001
       - multiply: 0.001
@@ -75,11 +75,12 @@ sensor:
       accuracy_decimals: 3
 
     voltage:
-      name: "Voltage"
+      name: "Volt"
       unit_of_measurement: V
       accuracy_decimals: 1
 
     power:
-      name: "Power"
-      id: "nous_a1t_watt"
+      id: watt
+      name: "Watt"
       unit_of_measurement: W
+      accuracy_decimals: 1
diff --git a/propbox.yaml b/propbox.yaml
index cf02964..a915ec5 100644
--- a/propbox.yaml
+++ b/propbox.yaml
@@ -41,14 +41,14 @@ sensor:
     update_interval: 5s
     temperature:
       id: temperature
-      name: "Temperature"
+      name: "Sensor: Temperature"
       accuracy_decimals: 2
       on_value:
         then:
           - script.execute: fan_control
     humidity:
       id: humidity
-      name: "Humidity"
+      name: "Sensor: Humidity"
       accuracy_decimals: 2
       on_value:
         then:
@@ -56,12 +56,12 @@ sensor:
     pressure:
       id: pressure
       accuracy_decimals: 2
-      name: "Pressure"
+      name: "Sensor: Pressure"
 
   - platform: dallas
     index: 0
     id: temperature_water
-    name: "Water Temperature"
+    name: "Sensor: Water Temperature"
     accuracy_decimals: 2
 
   # requires: https://github.com/esphome/feature-requests/issues/1746
@@ -99,49 +99,49 @@ sensor:
 select:
   - platform: template
     id: schedule
-    name: "Light Schedule"
+    name: "Light: Schedule"
     options: ["Disabled", "Grow", "Bloom"]
     initial_option: "Disabled"
     optimistic: true
     restore_value: true
   - platform: template
     id: temperature_max
-    name: "Temperature: Fan On"
+    name: "Fan: Temperature On"
     options: ["21", "22", "23", "24", "25", "26", "27", "28", "29"]
     initial_option: "27"
     optimistic: true
     restore_value: true
   - platform: template
     id: temperature_hysteresis
-    name: "Temperature: Fan Hysteresis"
+    name: "Fan: Temperature Hysteresis"
     options: ["1", "2", "3", "4", "5"]
     initial_option: "2"
     optimistic: true
     restore_value: true
   - platform: template
     id: temperature_min
-    name: "Temperature: Fan Off"
+    name: "Fan: Temperature Off"
     options: ["19", "20", "21", "22", "23", "24", "25"]
     initial_option: "21"
     optimistic: true
     restore_value: true
   - platform: template
     id: humidity_max
-    name: "Humidity: Fan On"
+    name: "Fan: Humidity On"
     options: ["40", "45", "50", "55", "60", "65", "70", "75"]
     initial_option: "70"
     optimistic: true
     restore_value: true
   - platform: template
     id: humidity_hysteresis
-    name: "Humidity: Fan Hysteresis"
+    name: "Fan: Humidity Hysteresis"
     options: ["5", "10", "15"]
     initial_option: "5"
     optimistic: true
     restore_value: true
   - platform: template
     id: humidity_min
-    name: "Humidity: Fan Off"
+    name: "Fan: Humidity Off"
     options: ["20", "25", "30", "35", "40", "45", "50"]
     initial_option: "40"
     optimistic: true
@@ -150,7 +150,7 @@ select:
 switch:
   - platform: template
     id: propbox_light
-    name: "Light Status"
+    name: "Status: Light"
     optimistic: true
     turn_on_action:
       - http_request.post:
@@ -160,7 +160,7 @@ switch:
           url: http://${hostname_light}/switch/power/turn_off
   - platform: template
     id: propbox_fan
-    name: "Fan Status"
+    name: "Status: Fan"
     optimistic: true
     turn_on_action:
       - http_request.post:
-- 
GitLab