Massive update: Few fixes, more new integrations & extensions

1 files changed, 325 insertions, 96 deletions

diff --git a/.storage/lovelace.lovelace_test b/.storage/lovelace.lovelace_test
index fcdba8e..47039a9 100644
--- a/.storage/lovelace.lovelace_test
+++ b/.storage/lovelace.lovelace_test
@@ -151,6 +151,20 @@
                                     "type": "entities",
                                     "entities": [
                                         {
+                                            "entity": "input_boolean.occupancy_toilet",
+                                            "name": "Toilet"
+                                        },
+                                        {
+                                            "entity": "input_boolean.occupancy_bathroom",
+                                            "name": "Bathroom"
+                                        }
+                                    ],
+                                    "title": "Occupancy"
+                                },
+                                {
+                                    "type": "entities",
+                                    "entities": [
+                                        {
                                             "entity": "binary_sensor.hall_motions_occupancy",
                                             "name": "Hall"
                                         },
@@ -162,13 +176,21 @@
                                             "name": "Kitchen"
                                         },
                                         {
+                                            "entity": "binary_sensor.kitchen_presence_presence",
+                                            "name": "Presence"
+                                        },
+                                        {
                                             "type": "divider"
                                         },
                                         {
-                                            "entity": "binary_sensor.bathroom_motions_occupancy",
+                                            "entity": "binary_sensor.bathroom_motions2_occupancy",
                                             "name": "Bathroom"
                                         },
                                         {
+                                            "entity": "binary_sensor.bathroom_motions_occupancy",
+                                            "name": "Door"
+                                        },
+                                        {
                                             "type": "divider"
                                         },
                                         {
@@ -198,6 +220,10 @@
                                             "name": "Bedroom"
                                         },
                                         {
+                                            "entity": "binary_sensor.bedroom_presence_presence",
+                                            "name": "Presence"
+                                        },
+                                        {
                                             "entity": "binary_sensor.guestroom_motions_occupancy",
                                             "name": "Guestroom"
                                         }
@@ -215,19 +241,27 @@
                                             "name": "Kitchen"
                                         },
                                         {
-                                            "entity": "binary_sensor.bathroom_motions_occupancy",
+                                            "entity": "binary_sensor.kitchen_presence_presence",
+                                            "name": "Presence"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.bathroom_motions2_occupancy",
                                             "name": "Bathroom"
                                         },
                                         {
+                                            "entity": "binary_sensor.bathroom_motions_occupancy",
+                                            "name": "Door"
+                                        },
+                                        {
                                             "entity": "binary_sensor.toilet_motions_occupancy",
                                             "name": "Toilet"
                                         },
                                         {
                                             "entity": "binary_sensor.toilet_door_contact",
-                                            "name": "Toilet Door"
+                                            "name": "Door"
                                         },
                                         {
-                                            "entity": "binary_sensor.presence_occupancy",
+                                            "entity": "binary_sensor.presence_presence",
                                             "name": "Living"
                                         },
                                         {
@@ -235,6 +269,10 @@
                                             "name": "Bedroom"
                                         },
                                         {
+                                            "entity": "binary_sensor.bedroom_presence_presence",
+                                            "name": "Presence"
+                                        },
+                                        {
                                             "entity": "binary_sensor.guestroom_motions_occupancy",
                                             "name": "Guestroom"
                                         }
@@ -254,19 +292,27 @@
                                             "name": "Kitchen"
                                         },
                                         {
-                                            "entity": "binary_sensor.bathroom_motions_occupancy",
+                                            "entity": "binary_sensor.kitchen_presence_presence",
+                                            "name": "Presence"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.bathroom_motions2_occupancy",
                                             "name": "Bathroom"
                                         },
                                         {
+                                            "entity": "binary_sensor.bathroom_motions_occupancy",
+                                            "name": "Door"
+                                        },
+                                        {
                                             "entity": "binary_sensor.toilet_motions_occupancy",
                                             "name": "Toilet"
                                         },
                                         {
                                             "entity": "binary_sensor.toilet_door_contact",
-                                            "name": "Toilet Door"
+                                            "name": "Door"
                                         },
                                         {
-                                            "entity": "binary_sensor.presence_occupancy",
+                                            "entity": "binary_sensor.presence_presence",
                                             "name": "Living"
                                         },
                                         {
@@ -274,6 +320,10 @@
                                             "name": "Bedroom"
                                         },
                                         {
+                                            "entity": "binary_sensor.bedroom_presence_presence",
+                                            "name": "Presence"
+                                        },
+                                        {
                                             "entity": "binary_sensor.guestroom_motions_occupancy",
                                             "name": "Guestroom"
                                         }
