From 8bf29a5c823b976835e964177169402181709c2e Mon Sep 17 00:00:00 2001 From: Martin Bauer Date: Thu, 4 Jul 2019 22:52:20 +0200 Subject: [PATCH] Removed unused scene, added device tracker --- .storage/auth | 50 +++++++- .storage/core.device_registry | 14 +-- .storage/core.restore_state | 177 ++++++++++++++--------------- config_creation/manual_config.yaml | 8 ++ scenes.yaml | 16 +-- 5 files changed, 155 insertions(+), 110 deletions(-) diff --git a/.storage/auth b/.storage/auth index e823634..682943e 100644 --- a/.storage/auth +++ b/.storage/auth @@ -323,7 +323,7 @@ "created_at": "2019-06-30T21:14:18.415794+00:00", "id": "4b042072829d416db7102e2ef1b627a8", "jwt_key": "464a41849ee7ba9d19a300c1dd7133bdca85714cfbc6f5e119c1dea53209926c3de9f7afea8fa7d79341ef970f60200745a1895115ada894a12b47bd17639777", - "last_used_at": "2019-07-03T18:55:50.414481+00:00", + "last_used_at": "2019-07-04T20:09:21.231573+00:00", "last_used_ip": "127.0.0.1", "token": "7f78a2d69fa4c70576fde67253220e35541ff9644554ee933cc568e543e44debf1a8d990d19c5b13084a1ce0c0cb24c43828caa875c99021ea914c581d82c759", "token_type": "normal", @@ -337,7 +337,7 @@ "created_at": "2019-06-30T21:40:45.236003+00:00", "id": "c921f02f078744dcab3dcf0a56a2ff47", "jwt_key": "125edd9a21a6cfb26458a0a831215ca25390e7f0d590b22b6a77ecffcc86737528914e2722420d93cd103fbc66706a813799258c9203d25b48c9c52028d46a74", - "last_used_at": "2019-07-01T14:44:40.984285+00:00", + "last_used_at": "2019-07-04T20:50:06.043318+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-03T14:24:35.227484+00:00", + "last_used_at": "2019-07-04T10:03:41.203106+00:00", "last_used_ip": "127.0.0.1", "token": "a44aeb5f2c646edd8066866d9d42641d0b81ba21255be56ef42df68f3a9c4c9fc3af4ef001ea739fc7242a7d7bbd95f34b05df527b8723d820e02ca699a50171", "token_type": "normal", @@ -407,12 +407,54 @@ "created_at": "2019-07-03T18:56:36.256497+00:00", "id": "9b09ea1fa45648a78d961760cba54323", "jwt_key": "f2145230898b93021c4891501618bab9b029748c363c6ba3a05ee6e6d9b5024359b69e508c20c599347bb5d1c75240a5da7c5bbad6fd983a96ca4cdf1cf4e7aa", - "last_used_at": "2019-07-03T19:46:24.624480+00:00", + "last_used_at": "2019-07-04T20:09:22.541614+00:00", "last_used_ip": "127.0.0.1", "token": "fe348a5563316252b232d5f6ddb183ac4a150f56bdb8cee9790f798e36854bb947f542bb24ee19464ff9a299508a3cd352f776ad0e4581366ad16efa44238402", "token_type": "normal", "user_id": "2ffcb10d3db745b396789364fdef72ec" }, + { + "access_token_expiration": 1800.0, + "client_icon": null, + "client_id": "https://home-assistant.io/iOS", + "client_name": null, + "created_at": "2019-07-03T20:37:40.792202+00:00", + "id": "52ff16c9ddc9494d89e33f2fb9eafafe", + "jwt_key": "0b92a91132f799529d70b0e9f1ae975a6f55369ad682fceabe0daff710be9bb6b719159a17b10d67c6f6b60085c63547f225c5bc13cbcf31def368ae31ded52a", + "last_used_at": "2019-07-04T20:30:05.412962+00:00", + "last_used_ip": "127.0.0.1", + "token": "f3b4115b2a302e0a7e2da65caeb8d859beed2023269f1d0a7524b1761efbd46cc40827b9c1be5b51e913f93cca87a696e7d7c2d6eab0e82705f9efe42edc8f0f", + "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-04T10:04:27.305217+00:00", + "id": "44bd366a776a48df9be52aa13458108d", + "jwt_key": "e28bc232bd652f7c102a362cf88061ceeb3a028e22583424ef32e1130d609ce5ce2532f7ac0aef8234fe2d3218a4c9b23aeb166ed5b56a29726350cf0f6707ff", + "last_used_at": "2019-07-04T10:04:27.305491+00:00", + "last_used_ip": "127.0.0.1", + "token": "5274e7443a3b0255afd864c85c09a06ec1df85780d9671cad9b91c1d29b4b6d91d9d64575137902c1cb8004b760a838322d859141be03e94cf34b08505fdd6ea", + "token_type": "normal", + "user_id": "2ffcb10d3db745b396789364fdef72ec" + }, + { + "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", + "last_used_ip": null, + "token": "aa7116db7377b39204058b29597ecb5a266a8256c82b6ee82c738a427891a28fc9f34419001337db02c99a0813cd8fffa615ce6c1f8d5492d65f297d95c85c4a", + "token_type": "long_lived_access_token", + "user_id": "2ffcb10d3db745b396789364fdef72ec" + }, { "access_token_expiration": 1800.0, "client_icon": null, diff --git a/.storage/core.device_registry b/.storage/core.device_registry index 06feffd..c46f9bd 100644 --- a/.storage/core.device_registry +++ b/.storage/core.device_registry @@ -559,13 +559,13 @@ "connections": [], "id": "c9c5a90d2665455f9445254dc9f71495", "identifiers": [ - [ - "webhook_id", - "c4707baa6eef9f03781be57ea4a5a80c5634b41a17dcbb3699ab97d24ad0cd19" - ], [ "device_id", "aba3eef2eb0d44eab143c525f5b0b190" + ], + [ + "webhook_id", + "c4707baa6eef9f03781be57ea4a5a80c5634b41a17dcbb3699ab97d24ad0cd19" ] ], "manufacturer": "HUAWEI", @@ -610,7 +610,7 @@ ], "manufacturer": null, "model": null, - "name": "Eingang", + "name": null, "name_by_user": null, "sw_version": null, "via_device_id": null @@ -630,7 +630,7 @@ ], "manufacturer": null, "model": null, - "name": "Arbeit", + "name": null, "name_by_user": null, "sw_version": null, "via_device_id": null @@ -650,7 +650,7 @@ ], "manufacturer": null, "model": null, - "name": "Auto", + "name": null, "name_by_user": null, "sw_version": null, "via_device_id": null diff --git a/.storage/core.restore_state b/.storage/core.restore_state index cfb8736..98ac98d 100644 --- a/.storage/core.restore_state +++ b/.storage/core.restore_state @@ -1,7 +1,7 @@ { "data": [ { - "last_seen": "2019-07-03T20:03:36.004055+00:00", + "last_seen": "2019-07-04T20:46:59.011760+00:00", "state": { "attributes": { "editable": true, @@ -10,36 +10,102 @@ "user_id": "2ffcb10d3db745b396789364fdef72ec" }, "context": { - "id": "e061ac3f371d47eaa263359d0cee919e", + "id": "cdd37accd7c04cfe98fe3190940be388", "parent_id": null, "user_id": null }, "entity_id": "person.martin_bauer", - "last_changed": "2019-07-03T19:03:26.833433+00:00", - "last_updated": "2019-07-03T19:03:32.655690+00:00", + "last_changed": "2019-07-03T20:30:33.131361+00:00", + "last_updated": "2019-07-03T20:30:38.842384+00:00", "state": "unknown" } }, { - "last_seen": "2019-07-03T20:03:36.004055+00:00", + "last_seen": "2019-07-04T20:46:59.011760+00:00", "state": { "attributes": { "friendly_name": "Martin_Handy", "source_type": "gps" }, "context": { - "id": "7fd5d7fa8d1243d486f87c68c3a00fa0", + "id": "3cd2a5b4becd4c7db4bcc686328f2499", "parent_id": null, "user_id": null }, "entity_id": "device_tracker.martin_handy_2", - "last_changed": "2019-07-03T19:03:31.576127+00:00", - "last_updated": "2019-07-03T19:03:31.576127+00:00", + "last_changed": "2019-07-03T20:30:36.845886+00:00", + "last_updated": "2019-07-03T20:30:36.845886+00:00", "state": "unknown" } }, { - "last_seen": "2019-07-03T20:03:36.004055+00:00", + "last_seen": "2019-07-04T20:46:59.011760+00:00", + "state": { + "attributes": { + "friendly_name": "Auto", + "gps_accuracy": 100, + "latitude": 49.369477, + "longitude": 10.9831468, + "source_type": "bluetooth_le", + "tid": "50" + }, + "context": { + "id": "b0b0afc662344a729da12f7bbea1b930", + "parent_id": null, + "user_id": null + }, + "entity_id": "device_tracker.beacon_auto", + "last_changed": "2019-07-04T17:19:10.464005+00:00", + "last_updated": "2019-07-04T17:19:11.125187+00:00", + "state": "home" + } + }, + { + "last_seen": "2019-07-04T20:46:59.011760+00:00", + "state": { + "attributes": { + "friendly_name": "martin", + "gps_accuracy": 100, + "latitude": 49.369477, + "longitude": 10.9831468, + "source_type": "gps", + "tid": "50" + }, + "context": { + "id": "f5df946a88184d33bfd94d251fff43f9", + "parent_id": null, + "user_id": null + }, + "entity_id": "device_tracker.martin_ipad", + "last_changed": "2019-07-04T17:19:10.459697+00:00", + "last_updated": "2019-07-04T17:19:10.707068+00:00", + "state": "home" + } + }, + { + "last_seen": "2019-07-04T20:46:59.011760+00:00", + "state": { + "attributes": { + "friendly_name": "Arbeit", + "gps_accuracy": 30.0, + "latitude": 49.573626, + "longitude": 11.029467, + "source_type": "bluetooth_le", + "tid": "50" + }, + "context": { + "id": "b004ab15b27c422ab8bc72f571db049e", + "parent_id": null, + "user_id": null + }, + "entity_id": "device_tracker.beacon_arbeit", + "last_changed": "2019-07-04T07:48:52.444871+00:00", + "last_updated": "2019-07-04T13:32:59.858047+00:00", + "state": "Uni" + } + }, + { + "last_seen": "2019-07-04T20:46:59.011760+00:00", "state": { "attributes": { "battery_level": 32, @@ -50,106 +116,35 @@ "source_type": "gps" }, "context": { - "id": "d781d9b97f994836a03872931c829678", + "id": "5eba7a954b7945a8b0ae85d1314e0926", "parent_id": null, "user_id": null }, "entity_id": "device_tracker.martin_handy", - "last_changed": "2019-07-03T19:03:31.960722+00:00", - "last_updated": "2019-07-03T19:03:31.960722+00:00", + "last_changed": "2019-07-03T20:30:37.347521+00:00", + "last_updated": "2019-07-03T20:30:37.347521+00:00", "state": "not_home" } }, { - "last_seen": "2019-07-03T20:03:36.004055+00:00", - "state": { - "attributes": { - "battery_level": 40, - "friendly_name": "martin", - "gps_accuracy": 10, - "latitude": 49.369476318359375, - "longitude": 10.983892511586642, - "source_type": "bluetooth_le", - "tid": "50", - "velocity": 0 - }, - "context": { - "id": "2a2e48e316674586bd8e4385e55e7d56", - "parent_id": null, - "user_id": null - }, - "entity_id": "device_tracker.martin_ipad", - "last_changed": "2019-07-03T19:03:31.962857+00:00", - "last_updated": "2019-07-03T20:03:10.153610+00:00", - "state": "home" - } - }, - { - "last_seen": "2019-07-03T20:03:36.004055+00:00", + "last_seen": "2019-07-04T20:46:59.011760+00:00", "state": { "attributes": { "friendly_name": "Eingang", - "gps_accuracy": 10, - "latitude": 49.369476318359375, - "longitude": 10.983892511586642, + "gps_accuracy": 100, + "latitude": 49.369477, + "longitude": 10.9831468, "source_type": "bluetooth_le", - "tid": "50", - "velocity": 0 + "tid": "50" }, "context": { - "id": "6ccc51adc2ec490895285cf2d696bdc5", + "id": "1ef1e940b7544e9fb4fbdabc4e2a5b54", "parent_id": null, "user_id": null }, "entity_id": "device_tracker.beacon_eingang", - "last_changed": "2019-07-03T19:19:42.303698+00:00", - "last_updated": "2019-07-03T20:03:10.158108+00:00", - "state": "home" - } - }, - { - "last_seen": "2019-07-03T20:03:36.004055+00:00", - "state": { - "attributes": { - "friendly_name": "Arbeit", - "gps_accuracy": 10, - "latitude": 49.369476318359375, - "longitude": 10.983892511586642, - "source_type": "bluetooth_le", - "tid": "50", - "velocity": 0 - }, - "context": { - "id": "9f73aa9812e14da99ac5c397959e0352", - "parent_id": null, - "user_id": null - }, - "entity_id": "device_tracker.beacon_arbeit", - "last_changed": "2019-07-03T19:55:31.126724+00:00", - "last_updated": "2019-07-03T20:03:10.155892+00:00", - "state": "home" - } - }, - { - "last_seen": "2019-07-03T20:03:36.004055+00:00", - "state": { - "attributes": { - "friendly_name": "Auto", - "gps_accuracy": 10, - "latitude": 49.369476318359375, - "longitude": 10.983892511586642, - "source_type": "bluetooth_le", - "tid": "50", - "velocity": 0 - }, - "context": { - "id": "811c0487c5324fa398fcf32a60c21626", - "parent_id": null, - "user_id": null - }, - "entity_id": "device_tracker.beacon_auto", - "last_changed": "2019-07-03T20:00:59.938367+00:00", - "last_updated": "2019-07-03T20:01:00.947906+00:00", + "last_changed": "2019-07-03T20:30:37.349593+00:00", + "last_updated": "2019-07-04T17:19:11.122393+00:00", "state": "home" } } diff --git a/config_creation/manual_config.yaml b/config_creation/manual_config.yaml index 17d137b..5f520e8 100644 --- a/config_creation/manual_config.yaml +++ b/config_creation/manual_config.yaml @@ -48,6 +48,14 @@ owntracks: waypoints: false +homekit: + name: BauerHome + filter: + include_domains: + - scene + + + # Custom stuff dimmer: cover_half: diff --git a/scenes.yaml b/scenes.yaml index 94d20bd..9c2b884 100644 --- a/scenes.yaml +++ b/scenes.yaml @@ -330,14 +330,14 @@ brightness: 1 color_temp: 477 -- name: Schlafzimmer Dunkel - entities: - light.schlafzimmer_deckenlampe: - state: off - light.schlafzimmer: - state: on - brightness: 15 - color_temp: 477 +#- name: Schlafzimmer Dunkel +# entities: +# light.schlafzimmer_deckenlampe: +# state: off +# light.schlafzimmer: +# state: on +# brightness: 15 +# color_temp: 477 - name: Schlafzimmer Orange entities: