Fixes, multi-room sounds, motion tracking in rooms

3 files changed, 203 insertions, 51 deletions

diff --git a/.storage/input_boolean b/.storage/input_boolean
index f03e5e7..6c81959 100644
--- a/.storage/input_boolean
+++ b/.storage/input_boolean
@@ -48,6 +48,14 @@
             {
                 "name": "Occupancy Bathroom",
                 "id": "occupancy_bathroom"
+            },
+            {
+                "name": "Mode Office Sleep",
+                "id": "mode_house_sleep_2"
+            },
+            {
+                "name": "Mode Office Hibernate",
+                "id": "mode_office_hibernate"
             }
         ]
     }
diff --git a/.storage/lovelace.lovelace_status b/.storage/lovelace.lovelace_status
index 1cfbb25..b259dfc 100644
--- a/.storage/lovelace.lovelace_status
+++ b/.storage/lovelace.lovelace_status
@@ -194,16 +194,24 @@
                                             "name": "Kitchen1"
                                         },
                                         {
-                                            "entity": "binary_sensor.kitchen_motions2_occupancy",
-                                            "name": "Kitchen2"
-                                        },
-                                        {
                                             "entity": "binary_sensor.bathroom_motions_occupancy",
                                             "name": "Bathroom"
                                         },
                                         {
                                             "entity": "binary_sensor.toilet_motions_occupancy",
                                             "name": "Toilet"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.guestroom_motions_occupancy",
+                                            "name": "Guestroom"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.bedroom_motions_occupancy",
+                                            "name": "Bedroom"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.presence_presence",
+                                            "name": "Living"
                                         }
                                     ],
                                     "title": "Motions"
@@ -220,16 +228,24 @@
                                             "name": "Kitchen1"
                                         },
                                         {
-                                            "entity": "binary_sensor.kitchen_motions2_occupancy",
-                                            "name": "Kitchen2"
-                                        },
-                                        {
                                             "entity": "binary_sensor.bathroom_motions_occupancy",
                                             "name": "Bathroom"
                                         },
                                         {
                                             "entity": "binary_sensor.toilet_motions_occupancy",
                                             "name": "Toilet"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.guestroom_motions_occupancy",
+                                            "name": "Guestroom"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.bedroom_motions_occupancy",
+                                            "name": "Bedroom"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.presence_presence",
+                                            "name": "Living"
                                         }
                                     ],
                                     "hours_to_show": 2,
diff --git a/.storage/lovelace.lovelace_test b/.storage/lovelace.lovelace_test
index 42bcdbf..fcdba8e 100644
--- a/.storage/lovelace.lovelace_test
+++ b/.storage/lovelace.lovelace_test
@@ -114,6 +114,33 @@
                                     ],
                                     "hours_to_show": 1,
                                     "title": "Vibration Sensor (1h)"
+                                },
+                                {
+                                    "type": "entities",
+                                    "entities": [
+                                        {
+                                            "entity": "input_number.knob_office_current"
+                                        },
+                                        {
+                                            "entity": "input_number.knob_office_brightness0"
+                                        },
+                                        {
+                                            "entity": "input_number.knob_office_temperature0"
+                                        },
+                                        {
+                                            "entity": "input_number.knob_office_hue0"
+                                        },
+                                        {
+                                            "entity": "input_number.knob_office_brightness1"
+                                        },
+                                        {
+                                            "entity": "input_number.knob_office_temperature1"
+                                        },
+                                        {
+                                            "entity": "input_number.knob_office_hue1"
+                                        }
+                                    ],
+                                    "title": "Knob Control"
                                 }
                             ]
                         },
