homebridge-tasmota-control 1.6.2-beta.14 → 1.6.2-beta.15

package/package.json

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

package/src/sensors.js

@@ -129,25 +129,6 @@ class Sensors extends EventEmitter {
                         load: sensorData.Load
                     };
 
-                    const servicesMap = [
-                        [this.sensorTemperatureServices?.[i], Characteristic.CurrentTemperature, obj.temperature],
-                        [this.sensorReferenceTemperatureServices?.[i], Characteristic.CurrentTemperature, obj.referenceTemperature],
-                        [this.sensorObjTemperatureServices?.[i], Characteristic.CurrentTemperature, obj.objTemperature],
-                        [this.sensorAmbTemperatureServices?.[i], Characteristic.CurrentTemperature, obj.ambTemperature],
-                        [this.sensorDewPointTemperatureServices?.[i], Characteristic.CurrentTemperature, obj.dewPointTemperature],
-                        [this.sensorHumidityServices?.[i], Characteristic.CurrentRelativeHumidity, obj.humidity],
-                        [this.sensorCarbonDioxydeServices?.[i], Characteristic.CarbonDioxideDetected, obj.carbonDioxyde > 1000],
-                        [this.sensorCarbonDioxydeServices?.[i], Characteristic.CarbonDioxideLevel, obj.carbonDioxyde],
-                        [this.sensorCarbonDioxydeServices?.[i], Characteristic.CarbonDioxidePeakLevel, obj.carbonDioxyde],
-                        [this.sensorAmbientLightServices?.[i], Characteristic.CurrentAmbientLightLevel, obj.ambientLight],
-                        [this.sensorMotionServices?.[i], Characteristic.MotionDetected, obj.motion],
-                    ];
-
-                    for (const [service, charType, value] of servicesMap) {
-                        service?.getCharacteristic(charType)?.updateValue(value);
-                    }
-
-                    // ENERGY section
                     const energy = {
                         power: sensorData.Power,
                         apparentPower: sensorData.ApparentPower,
@@ -165,19 +146,41 @@ class Sensors extends EventEmitter {
                     };
 
                     const isEnergy = key === 'ENERGY';
+                    const sensor = isEnergy ? { ...obj, ...energy } : obj;
+                    this.sensors.push(sensor);
+
+                    const servicesMap = [
+                        [this.sensorTemperatureServices?.[i], Characteristic.CurrentTemperature, sensor.temperature],
+                        [this.sensorReferenceTemperatureServices?.[i], Characteristic.CurrentTemperature, sensor.referenceTemperature],
+                        [this.sensorObjTemperatureServices?.[i], Characteristic.CurrentTemperature, sensor.objTemperature],
+                        [this.sensorAmbTemperatureServices?.[i], Characteristic.CurrentTemperature, sensor.ambTemperature],
+                        [this.sensorDewPointTemperatureServices?.[i], Characteristic.CurrentTemperature, sensor.dewPointTemperature],
+                        [this.sensorHumidityServices?.[i], Characteristic.CurrentRelativeHumidity, sensor.humidity],
+                        [this.sensorCarbonDioxydeServices?.[i], Characteristic.CarbonDioxideDetected, sensor.carbonDioxyde > 1000],
+                        [this.sensorCarbonDioxydeServices?.[i], Characteristic.CarbonDioxideLevel, sensor.carbonDioxyde],
+                        [this.sensorCarbonDioxydeServices?.[i], Characteristic.CarbonDioxidePeakLevel, sensor.carbonDioxyde],
+                        [this.sensorAmbientLightServices?.[i], Characteristic.CurrentAmbientLightLevel, sensor.ambientLight],
+                        [this.sensorMotionServices?.[i], Characteristic.MotionDetected, sensor.motion],
+                    ];
+
+                    for (const [service, charType, value] of servicesMap) {
+                        service?.getCharacteristic(charType)?.updateValue(value);
+                    }
+
+                    // ENERGY section
                     if (isEnergy) {
                         const energyMap = [
-                            [this.sensorEnergyServices?.[i], Characteristic.Power, energy.power],
-                            [this.sensorEnergyServices?.[i], Characteristic.ApparentPower, energy.apparentPower],
-                            [this.sensorEnergyServices?.[i], Characteristic.ReactivePower, energy.reactivePower],
-                            [this.sensorEnergyServices?.[i], Characteristic.EnergyToday, energy.energyToday],
-                            [this.sensorEnergyServices?.[i], Characteristic.EnergyLastDay, energy.energyLastDay],
-                            [this.sensorEnergyServices?.[i], Characteristic.EnergyLifetime, energy.energyLifetime],
-                            [this.sensorEnergyServices?.[i], Characteristic.Current, energy.current],
-                            [this.sensorEnergyServices?.[i], Characteristic.Voltage, energy.voltage],
-                            [this.sensorEnergyServices?.[i], Characteristic.Factor, energy.factor],
-                            [this.sensorEnergyServices?.[i], Characteristic.Frequency, energy.frequency],
-                            [this.sensorEnergyServices?.[i], Characteristic.ReadingTime, energy.time],
+                            [this.sensorEnergyServices?.[i], Characteristic.Power, sensor.power],
+                            [this.sensorEnergyServices?.[i], Characteristic.ApparentPower, sensor.apparentPower],
+                            [this.sensorEnergyServices?.[i], Characteristic.ReactivePower, sensor.reactivePower],
+                            [this.sensorEnergyServices?.[i], Characteristic.EnergyToday, sensor.energyToday],
+                            [this.sensorEnergyServices?.[i], Characteristic.EnergyLastDay, sensor.energyLastDay],
+                            [this.sensorEnergyServices?.[i], Characteristic.EnergyLifetime, sensor.energyLifetime],
+                            [this.sensorEnergyServices?.[i], Characteristic.Current, sensor.current],
+                            [this.sensorEnergyServices?.[i], Characteristic.Voltage, sensor.voltage],
+                            [this.sensorEnergyServices?.[i], Characteristic.Factor, sensor.factor],
+                            [this.sensorEnergyServices?.[i], Characteristic.Frequency, sensor.frequency],
+                            [this.sensorEnergyServices?.[i], Characteristic.ReadingTime, sensor.time],
                         ];
 
                         for (const [service, charType, value] of energyMap) {
@@ -185,8 +188,6 @@ class Sensors extends EventEmitter {
                             this.emit('warn', `Updated ${charType}: ${value}`);
                         }
                     }
-                    const sensor = { ...obj, ...energy };
-                    this.sensors.push(sensor);
                     const debug1 = this.enableDebugMode ? this.emit('debug', `Sensor: ${JSON.stringify(sensor, null, 2)}`) : false;
                     i++;
                 }