@@ -286,11 +336,27 @@
                                     "entities": [
                                         {
                                             "entity": "binary_sensor.presence_presence",
-                                            "name": "Prsence"
+                                            "name": "Living"
                                         },
                                         {
                                             "entity": "sensor.presence_target_distance",
-                                            "name": "Distance"
+                                            "name": "Living"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.bedroom_presence_presence",
+                                            "name": "Bedroom"
+                                        },
+                                        {
+                                            "entity": "sensor.bedroom_presence_target_distance",
+                                            "name": "Bedroom"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.kitchen_presence_presence",
+                                            "name": "Kitchen"
+                                        },
+                                        {
+                                            "entity": "sensor.kitchen_presence_target_distance",
+                                            "name": "Kitchen"
                                         }
                                     ],
                                     "hours_to_show": 1,
@@ -301,11 +367,27 @@
                                     "entities": [
                                         {
                                             "entity": "binary_sensor.presence_presence",
-                                            "name": "Presence"
+                                            "name": "Living"
                                         },
                                         {
                                             "entity": "sensor.presence_target_distance",
-                                            "name": "Distance"
+                                            "name": "Living"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.bedroom_presence_presence",
+                                            "name": "Bedroom"
+                                        },
+                                        {
+                                            "entity": "sensor.bedroom_presence_target_distance",
+                                            "name": "Bedroom"
+                                        },
+                                        {
+                                            "entity": "binary_sensor.kitchen_presence_presence",
+                                            "name": "Kitchen"
+                                        },
+                                        {
+                                            "entity": "sensor.kitchen_presence_target_distance",
+                                            "name": "Kitchen"
                                         }
                                     ],
                                     "hours_to_show": 12,
