homebridge-tasmota-control 1.6.2-beta.9 → 1.6.2

package/package.json

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

package/src/sensors.js

@@ -98,11 +98,10 @@ class Sensors extends EventEmitter {
                 for (const [key, value] of Object.entries(sensorData)) {
                     const sensorData = value;
 
-                    //sensor
                     const obj = {
                         name: key,
                         time: statusSns.Time,
-                        tempUnit: statusSns.TempUnit,
+                        tempUnit: statusSns.TempUnit === 'C' ? '°C' : statusSns.TempUnit,
                         pressureUnit: statusSns.PressureUnit,
                         temperature: sensorData.Temperature,
                         referenceTemperature: sensorData.ReferenceTemperature,
@@ -115,6 +114,9 @@ class Sensors extends EventEmitter {
                         carbonDioxyde: sensorData.CarbonDioxyde,
                         ambientLight: sensorData.Ambient,
                         motion: sensorData.Motion,
+                    };
+
+                    const energy = {
                         power: sensorData.Power,
                         apparentPower: sensorData.ApparentPower,
                         reactivePower: sensorData.ReactivePower,
@@ -128,59 +130,55 @@ class Sensors extends EventEmitter {
                         factor: sensorData.Factor,
                         frequency: sensorData.Frequency,
                         load: sensorData.Load
-                    }
-                    if (obj.tempUnit === 'C') {
-                        obj.tempUnit = '°C';
-                    }
+                    };
 
-                    //push to array
-                    this.sensors.push(obj);
+                    const isEnergy = key === 'ENERGY';
+                    const sensor = isEnergy ? { ...obj, ...energy } : obj;
+                    this.sensors.push(sensor);
 
                     //update characteristics
-                    const charMap = [
-                        [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],
+                    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 charMap) {
-                        service?.Characteristic?.[charType]?.updateCharacteristic?.(charType, value);
+                    for (const [service, charType, value] of servicesMap) {
+                        service?.getCharacteristic(charType)?.updateValue(value);
                     }
 
                     //energy
-                    const isEnergy = key === 'ENERGY';
                     if (isEnergy) {
                         const energyMap = [
-                            [Characteristic.Power, obj.power],
-                            [Characteristic.ApparentPower, obj.apparentPower],
-                            [Characteristic.ReactivePower, obj.reactivePower],
-                            [Characteristic.EnergyToday, obj.energyToday],
-                            [Characteristic.EnergyLastDay, obj.energyLastDay],
-                            [Characteristic.EnergyLifetime, obj.energyLifetime],
-                            [Characteristic.Current, obj.current],
-                            [Characteristic.Voltage, obj.voltage],
-                            [Characteristic.Factor, obj.factor],
-                            [Characteristic.Frequency, obj.frequency],
-                            [Characteristic.ReadingTime, obj.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],
                         ];
 
-                        const energyService = this.sensorEnergyServices?.[i];
-                        for (const [charType, value] of energyMap) {
-                            energyService?.Characteristic?.[charType]?.updateCharacteristic?.(charType, value);
-                            this.emit('warn', `Power: ${JSON.stringify(obj, null, 2)}`)
+                        for (const [service, charType, value] of energyMap) {
+                            service?.getCharacteristic(charType)?.updateValue(value);
                         }
                     }
-                    const debug1 = this.enableDebugMode ? this.emit('debug', `Sensor: ${JSON.stringify(obj, null, 2)}`) : false;
+                    const debug1 = this.enableDebugMode ? this.emit('debug', `Sensor: ${JSON.stringify(sensor, null, 2)}`) : false;
                     i++;
                 }
+
                 this.sensorsCount = this.sensors.length;
             }