From b164b520417a36936e371fb99f4f9c97b5547df0 Mon Sep 17 00:00:00 2001
From: Georgi Gardev <georgi@gardev.com>
Date: Mon, 1 Jun 2020 22:51:14 +0300
Subject: [PATCH] Refactor climate config

---
 config/packages/modules/climate/climate.yaml | 40 ++++++++++++++++++++
 config/packages/modules/climate/weather.yaml | 18 ---------
 config/packages/modules/climate/windows.yaml | 28 +++++++++++---
 3 files changed, 62 insertions(+), 24 deletions(-)
 create mode 100644 config/packages/modules/climate/climate.yaml

diff --git a/config/packages/modules/climate/climate.yaml b/config/packages/modules/climate/climate.yaml
new file mode 100644
index 0000000..c79579d
--- /dev/null
+++ b/config/packages/modules/climate/climate.yaml
@@ -0,0 +1,40 @@
+sensor:
+  - platform: min_max
+    type: mean
+    name: Average Temperature
+    entity_ids:
+      - sensor.trisensor_temperature
+      - sensor.bedroom_weather_temperature
+      - sensor.kitchen_weather_temperature
+      - sensor.bathroom_weather_temperature
+      - sensor.hallway_weather_temperature
+      - sensor.guest_bedroom_weather_temperature
+
+  - platform: min_max
+    type: mean
+    name: Average humidity
+    entity_ids:
+      - sensor.multisensor_6_relative_humidity
+      - sensor.bedroom_weather_humidity
+      - sensor.kitchen_weather_humidity
+      - sensor.bathroom_weather_humidity
+      - sensor.hallway_weather_humidity
+      - sensor.guest_bedroom_weather_humidity
+
+#
+# ─── CUSTOMIZATION ──────────────────────────────────────────────────────────────
+#
+
+homeassistant:
+  customize:
+    sensor.bedroom_weather_power:
+      friendly_name: Bedroom weather battery
+
+    sensor.bedroom_weather_temperature:
+      friendly_name: Temperature
+
+    sensor.bedroom_weather_pressure:
+      friendly_name: Pressure
+
+    sensor.bedroom_weather_humidity:
+      friendly_name: Humidity
diff --git a/config/packages/modules/climate/weather.yaml b/config/packages/modules/climate/weather.yaml
index cda3101..f6f87a3 100644
--- a/config/packages/modules/climate/weather.yaml
+++ b/config/packages/modules/climate/weather.yaml
@@ -46,21 +46,3 @@ sensor:
       - nearest_storm_distance
       - nearest_storm_bearing
       - alerts
-
-#
-# ─── CUSTOMIZATION ──────────────────────────────────────────────────────────────
-#
-
-homeassistant:
-  customize:
-    sensor.bedroom_weather_power:
-      friendly_name: Bedroom weather battery
-
-    sensor.bedroom_weather_temperature:
-      friendly_name: Temperature
-
-    sensor.bedroom_weather_pressure:
-      friendly_name: Pressure
-
-    sensor.bedroom_weather_humidity:
-      friendly_name: Humidity
diff --git a/config/packages/modules/climate/windows.yaml b/config/packages/modules/climate/windows.yaml
index efb53e5..e05196a 100644
--- a/config/packages/modules/climate/windows.yaml
+++ b/config/packages/modules/climate/windows.yaml
@@ -1,3 +1,12 @@
+group:
+  all_windows:
+    name: All windows
+    entities:
+      - binary_sensor.living_room_right_window
+      - binary_sensor.bedroom_left_window
+      - binary_sensor.bedroom_right_window
+      - binary_sensor.kitchen_window
+
 binary_sensor:
   - platform: template
     sensors:
@@ -41,12 +50,19 @@ binary_sensor:
           {% else %} mdi:window-closed-variant
           {% endif %}
 
-group:
-  all_windows:
-    name: All windows
-    entities:
-      - binary_sensor.living_room_right_window_on_off
-      - binary_sensor.bedroom_right_window_on_off
+
+sensor:
+  - platform: template
+    sensors:
+      open_window_count:
+        entity_id:
+          - binary_sensor.living_room_right_window
+          - binary_sensor.bedroom_left_window
+          - binary_sensor.bedroom_right_window
+          - binary_sensor.kitchen_window
+        friendly_name: Open window count
+        value_template: >-
+          {{ states | selectattr('entity_id', 'in', state_attr('group.all_windows', 'entity_id')) | selectattr('state', 'eq', 'on') | list | count | int }}
 
 #
 # ─── CUSTOMIZATION ──────────────────────────────────────────────────────────────