@@ -320,6 +402,158 @@
                                     "type": "entities",
                                     "entities": [
                                         {
+                                            "entity": "sensor.bedroom_tablelamp_voltage",
+                                            "name": "L1/Lamp"
+                                        },
+                                        {
+                                            "entity": "sensor.living_tablelampsocket_voltage",
+                                            "name": "L2/Lamp"
+                                        },
+                                        {
+                                            "type": "divider"
+                                        },
+                                        {
+                                            "entity": "sensor.hall_camera_voltage",
+                                            "name": "L1/Camera"
+                                        },
+                                        {
+                                            "entity": "sensor.hall_infra_voltage",
+                                            "name": "L1/Infra"
+                                        },
+                                        {
+                                            "type": "divider"
+                                        },
+                                        {
+                                            "entity": "sensor.kitchen_oven_voltage",
+                                            "name": "L2/Kitchen/Oven"
+                                        },
+                                        {
+                                            "entity": "sensor.kitchen_wash_voltage",
+                                            "name": "L2/Kitchen/Washers"
+                                        },
+                                        {
+                                            "entity": "sensor.kitchen_teatable_voltage",
+                                            "name": "L2/Kitchen/Tea"
+                                        },
+                                        {
+                                            "entity": "sensor.office_table_voltage",
+                                            "name": "L2/Office/Table"
+                                        },
+                                        {
+                                            "entity": "sensor.office_shelftop_voltage",
+                                            "name": "L2/Office/Top"
+                                        },
+                                        {
+                                            "entity": "sensor.office_shelfbottom_voltage",
+                                            "name": "L2/Office/Bottom"
+                                        },
+                                        {
+                                            "entity": "sensor.office_smartpi_energy_voltage",
+                                            "name": "L2/Office/SmartPI"
+                                        },
+                                        {
+                                            "type": "divider"
+                                        },
+                                        {
+                                            "entity": "sensor.bedroom_aircon_voltage",
+                                            "name": "L1/AirCon"
+                                        },
+                                        {
+                                            "entity": "sensor.office_aircon_voltage",
+                                            "name": "L2/AirCon"
+                                        }
+                                    ],
+                                    "title": "Voltages"
+                                },
+                                {
+                                    "type": "history-graph",
+                                    "hours_to_show": 24,
+                                    "title": "L1 vs L2 (24h)",
+                                    "entities": [
+                                        {
+                                            "entity": "sensor.bedroom_tablelamp_voltage",
+                                            "name": "L1/Lamp"
+                                        },
+                                        {
+                                            "entity": "sensor.living_tablelampsocket_voltage",
+                                            "name": "L2/Lamp"
+                                        }
+                                    ]
+                                },
+                                {
+                                    "type": "history-graph",
+                                    "hours_to_show": 24,
+                                    "title": "L1 (24h)",
+                                    "entities": [
+                                        {
+                                            "entity": "sensor.bedroom_tablelamp_voltage",
+                                            "name": "L1/Lamp"
+                                        },
+                                        {
+                                            "entity": "sensor.hall_camera_voltage",
+                                            "name": "L1/Camera"
+                                        },
+                                        {
+                                            "entity": "sensor.hall_infra_voltage",
+                                            "name": "L1/Infra"
+                                        }
+                                    ]
+                                },
+                                {
+                                    "type": "history-graph",
+                                    "hours_to_show": 24,
+                                    "title": "L2 (24h)",
+                                    "entities": [
+                                        {
+                                            "entity": "sensor.living_tablelampsocket_voltage",
+                                            "name": "L2/Lamp"
+                                        },
+                                        {
+                                            "entity": "sensor.kitchen_oven_voltage",
+                                            "name": "L2/Kitchen/Oven"
+                                        },
+                                        {
+                                            "entity": "sensor.kitchen_wash_voltage",
+                                            "name": "L2/Kitchen/Washers"
+                                        },
+                                        {
+                                            "entity": "sensor.kitchen_teatable_voltage",
+                                            "name": "L2/Kitchen/Tea"
+                                        },
+                                        {
+                                            "entity": "sensor.office_table_voltage",
+                                            "name": "L2/Office/Table"
+                                        },
+                                        {
+                                            "entity": "sensor.office_shelftop_voltage",
+                                            "name": "L2/Office/Top"
+                                        },
+                                        {
+                                            "entity": "sensor.office_shelfbottom_voltage",
+                                            "name": "L2/Office/Bottom"
+                                        }
+                                    ]
+                                },
+                                {
+                                    "type": "history-graph",
+                                    "hours_to_show": 24,
+                                    "title": "Strange (24h)",
+                                    "entities": [
+                                        {
+                                            "entity": "sensor.office_smartpi_energy_voltage",
+                                            "name": "L2/Office/SmartPI"
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "type": "vertical-stack",
+                            "cards": [
+                                {
+                                    "type": "entities",
+                                    "entities": [
+                                        {
                                             "entity": "switch.hall_lights_left",
                                             "name": "Hall Light"
                                         },
@@ -360,6 +594,86 @@
                                     ]
                                 },
                                 {
+                                    "type": "entities",
+                                    "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"
+                                        }
+                                    ],
+                                    "title": "Illuminance"
+                                },
+                                {
+                                    "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": 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)"
+                                },
+                                {
                                     "type": "history-graph",
                                     "entities": [
                                         {
@@ -573,91 +887,6 @@
                                     }
                                 ]
                             }
-                        },
-                        {
-                            "type": "vertical-stack",
-                            "cards": [
-                                {
-                                    "type": "entities",
-                                    "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"
-                                        }
-                                    ],
-                                    "title": "Illuminance"
-                                },
-                                {
-                                    "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": 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)"
-                                }
-                            ]
                         }
                     ]
                 }