diff --git a/.HA_VERSION b/.HA_VERSION index 781a93a..be2a06a 100644 --- a/.HA_VERSION +++ b/.HA_VERSION @@ -1 +1 @@ -0.95.4 \ No newline at end of file +0.100.2 \ No newline at end of file diff --git a/.storage/auth b/.storage/auth index 2e83682..8b9e648 100644 --- a/.storage/auth +++ b/.storage/auth @@ -337,7 +337,7 @@ "created_at": "2019-06-30T21:40:45.236003+00:00", "id": "c921f02f078744dcab3dcf0a56a2ff47", "jwt_key": "125edd9a21a6cfb26458a0a831215ca25390e7f0d590b22b6a77ecffcc86737528914e2722420d93cd103fbc66706a813799258c9203d25b48c9c52028d46a74", - "last_used_at": "2019-07-15T12:07:15.212157+00:00", + "last_used_at": "2019-10-27T21:28:17.705427+00:00", "last_used_ip": "127.0.0.1", "token": "5dcf0fd720f5f0a016325c55bc2744e8a4b913e3f863b30b1fc3eee72e7e52982b390b1551ba9e19c86cc756a080ea351e0906433c335a2fcea921349b1c675b", "token_type": "normal", @@ -351,7 +351,7 @@ "created_at": "2019-06-30T21:51:24.978927+00:00", "id": "9f205cb3449d432ca1e67fe9d36ef350", "jwt_key": "73e668fb953a71287fa6e0f95be8affdb9dfae7c305cc8d35bbfd568d3839ad491b9ff54cb7e11fe20dc702c3801b8ba7290631f8176dd0b76d56f4eba902eb4", - "last_used_at": "2019-07-14T14:30:16.232723+00:00", + "last_used_at": "2019-09-13T16:43:42.940458+00:00", "last_used_ip": "127.0.0.1", "token": "a44aeb5f2c646edd8066866d9d42641d0b81ba21255be56ef42df68f3a9c4c9fc3af4ef001ea739fc7242a7d7bbd95f34b05df527b8723d820e02ca699a50171", "token_type": "normal", @@ -407,7 +407,7 @@ "created_at": "2019-07-03T18:56:36.256497+00:00", "id": "9b09ea1fa45648a78d961760cba54323", "jwt_key": "f2145230898b93021c4891501618bab9b029748c363c6ba3a05ee6e6d9b5024359b69e508c20c599347bb5d1c75240a5da7c5bbad6fd983a96ca4cdf1cf4e7aa", - "last_used_at": "2019-07-15T19:57:12.932165+00:00", + "last_used_at": "2019-10-28T16:43:20.924274+00:00", "last_used_ip": "127.0.0.1", "token": "fe348a5563316252b232d5f6ddb183ac4a150f56bdb8cee9790f798e36854bb947f542bb24ee19464ff9a299508a3cd352f776ad0e4581366ad16efa44238402", "token_type": "normal", @@ -421,7 +421,7 @@ "created_at": "2019-07-03T20:37:40.792202+00:00", "id": "52ff16c9ddc9494d89e33f2fb9eafafe", "jwt_key": "0b92a91132f799529d70b0e9f1ae975a6f55369ad682fceabe0daff710be9bb6b719159a17b10d67c6f6b60085c63547f225c5bc13cbcf31def368ae31ded52a", - "last_used_at": "2019-07-15T19:57:45.466402+00:00", + "last_used_at": "2019-10-28T15:23:18.288787+00:00", "last_used_ip": "127.0.0.1", "token": "f3b4115b2a302e0a7e2da65caeb8d859beed2023269f1d0a7524b1761efbd46cc40827b9c1be5b51e913f93cca87a696e7d7c2d6eab0e82705f9efe42edc8f0f", "token_type": "normal", @@ -445,16 +445,72 @@ "access_token_expiration": 315360000.0, "client_icon": null, "client_id": null, - "client_name": "node_red_test", - "created_at": "2019-07-04T10:04:44.006656+00:00", - "id": "6673e55374f1447bb4909ad679805921", - "jwt_key": "f3e1b6f45d48c261437c90ed729514ecce5e43a799a2f21f7701cf296e8f509090d81dc639147decd31284936c1c3d360bb25cbb9b9da498287599136ae53952", - "last_used_at": "2019-07-04T10:04:44.007085+00:00", + "client_name": "NodeRED", + "created_at": "2019-07-21T14:50:18.098238+00:00", + "id": "d626021d594241d2a709ae48f12b670a", + "jwt_key": "a5ea25bf5eeff062e2d6b43bd4bf3aa47fd292553f43a15172fe6ab21430a201fdbef5e8e957c7fe945ba4c203ef7c2092375ad56e268b3303a65b15542b5ddd", + "last_used_at": "2019-07-21T14:50:18.098686+00:00", "last_used_ip": null, - "token": "aa7116db7377b39204058b29597ecb5a266a8256c82b6ee82c738a427891a28fc9f34419001337db02c99a0813cd8fffa615ce6c1f8d5492d65f297d95c85c4a", + "token": "99a0599d8d56b8b6be3dd3df16bc59f2567a8243625f3bf75a87192fbff1fa2c619404920f58b52d3baaa16e49a74c0b61fa67da338a3814436e09ab62510d8e", "token_type": "long_lived_access_token", "user_id": "2ffcb10d3db745b396789364fdef72ec" }, + { + "access_token_expiration": 1800.0, + "client_icon": null, + "client_id": "https://ha.bauer.tech/", + "client_name": null, + "created_at": "2019-07-22T21:18:22.429496+00:00", + "id": "4763eecfeb5b407d80926b4cb78ff654", + "jwt_key": "73ad6b0f9a88ce1b623ceb12c57b81d271ff1d69a95a13ab8a44c3430c8eba7edb1bd3ad198923e7e1b9675e4a83e9a6b9046dd8f5493a61ce3697dd2f47ecc0", + "last_used_at": "2019-10-16T07:09:06.957061+00:00", + "last_used_ip": "127.0.0.1", + "token": "0fe0962b744bc1c53e1d6ef65521b756a4b6cb1cf12e7e65cf1305de06c64aff98a96c8eef5da554848cc30edc9b71f5f7e6313935bd4feae624c4fbf342f855", + "token_type": "normal", + "user_id": "2ffcb10d3db745b396789364fdef72ec" + }, + { + "access_token_expiration": 1800.0, + "client_icon": null, + "client_id": "https://ha.bauer.tech/", + "client_name": null, + "created_at": "2019-07-25T12:04:50.524499+00:00", + "id": "94363419521044db8647979a2f2794a7", + "jwt_key": "85202a8071aa898b9ed7c644d754d1ed0f776a662363dbfe7dc7260eee82f388c43865c1ad6532f8179dfe02e112c1810ea8823568bb54095dc7885d2a3ebdb5", + "last_used_at": "2019-09-30T13:22:33.931626+00:00", + "last_used_ip": "127.0.0.1", + "token": "1e749408807d132560330a29a8288674c2636582bb4d8c76ec0335e0a12506799d981370ab334dba84b41cfc610f56c49ff7c3d6ebd78c23757c5788eb08702e", + "token_type": "normal", + "user_id": "2ffcb10d3db745b396789364fdef72ec" + }, + { + "access_token_expiration": 1800.0, + "client_icon": null, + "client_id": "https://ha.bauer.tech/", + "client_name": null, + "created_at": "2019-08-10T23:19:49.218658+00:00", + "id": "f12a4a8e6a784e82b2e3ff5669606ab7", + "jwt_key": "a50d4cdb16e9739c96212178ca97e0dc096034af4e2f87d3a2d2e5dc1a3910d3d6867ddb34c493494c1a1d2802ef4859dcf0e56d6f778b7a78b638cc0fabb928", + "last_used_at": "2019-08-10T23:19:49.218938+00:00", + "last_used_ip": "127.0.0.1", + "token": "b1e00381202401857bac065bfdb9cdfd4e91ca4bac192c591478da8bc557d171ea2256333ad5e02934e37fe6b2098aa7ab9e14babbf4fa9a4b91a73054605e0b", + "token_type": "normal", + "user_id": "2ffcb10d3db745b396789364fdef72ec" + }, + { + "access_token_expiration": 1800.0, + "client_icon": null, + "client_id": "https://ha.bauer.tech/", + "client_name": null, + "created_at": "2019-10-16T07:29:48.612044+00:00", + "id": "9f7c5270da8347ecba636a2280500e58", + "jwt_key": "6dfbd48a36d3c2bf89790383191f4fdf4435bf4c082d5aaf99e3fad079e4d6f34ac05629afb46c333f8851b4a3e623ad9b6dcc252256428cdd864db8c30dad17", + "last_used_at": "2019-10-16T07:29:48.612286+00:00", + "last_used_ip": "127.0.0.1", + "token": "d1e41058805f66573bc53f92ae4a887902c8ddc590ad1fef38e03cb358e3f439512f642503cead5085440b2a428ff5b1d2b1cb2cc42a5e73b8b027e664450ce0", + "token_type": "normal", + "user_id": "2ffcb10d3db745b396789364fdef72ec" + }, { "access_token_expiration": 1800.0, "client_icon": null, @@ -482,6 +538,62 @@ "token": "3453228edae484bc436ba6f41a22fcb46973d8957ac67691ff662d5feab135bcf2b8d7b574e34386b241c9239e7cb1aa8f4aa6089cece5cb24f0491fdf63922d", "token_type": "normal", "user_id": "bd0f10a32b324e85998881cb5b748d0f" + }, + { + "access_token_expiration": 1800.0, + "client_icon": null, + "client_id": "https://ha.bauer.tech/", + "client_name": null, + "created_at": "2019-07-23T16:57:07.828857+00:00", + "id": "ad2109b59d2148d98fae553e8f22b66c", + "jwt_key": "5b37cbd04e7087318173ec3df627120cb88f9043126f17e2d4cfff9684e2d782793493d0c847ba7e6f68e8fe82af2d0f324984514c5630833a73620b39e130de", + "last_used_at": "2019-09-15T08:15:48.148712+00:00", + "last_used_ip": "127.0.0.1", + "token": "c008fe893f268d124033d1258fc59917cbf4b392c36016f4f78740688abcb6a1edf23ace480bc2d65b39b616859218a18d8695d4162622c2a5dc5d234c84fe77", + "token_type": "normal", + "user_id": "bd0f10a32b324e85998881cb5b748d0f" + }, + { + "access_token_expiration": 1800.0, + "client_icon": null, + "client_id": "https://ha.bauer.tech/", + "client_name": null, + "created_at": "2019-07-23T16:59:24.218485+00:00", + "id": "7458230819a34628bcfb65dbfc7051ec", + "jwt_key": "2a6b9ccfe7a040ceae2e77a05d0c97cd67150297b33f2b4316dfb527418a5dcbc0f96eb0edd11d8288e28824bb7bc65c2ceeeb5d5c893f0c50b3dc9ed77b40ee", + "last_used_at": "2019-07-23T16:59:24.218725+00:00", + "last_used_ip": "127.0.0.1", + "token": "a9b15071e0ed591eea3d66d903cfba5efa872b44acc5a0abeb7c4518b122ca6136be3c53df37246fbcb2e9abbb085b25921e911907e2346fc0f6fcc4c99f5f05", + "token_type": "normal", + "user_id": "bd0f10a32b324e85998881cb5b748d0f" + }, + { + "access_token_expiration": 1800.0, + "client_icon": null, + "client_id": "https://ha.bauer.tech/", + "client_name": null, + "created_at": "2019-09-08T12:16:48.684967+00:00", + "id": "d94991861636455788d6e0ed5ddc8827", + "jwt_key": "b9b452e023c71697b81e102d8fd5a888f00afe147dbe4c25318532613113a9024164c1ad0a40fe6825cd4e93d988098912b4ec7ef3953399ec361ad9220e57e6", + "last_used_at": "2019-09-08T12:16:48.685517+00:00", + "last_used_ip": "127.0.0.1", + "token": "924a6cccc1a0fcb5c38005c60e75e64933a79a6e54b50c5b06664588de45079568944f344305b3372b252d71b039d6e37c109f6d3fe68280594aaf6016624fd1", + "token_type": "normal", + "user_id": "bd0f10a32b324e85998881cb5b748d0f" + }, + { + "access_token_expiration": 1800.0, + "client_icon": null, + "client_id": "https://ha.bauer.tech/", + "client_name": null, + "created_at": "2019-09-08T12:19:22.746470+00:00", + "id": "8566533d718046c4a3e510469acf23d2", + "jwt_key": "46b2da9ef932594aaf9832e607be4af24a6eba1b2f6011edbfba2ad028882574527b5d482ae1b98e3e5268508fdbc3fe8ba28a599b18cdd8be2a183f4d1d3215", + "last_used_at": "2019-09-08T12:19:22.746709+00:00", + "last_used_ip": "127.0.0.1", + "token": "6254e038d2b37d1bfec16f5eb5cd8d8f35a8fb8611ae2fedcc434fb8db857905faec6a8f39400b792b20f6677384a5a0719b2d128879532ad51e12a9cf259872", + "token_type": "normal", + "user_id": "bd0f10a32b324e85998881cb5b748d0f" } ], "users": [ diff --git a/.storage/core.config_entries b/.storage/core.config_entries index 4c18c3a..4fd1569 100644 --- a/.storage/core.config_entries +++ b/.storage/core.config_entries @@ -12,6 +12,9 @@ "entry_id": "e0ebcf51d57b4df4baaf36894d59979d", "options": {}, "source": "discovery", + "system_options": { + "disable_new_entities": false + }, "title": "Philips hue", "version": 1 }, @@ -24,6 +27,9 @@ "entry_id": "c4adbdd188db4f34ad27d14ba2d71abe", "options": {}, "source": "discovery", + "system_options": { + "disable_new_entities": false + }, "title": "UPnP/IGD", "version": 1 }, @@ -38,6 +44,9 @@ "entry_id": "663be35bc88343568ce876c17f04d781", "options": {}, "source": "user", + "system_options": { + "disable_new_entities": false + }, "title": "OwnTracks", "version": 1 }, @@ -65,6 +74,9 @@ "entry_id": "ed94faecc60f4d25baf616a3fcd3b2ce", "options": {}, "source": "registration", + "system_options": { + "disable_new_entities": false + }, "title": "Martin_Handy", "version": 1 }, @@ -75,6 +87,9 @@ "entry_id": "e4728d23a5aa4c0dbc35a2d5036df7d1", "options": {}, "source": "import", + "system_options": { + "disable_new_entities": false + }, "title": "Home Assistant iOS", "version": 1 } diff --git a/.storage/core.device_registry b/.storage/core.device_registry index e00be3b..27d803b 100644 --- a/.storage/core.device_registry +++ b/.storage/core.device_registry @@ -23,7 +23,7 @@ "model": "BSB002", "name": "Philips hue", "name_by_user": null, - "sw_version": "1932126170", + "sw_version": "1935074050", "via_device_id": null }, { @@ -672,8 +672,88 @@ "model": "iPad Pro (10.5-inch)", "name": "Martin\u2019s iPad", "name_by_user": null, - "sw_version": "12.3.1", + "sw_version": "13.1.3", "via_device_id": null + }, + { + "area_id": null, + "config_entries": [ + "e0ebcf51d57b4df4baaf36894d59979d" + ], + "connections": [], + "id": "4fa58dcef8af4af897a1a9558a015611", + "identifiers": [ + [ + "hue", + "00:17:88:01:06:25:80:c9-0b" + ] + ], + "manufacturer": "Philips", + "model": "Hue outdoor spot", + "name": "Garten1", + "name_by_user": null, + "sw_version": "1.46.13_r26312", + "via_device_id": "8e09114c26574165a8f8fa43ff0c5395" + }, + { + "area_id": null, + "config_entries": [ + "e0ebcf51d57b4df4baaf36894d59979d" + ], + "connections": [], + "id": "50781ad2a8d14062a96f4a004924be56", + "identifiers": [ + [ + "hue", + "00:17:88:01:06:25:94:0c-0b" + ] + ], + "manufacturer": "Philips", + "model": "Hue outdoor spot", + "name": "Garten2", + "name_by_user": null, + "sw_version": "1.46.13_r26312", + "via_device_id": "8e09114c26574165a8f8fa43ff0c5395" + }, + { + "area_id": null, + "config_entries": [ + "e0ebcf51d57b4df4baaf36894d59979d" + ], + "connections": [], + "id": "6ad58be1b42d4e0988a030fcd5e9d7e8", + "identifiers": [ + [ + "hue", + "00:17:88:01:04:f9:c3:32-0b" + ] + ], + "manufacturer": "Philips", + "model": "Hue outdoor pedestal", + "name": "GartenGross", + "name_by_user": null, + "sw_version": "1.46.13_r26312", + "via_device_id": "8e09114c26574165a8f8fa43ff0c5395" + }, + { + "area_id": null, + "config_entries": [ + "e0ebcf51d57b4df4baaf36894d59979d" + ], + "connections": [], + "id": "d7edef34e0bd469f9f3928985e93c66a", + "identifiers": [ + [ + "hue", + "00:17:88:01:06:25:54:59-0b" + ] + ], + "manufacturer": "Philips", + "model": "Hue outdoor spot", + "name": "Garten3", + "name_by_user": null, + "sw_version": "1.46.13_r26312", + "via_device_id": "8e09114c26574165a8f8fa43ff0c5395" } ] }, diff --git a/.storage/core.entity_registry b/.storage/core.entity_registry index fbefde6..96793f7 100644 --- a/.storage/core.entity_registry +++ b/.storage/core.entity_registry @@ -342,6 +342,51 @@ "name": null, "platform": "ios", "unique_id": "state_martins_ipad" + }, + { + "config_entry_id": "e0ebcf51d57b4df4baaf36894d59979d", + "device_id": "6ad58be1b42d4e0988a030fcd5e9d7e8", + "disabled_by": null, + "entity_id": "light.garten_stehleuchte", + "name": "Garten Stehleuchte", + "platform": "hue", + "unique_id": "00:17:88:01:04:f9:c3:32-0b" + }, + { + "config_entry_id": "e0ebcf51d57b4df4baaf36894d59979d", + "device_id": "d7edef34e0bd469f9f3928985e93c66a", + "disabled_by": null, + "entity_id": "light.garten_spot_beet", + "name": "Garten Spot Beet", + "platform": "hue", + "unique_id": "00:17:88:01:06:25:54:59-0b" + }, + { + "config_entry_id": "e0ebcf51d57b4df4baaf36894d59979d", + "device_id": "50781ad2a8d14062a96f4a004924be56", + "disabled_by": null, + "entity_id": "light.garten_spot_birke", + "name": "Garten Spot Birke", + "platform": "hue", + "unique_id": "00:17:88:01:06:25:94:0c-0b" + }, + { + "config_entry_id": "e0ebcf51d57b4df4baaf36894d59979d", + "device_id": "4fa58dcef8af4af897a1a9558a015611", + "disabled_by": null, + "entity_id": "light.garten_spot_magnolie", + "name": "Garten Spot Magnolie", + "platform": "hue", + "unique_id": "00:17:88:01:06:25:80:c9-0b" + }, + { + "config_entry_id": null, + "device_id": null, + "disabled_by": null, + "entity_id": "binary_sensor.updater", + "name": null, + "platform": "updater", + "unique_id": "updater" } ] }, diff --git a/.storage/core.restore_state b/.storage/core.restore_state index 194c5a7..fab3e17 100644 --- a/.storage/core.restore_state +++ b/.storage/core.restore_state @@ -1,148 +1,45 @@ { "data": [ { - "last_seen": "2019-07-15T20:01:30.624376+00:00", + "last_seen": "2019-10-28T16:32:40.021756+00:00", "state": { "attributes": { "editable": true, "friendly_name": "Martin Bauer", "id": "d433f5e7758548dab8baa44b545a8668", - "source": "person.martin_bauer", "user_id": "2ffcb10d3db745b396789364fdef72ec" }, "context": { - "id": "c453892bfbc342499b782f87c5fefdea", + "id": "f6884f7919ab4c3190621ede3bdd1bb7", "parent_id": null, "user_id": null }, "entity_id": "person.martin_bauer", - "last_changed": "2019-07-15T20:01:25.000202+00:00", - "last_updated": "2019-07-15T20:01:25.000202+00:00", + "last_changed": "2019-10-20T15:51:45.248477+00:00", + "last_updated": "2019-10-20T15:52:24.174874+00:00", "state": "unknown" } }, { - "last_seen": "2019-07-15T20:01:30.624376+00:00", - "state": { - "attributes": { - "friendly_name": "Martin\u2019s iPad", - "source_type": null - }, - "context": { - "id": "b1981a04873f442184e446614d3163f1", - "parent_id": null, - "user_id": null - }, - "entity_id": "device_tracker.martins_ipad", - "last_changed": "2019-07-15T20:01:28.618367+00:00", - "last_updated": "2019-07-15T20:01:28.618367+00:00", - "state": "not_home" - } - }, - { - "last_seen": "2019-07-15T20:01:30.624376+00:00", + "last_seen": "2019-10-28T16:32:40.021756+00:00", "state": { "attributes": { "friendly_name": "Martin_Handy", "source_type": "gps" }, "context": { - "id": "b90bbc2e9114485086b5275da4f78a8e", + "id": "046fc7b330a2452c8826222dc9d61cda", "parent_id": null, "user_id": null }, "entity_id": "device_tracker.martin_handy_2", - "last_changed": "2019-07-15T20:01:29.770913+00:00", - "last_updated": "2019-07-15T20:01:29.770913+00:00", + "last_changed": "2019-10-20T15:52:04.508151+00:00", + "last_updated": "2019-10-20T15:52:04.508151+00:00", "state": "unknown" } }, { - "last_seen": "2019-07-15T20:01:30.624376+00:00", - "state": { - "attributes": { - "friendly_name": "Eingang", - "gps_accuracy": 100, - "latitude": 49.369477, - "longitude": 10.9831468, - "source_type": "bluetooth_le" - }, - "context": { - "id": "150a5eb4e4e34f2b9528946e15adea4c", - "parent_id": null, - "user_id": null - }, - "entity_id": "device_tracker.beacon_eingang", - "last_changed": "2019-07-15T20:01:30.004025+00:00", - "last_updated": "2019-07-15T20:01:30.004025+00:00", - "state": "home" - } - }, - { - "last_seen": "2019-07-15T20:01:30.624376+00:00", - "state": { - "attributes": { - "friendly_name": "Arbeit", - "gps_accuracy": 30.0, - "latitude": 49.573626, - "longitude": 11.029467, - "source_type": "bluetooth_le" - }, - "context": { - "id": "6eeb49a6ef24453fb803fa2b5dae5e2a", - "parent_id": null, - "user_id": null - }, - "entity_id": "device_tracker.beacon_arbeit", - "last_changed": "2019-07-15T20:01:30.006352+00:00", - "last_updated": "2019-07-15T20:01:30.006352+00:00", - "state": "Uni" - } - }, - { - "last_seen": "2019-07-15T20:01:30.624376+00:00", - "state": { - "attributes": { - "friendly_name": "martin", - "gps_accuracy": 100, - "latitude": 49.369477, - "longitude": 10.9831468, - "source_type": "bluetooth_le" - }, - "context": { - "id": "f540bc71c2ad49b097f4023ddcdd6ea2", - "parent_id": null, - "user_id": null - }, - "entity_id": "device_tracker.martin_ipad", - "last_changed": "2019-07-15T20:01:30.008537+00:00", - "last_updated": "2019-07-15T20:01:30.008537+00:00", - "state": "home" - } - }, - { - "last_seen": "2019-07-15T20:01:30.624376+00:00", - "state": { - "attributes": { - "friendly_name": "martin", - "gps_accuracy": 30.0, - "latitude": 49.573626, - "longitude": 11.029467, - "source_type": "gps" - }, - "context": { - "id": "1c6d7f6d113a47548cd2751ce3151031", - "parent_id": null, - "user_id": null - }, - "entity_id": "device_tracker.martin_handy", - "last_changed": "2019-07-15T20:01:30.010768+00:00", - "last_updated": "2019-07-15T20:01:30.010768+00:00", - "state": "Uni" - } - }, - { - "last_seen": "2019-07-15T20:01:30.624376+00:00", + "last_seen": "2019-10-28T16:32:40.021756+00:00", "state": { "attributes": { "friendly_name": "Auto", @@ -152,15 +49,99 @@ "source_type": "bluetooth_le" }, "context": { - "id": "e167b7848df3480cb312bb6388cb6a0a", + "id": "5ecf7543c1ca4b9295c323e892d4170f", "parent_id": null, "user_id": null }, "entity_id": "device_tracker.beacon_auto", - "last_changed": "2019-07-15T20:01:30.012894+00:00", - "last_updated": "2019-07-15T20:01:30.012894+00:00", + "last_changed": "2019-10-20T15:52:24.047675+00:00", + "last_updated": "2019-10-20T15:52:24.047675+00:00", "state": "home" } + }, + { + "last_seen": "2019-10-28T16:32:40.021756+00:00", + "state": { + "attributes": { + "friendly_name": "Eingang", + "gps_accuracy": 100, + "latitude": 49.369477, + "longitude": 10.9831468, + "source_type": "bluetooth_le" + }, + "context": { + "id": "13112cb47ca74c869e5e51ad469d5d69", + "parent_id": null, + "user_id": null + }, + "entity_id": "device_tracker.beacon_eingang", + "last_changed": "2019-10-20T15:52:24.050168+00:00", + "last_updated": "2019-10-20T15:52:24.050168+00:00", + "state": "home" + } + }, + { + "last_seen": "2019-10-28T16:32:40.021756+00:00", + "state": { + "attributes": { + "friendly_name": "martin", + "gps_accuracy": 100, + "latitude": 49.369477, + "longitude": 10.9831468, + "source_type": "bluetooth_le" + }, + "context": { + "id": "5d7df67bde20411c9e61cfa71119d975", + "parent_id": null, + "user_id": null + }, + "entity_id": "device_tracker.martin_ipad", + "last_changed": "2019-10-20T15:52:24.052739+00:00", + "last_updated": "2019-10-20T15:52:24.052739+00:00", + "state": "home" + } + }, + { + "last_seen": "2019-10-28T16:32:40.021756+00:00", + "state": { + "attributes": { + "friendly_name": "Arbeit", + "gps_accuracy": 30.0, + "latitude": 49.573626, + "longitude": 11.029467, + "source_type": "bluetooth_le" + }, + "context": { + "id": "3197ffe7e5cf4f5cad56a3b74ecc0fc0", + "parent_id": null, + "user_id": null + }, + "entity_id": "device_tracker.beacon_arbeit", + "last_changed": "2019-10-20T15:52:24.055361+00:00", + "last_updated": "2019-10-20T15:52:24.055361+00:00", + "state": "Uni" + } + }, + { + "last_seen": "2019-10-28T16:32:40.021756+00:00", + "state": { + "attributes": { + "friendly_name": "martin", + "gps_accuracy": 30.0, + "latitude": 49.573626, + "longitude": 11.029467, + "source_type": "gps" + }, + "context": { + "id": "b80700902e764b1a9abda08741f9d6dc", + "parent_id": null, + "user_id": null + }, + "entity_id": "device_tracker.martin_handy", + "last_changed": "2019-10-20T15:52:24.057813+00:00", + "last_updated": "2019-10-20T15:52:24.057813+00:00", + "state": "Uni" + } } ], "key": "core.restore_state", diff --git a/.storage/lovelace b/.storage/lovelace index 4fcf0dd..1967dae 100644 --- a/.storage/lovelace +++ b/.storage/lovelace @@ -2,10 +2,6 @@ "data": { "config": { "resources": [ - { - "type": "module", - "url": "/local/custom_ui/compact-custom-header.js?v=0.0.1" - }, { "type": "js", "url": "/local/custom_ui/state-card-custom-cover.js" @@ -31,13 +27,6 @@ "views": [ { "cards": [ - { - "main_config": true, - "swipe": true, - "swipe_animate": "flip", - "type": "custom:compact-custom-header", - "voice": "hide" - }, { "aspect_ratio": "16x9", "entities": [ @@ -70,65 +59,6 @@ "type": "custom:room-glance-card" }, { - "artwork": "cover", - "entity": "media_player.martins_ipad_2", - "hide": { - "power_state": false, - "source": true, - "volume": true - }, - "icon": "mdi:spotify", - "type": "custom:mini-media-player" - }, - { - "entities": [ - { - "entity": "light.kuche_deckenlampe", - "name": "Decke K\u00fcche" - }, - { - "entity": "light.esszimmer_deckenlampe_mitte", - "name": "Decke Esszimmer Mitte" - }, - { - "entity": "light.esszimmer_deckenlampe_west", - "name": "Decke Esszimmer" - }, - { - "type": "divider" - }, - { - "entity": "light.kuche_links", - "name": "K\u00fcche LED links" - }, - { - "entity": "light.kuche_rechts", - "name": "K\u00fcche LED rechts" - }, - { - "entity": "light.kuche_vorne", - "name": "K\u00fcche LED vorne" - }, - { - "type": "divider" - }, - { - "entity": "cover.kuche_fenster_rollo", - "name": "K\u00fcche", - "type": "custom:state-card-custom-cover" - }, - { - "entity": "cover.esszimmer_fenster_rollo", - "name": "Esszimmer", - "type": "custom:state-card-custom-cover" - } - ], - "show_header_toggle": true, - "title": "K\u00fcche/Esszimmer", - "type": "entities" - }, - { - "artwork": "cover", "entity": "media_player.kitchenpi", "hide": { "power_state": false, @@ -136,9 +66,14 @@ "source": true, "volume": false }, - "icon": "mdi:music", + "idle_view": { + "when_idle": true, + "when_paused": true, + "when_standby": true + }, "shortcuts": { "columns": 4, + "label": "Playlists", "list": [ { "icon": "mdi:alpha-r", @@ -164,67 +99,45 @@ }, { "entities": [ - { - "entity": "light.wohnzimmer_deckenlampe", - "name": "Decke" - }, - { - "type": "divider" - }, - { - "entity": "light.wohnzimmer_kugel", - "name": "Kugel" - }, - { - "entity": "light.wohnzimmer_regal_links", - "name": "Regal links" - }, - { - "entity": "light.wohnzimmer_regal_rechts", - "name": "Regal rechts" - }, - { - "type": "divider" - }, - { - "entity": "light.wohnzimmer_stehlampe_oben", - "name": "Stehlampe oben" - }, - { - "entity": "light.wohnzimmer_stehlampe", - "name": "Stehlampe unten" - }, - { - "type": "divider" - }, { "entity": "cover.wohnzimmer_fenster_rollo", - "name": "Fenster", + "name": "Wohnzimmer Fenster", "type": "custom:state-card-custom-cover" }, { "entity": "cover.wohnzimmer_terrassentur_rollo", - "name": "T\u00fcr", + "name": "Wohnzimmer T\u00fcr", "type": "custom:state-card-custom-cover" - } - ], - "show_header_toggle": true, - "title": "Wohnzimmer", - "type": "entities" - }, - { - "entities": [ + }, + { + "entity": "cover.kuche_fenster_rollo", + "name": "K\u00fcche", + "type": "custom:state-card-custom-cover" + }, + { + "entity": "cover.esszimmer_fenster_rollo", + "name": "Esszimmer", + "type": "custom:state-card-custom-cover" + }, + { + "type": "divider" + }, + { + "entity": "light.wohnzimmer_deckenlampe", + "name": "Wohnzimmer Decke" + }, + { + "type": "divider" + }, { "entity": "light.gang_licht", - "name": "Licht" + "name": "Gang Licht" }, { "entity": "light.gang_bogen", - "name": "Bogen" + "name": "Gang Bogen" } ], - "show_header_toggle": true, - "title": "Gang", "type": "entities" } ], @@ -233,9 +146,6 @@ }, { "cards": [ - { - "type": "custom:compact-custom-header" - }, { "aspect_ratio": "16x9", "entities": [ @@ -287,6 +197,11 @@ "entity": "group.light_office_martin", "icon": "mdi:monitor-multiple", "name": "Martins B\u00fcro" + }, + { + "entity": "group.outside", + "icon": "mdi-flower", + "name": "Drau\u00dfen" } ], "show_empty": false, @@ -372,9 +287,6 @@ }, { "cards": [ - { - "type": "custom:compact-custom-header" - }, { "aspect_ratio": "16x9", "entities": [ @@ -444,66 +356,112 @@ }, { "cards": [ - { - "type": "custom:compact-custom-header" - }, { "entities": [ { - "entity": "switch.pool_pumpe", - "name": "Pool Pumpe" + "entity": "sensor.motion_combined", + "format": "relative", + "name": "Bewegung", + "secondary_info": "last-changed" }, { - "entity": "sensor.pool_pumpe_verbrauch", - "name": "Pool Pumpe Verbrauch" + "entity": "binary_sensor.gang_bewegungsmelder_ost", + "name": "Eingang", + "secondary_info": "last-changed" }, { - "entity": "sensor.pool_pumpe_heute", - "name": "Pumpe an heute" + "entity": "binary_sensor.gang_bewegungsmelder_mitte", + "name": "Mitte", + "secondary_info": "last-changed" }, { - "entity": "sensor.pool_pumpe_gestern", - "name": "Pumpe an gestern" + "entity": "binary_sensor.gang_bewegungsmelder_wohnzimmer", + "name": "Zum Wohnzimmer", + "secondary_info": "last-changed" + }, + { + "entity": "binary_sensor.gang_bewegungsmelder_schlafzimmer", + "name": "Zum Schlafzimmer", + "secondary_info": "last-changed" } ], - "show_header_toggle": false, - "title": "Pool", + "title": "Bewegungsmelder", "type": "entities" }, { "entities": [ - { - "entity": "sensor.trockner_verbrauch", - "name": "Trockner aktuell" - }, - { - "entity": "sensor.trockner_verbrauch_summe", - "name": "Trockner insgesamt" - }, - { - "entity": "sensor.trockner_betriebsstunden", - "name": "Trockner Stunden" - }, - { - "type": "divider" - }, - { - "entity": "sensor.waschmaschine_verbrauch", - "name": "Waschmaschine aktuell" - }, - { - "entity": "sensor.waschmaschine_verbrauch_summe", - "name": "Waschmaschine insgesamt" - }, - { - "entity": "sensor.waschmaschine_betriebsstunden", - "name": "Waschmaschine Stunden" - } + "switch.bewegungsmelder_west_led", + "switch.bewegungsmelder_ost_led", + "switch.bewegungsmelder_mitte_led" ], - "show_header_toggle": false, - "title": "Verbrauch", + "title": "Bewegungsmelder LEDs", "type": "entities" }, + { + "animate": true, + "entities": [ + "sensor.waschmaschine_verbrauch", + "sensor.trockner_verbrauch" + ], + "hours_to_show": 96, + "name": "Waschen & Trocknen", + "points_per_hour": 1, + "type": "custom:mini-graph-card", + "upper_bound": 700 + }, + { + "animate": true, + "entities": [ + { + "entity": "sensor.spulmaschine_verbrauch", + "name": "Sp\u00fchlmaschine" + }, + { + "entity": "sensor.backofen_verbrauch", + "name": "Backofen" + }, + { + "entity": "sensor.herd_phase_1_verbrauch", + "name": "Herd P1" + }, + { + "entity": "sensor.herd_phase_2_verbrauch", + "name": "Herd P2" + }, + { + "entity": "sensor.herd_phase_3_verbrauch", + "name": "Herd P3" + } + ], + "hours_to_show": 8, + "name": "K\u00fcche", + "points_per_hour": 4, + "type": "custom:mini-graph-card", + "upper_bound": 2000 + }, + { + "animate": true, + "entities": [ + { + "entity": "sensor.fritz_box_7490_kbyte_sec_received", + "name": "Down" + }, + { + "entity": "sensor.fritz_box_7490_kbyte_sec_sent", + "name": "Up" + } + ], + "hours_to_show": 2, + "name": "Internet", + "points_per_hour": 30, + "type": "custom:mini-graph-card" + } + ], + "icon": "mdi:key", + "title": "Admin" + }, + { + "cards": [ { "entities": [ { @@ -538,65 +496,113 @@ "show_header_toggle": false, "title": "Sicherheitsabschaltung", "type": "entities" - }, - { - "animate": true, - "entities": [ - "sensor.waschmaschine_verbrauch", - "sensor.trockner_verbrauch" - ], - "name": "Waschen & Trocknen", - "type": "custom:mini-graph-card" - }, - { - "animate": true, - "entities": [ - { - "entity": "sensor.spulmaschine_verbrauch", - "name": "Sp\u00fchlmaschine" - }, - { - "entity": "sensor.backofen_verbrauch", - "name": "Backofen" - }, - { - "entity": "sensor.herd_phase_1_verbrauch", - "name": "Herd P1" - }, - { - "entity": "sensor.herd_phase_2_verbrauch", - "name": "Herd P2" - }, - { - "entity": "sensor.herd_phase_3_verbrauch", - "name": "Herd P3" - } - ], - "hours_to_show": 8, - "name": "K\u00fcche", - "points_per_hour": 4, - "type": "custom:mini-graph-card" - }, - { - "animate": true, - "entities": [ - { - "entity": "sensor.fritz_box_7490_kbyte_sec_received", - "name": "Down" - }, - { - "entity": "sensor.fritz_box_7490_kbyte_sec_sent", - "name": "Up" - } - ], - "hours_to_show": 2, - "name": "Internet", - "points_per_hour": 30, - "type": "custom:mini-graph-card" } ], - "icon": "mdi:settings", - "title": "Admin" + "icon": "mdi:shield-check", + "title": "Security" + }, + { + "cards": [ + { + "entities": [ + { + "entity": "light.kuche_deckenlampe", + "name": "Decke K\u00fcche" + }, + { + "entity": "light.esszimmer_deckenlampe_mitte", + "name": "Decke Esszimmer Mitte" + }, + { + "entity": "light.esszimmer_deckenlampe_west", + "name": "Decke Esszimmer" + }, + { + "type": "divider" + }, + { + "entity": "light.kuche_links", + "name": "K\u00fcche LED links" + }, + { + "entity": "light.kuche_rechts", + "name": "K\u00fcche LED rechts" + }, + { + "entity": "light.kuche_vorne", + "name": "K\u00fcche LED vorne" + }, + { + "type": "divider" + }, + { + "entity": "cover.kuche_fenster_rollo", + "name": "K\u00fcche", + "type": "custom:state-card-custom-cover" + }, + { + "entity": "cover.esszimmer_fenster_rollo", + "name": "Esszimmer", + "type": "custom:state-card-custom-cover" + } + ], + "show_header_toggle": true, + "title": "K\u00fcche/Esszimmer", + "type": "entities" + }, + { + "entities": [ + { + "entity": "light.wohnzimmer_deckenlampe", + "name": "Decke" + }, + { + "type": "divider" + }, + { + "entity": "light.wohnzimmer_kugel", + "name": "Kugel" + }, + { + "entity": "light.wohnzimmer_regal_links", + "name": "Regal links" + }, + { + "entity": "light.wohnzimmer_regal_rechts", + "name": "Regal rechts" + }, + { + "type": "divider" + }, + { + "entity": "light.wohnzimmer_stehlampe_oben", + "name": "Stehlampe oben" + }, + { + "entity": "light.wohnzimmer_stehlampe", + "name": "Stehlampe unten" + }, + { + "type": "divider" + }, + { + "entity": "cover.wohnzimmer_fenster_rollo", + "name": "Fenster", + "type": "custom:state-card-custom-cover" + }, + { + "entity": "cover.wohnzimmer_terrassentur_rollo", + "name": "T\u00fcr", + "type": "custom:state-card-custom-cover" + } + ], + "show_header_toggle": true, + "title": "Wohnzimmer", + "type": "entities" + } + ], + "icon": "mdi:more", + "title": "Mehr" } ] } diff --git a/Dockerfile b/Dockerfile index 4a423b9..c152556 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ FROM homeassistant/home-assistant -RUN apt-get update && apt-get install -y nodejs +#RUN apt-get update && apt-get install -y nodejs +RUN apk update && apk add --update nodejs npm WORKDIR /config CMD [ "./run_on_server.sh" ]