Media controls, occupancy tracking, and fixes

1 files changed, 300 insertions, 163 deletions

diff --git a/.storage/lovelace.lovelace_test b/.storage/lovelace.lovelace_test
index d9477fe..42bcdbf 100644
--- a/.storage/lovelace.lovelace_test
+++ b/.storage/lovelace.lovelace_test
@@ -31,169 +31,194 @@
                             "type": "vertical-stack",
                             "cards": [
                                 {
-                                    "type": "history-graph",
+                                    "type": "entities",
                                     "entities": [
                                         {
-                                            "entity": "binary_sensor.entrance_door_contact",
-                                            "name": "Contact"
+                                            "entity": "group.master_phones",
+                                            "name": "Phones"
                                         },
                                         {
-                                            "entity": "binary_sensor.hall_motions_occupancy",
-                                            "name": "Motions"
+                                            "entity": "group.master_laptops",
+                                            "name": "Laptops"
                                         },
                                         {
-                                            "entity": "binary_sensor.entrance_vibrations_vibration",
-                                            "name": "Vibration"
+                                            "entity": "sensor.192_168_50_1_devices_connected",
+                                            "name": "Asgard clients"
                                         },
                                         {
-                                            "entity": "sensor.entrance_vibrations_strength",
-                                            "name": "Strength"
+                                            "type": "divider"
+                                        },
+                                        {
+                                            "entity": "device_tracker.legion8",
+                                            "name": "Legion8/Asgard"
+                                        },
+                                        {
+                                            "entity": "device_tracker.lm_g810",
+                                            "name": "Legion8/Hass"
+                                        },
+                                        {
+                                            "entity": "device_tracker.nyx",
+                                            "name": "Nyx/Asgard"
                                         }
-                                    ],
-                                    "hours_to_show": 1,
-                                    "title": "Vibration Sensor (1h)"
+                                    ]
                                 },
                                 {
-                                    "type": "entities",
+                                    "type": "history-graph",
                                     "entities": [
                                         {
-                                            "entity": "binary_sensor.hall_motions_occupancy",
-                                            "name": "Hall"
+                                            "entity": "group.master_phones",
+                                            "name": "Phones"
                                         },
                                         {
-                                            "entity": "binary_sensor.office_motions_occupancy",
-                                            "name": "Office"
+                                            "entity": "group.master_laptops",
+                                            "name": "Laptops"
                                         },
                                         {
-                                            "entity": "binary_sensor.living_motions_occupancy",
-                                            "name": "Living"
+                                            "entity": "device_tracker.legion8",
+                                            "name": "Legion8/Asgard"
                                         },
                                         {
-                                            "entity": "binary_sensor.bedroom_motions_occupancy",
-                                            "name": "Bedroom"
+                                            "entity": "device_tracker.lm_g810",
+                                            "name": "Legion8/Hass"
                                         },
                                         {
-                                            "entity": "binary_sensor.kitchen_motions_occupancy",
-                                            "name": "Kitchen"
+                                            "entity": "device_tracker.nyx",
+                                            "name": "Nyx/Asgard"
+                                        },
+                                        {
+                                            "entity": "sensor.192_168_50_1_devices_connected",
+                                            "name": "Asgard clients"
                                         }
                                     ],
-                                    "title": "Motions"
+                                    "hours_to_show": 12
                                 },
                                 {
                                     "type": "history-graph",
                                     "entities": [
                                         {
-                                            "entity": "binary_sensor.hall_motions_occupancy",
-                                            "name": "Hall"
-                                        },
-                                        {
-                                            "entity": "binary_sensor.living_motions_occupancy",
-                                            "name": "Living"
+                                            "entity": "binary_sensor.entrance_door_contact",
+                                            "name": "Contact"
                                         },
                                         {
-                                            "entity": "binary_sensor.office_motions_occupancy",
-                                            "name": "Office"
+                                            "entity": "binary_sensor.hall_motions_occupancy",
+                                            "name": "Motions"
                                         },
                                         {
-                                            "entity": "binary_sensor.bedroom_motions_occupancy",
-                                            "name": "Bedroom"
+                                            "entity": "binary_sensor.entrance_vibrations_vibration",
+                                            "name": "Vibration"
                                         },
                                         {
-                                            "entity": "binary_sensor.kitchen_motions_occupancy",
-                                            "name": "Kitchen"
+                                            "entity": "sensor.entrance_vibrations_strength",
+                                            "name": "Strength"
                                         }
                                     ],
                                     "hours_to_show": 1,
-                                    "title": "Motion Sensors (1h)"
-                                },
+                                    "title": "Vibration Sensor (1h)"
+                                }
+                            ]
+                        },
+                        {
+                            "type": "vertical-stack",
+                            "cards": [
                                 {
-                                    "type": "history-graph",
+                                    "type": "entities",
                                     "entities": [
                                         {
                                             "entity": "binary_sensor.hall_motions_occupancy",
                                             "name": "Hall"
                                         },
                                         {
-                                            "entity": "binary_sensor.living_motions_occupancy",
-                                            "name": "Living"
+                                            "type": "divider"
                                         },
                                         {
-                                            "entity": "binary_sensor.office_motions_occupancy",
-                                            "name": "Office"
+                                            "entity": "binary_sensor.kitchen_motions_occupancy",
+                                            "name": "Kitchen/Table"
                                         },
                                         {
-                                            "entity": "binary_sensor.bedroom_motions_occupancy",
-                                            "name": "Bedroom"
+                                            "entity": "binary_sensor.kitchen_motions2_occupancy",
+                                            "name": "Kitchen/Sink"
                                         },
                                         {
-                                            "entity": "binary_sensor.kitchen_motions_occupancy",
-                                            "name": "Kitchen"
+                                            "type": "divider"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.bathroom_motions_occupancy",
+                                            "name": "Bathroom"
+                                        },
+                                        {
+                                            "type": "divider"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.toilet_motions_occupancy",
+                                            "name": "Toilet"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.toilet_door_contact",
+                                            "name": "Door"
                                         }
-                                    ],
-                                    "hours_to_show": 12,
-                                    "title": "Motion Sensors (12h)"
+                                    ]
                                 },
                                 {
-                                    "type": "entities",
+                                    "type": "history-graph",
                                     "entities": [
                                         {
-                                            "entity": "group.master_phones",
-                                            "name": "Phones"
-                                        },
-                                        {
-                                            "entity": "group.master_laptops",
-                                            "name": "Laptops"
+                                            "entity": "binary_sensor.hall_motions_occupancy",
+                                            "name": "Hall"
                                         },
                                         {
-                                            "entity": "sensor.192_168_50_1_devices_connected",
-                                            "name": "Asgard clients"
+                                            "entity": "binary_sensor.kitchen_motions_occupancy",
+                                            "name": "Kitchen/Table"
                                         },
                                         {
-                                            "type": "divider"
+                                            "entity": "binary_sensor.kitchen_motions2_occupancy",
+                                            "name": "Kitchen/Sink"
                                         },
                                         {
-                                            "entity": "device_tracker.legion8",
-                                            "name": "Legion8/Asgard"
+                                            "entity": "binary_sensor.bathroom_motions_occupancy",
+                                            "name": "Bathroom"
                                         },
                                         {
-                                            "entity": "device_tracker.lm_g810",
-                                            "name": "Legion8/Hass"
+                                            "entity": "binary_sensor.toilet_motions_occupancy",
+                                            "name": "Toilet"
                                         },
                                         {
-                                            "entity": "device_tracker.nyx",
-                                            "name": "Nyx/Asgard"
+                                            "entity": "binary_sensor.toilet_door_contact",
+                                            "name": "Toilet Door"
                                         }
-                                    ]
+                                    ],
+                                    "hours_to_show": 1,
+                                    "title": "Motion Sensors (1h)"
                                 },
                                 {
                                     "type": "history-graph",
                                     "entities": [
                                         {
-                                            "entity": "group.master_phones",
-                                            "name": "Phones"
+                                            "entity": "binary_sensor.hall_motions_occupancy",
+                                            "name": "Hall"
                                         },
                                         {
-                                            "entity": "group.master_laptops",
-                                            "name": "Laptops"
+                                            "entity": "binary_sensor.kitchen_motions_occupancy",
+                                            "name": "Kitchen/Table"
                                         },
                                         {
-                                            "entity": "device_tracker.legion8",
-                                            "name": "Legion8/Asgard"
+                                            "entity": "binary_sensor.kitchen_motions2_occupancy",
+                                            "name": "Kitchen/Sink"
                                         },
                                         {
-                                            "entity": "device_tracker.lm_g810",
-                                            "name": "Legion8/Hass"
+                                            "entity": "binary_sensor.bathroom_motions_occupancy",
+                                            "name": "Bathroom"
                                         },
                                         {
-                                            "entity": "device_tracker.nyx",
-                                            "name": "Nyx/Asgard"
+                                            "entity": "binary_sensor.toilet_motions_occupancy",
+                                            "name": "Toilet"
                                         },
                                         {
-                                            "entity": "sensor.192_168_50_1_devices_connected",
-                                            "name": "Asgard clients"
+                                            "entity": "binary_sensor.toilet_door_contact",
+                                            "name": "Toilet Door"
                                         }
                                     ],
-                                    "hours_to_show": 12
+                                    "hours_to_show": 12,
+                                    "title": "Motion Sensors (12h)"
                                 }
                             ]
                         },
