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

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.10",
   "description": "Homebridge plugin to control Tasmota flashed devices.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/sensors.js

@@ -114,29 +114,7 @@ class Sensors extends EventEmitter {
                         gas: sensorData.Gas,
                         carbonDioxyde: sensorData.CarbonDioxyde,
                         ambientLight: sensorData.Ambient,
-                        motion: sensorData.Motion
-                    }
-                    if (obj.tempUnit === 'C') {
-                        obj.tempUnit = '°C';
-                    }
-
-                    this.emit('warn', `Sensors status: ${JSON.stringify(obj, null, 2)}`)
-                    //update characteristics
-                    this.sensorTemperatureServices?.[i]?.Characteristic?.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, obj.temperature);
-                    this.sensorReferenceTemperatureServices?.[i]?.Characteristic?.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, obj.referenceTemperature);
-                    this.sensorObjTemperatureServices?.[i]?.Characteristic?.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, obj.objTemperature);
-                    this.sensorAmbTemperatureServices?.[i]?.Characteristic?.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, obj.ambTemperature);
-                    this.sensorDewPointTemperatureServices?.[i]?.Characteristic?.CurrentTemperature?.updateCharacteristic(Characteristic.CurrentTemperature, obj.dewPointTemperature);
-                    this.sensorHumidityServices?.[i]?.Characteristic?.CurrentRelativeHumidity?.updateCharacteristic(Characteristic.CurrentRelativeHumidity, obj.humidity);
-                    this.sensorCarbonDioxydeServices?.[i]?.Characteristic?.CarbonDioxideDetected?.updateCharacteristic(Characteristic.CarbonDioxideDetected, obj.carbonDioxyde > 1000);
-                    this.sensorCarbonDioxydeServices?.[i]?.Characteristic?.CarbonDioxideLevel?.updateCharacteristic(Characteristic.CarbonDioxideLevel, obj.carbonDioxyde);
-                    this.sensorCarbonDioxydeServices?.[i]?.Characteristic?.CarbonDioxidePeakLevel?.updateCharacteristic(Characteristic.CarbonDioxidePeakLevel, obj.carbonDioxyde);
-                    this.sensorAmbientLightServices?.[i]?.Characteristic?.CurrentAmbientLightLevel?.updateCharacteristic(Characteristic.CurrentAmbientLightLevel, obj.ambientLight);
-                    this.sensorMotionServices?.[i]?.Characteristic?.MotionDetected?.updateCharacteristic(Characteristic.MotionDetected, obj.motion);
-
-                    //energy
-                    const isEnergy = key === 'ENERGY';
-                    const energy = {
+                        motion: sensorData.Motion,
                         power: sensorData.Power,
                         apparentPower: sensorData.ApparentPower,
                         reactivePower: sensorData.ReactivePower,
@@ -149,31 +127,58 @@ class Sensors extends EventEmitter {
                         voltage: sensorData.Voltage,
                         factor: sensorData.Factor,
                         frequency: sensorData.Frequency,
-                        load: sensorData.Load,
+                        load: sensorData.Load
                     }
-
-                    if (isEnergy) {
-                        this.emit('warn', `Energy: ${JSON.stringify(energy, 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);
+                    if (obj.tempUnit === 'C') {
+                        obj.tempUnit = '°C';
                     }
 
-                    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);
+                    this.sensors.push(obj);
+
+                    //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],
+                    ];
+
+                    for (const [service, charType, value] of charMap) {
+                        service?.Characteristic?.[charType]?.updateCharacteristic?.(charType, 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],
+                        ];
+
+                        const energyService = this.sensorEnergyServices?.[i];
+                        for (const [charType, value] of energyMap) {
+                            energyService?.Characteristic?.[charType]?.updateCharacteristic?.(charType, value);
+                            const emitw = energyService?.Characteristic?.[charType] ? this.emit('warn', `Power: ${JSON.stringify(obj, null, 2)}`) : false
+                        }
+                    }
+                    const debug1 = this.enableDebugMode ? this.emit('debug', `Sensor: ${JSON.stringify(obj, null, 2)}`) : false;
                     i++;
                 }
                 this.sensorsCount = this.sensors.length;