@@ -132,11 +159,7 @@
                                         },
                                         {
                                             "entity": "binary_sensor.kitchen_motions_occupancy",
-                                            "name": "Kitchen/Table"
-                                        },
-                                        {
-                                            "entity": "binary_sensor.kitchen_motions2_occupancy",
-                                            "name": "Kitchen/Sink"
+                                            "name": "Kitchen"
                                         },
                                         {
                                             "type": "divider"
@@ -155,6 +178,28 @@
                                         {
                                             "entity": "binary_sensor.toilet_door_contact",
                                             "name": "Door"
+                                        },
+                                        {
+                                            "type": "divider"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.presence_presence",
+                                            "name": "Living"
+                                        },
+                                        {
+                                            "entity": "sensor.presence_target_distance",
+                                            "name": "Distance"
+                                        },
+                                        {
+                                            "type": "divider"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.bedroom_motions_occupancy",
+                                            "name": "Bedroom"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.guestroom_motions_occupancy",
+                                            "name": "Guestroom"
                                         }
                                     ]
                                 },
@@ -167,11 +212,7 @@
                                         },
                                         {
                                             "entity": "binary_sensor.kitchen_motions_occupancy",
-                                            "name": "Kitchen/Table"
-                                        },
-                                        {
-                                            "entity": "binary_sensor.kitchen_motions2_occupancy",
-                                            "name": "Kitchen/Sink"
+                                            "name": "Kitchen"
                                         },
                                         {
                                             "entity": "binary_sensor.bathroom_motions_occupancy",
@@ -184,6 +225,18 @@
                                         {
                                             "entity": "binary_sensor.toilet_door_contact",
                                             "name": "Toilet Door"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.presence_occupancy",
+                                            "name": "Living"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.bedroom_motions_occupancy",
+                                            "name": "Bedroom"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.guestroom_motions_occupancy",
+                                            "name": "Guestroom"
                                         }
                                     ],
                                     "hours_to_show": 1,
@@ -198,11 +251,7 @@
                                         },
                                         {
                                             "entity": "binary_sensor.kitchen_motions_occupancy",
-                                            "name": "Kitchen/Table"
-                                        },
-                                        {
-                                            "entity": "binary_sensor.kitchen_motions2_occupancy",
-                                            "name": "Kitchen/Sink"
+                                            "name": "Kitchen"
                                         },
                                         {
                                             "entity": "binary_sensor.bathroom_motions_occupancy",
@@ -215,10 +264,52 @@
                                         {
                                             "entity": "binary_sensor.toilet_door_contact",
                                             "name": "Toilet Door"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.presence_occupancy",
+                                            "name": "Living"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.bedroom_motions_occupancy",
+                                            "name": "Bedroom"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.guestroom_motions_occupancy",
+                                            "name": "Guestroom"
                                         }
                                     ],
                                     "hours_to_show": 12,
                                     "title": "Motion Sensors (12h)"
+                                },
+                                {
+                                    "type": "history-graph",
+                                    "entities": [
+                                        {
+                                            "entity": "binary_sensor.presence_presence",
+                                            "name": "Prsence"
+                                        },
+                                        {
+                                            "entity": "sensor.presence_target_distance",
+                                            "name": "Distance"
+                                        }
+                                    ],
+                                    "hours_to_show": 1,
+                                    "title": "Presence (1h)"
+                                },
+                                {
+                                    "type": "history-graph",
+                                    "entities": [
+                                        {
+                                            "entity": "binary_sensor.presence_presence",
+                                            "name": "Presence"
+                                        },
+                                        {
+                                            "entity": "sensor.presence_target_distance",
+                                            "name": "Distance"
+                                        }
+                                    ],
+                                    "hours_to_show": 12,
+                                    "title": "Presence (12h)"
                                 }
                             ]
                         },
@@ -253,11 +344,7 @@
                                         },
                                         {
                                             "entity": "binary_sensor.kitchen_motions_occupancy",
-                                            "name": "Motions/Table"
-                                        },
-                                        {
-                                            "entity": "binary_sensor.kitchen_motions2_occupancy",
-                                            "name": "Motions/Sink"
+                                            "name": "Motions/Kitchen"
                                         },
                                         {
                                             "type": "divider"
@@ -268,11 +355,7 @@
                                         },
                                         {
                                             "entity": "sensor.kitchen_motions_illuminance_lux",
-                                            "name": "Lux/Table"
-                                        },
-                                        {
-                                            "entity": "sensor.kitchen_motions2_illuminance_lux",
-                                            "name": "Lux/Sink"
+                                            "name": "Lux/Kitchen"
                                         }
                                     ]
                                 },
