homebridge-tasmota-control 1.6.2-beta.1 → 1.6.2-beta.3

package/package.json

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

package/src/sensors.js

@@ -114,13 +114,28 @@ class Sensors extends EventEmitter {
                         gas: sensorData.Gas,
                         carbonDioxyde: sensorData.CarbonDioxyde,
                         ambientLight: sensorData.Ambient,
-                        motion: sensorData.Motion
+                        motion: sensorData.Motion,
+                        power: sensorData.Power,
+                        apparentPower: sensorData.ApparentPower,
+                        reactivePower: sensorData.ReactivePower,
+                        energyToday: sensorData.Today,
+                        energyLastDay: sensorData.Yesterday,
+                        energyLifetime: sensorData.Total,
+                        energyLifeTimeStartTime: sensorData.TotalStartTime,
+                        energyPeriod: sensorData.Period,
+                        current: sensorData.Current,
+                        voltage: sensorData.Voltage,
+                        factor: sensorData.Factor,
+                        frequency: sensorData.Frequency,
+                        load: sensorData.Load
                     }
                     if (obj.tempUnit === 'C') {
                         obj.tempUnit = '°C';
                     }
 
-                    this.emit('warn', `Sensors status: ${JSON.stringify(obj, null, 2)}`)
+                    //push to array
+                    this.sensors.push(obj);
+
                     //update characteristics
                     this.sensorTemperatureServices?.[i]?.Characteristic?.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, obj.temperature);
                     this.sensorReferenceTemperatureServices?.[i]?.Characteristic?.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, obj.referenceTemperature);
@@ -136,44 +151,24 @@ class Sensors extends EventEmitter {
 
                     //energy
                     const isEnergy = key === 'ENERGY';
-                    const energy = {
-                        power: sensorData.Power,
-                        apparentPower: sensorData.ApparentPower,
-                        reactivePower: sensorData.ReactivePower,
-                        energyToday: sensorData.Today,
-                        energyLastDay: sensorData.Yesterday,
-                        energyLifetime: sensorData.Total,
-                        energyLifeTimeStartTime: sensorData.TotalStartTime,
-                        energyPeriod: sensorData.Period,
-                        current: sensorData.Current,
-                        voltage: sensorData.Voltage,
-                        factor: sensorData.Factor,
-                        frequency: sensorData.Frequency,
-                        load: sensorData.Load,
-                    }
-
                     if (isEnergy) {
-                        this.emit('warn', `Energy: ${JSON.stringify(energy, null, 2)}`)
+                        this.emit('warn', `Energy: ${JSON.stringify(obj, null, 2)}`)
                         //update characteristics
-                        this.sensorEnergyServices?.[i]?.Characteristic?.Power?.updateCharacteristic(Characteristic.Power, energy.power);
-                        this.sensorEnergyServices?.[i]?.Characteristic?.ApparentPower?.updateCharacteristic(Characteristic.ApparentPower, energy.apparentPower);
-                        this.sensorEnergyServices?.[i]?.Characteristic?.ReactivePower?.updateCharacteristic(Characteristic.ReactivePower, energy.reactivePower);
-                        this.sensorEnergyServices?.[i]?.Characteristic?.EnergyToday?.updateCharacteristic(Characteristic.EnergyToday, energy.energyToday);
-                        this.sensorEnergyServices?.[i]?.Characteristic?.EnergyLastDay?.updateCharacteristic(Characteristic.EnergyLastDay, energy.energyLastDay);
-                        this.sensorEnergyServices?.[i]?.Characteristic?.EnergyLifetime?.updateCharacteristic(Characteristic.EnergyLifetime, energy.energyLifetime);
-                        this.sensorEnergyServices?.[i]?.Characteristic?.Current?.updateCharacteristic(Characteristic.Current, energy.current);
-                        this.sensorEnergyServices?.[i]?.Characteristic?.Voltage?.updateCharacteristic(Characteristic.Voltage, energy.voltage);
-                        this.sensorEnergyServices?.[i]?.Characteristic?.Factor?.updateCharacteristic(Characteristic.Factor, energy.factor);
-                        this.sensorEnergyServices?.[i]?.Characteristic?.Frequency?.updateCharacteristic(Characteristic.Frequency, energy.frequency);
-                        this.sensorEnergyServices?.[i]?.Characteristic?.ReadingTime?.updateCharacteristic(Characteristic.ReadingTime, energy.time);
+                        this.sensorEnergyServices?.[i]?.Characteristic?.Power?.updateCharacteristic(Characteristic.Power, obj.power);
+                        this.sensorEnergyServices?.[i]?.Characteristic?.ApparentPower?.updateCharacteristic(Characteristic.ApparentPower, obj.apparentPower);
+                        this.sensorEnergyServices?.[i]?.Characteristic?.ReactivePower?.updateCharacteristic(Characteristic.ReactivePower, obj.reactivePower);
+                        this.sensorEnergyServices?.[i]?.Characteristic?.EnergyToday?.updateCharacteristic(Characteristic.EnergyToday, obj.energyToday);
+                        this.sensorEnergyServices?.[i]?.Characteristic?.EnergyLastDay?.updateCharacteristic(Characteristic.EnergyLastDay, obj.energyLastDay);
+                        this.sensorEnergyServices?.[i]?.Characteristic?.EnergyLifetime?.updateCharacteristic(Characteristic.EnergyLifetime, obj.energyLifetime);
+                        this.sensorEnergyServices?.[i]?.Characteristic?.Current?.updateCharacteristic(Characteristic.Current, obj.current);
+                        this.sensorEnergyServices?.[i]?.Characteristic?.Voltage?.updateCharacteristic(Characteristic.Voltage, obj.voltage);
+                        this.sensorEnergyServices?.[i]?.Characteristic?.Factor?.updateCharacteristic(Characteristic.Factor, obj.factor);
+                        this.sensorEnergyServices?.[i]?.Characteristic?.Frequency?.updateCharacteristic(Characteristic.Frequency, obj.frequency);
+                        this.sensorEnergyServices?.[i]?.Characteristic?.ReadingTime?.updateCharacteristic(Characteristic.ReadingTime, obj.time);
                     }
 
-                    const sensor = isEnergy ? { ...obj, ...energy } : obj;
-                    const debug1 = this.enableDebugMode ? this.emit('debug', `Sensor: ${JSON.stringify(sensor, null, 2)}`) : false;
-                    this.emit('warn', `Sensor: ${JSON.stringify(sensor, null, 2)}`)
-
-                    //push to array
-                    this.sensors.push(sensor);
+                    const debug1 = this.enableDebugMode ? this.emit('debug', `Sensor: ${JSON.stringify(obj, null, 2)}`) : false;
+                    this.emit('warn', `Sensor: ${JSON.stringify(obj, null, 2)}`)
                     i++;
                 }
                 this.sensorsCount = this.sensors.length;