@@ -201,43 +226,55 @@
                             "type": "vertical-stack",
                             "cards": [
                                 {
-                                    "type": "history-graph",
+                                    "type": "entities",
                                     "entities": [
                                         {
-                                            "entity": "switch.living_lights_left",
-                                            "name": "Lustre 1"
+                                            "entity": "switch.hall_lights_left",
+                                            "name": "Hall Light"
                                         },
                                         {
-                                            "entity": "switch.living_lights_center",
-                                            "name": "Lustre 2"
+                                            "entity": "switch.entrance_lights_left",
+                                            "name": "Entrance Light"
                                         },
                                         {
-                                            "entity": "switch.living_lights_right",
-                                            "name": "Smart Bulb"
+                                            "entity": "switch.kitchen_lights_left",
+                                            "name": "Kitchen/Lustre"
+                                        },
+                                        {
+                                            "entity": "switch.kitchen_lights_center",
+                                            "name": "Kitchen/LED"
                                         },
                                         {
-                                            "entity": "switch.living_tablelamp",
-                                            "name": "DeskLamp"
+                                            "type": "divider"
                                         },
                                         {
-                                            "entity": "binary_sensor.living_motions_occupancy",
-                                            "name": "Room Motions"
+                                            "entity": "binary_sensor.hall_motions_occupancy",
+                                            "name": "Motions/Hall"
                                         },
                                         {
-                                            "entity": "sensor.living_motions_illuminance_lux",
-                                            "name": "Room Lux"
+                                            "entity": "binary_sensor.kitchen_motions_occupancy",
+                                            "name": "Motions/Table"
                                         },
                                         {
-                                            "entity": "binary_sensor.office_motions_occupancy",
-                                            "name": "Office Motions"
+                                            "entity": "binary_sensor.kitchen_motions2_occupancy",
+                                            "name": "Motions/Sink"
                                         },
                                         {
-                                            "entity": "sensor.office_motions_illuminance_lux",
-                                            "name": "Office Lux"
+                                            "type": "divider"
+                                        },
+                                        {
+                                            "entity": "sensor.hall_motions_illuminance_lux",
+                                            "name": "Lux/Hall"
+                                        },
+                                        {
+                                            "entity": "sensor.kitchen_motions_illuminance_lux",
+                                            "name": "Lux/Table"
+                                        },
+                                        {
+                                            "entity": "sensor.kitchen_motions2_illuminance_lux",
+                                            "name": "Lux/Sink"
                                         }
-                                    ],
-                                    "hours_to_show": 1,
-                                    "title": "Living Illuminance (1h)"
+                                    ]
                                 },
                                 {
                                     "type": "history-graph",
@@ -251,118 +288,218 @@
                                             "name": "Entrance Light"
                                         },
                                         {
-                                            "entity": "binary_sensor.hall_motions_occupancy",
-                                            "name": "Motions"
-                                        },
-                                        {
-                                            "entity": "sensor.hall_motions_illuminance_lux",
-                                            "name": "Lux"
-                                        }
-                                    ],
-                                    "hours_to_show": 1,
-                                    "title": "Hall Illuminance (1h)"
-                                },
-                                {
-                                    "type": "history-graph",
-                                    "entities": [
-                                        {
                                             "entity": "switch.kitchen_lights_left",
-                                            "name": "Lustre"
+                                            "name": "Kitchen/Lustre"
                                         },
                                         {
                                             "entity": "switch.kitchen_lights_center",
-                                            "name": "LED"
+                                            "name": "Kitchen/LED"
                                         },
                                         {
-                                            "entity": "binary_sensor.kitchen_motions_occupancy",
-                                            "name": "Motions"
+                                            "entity": "switch.living_lights_left",
+                                            "name": "Living/Lustre1"
                                         },
                                         {
-                                            "entity": "sensor.kitchen_motions_illuminance_lux",
-                                            "name": "Lux"
-                                        }
-                                    ],
-                                    "hours_to_show": 1,
-                                    "title": "Kitchen Illuminance (1h)"
-                                }
-                            ]
-                        },
-                        {
-                            "type": "vertical-stack",
-                            "cards": [
-                                {
-                                    "type": "history-graph",
-                                    "entities": [
+                                            "entity": "switch.living_lights_center",
+                                            "name": "Living/Lustre2"
+                                        },
                                         {
-                                            "entity": "switch.bedroom_lights_left",
-                                            "name": "Lustre 1"
+                                            "entity": "switch.living_lights_right",
+                                            "name": "Living/Office"
                                         },
                                         {
-                                            "entity": "switch.bedroom_lights_center",
-                                            "name": "Lustre 2"
+                                            "entity": "switch.bathroom_lights_left",
+                                            "name": "Bedroom/Lustre1"
                                         },
                                         {
-                                            "entity": "switch.bedroom_lights_right",
-                                            "name": "Smart Bulb"
+                                            "entity": "switch.bedroom_lights_center",
+                                            "name": "Bedroom/Lustre1"
                                         },
                                         {
-                                            "entity": "switch.bedroom_tablelamp",
-                                            "name": "DeskLamp"
+                                            "entity": "switch.bathroom_lights_left",
+                                            "name": "Bathroom/Light"
                                         },
                                         {
-                                            "entity": "binary_sensor.bedroom_bedsidelamp",
-                                            "name": "BedLamp"
+                                            "entity": "switch.entrance_lights_left",
+                                            "name": "Toilet/Light"
                                         },
                                         {
-                                            "entity": "binary_sensor.bedroom_motions_occupancy",
+                                            "entity": "binary_sensor.hall_motions_occupancy",
                                             "name": "Motions"
                                         },
                                         {
-                                            "entity": "sensor.bedroom_motions_illuminance_lux",
+                                            "entity": "sensor.hall_motions_illuminance_lux",
                                             "name": "Lux"
                                         }
                                     ],
                                     "hours_to_show": 1,
-                                    "title": "Bedroom Illuminance (1h)"
+                                    "title": "Hall Illuminance (1h)"
                                 },
                                 {
                                     "type": "history-graph",
                                     "entities": [
                                         {
-                                            "entity": "switch.bedroom_lights_left",
-                                            "name": "Lustre 1"
+                                            "entity": "switch.kitchen_lights_left",
+                                            "name": "Lustre"
+                                        },
+                                        {
+                                            "entity": "switch.kitchen_lights_center",
+                                            "name": "LED"
                                         },
                                         {
-                                            "entity": "switch.bedroom_lights_center",
-                                            "name": "Lustre 2"
+                                            "entity": "switch.hall_lights_left",
+                                            "name": "Hall Light"
                                         },
                                         {
-                                            "entity": "switch.bedroom_lights_right",
-                                            "name": "Smart Bulb"
+                                            "entity": "switch.entrance_lights_left",
+                                            "name": "Entrance Light"
                                         },
                                         {
-                                            "entity": "switch.bedroom_tablelamp",
-                                            "name": "DeskLamp"
+                                            "entity": "binary_sensor.kitchen_motions_occupancy",
+                                            "name": "Motions/Table"
                                         },
                                         {
-                                            "entity": "binary_sensor.bedroom_bedsidelamp",
-                                            "name": "BedLamp"
+                                            "entity": "binary_sensor.kitchen_motions2_occupancy",
+                                            "name": "Motions/Sink"
                                         },
                                         {
-                                            "entity": "binary_sensor.bedroom_motions_occupancy",
-                                            "name": "Motions"
+                                            "entity": "sensor.kitchen_motions_illuminance_lux",
+                                            "name": "Lux/Table"
                                         },
                                         {
-                                            "entity": "sensor.bedroom_motions_illuminance_lux",
-                                            "name": "Lux"
+                                            "entity": "sensor.kitchen_motions2_illuminance_lux",
+                                            "name": "Lux/Sink"
                                         }
                                     ],
-                                    "hours_to_show": 12,
-                                    "title": "Bedroom Illuminance (12h)"
+                                    "hours_to_show": 1,
+                                    "title": "Kitchen Illuminance (1h)"
                                 }
                             ]
                         },
                         {
+                            "type": "conditional",
+                            "conditions": [
+                                {
+                                    "entity": "binary_sensor.kitchen_motions_illuminance_lux",
+                                    "state": "3333"
+                                }
+                            ],
+                            "card": {
+                                "type": "vertical-stack",
+                                "cards": [
+                                    {
+                                        "type": "history-graph",
+                                        "entities": [
+                                            {
+                                                "entity": "switch.living_lights_left",
+                                                "name": "Lustre 1"
+                                            },
+                                            {
+                                                "entity": "switch.living_lights_center",
+                                                "name": "Lustre 2"
+                                            },
+                                            {
+                                                "entity": "switch.living_lights_right",
+                                                "name": "Smart Bulb"
+                                            },
+                                            {
+                                                "entity": "switch.living_tablelamp",
+                                                "name": "DeskLamp"
+                                            },
+                                            {
+                                                "entity": "binary_sensor.living_motions_occupancy",
+                                                "name": "Room Motions"
+                                            },
+                                            {
+                                                "entity": "sensor.living_motions_illuminance_lux",
+                                                "name": "Room Lux"
+                                            },
+                                            {
+                                                "entity": "binary_sensor.office_motions_occupancy",
+                                                "name": "Office Motions"
+                                            },
+                                            {
+                                                "entity": "sensor.office_motions_illuminance_lux",
+                                                "name": "Office Lux"
+                                            }
+                                        ],
+                                        "hours_to_show": 1,
+                                        "title": "Living Illuminance (1h)"
+                                    },
+                                    {
+                                        "type": "history-graph",
+                                        "entities": [
+                                            {
+                                                "entity": "switch.bedroom_lights_left",
+                                                "name": "Lustre 1"
+                                            },
+                                            {
+                                                "entity": "switch.bedroom_lights_center",
+                                                "name": "Lustre 2"
+                                            },
+                                            {
+                                                "entity": "switch.bedroom_lights_right",
+                                                "name": "Smart Bulb"
+                                            },
+                                            {
+                                                "entity": "switch.bedroom_tablelamp",
+                                                "name": "DeskLamp"
+                                            },
+                                            {
+                                                "entity": "binary_sensor.bedroom_bedsidelamp",
+                                                "name": "BedLamp"
+                                            },
+                                            {
+                                                "entity": "binary_sensor.bedroom_motions_occupancy",
+                                                "name": "Motions"
+                                            },
+                                            {
+                                                "entity": "sensor.bedroom_motions_illuminance_lux",
+                                                "name": "Lux"
+                                            }
+                                        ],
+                                        "hours_to_show": 1,
+                                        "title": "Bedroom Illuminance (1h)"
+                                    },
+                                    {
+                                        "type": "history-graph",
+                                        "entities": [
+                                            {
+                                                "entity": "switch.bedroom_lights_left",
+                                                "name": "Lustre 1"
+                                            },
+                                            {
+                                                "entity": "switch.bedroom_lights_center",
+                                                "name": "Lustre 2"
+                                            },
+                                            {
+                                                "entity": "switch.bedroom_lights_right",
+                                                "name": "Smart Bulb"
+                                            },
+                                            {
+                                                "entity": "switch.bedroom_tablelamp",
+                                                "name": "DeskLamp"
+                                            },
+                                            {
+                                                "entity": "binary_sensor.bedroom_bedsidelamp",
+                                                "name": "BedLamp"
+                                            },
+                                            {
+                                                "entity": "binary_sensor.bedroom_motions_occupancy",
+                                                "name": "Motions"
+                                            },
+                                            {
+                                                "entity": "sensor.bedroom_motions_illuminance_lux",
+                                                "name": "Lux"
+                                            }
+                                        ],
+                                        "hours_to_show": 12,
+                                        "title": "Bedroom Illuminance (12h)"
+                                    }
+                                ]
+                            }
+                        },
+                        {
                             "type": "vertical-stack",
                             "cards": [
                                 {