@@ -356,19 +439,11 @@
                                         },
                                         {
                                             "entity": "binary_sensor.kitchen_motions_occupancy",
-                                            "name": "Motions/Table"
-                                        },
-                                        {
-                                            "entity": "binary_sensor.kitchen_motions2_occupancy",
-                                            "name": "Motions/Sink"
+                                            "name": "Motions"
                                         },
                                         {
                                             "entity": "sensor.kitchen_motions_illuminance_lux",
-                                            "name": "Lux/Table"
-                                        },
-                                        {
-                                            "entity": "sensor.kitchen_motions2_illuminance_lux",
-                                            "name": "Lux/Sink"
+                                            "name": "Lux"
                                         }
                                     ],
                                     "hours_to_show": 1,
@@ -506,28 +581,81 @@
                                     "type": "entities",
                                     "entities": [
                                         {
-                                            "entity": "input_number.knob_office_current"
+                                            "entity": "sensor.hall_motions_illuminance_lux",
+                                            "name": "Hall"
                                         },
                                         {
-                                            "entity": "input_number.knob_office_brightness0"
+                                            "entity": "sensor.kitchen_motions_illuminance_lux",
+                                            "name": "Kitchen"
                                         },
                                         {
-                                            "entity": "input_number.knob_office_temperature0"
+                                            "entity": "sensor.presence_illuminance_lux",
+                                            "name": "Living"
                                         },
                                         {
-                                            "entity": "input_number.knob_office_hue0"
+                                            "entity": "sensor.bedroom_motions_illuminance_lux",
+                                            "name": "Bedroom"
                                         },
                                         {
-                                            "entity": "input_number.knob_office_brightness1"
+                                            "entity": "sensor.guestroom_motions_illuminance_lux",
+                                            "name": "Guestroom"
+                                        }
+                                    ],
+                                    "title": "Illuminance"
+                                },
+                                {
+                                    "type": "history-graph",
+                                    "entities": [
+                                        {
+                                            "entity": "sensor.hall_motions_illuminance_lux",
+                                            "name": "Hall"
                                         },
                                         {
-                                            "entity": "input_number.knob_office_temperature1"
+                                            "entity": "sensor.kitchen_motions_illuminance_lux",
+                                            "name": "Kitchen"
                                         },
                                         {
-                                            "entity": "input_number.knob_office_hue1"
+                                            "entity": "sensor.presence_illuminance_lux",
+                                            "name": "Living"
+                                        },
+                                        {
+                                            "entity": "sensor.bedroom_motions_illuminance_lux",
+                                            "name": "Bedroom"
+                                        },
+                                        {
+                                            "entity": "sensor.guestroom_motions_illuminance_lux",
+                                            "name": "Guestroom"
                                         }
                                     ],
-                                    "title": "Knob Control"
+                                    "hours_to_show": 1,
+                                    "title": "Illuminance (1h)"
+                                },
+                                {
+                                    "type": "history-graph",
+                                    "entities": [
+                                        {
+                                            "entity": "sensor.hall_motions_illuminance_lux",
+                                            "name": "Hall"
+                                        },
+                                        {
+                                            "entity": "sensor.kitchen_motions_illuminance_lux",
+                                            "name": "Kitchen"
+                                        },
+                                        {
+                                            "entity": "sensor.presence_illuminance_lux",
+                                            "name": "Living"
+                                        },
+                                        {
+                                            "entity": "sensor.bedroom_motions_illuminance_lux",
+                                            "name": "Bedroom"
+                                        },
+                                        {
+                                            "entity": "sensor.guestroom_motions_illuminance_lux",
+                                            "name": "Guestroom"
+                                        }
+                                    ],
+                                    "hours_to_show": 12,
+                                    "title": "Illuminance (12h)"
                                 }
                             ]
                         }