Преглед на файлове

Update 2024-03-16

master
Dirk Alders преди 9 месеца
родител
ревизия
9b2ae83f9d
променени са 5 файла, в които са добавени 51 реда и са изтрити 32 реда
  1. 4
    4
      bin/c2r.py
  2. 2
    2
      config/coordinator_backup.json
  3. 9
    7
      config/database.db
  4. 28
    15
      config/state.json
  5. 8
    4
      config_example/configuration.j2

+ 4
- 4
bin/c2r.py Целия файл

@@ -17,10 +17,10 @@ except (PermissionError, FileNotFoundError) as e:
17 17
     print("Unable to open", '"' + src_file + '"')
18 18
     sys.exit(18)
19 19
 
20
-n = re.sub('^.*server: .*', '  server: mqtt://<mqtt_smarthome_hostname>', s, flags=re.MULTILINE)
21
-n = re.sub('^.*user: .*', '  user: <mqtt_smarthome_username>', n, flags=re.MULTILINE)
22
-n = re.sub('^.*password: .*', '  password: <mqtt_smarthome_password>', n, flags=re.MULTILINE)
23
-n = re.sub('^.*auth_token: .*', '  auth_token: <zigbee_auth_token>', n, flags=re.MULTILINE)
20
+n = re.sub('^.*server: .*', '  server: mqtt://{{ smart_sat_zigbee2mqtt_hostname }}', s, flags=re.MULTILINE)
21
+n = re.sub('^.*user: .*', '  user: {{ smart_sat_zigbee2mqtt_username }}', n, flags=re.MULTILINE)
22
+n = re.sub('^.*password: .*', '  password: {{ smart_sat_zigbee2mqtt_password  }}', n, flags=re.MULTILINE)
23
+n = re.sub('^.*auth_token: .*', '  auth_token: {{ smart_sat_zigbee2mqtt_auth_token }}', n, flags=re.MULTILINE)
24 24
 
25 25
 try:
26 26
     with open(dst_file, 'w') as fh:

+ 2
- 2
config/coordinator_backup.json Целия файл

@@ -4,7 +4,7 @@
4 4
     "version": 1,
5 5
     "source": "zigbee-herdsman@0.19.0",
6 6
     "internal": {
7
-      "date": "2023-10-21T17:16:25.638Z",
7
+      "date": "2024-03-15T16:38:32.486Z",
8 8
       "ezspVersion": 8
9 9
     }
10 10
   },
@@ -40,7 +40,7 @@
40 40
   "network_key": {
41 41
     "key": "b3b0b56202eff5974b8addf9b310d1b0",
42 42
     "sequence_number": 0,
43
-    "frame_counter": 132548
43
+    "frame_counter": 1781587
44 44
   },
45 45
   "devices": []
46 46
 }

+ 9
- 7
config/database.db Целия файл

@@ -1,7 +1,9 @@
1
-{"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"}
2
-{"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"}
3
-{"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"}
4
-{"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"}
5
-{"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"}
6
-{"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"}
7
-{"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"}
1
+{"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"}
2
+{"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"}
3
+{"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"}
4
+{"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"}
5
+{"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"}
6
+{"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"}
7
+{"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"}
8
+{"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"}
9
+{"id":9,"type":"Unknown","ieeeAddr":"0xcc86ecfffea41814","nwkAddr":485,"epList":[],"endpoints":{},"interviewCompleted":false,"meta":{},"lastSeen":1707043201182,"defaultSendRequestWhen":"immediate"}

+ 28
- 15
config/state.json Целия файл

