iobroker.device-watcher 2.12.0 → 2.12.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +9 -3
- package/io-package.json +844 -866
- package/lib/arrApart.js +2 -0
- package/main.js +19 -5
- package/package.json +7 -7
package/lib/arrApart.js
CHANGED
|
@@ -627,6 +627,7 @@ const arrApart = {
|
|
|
627
627
|
adapterID: 'zigbee',
|
|
628
628
|
adapter: 'Zigbee',
|
|
629
629
|
battery: '.battery',
|
|
630
|
+
battery2: '.battery_state',
|
|
630
631
|
rssiState: '.link_quality',
|
|
631
632
|
reach: '.available',
|
|
632
633
|
isLowBat: '.battery_low',
|
|
@@ -637,6 +638,7 @@ const arrApart = {
|
|
|
637
638
|
adapterID: 'zigbee2MQTT',
|
|
638
639
|
adapter: 'Zigbee2MQTT',
|
|
639
640
|
battery: '.battery',
|
|
641
|
+
battery2: '.battery_state',
|
|
640
642
|
rssiState: '.link_quality',
|
|
641
643
|
reach: '.available',
|
|
642
644
|
isLowBat: '.battery_low',
|
package/main.js
CHANGED
|
@@ -1173,10 +1173,22 @@ class DeviceWatcher extends utils.Adapter {
|
|
|
1173
1173
|
}
|
|
1174
1174
|
}
|
|
1175
1175
|
} else {
|
|
1176
|
-
|
|
1177
|
-
|
|
1178
|
-
|
|
1179
|
-
|
|
1176
|
+
if (typeof deviceBatteryState === 'string') {
|
|
1177
|
+
if (deviceBatteryState === 'high' || deviceBatteryState === 'medium')
|
|
1178
|
+
{
|
|
1179
|
+
batteryHealth = 'ok';
|
|
1180
|
+
isBatteryDevice = true;
|
|
1181
|
+
}
|
|
1182
|
+
else if (deviceBatteryState === 'low') {
|
|
1183
|
+
batteryHealth = 'low';
|
|
1184
|
+
isBatteryDevice = true;
|
|
1185
|
+
}
|
|
1186
|
+
} else {
|
|
1187
|
+
batteryHealth = `${deviceBatteryState}%`;
|
|
1188
|
+
batteryHealthRaw = deviceBatteryState;
|
|
1189
|
+
batteryHealthUnitRaw = '%';
|
|
1190
|
+
isBatteryDevice = true;
|
|
1191
|
+
}
|
|
1180
1192
|
}
|
|
1181
1193
|
break;
|
|
1182
1194
|
}
|
|
@@ -1211,7 +1223,9 @@ class DeviceWatcher extends utils.Adapter {
|
|
|
1211
1223
|
lowBatIndicator = true;
|
|
1212
1224
|
}
|
|
1213
1225
|
}
|
|
1214
|
-
} else if (deviceBatteryState < this.config.minWarnBatterie) {
|
|
1226
|
+
} else if (typeof deviceBatteryState === 'number' && deviceBatteryState < this.config.minWarnBatterie) {
|
|
1227
|
+
lowBatIndicator = true;
|
|
1228
|
+
} else if (typeof deviceBatteryState === 'string' && deviceBatteryState === 'low') {
|
|
1215
1229
|
lowBatIndicator = true;
|
|
1216
1230
|
}
|
|
1217
1231
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.device-watcher",
|
|
3
|
-
"version": "2.12.
|
|
3
|
+
"version": "2.12.1",
|
|
4
4
|
"description": "Watchdog for devices",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Christian Behrends",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"node": ">=18"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@iobroker/adapter-core": "^3.
|
|
28
|
+
"@iobroker/adapter-core": "^3.1.4"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
31
|
"@alcalzone/release-script": "^3.7.0",
|
|
@@ -33,17 +33,17 @@
|
|
|
33
33
|
"@alcalzone/release-script-plugin-license": "^3.7.0",
|
|
34
34
|
"@alcalzone/release-script-plugin-manual-review": "^3.7.0",
|
|
35
35
|
"@iobroker/adapter-dev": "^1.3.0",
|
|
36
|
-
"@iobroker/testing": "^4.1.
|
|
36
|
+
"@iobroker/testing": "^4.1.3",
|
|
37
37
|
"@types/chai": "^4.3.11",
|
|
38
38
|
"@types/chai-as-promised": "^7.1.8",
|
|
39
39
|
"@types/mocha": "^10.0.6",
|
|
40
|
-
"@types/node": "^20.12.
|
|
40
|
+
"@types/node": "^20.12.8",
|
|
41
41
|
"@types/node-schedule": "^2.1.7",
|
|
42
42
|
"@types/proxyquire": "^1.3.31",
|
|
43
43
|
"@types/sinon": "^17.0.3",
|
|
44
44
|
"@types/sinon-chai": "^3.2.12",
|
|
45
|
-
"@typescript-eslint/eslint-plugin": "^7.
|
|
46
|
-
"@typescript-eslint/parser": "^7.
|
|
45
|
+
"@typescript-eslint/eslint-plugin": "^7.8.0",
|
|
46
|
+
"@typescript-eslint/parser": "^7.8.0",
|
|
47
47
|
"chai": "^4.4.1",
|
|
48
48
|
"chai-as-promised": "^7.1.1",
|
|
49
49
|
"cron-parser": "^4.9.0",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"proxyquire": "^2.1.3",
|
|
57
57
|
"sinon": "^17.0.1",
|
|
58
58
|
"sinon-chai": "^3.7.0",
|
|
59
|
-
"typescript": "~5.4.
|
|
59
|
+
"typescript": "~5.4.5"
|
|
60
60
|
},
|
|
61
61
|
"main": "main.js",
|
|
62
62
|
"files": [
|