From 94581b73b960c7e1650d3bd531c03d1a2111caeb Mon Sep 17 00:00:00 2001
From: Georgi Gardev <georgi@gardev.com>
Date: Wed, 6 May 2020 03:48:43 +0300
Subject: [PATCH] Define motion sensors. Add new sensors on living room
 dashboard.

---
 .../lovelace/advanced_dashboard/01_new.yaml   | 24 ------
 .../home_dashboard/living_room_dashboard.yaml | 85 ++++++++++++++++---
 config/packages/modules/presence.yaml         | 12 +++
 3 files changed, 86 insertions(+), 35 deletions(-)

diff --git a/config/lovelace/advanced_dashboard/01_new.yaml b/config/lovelace/advanced_dashboard/01_new.yaml
index f00331f..33645a9 100644
--- a/config/lovelace/advanced_dashboard/01_new.yaml
+++ b/config/lovelace/advanced_dashboard/01_new.yaml
@@ -51,18 +51,6 @@ cards:
           extrema: true
           fill: true
 
-      - type: "custom:mini-graph-card"
-        entities:
-          - sensor.trisensor_burglar
-        cache: false
-        group_by: hour
-        hours_to_show: 72
-        line_width: 2
-        show:
-          average: true
-          extrema: true
-          fill: true
-
       - type: entities
         entities:
           - zwave.aeotec_limited_zwa005_trisensor
@@ -103,18 +91,6 @@ cards:
           extrema: true
           fill: true
 
-      - type: "custom:mini-graph-card"
-        entities:
-          - sensor.multisensor_6_burglar
-        cache: false
-        group_by: hour
-        hours_to_show: 72
-        line_width: 2
-        show:
-          average: true
-          extrema: true
-          fill: true
-
       - type: "custom:mini-graph-card"
         entities:
           - sensor.multisensor_6_relative_humidity
diff --git a/config/lovelace/home_dashboard/living_room_dashboard.yaml b/config/lovelace/home_dashboard/living_room_dashboard.yaml
index fe5a01d..246f111 100644
--- a/config/lovelace/home_dashboard/living_room_dashboard.yaml
+++ b/config/lovelace/home_dashboard/living_room_dashboard.yaml
@@ -100,6 +100,18 @@
                   - player_name: Living room
 
 
+          - type: vertical-stack
+            title: Camera
+            cards:
+              - type: picture-glance
+                camera_image: camera.amcrest_camera
+                entities:
+                  - entity: camera.amcrest_camera
+                  - entity: switch.camera
+                    show_state: false
+                  - entity: binary_sensor.amcrest_camera_online
+                    show_state: false
+
       - type: vertical-stack
         cards:
           - type: horizontal-stack
@@ -128,15 +140,66 @@
                   max_value: 800
                   normal_value: 100
                   high_value: 300
-          - type: vertical-stack
-            title: Camera
-            cards:
-              - type: picture-glance
-                camera_image: camera.amcrest_camera
-                entities:
-                  - entity: camera.amcrest_camera
-                  - entity: switch.camera
-                    show_state: false
-                  - entity: binary_sensor.amcrest_camera_online
-                    show_state: false
+
+          - type: horizontal-stack
+            title: Tri Sensor
+            cards:
+              - type: custom:button-card
+                template:
+                  - small
+                  - progress
+                entity: sensor.trisensor_temperature
+                name: Temperature
+              - type: custom:button-card
+                template:
+                  - small
+                  - progress
+                entity: sensor.trisensor_luminance
+                name: Lux
+              - type: custom:button-card
+                template: default
+                entity: binary_sensor.trisensor_motion
+                name: Motion
+
+          - type: horizontal-stack
+            title: Multi Sensor
+            cards:
+              - type: custom:button-card
+                template:
+                  - small
+                  - progress
+                entity: sensor.multisensor_6_temperature
+                name: Temperature
+              - type: custom:button-card
+                template:
+                  - small
+                  - progress
+                entity: sensor.multisensor_6_luminance
+                name: Lux
+              - type: custom:button-card
+                template: default
+                entity: binary_sensor.multisensor_motion
+                name: Motion
+
+          - type: horizontal-stack
+            title: More
+            cards:
+              - type: custom:button-card
+                template:
+                  - small
+                  - progress
+                entity: sensor.living_room_thermostat_temperature
+                name: Radiator temperature
+              - type: custom:button-card
+                template:
+                  - small
+                  - progress
+                entity: sensor.multisensor_6_relative_humidity
+                name: Multi Humidity
+              - type: custom:button-card
+                template:
+                  - small
+                  - progress
+                entity: sensor.multisensor_6_ultraviolet
+                name: Multi UV
 
diff --git a/config/packages/modules/presence.yaml b/config/packages/modules/presence.yaml
index 31dd62f..dd1b55a 100644
--- a/config/packages/modules/presence.yaml
+++ b/config/packages/modules/presence.yaml
@@ -51,6 +51,18 @@ binary_sensor:
           {% else %} mdi:account-off-outline
           {% endif %}
 
+      trisensor_motion:
+        friendly_name: TriSensor motion
+        device_class: motion
+        entity_id: sensor.trisensor_burglar
+        value_template: "{{ is_state('sensor.trisensor_burglar', 8) }}"
+
+      multisensor_motion:
+        friendly_name: MultiSensor motion
+        device_class: motion
+        entity_id: sensor.multisensor_6_burglar
+        value_template: "{{ is_state('sensor.multisensor_6_burglar', 8) }}"
+
 sensor:
   - platform: history_stats
     name: Quarantined percent