homebridge-tasmota-control 1.6.3-beta.5 → 1.6.3-beta.7
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/package.json +1 -1
- package/src/sensors.js +14 -5
package/package.json
CHANGED
package/src/sensors.js
CHANGED
|
@@ -152,10 +152,14 @@ class Sensors extends EventEmitter {
|
|
|
152
152
|
];
|
|
153
153
|
|
|
154
154
|
for (const [service, charType, value] of servicesMap) {
|
|
155
|
-
service?.getCharacteristic(charType)
|
|
155
|
+
const characteristic = service?.getCharacteristic(charType);
|
|
156
|
+
if (!characteristic) {
|
|
157
|
+
continue;
|
|
158
|
+
}
|
|
159
|
+
service?.getCharacteristic(charType)?.updateCharacteristic(charType, value);
|
|
156
160
|
}
|
|
157
161
|
|
|
158
|
-
//energy
|
|
162
|
+
// energy
|
|
159
163
|
if (isEnergy) {
|
|
160
164
|
const energyMap = [
|
|
161
165
|
[this.sensorEnergyServices?.[i], Characteristic.Power, sensor.power],
|
|
@@ -172,9 +176,14 @@ class Sensors extends EventEmitter {
|
|
|
172
176
|
];
|
|
173
177
|
|
|
174
178
|
for (const [service, charType, value] of energyMap) {
|
|
175
|
-
service?.getCharacteristic(charType)
|
|
179
|
+
const characteristic = service?.getCharacteristic(charType);
|
|
180
|
+
if (!characteristic) {
|
|
181
|
+
continue;
|
|
182
|
+
}
|
|
183
|
+
service?.getCharacteristic(charType)?.updateCharacteristic(charType, value);
|
|
176
184
|
}
|
|
177
185
|
}
|
|
186
|
+
|
|
178
187
|
const debug1 = this.enableDebugMode ? this.emit('debug', `Sensor: ${JSON.stringify(sensor, null, 2)}`) : false;
|
|
179
188
|
i++;
|
|
180
189
|
}
|
|
@@ -431,7 +440,7 @@ class Sensors extends EventEmitter {
|
|
|
431
440
|
if (sensor.name === 'ENERGY') {
|
|
432
441
|
const debug4 = this.enableDebugMode ? this.emit('debug', `Prepare Power And Energy Service`) : false;
|
|
433
442
|
const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName}` : `${sensorName}`;
|
|
434
|
-
const energyService = accessory.addService(Service.
|
|
443
|
+
const energyService = accessory.addService(Service.PowerAndEnergy, serviceName, `Energy Sensor ${i}`);
|
|
435
444
|
energyService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
|
|
436
445
|
if (sensor.power) {
|
|
437
446
|
energyService.getCharacteristic(Characteristic.Power)
|
|
@@ -453,7 +462,7 @@ class Sensors extends EventEmitter {
|
|
|
453
462
|
energyService.getCharacteristic(Characteristic.ReactivePower)
|
|
454
463
|
.onGet(async () => {
|
|
455
464
|
const value = sensor.reactivePower;
|
|
456
|
-
const info = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} reactive power: ${value}
|
|
465
|
+
const info = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} reactive power: ${value} var`);
|
|
457
466
|
return value;
|
|
458
467
|
});
|
|
459
468
|
}
|