From d9deae3d63ca0ea1f060a50e999b2021dd51a238 Mon Sep 17 00:00:00 2001 From: Dirk Alders Date: Sat, 21 Oct 2023 22:56:04 +0200 Subject: [PATCH] Update 2023-10-21 --- config/coordinator_backup.json | 4 +- config/database.db | 13 ++--- config/state.json | 84 ++++++++++++++++++------------- config_example/configuration.yaml | 30 +++++------ 4 files changed, 73 insertions(+), 58 deletions(-) diff --git a/config/coordinator_backup.json b/config/coordinator_backup.json index d50ad34..70e98eb 100644 --- a/config/coordinator_backup.json +++ b/config/coordinator_backup.json @@ -4,7 +4,7 @@ "version": 1, "source": "zigbee-herdsman@0.19.0", "internal": { - "date": "2023-10-15T19:05:03.386Z", + "date": "2023-10-21T17:16:25.638Z", "ezspVersion": 8 } }, @@ -40,7 +40,7 @@ "network_key": { "key": "b3b0b56202eff5974b8addf9b310d1b0", "sequence_number": 0, - "frame_counter": 63466 + "frame_counter": 132548 }, "devices": [] } \ No newline at end of file diff --git a/config/database.db b/config/database.db index 7c246cc..c86f4b1 100644 --- a/config/database.db +++ b/config/database.db @@ -1,6 +1,7 @@ -{"id":1,"type":"Coordinator","ieeeAddr":"0xe0798dfffe8f943f","nwkAddr":0,"manufId":0,"epList":[1,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":48879,"inClusterList":[0,3,6,10,25,26,768],"outClusterList":[0,3,4,5,6,8,32,768,1024,1026,1029,1030,1280,2817,2819,2820,1794,4096,64513,64514],"clusters":{},"binds":[],"configuredReportings":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[],"outClusterList":[33],"clusters":{},"binds":[],"configuredReportings":[],"meta":{}}},"interviewCompleted":true,"meta":{},"lastSeen":1697387067459,"defaultSendRequestWhen":"immediate"} -{"id":2,"type":"Router","ieeeAddr":"0x000b57fffedadf27","nwkAddr":45787,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"FLOALT panel WS 30x90","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":544,"inClusterList":[0,3,4,5,6,8,768,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"lightingColorCtrl":{"attributes":{"colorCapabilities":16,"colorTempPhysicalMin":250,"colorTempPhysicalMax":454}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":18,"stackVersion":87,"hwVersion":1,"dateCode":"20200107","swBuildId":"1.2.224","zclVersion":1,"interviewCompleted":true,"meta":{"configured":2},"lastSeen":1697399021958,"defaultSendRequestWhen":"immediate"} -{"id":3,"type":"Router","ieeeAddr":"0x943469fffea68993","nwkAddr":10390,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E27 WW 806lm","epList":[1,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":257,"inClusterList":[0,3,4,5,6,8,4096,64636],"outClusterList":[5,25,32,4096],"clusters":{},"binds":[],"configuredReportings":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[33],"outClusterList":[33],"clusters":{},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050","zclVersion":3,"interviewCompleted":true,"meta":{"configured":2},"lastSeen":1697393651489,"defaultSendRequestWhen":"immediate"} -{"id":4,"type":"Router","ieeeAddr":"0x000d6ffffe62221e","nwkAddr":45528,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"FLOALT panel WS 30x90","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":544,"inClusterList":[0,3,4,5,6,8,768,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"lightingColorCtrl":{"attributes":{"colorCapabilities":16,"colorTempPhysicalMin":250,"colorTempPhysicalMax":454}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":18,"stackVersion":87,"hwVersion":1,"dateCode":"20200107","swBuildId":"1.2.224","zclVersion":1,"interviewCompleted":true,"meta":{"configured":2},"lastSeen":1697400401165,"defaultSendRequestWhen":"immediate"} -{"id":5,"type":"EndDevice","ieeeAddr":"0x84ba20fffe82ed95","nwkAddr":4602,"manufId":4098,"manufName":"_TZE200_hhrtiq0x","powerSource":"Battery","modelId":"TS0601","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":81,"inClusterList":[0,4,5,61184],"outClusterList":[25,10],"clusters":{"genBasic":{"attributes":{"65503":"CX�,\u0011","65506":31,"65508":0,"modelId":"TS0601","manufacturerName":"_TZE200_hhrtiq0x","stackVersion":0,"dateCode":"","appVersion":85}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":85,"stackVersion":0,"hwVersion":1,"dateCode":"","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1697425273145,"defaultSendRequestWhen":"immediate"} -{"id":6,"type":"EndDevice","ieeeAddr":"0x94deb8fffe3330b6","nwkAddr":49122,"manufId":4098,"manufName":"_TZE200_hhrtiq0x","powerSource":"Battery","modelId":"TS0601","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":81,"inClusterList":[0,4,5,61184],"outClusterList":[25,10],"clusters":{"genBasic":{"attributes":{"65503":"\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\u0011C�,\u0011","65506":31,"65508":0,"modelId":"TS0601","manufacturerName":"_TZE200_hhrtiq0x","stackVersion":0,"dateCode":"","appVersion":85}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":85,"stackVersion":0,"hwVersion":1,"dateCode":"","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1697425319271,"defaultSendRequestWhen":"immediate"} \ No newline at end of file +{"id":1,"type":"Coordinator","ieeeAddr":"0xe0798dfffe8f943f","nwkAddr":0,"manufId":0,"epList":[1,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":48879,"inClusterList":[0,3,6,10,25,26,768],"outClusterList":[0,3,4,5,6,8,32,768,1024,1026,1029,1030,1280,2817,2819,2820,1794,4096,64513,64514],"clusters":{},"binds":[],"configuredReportings":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[],"outClusterList":[33],"clusters":{},"binds":[],"configuredReportings":[],"meta":{}}},"interviewCompleted":true,"meta":{},"lastSeen":1697814884916,"defaultSendRequestWhen":"immediate"} +{"id":2,"type":"Router","ieeeAddr":"0x000b57fffedadf27","nwkAddr":45787,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"FLOALT panel WS 30x90","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":544,"inClusterList":[0,3,4,5,6,8,768,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"FLOALT panel WS 30x90","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":18,"stackVersion":87,"hwVersion":1,"dateCode":"20200107","swBuildId":"1.2.224"}},"lightingColorCtrl":{"attributes":{"colorCapabilities":16,"colorTempPhysicalMin":250,"colorTempPhysicalMax":454}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":18,"stackVersion":87,"hwVersion":1,"dateCode":"20200107","swBuildId":"1.2.224","zclVersion":1,"interviewCompleted":true,"meta":{"configured":2},"lastSeen":1697918787887,"defaultSendRequestWhen":"immediate"} +{"id":3,"type":"Router","ieeeAddr":"0x000d6ffffe62221e","nwkAddr":45528,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"FLOALT panel WS 30x90","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":544,"inClusterList":[0,3,4,5,6,8,768,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"FLOALT panel WS 30x90","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":18,"stackVersion":87,"hwVersion":1,"dateCode":"20200107","swBuildId":"1.2.224"}},"lightingColorCtrl":{"attributes":{"colorCapabilities":16,"colorTempPhysicalMin":250,"colorTempPhysicalMax":454}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":18,"stackVersion":87,"hwVersion":1,"dateCode":"20200107","swBuildId":"1.2.224","zclVersion":1,"interviewCompleted":true,"meta":{"configured":2},"lastSeen":1697916418308,"defaultSendRequestWhen":"immediate"} +{"id":4,"type":"Router","ieeeAddr":"0x943469fffea68993","nwkAddr":10390,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E27 WW 806lm","epList":[1,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":257,"inClusterList":[0,3,4,5,6,8,4096,64636],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E27 WW 806lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":3,"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050"}}},"binds":[],"configuredReportings":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[33],"outClusterList":[33],"clusters":{},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050","zclVersion":3,"interviewCompleted":true,"meta":{"configured":2},"lastSeen":1697916968552,"defaultSendRequestWhen":"immediate"} +{"id":5,"type":"EndDevice","ieeeAddr":"0x94deb8fffe3330b6","nwkAddr":49122,"manufId":4098,"manufName":"_TZE200_hhrtiq0x","powerSource":"Battery","modelId":"TS0601","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":81,"inClusterList":[0,4,5,61184],"outClusterList":[25,10],"clusters":{"genBasic":{"attributes":{"65503":"ƍ�,\u0011��,\u0011","65506":31,"65508":0,"modelId":"TS0601","manufacturerName":"_TZE200_hhrtiq0x","powerSource":3,"zclVersion":3,"appVersion":85,"stackVersion":0,"hwVersion":1,"dateCode":""}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":85,"stackVersion":0,"hwVersion":1,"dateCode":"","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1697918161930,"defaultSendRequestWhen":"immediate"} +{"id":6,"type":"EndDevice","ieeeAddr":"0x84ba20fffe82ed95","nwkAddr":63864,"manufId":4098,"manufName":"_TZE200_hhrtiq0x","powerSource":"Battery","modelId":"TS0601","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":81,"inClusterList":[0,4,5,61184],"outClusterList":[25,10],"clusters":{"genBasic":{"attributes":{"65503":"\u0007��,\u0011","65506":31,"65508":0,"modelId":"TS0601","manufacturerName":"_TZE200_hhrtiq0x","powerSource":3,"zclVersion":3,"appVersion":85,"stackVersion":0,"hwVersion":1,"dateCode":""}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":85,"stackVersion":0,"hwVersion":1,"dateCode":"","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1697919355775,"defaultSendRequestWhen":"immediate"} +{"id":7,"type":"EndDevice","ieeeAddr":"0x003c84fffec4f2f4","nwkAddr":24695,"manufId":4098,"manufName":"_TZE200_hhrtiq0x","powerSource":"Battery","modelId":"TS0601","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":81,"inClusterList":[0,4,5,61184],"outClusterList":[25,10],"clusters":{"genBasic":{"attributes":{"65503":"\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000\u0000\u0011","65506":31,"65508":0,"modelId":"TS0601","manufacturerName":"_TZE200_hhrtiq0x","powerSource":3,"zclVersion":3,"appVersion":85,"stackVersion":0,"hwVersion":1,"dateCode":""}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":85,"stackVersion":0,"hwVersion":1,"dateCode":"","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1697918716501,"defaultSendRequestWhen":"immediate"} \ No newline at end of file diff --git a/config/state.json b/config/state.json index de97da9..6818995 100644 --- a/config/state.json +++ b/config/state.json @@ -1,15 +1,39 @@ { - "0x84ba20fffe82ed95": { + "0x000b57fffedadf27": { + "color_mode": "color_temp", + "brightness": 102, + "state": "ON", + "update": { + "state": "idle", + "installed_version": 304235891, + "latest_version": 304235891 + }, + "color_temp": 434, + "linkquality": 220 + }, + "0x000d6ffffe62221e": { + "color_mode": "color_temp", + "brightness": 77, + "state": "ON", + "color_temp": 413, + "update": { + "state": "idle", + "installed_version": 304235891, + "latest_version": 304235891 + }, + "linkquality": 192 + }, + "0x94deb8fffe3330b6": { "preset": "manual", "away_mode": "OFF", "system_mode": "heat", - "current_heating_setpoint": 21.5, + "current_heating_setpoint": 20.5, "window_detection": "ON", "valve_detection": "ON", "child_lock": "UNLOCK", - "local_temperature": 23.5, - "battery": 11, - "linkquality": 96 + "local_temperature": 21.5, + "battery": 49, + "linkquality": 168 }, "0x943469fffea68993": { "update": { @@ -18,42 +42,30 @@ "latest_version": 587531825 }, "brightness": 102, - "state": "ON", - "linkquality": 192 + "state": "ON" }, - "0x000d6ffffe62221e": { - "color_mode": "color_temp", - "update": { - "state": "idle", - "installed_version": 304235891, - "latest_version": 304235891 - }, - "brightness": 77, - "state": "ON", - "color_temp": 413, - "linkquality": 196 - }, - "0x000b57fffedadf27": { - "color_mode": "color_temp", - "brightness": 102, - "state": "ON", - "color_temp": 434, - "linkquality": 188, - "update": { - "state": "idle", - "installed_version": 304235891, - "latest_version": 304235891 - } - }, - "0x94deb8fffe3330b6": { + "0x84ba20fffe82ed95": { + "current_heating_setpoint": 21.5, + "battery": 5, + "window_detection": "ON", "preset": "manual", "away_mode": "OFF", "system_mode": "heat", - "current_heating_setpoint": 16.5, - "window_detection": "ON", "valve_detection": "ON", "child_lock": "UNLOCK", - "local_temperature": 20.2, - "battery": 46 + "linkquality": 152, + "local_temperature": 22.8 + }, + "0x003c84fffec4f2f4": { + "preset": "manual", + "away_mode": "OFF", + "system_mode": "heat", + "current_heating_setpoint": 21.5, + "window_detection": "ON", + "valve_detection": "ON", + "child_lock": "LOCK", + "local_temperature": 19.6, + "battery": 5, + "linkquality": 208 } } \ No newline at end of file diff --git a/config_example/configuration.yaml b/config_example/configuration.yaml index c522855..4b3939a 100644 --- a/config_example/configuration.yaml +++ b/config_example/configuration.yaml @@ -9,22 +9,22 @@ serial: port: /dev/ttyACM0 advanced: network_key: - - 179 + - 143 + - 59 + - 24 + - 190 - 176 - - 181 + - 106 - 98 - - 2 - - 239 - - 245 - - 151 - - 75 - - 138 - - 221 - - 249 - - 179 - - 16 - - 209 - - 176 + - 14 + - 59 + - 63 + - 131 + - 53 + - 228 + - 89 + - 37 + - 116 ikea_ota_use_test_url: true legacy_api: false channel: 20 @@ -44,3 +44,5 @@ devices: friendly_name: julian/main_light '0x94deb8fffe3330b6': friendly_name: sleep/heating_valve + '0x003c84fffec4f2f4': + friendly_name: julian/heating_valve