@@ -1,19 +1,19 @@
1 1
 {
2 2
     "0x000b57fffedadf27": {
3 3
         "color_mode": "color_temp",
4
-        "brightness": 102,
4
+        "brightness": 39,
5 5
         "state": "ON",
6 6
         "update": {
7 7
             "state": "idle",
8 8
             "installed_version": 304235891,
9 9
             "latest_version": 304235891
10 10
         },
11
-        "color_temp": 434,
12
-        "linkquality": 220
11
+        "color_temp": 413,
12
+        "linkquality": 200
13 13
     },
14 14
     "0x000d6ffffe62221e": {
15 15
         "color_mode": "color_temp",
16
-        "brightness": 77,
16
+        "brightness": 128,
17 17
         "state": "ON",
18 18
         "color_temp": 413,
19 19
         "update": {
@@ -21,19 +21,19 @@
21 21
             "installed_version": 304235891,
22 22
             "latest_version": 304235891
23 23
         },
24
-        "linkquality": 192
24
+        "linkquality": 216
25 25
     },
26 26
     "0x94deb8fffe3330b6": {
27 27
         "preset": "manual",
28 28
         "away_mode": "OFF",
29 29
         "system_mode": "heat",
30
-        "current_heating_setpoint": 20.5,
30
+        "current_heating_setpoint": 16.5,
31 31
         "window_detection": "ON",
32 32
         "valve_detection": "ON",
33 33
         "child_lock": "UNLOCK",
34
-        "local_temperature": 21.5,
35
-        "battery": 49,
36
-        "linkquality": 168
34
+        "local_temperature": 17.4,
35
+        "battery": 6,
36
+        "linkquality": 184
37 37
     },
38 38
     "0x943469fffea68993": {
39 39
         "update": {
@@ -41,8 +41,9 @@
41 41
             "installed_version": 587531825,
42 42
             "latest_version": 587531825
43 43
         },
44
-        "brightness": 102,
45
-        "state": "ON"
44
+        "brightness": 125,
45
+        "state": "ON",
46
+        "linkquality": 144
46 47
     },
47 48
     "0x84ba20fffe82ed95": {
48 49
         "current_heating_setpoint": 21.5,
@@ -53,18 +54,30 @@
53 54
         "system_mode": "heat",
54 55
         "valve_detection": "ON",
55 56
         "child_lock": "UNLOCK",
56
-        "linkquality": 152,
57
-        "local_temperature": 22.8
57
+        "linkquality": 140,
58
+        "local_temperature": 22.5
58 59
     },
59 60
     "0x003c84fffec4f2f4": {
60 61
         "preset": "manual",
61 62
         "away_mode": "OFF",
62 63
         "system_mode": "heat",
63
-        "current_heating_setpoint": 21.5,
64
+        "current_heating_setpoint": 16,
64 65
         "window_detection": "ON",
65 66
         "valve_detection": "ON",
66 67
         "child_lock": "LOCK",
67
-        "local_temperature": 19.6,
68
+        "local_temperature": 16.1,
69
+        "battery": 5,
70
+        "linkquality": 220
71
+    },
72
+    "0x94deb8fffe2e6064": {
73
+        "preset": "manual",
74
+        "away_mode": "OFF",
75
+        "system_mode": "heat",
76
+        "current_heating_setpoint": 16.5,
77
+        "window_detection": "ON",
78
+        "valve_detection": "ON",
79
+        "child_lock": "UNLOCK",
80
+        "local_temperature": 17.2,
68 81
         "battery": 5,
69 82
         "linkquality": 208
70 83
     }

config_example/configuration.yaml → config_example/configuration.j2 Целия файл

@@ -2,9 +2,9 @@ homeassistant: false
2 2
 permit_join: false
3 3
 mqtt:
4 4
   base_topic: zigbee/ffw
5
-  server: mqtt://<mqtt_smarthome_hostname>
6
-  user: <mqtt_smarthome_username>
7
-  password: <mqtt_smarthome_password>
5
+  server: mqtt://{{ smart_sat_zigbee2mqtt_hostname }}
6
+  user: {{ smart_sat_zigbee2mqtt_username }}
7
+  password: {{ smart_sat_zigbee2mqtt_password  }}
8 8
 serial:
9 9
   port: /dev/ttyACM0
10 10
 advanced:
@@ -31,7 +31,7 @@ advanced:
31 31
 frontend:
32 32
   port: 8038
33 33
   host: 0.0.0.0
34
-  auth_token: <zigbee_auth_token>
34
+  auth_token: {{ smart_sat_zigbee2mqtt_auth_token }}
35 35
   url: http://localhost
36 36
 devices:
37 37
   '0x943469fffea68993':
@@ -46,3 +46,7 @@ devices:
46 46
     friendly_name: sleep/heating_valve
47 47
   '0x003c84fffec4f2f4':
48 48
     friendly_name: julian/heating_valve
49
+  '0x94deb8fffe2e6064':
50
+    friendly_name: livingroom/heating_valve
51
+  '0xcc86ecfffea41814':
52
+    friendly_name: '0xcc86ecfffea41814'

Loading…
Отказ
Запис