homebridge-tasmota-control 1.6.1-beta.14 → 1.6.1-beta.16

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Tasmota Control",
   "name": "homebridge-tasmota-control",
-  "version": "1.6.1-beta.14",
+  "version": "1.6.1-beta.16",
   "description": "Homebridge plugin to control Tasmota flashed devices.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/sensors.js

@@ -147,32 +147,35 @@ class Sensors extends EventEmitter {
                 if (this.sensorsCount > 0) {
                     for (let i = 0; i < this.sensorsCount; i++) {
                         const sensor = this.sensors[i];
-                        this.sensorTemperatureServices?.[i]?.Characteristic.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.temperature);
-                        this.sensorReferenceTemperatureServices?.[i]?.Characteristic.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.referenceTemperature);
-                        this.sensorObjTemperatureServices?.[i]?.Characteristic.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.objTemperature);
-                        this.sensorAmbTemperatureServices?.[i]?.Characteristic.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.ambTemperature);
-                        this.sensorDewPointTemperatureServices?.[i]?.Characteristic.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.dewPointTemperature);
-                        this.sensorHumidityServices?.[i]?.Characteristic.CurrentRelativeHumidity?.updateCharacteristic(Characteristic.CurrentRelativeHumidity, sensor.humidity);
+                        this.sensorTemperatureServices?.[i]?.Characteristic?.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.temperature);
+                        this.sensorReferenceTemperatureServices?.[i]?.Characteristic?.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.referenceTemperature);
+                        this.sensorObjTemperatureServices?.[i]?.Characteristic?.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.objTemperature);
+                        this.sensorAmbTemperatureServices?.[i]?.Characteristic?.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.ambTemperature);
+                        this.sensorDewPointTemperatureServices?.[i]?.Characteristic?.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.dewPointTemperature);
+                        this.sensorHumidityServices?.[i]?.Characteristic?.CurrentRelativeHumidity?.updateCharacteristic(Characteristic.CurrentRelativeHumidity, sensor.humidity);
 
                         const co2Service = this.sensorCarbonDioxydeServices?.[i];
-                        co2Service?.Characteristic.CarbonDioxideDetected?.updateCharacteristic(Characteristic.CarbonDioxideDetected, sensor.carbonDioxyde > 1000);
-                        co2Service?.Characteristic.CarbonDioxideLevel?.updateCharacteristic(Characteristic.CarbonDioxideLevel, sensor.carbonDioxyde);
-                        co2Service?.Characteristic.CarbonDioxidePeakLevel?.updateCharacteristic(Characteristic.CarbonDioxidePeakLevel, sensor.carbonDioxyde);
+                        co2Service?.Characteristic?.CarbonDioxideDetected?.updateCharacteristic(Characteristic.CarbonDioxideDetected, sensor.carbonDioxyde > 1000);
+                        co2Service?.Characteristic?.CarbonDioxideLevel?.updateCharacteristic(Characteristic.CarbonDioxideLevel, sensor.carbonDioxyde);
+                        co2Service?.Characteristic?.CarbonDioxidePeakLevel?.updateCharacteristic(Characteristic.CarbonDioxidePeakLevel, sensor.carbonDioxyde);
 
-                        this.sensorAmbientLightServices?.[i]?.Characteristic.CurrentAmbientLightLevel?.updateCharacteristic(Characteristic.CurrentAmbientLightLevel, sensor.ambientLight);
-                        this.sensorMotionServices?.[i]?.Characteristic.MotionDetected?.updateCharacteristic(Characteristic.MotionDetected, sensor.motion);
+                        this.sensorAmbientLightServices?.[i]?.Characteristic?.CurrentAmbientLightLevel?.updateCharacteristic(Characteristic.CurrentAmbientLightLevel, sensor.ambientLight);
+                        this.sensorMotionServices?.[i]?.Characteristic?.MotionDetected?.updateCharacteristic(Characteristic.MotionDetected, sensor.motion);
 
 
                         //energy
-                        const fields = [
-                            'Power', 'ApparentPower', 'ReactivePower', 'EnergyToday', 'EnergyLastDay',
-                            'EnergyLifetime', 'Current', 'Voltage', 'Factor', 'Frequency', 'ReadingTime'
-                        ];
-                        const characteristic = this.sensorEnergyServices?.[i]?.Characteristic;
-                        for (const key of fields) {
-                            characteristic?.[key]?.updateCharacteristic(Characteristic[key], sensor[key.toLowerCase()]);
-                        }
-
+                        this.sensorMotionServices?.[i]
+                            ?.Characteristic?.Power?.updateCharacteristic(Characteristic.MotionDetected, sensor.power)
+                            .Characteristic?.ApparentPower?.updateCharacteristic(Characteristic.MotionDetected, sensor.apparentPower)
+                            .Characteristic?.ReactivePower?.updateCharacteristic(Characteristic.MotionDetected, sensor.reactivePower)
+                            .Characteristic?.EnergyToday?.updateCharacteristic(Characteristic.MotionDetected, sensor.energyToday)
+                            .Characteristic?.EnergyLastDay?.updateCharacteristic(Characteristic.MotionDetected, sensor.energyLastDay)
+                            .Characteristic?.EnergyLifetime?.updateCharacteristic(Characteristic.MotionDetected, sensor.energyLifetime)
+                            .Characteristic?.Current?.updateCharacteristic(Characteristic.MotionDetected, sensor.current)
+                            .Characteristic?.Voltage?.updateCharacteristic(Characteristic.MotionDetected, sensor.voltage)
+                            .Characteristic?.Factor?.updateCharacteristic(Characteristic.MotionDetected, sensor.factor)
+                            .Characteristic?.Frequency?.updateCharacteristic(Characteristic.MotionDetected, sensor.frequency)
+                            .Characteristic?.ReadingTime?.updateCharacteristic(Characteristic.MotionDetected, sensor.readingTime);
                     }
                 }
             }