diff --git a/bin/c2r.py b/bin/c2r.py index 9f53bd1..de0976d 100755 --- a/bin/c2r.py +++ b/bin/c2r.py @@ -17,10 +17,10 @@ except (PermissionError, FileNotFoundError) as e: print("Unable to open", '"' + src_file + '"') sys.exit(18) -n = re.sub('^.*server: .*', ' server: mqtt://', s, flags=re.MULTILINE) -n = re.sub('^.*user: .*', ' user: ', n, flags=re.MULTILINE) -n = re.sub('^.*password: .*', ' password: ', n, flags=re.MULTILINE) -n = re.sub('^.*auth_token: .*', ' auth_token: ', n, flags=re.MULTILINE) +n = re.sub('^.*server: .*', ' server: mqtt://{{ smart_sat_zigbee2mqtt_hostname }}', s, flags=re.MULTILINE) +n = re.sub('^.*user: .*', ' user: {{ smart_sat_zigbee2mqtt_username }}', n, flags=re.MULTILINE) +n = re.sub('^.*password: .*', ' password: {{ smart_sat_zigbee2mqtt_password }}', n, flags=re.MULTILINE) +n = re.sub('^.*auth_token: .*', ' auth_token: {{ smart_sat_zigbee2mqtt_auth_token }}', n, flags=re.MULTILINE) try: with open(dst_file, 'w') as fh: diff --git a/config/coordinator_backup.json b/config/coordinator_backup.json index 70e98eb..ff4d626 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-21T17:16:25.638Z", + "date": "2024-03-15T16:38:32.486Z", "ezspVersion": 8 } }, @@ -40,7 +40,7 @@ "network_key": { "key": "b3b0b56202eff5974b8addf9b310d1b0", "sequence_number": 0, - "frame_counter": 132548 + "frame_counter": 1781587 }, "devices": [] } \ No newline at end of file diff --git a/config/database.db b/config/database.db index c86f4b1..62f96b7 100644 --- a/config/database.db +++ b/config/database.db @@ -1,7 +1,9 @@ -{"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 +{"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":1704993627791,"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":1710222373354,"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":1710353169169,"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":1710477104201,"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":"�\r�-\u0011","65506":31,"65508":0,"modelId":"TS0601","manufacturerName":"_TZE200_hhrtiq0x","appVersion":85,"stackVersion":0,"dateCode":""}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":85,"stackVersion":0,"hwVersion":1,"dateCode":"","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1710568451028,"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":"jp�-\u0011","65506":31,"65508":0,"modelId":"TS0601","manufacturerName":"_TZE200_hhrtiq0x","stackVersion":0,"appVersion":85,"dateCode":""}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":85,"stackVersion":0,"hwVersion":1,"dateCode":"","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1710569275931,"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":"�G-\u0011M�G-\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":1710570185916,"defaultSendRequestWhen":"immediate"} +{"id":8,"type":"EndDevice","ieeeAddr":"0x94deb8fffe2e6064","nwkAddr":6941,"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":"j�c-\u0019�c-\u0019Z�c-\u0019Ҹc-\u0019J�c-\u0019¹c-\u0019","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":1710570839805,"defaultSendRequestWhen":"immediate"} +{"id":9,"type":"Unknown","ieeeAddr":"0xcc86ecfffea41814","nwkAddr":485,"epList":[],"endpoints":{},"interviewCompleted":false,"meta":{},"lastSeen":1707043201182,"defaultSendRequestWhen":"immediate"} \ No newline at end of file diff --git a/config/state.json b/config/state.json index 6818995..274f22e 100644 --- a/config/state.json +++ b/config/state.json @@ -1,19 +1,19 @@ { "0x000b57fffedadf27": { "color_mode": "color_temp", - "brightness": 102, + "brightness": 39, "state": "ON", "update": { "state": "idle", "installed_version": 304235891, "latest_version": 304235891 }, - "color_temp": 434, - "linkquality": 220 + "color_temp": 413, + "linkquality": 200 }, "0x000d6ffffe62221e": { "color_mode": "color_temp", - "brightness": 77, + "brightness": 128, "state": "ON", "color_temp": 413, "update": { @@ -21,19 +21,19 @@ "installed_version": 304235891, "latest_version": 304235891 }, - "linkquality": 192 + "linkquality": 216 }, "0x94deb8fffe3330b6": { "preset": "manual", "away_mode": "OFF", "system_mode": "heat", - "current_heating_setpoint": 20.5, + "current_heating_setpoint": 16.5, "window_detection": "ON", "valve_detection": "ON", "child_lock": "UNLOCK", - "local_temperature": 21.5, - "battery": 49, - "linkquality": 168 + "local_temperature": 17.4, + "battery": 6, + "linkquality": 184 }, "0x943469fffea68993": { "update": { @@ -41,8 +41,9 @@ "installed_version": 587531825, "latest_version": 587531825 }, - "brightness": 102, - "state": "ON" + "brightness": 125, + "state": "ON", + "linkquality": 144 }, "0x84ba20fffe82ed95": { "current_heating_setpoint": 21.5, @@ -53,18 +54,30 @@ "system_mode": "heat", "valve_detection": "ON", "child_lock": "UNLOCK", - "linkquality": 152, - "local_temperature": 22.8 + "linkquality": 140, + "local_temperature": 22.5 }, "0x003c84fffec4f2f4": { "preset": "manual", "away_mode": "OFF", "system_mode": "heat", - "current_heating_setpoint": 21.5, + "current_heating_setpoint": 16, "window_detection": "ON", "valve_detection": "ON", "child_lock": "LOCK", - "local_temperature": 19.6, + "local_temperature": 16.1, + "battery": 5, + "linkquality": 220 + }, + "0x94deb8fffe2e6064": { + "preset": "manual", + "away_mode": "OFF", + "system_mode": "heat", + "current_heating_setpoint": 16.5, + "window_detection": "ON", + "valve_detection": "ON", + "child_lock": "UNLOCK", + "local_temperature": 17.2, "battery": 5, "linkquality": 208 } diff --git a/config_example/configuration.yaml b/config_example/configuration.j2 similarity index 70% rename from config_example/configuration.yaml rename to config_example/configuration.j2 index 4b3939a..e48e245 100644 --- a/config_example/configuration.yaml +++ b/config_example/configuration.j2 @@ -2,9 +2,9 @@ homeassistant: false permit_join: false mqtt: base_topic: zigbee/ffw - server: mqtt:// - user: - password: + server: mqtt://{{ smart_sat_zigbee2mqtt_hostname }} + user: {{ smart_sat_zigbee2mqtt_username }} + password: {{ smart_sat_zigbee2mqtt_password }} serial: port: /dev/ttyACM0 advanced: @@ -31,7 +31,7 @@ advanced: frontend: port: 8038 host: 0.0.0.0 - auth_token: + auth_token: {{ smart_sat_zigbee2mqtt_auth_token }} url: http://localhost devices: '0x943469fffea68993': @@ -46,3 +46,7 @@ devices: friendly_name: sleep/heating_valve '0x003c84fffec4f2f4': friendly_name: julian/heating_valve + '0x94deb8fffe2e6064': + friendly_name: livingroom/heating_valve + '0xcc86ecfffea41814': + friendly_name: '0xcc86ecfffea41814'