homebridge-tasmota-control 1.7.1 → 1.7.2

package/package.json

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

package/src/fans.js

@@ -132,14 +132,12 @@ class Fans extends EventEmitter {
                     this.fans.push(fan);
 
                     //update characteristics
-                    const fanService = this.fanServices?.[i];
-                    if (fanService) {
-                        const serviceName = this.fansNamePrefix ? `${this.info.deviceName} ${friendlyName}` : friendlyName;
-                        fanService.updateCharacteristic(Characteristic.ConfiguredName, serviceName)
-                            .updateCharacteristic(Characteristic.On, powerFan)
-                            // .updateCharacteristic(Characteristic.Direction, direction)
-                            .updateCharacteristic(Characteristic.RotationSpeed, speed);
-                    }
+                    const serviceName = this.fansNamePrefix ? `${this.info.deviceName} ${friendlyName}` : friendlyName;
+                    this.fanServices?.[i]
+                        ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
+                        .updateCharacteristic(Characteristic.On, powerFan)
+                        // .updateCharacteristic(Characteristic.Direction, direction)
+                        .updateCharacteristic(Characteristic.RotationSpeed, speed);
 
 
                     //log info

package/src/lights.js

@@ -125,25 +125,15 @@ class Lights extends EventEmitter {
                     this.lights.push(light);
 
                     //update characteristics
-                    const service = this.lightServices?.[i];
-                    if (service) {
-                        const serviceName = this.lightsNamePrefix ? `${this.info.deviceName} ${friendlyName}` : friendlyName;
-                        service.updateCharacteristic(Characteristic.ConfiguredName, serviceName);
-                        service.updateCharacteristic(Characteristic.On, power);
-
-                        if (brightnessType > 0) {
-                            service.updateCharacteristic(Characteristic.Brightness, bright);
-                        }
-                        if (colorTemperature !== false) {
-                            service.updateCharacteristic(Characteristic.ColorTemperature, colorTemperature);
-                        }
-                        if (hue !== false) {
-                            service.updateCharacteristic(Characteristic.Hue, hue);
-                        }
-                        if (saturation !== false) {
-                            service.updateCharacteristic(Characteristic.Saturation, saturation);
-                        }
-                    }
+                    const serviceName = this.lightsNamePrefix ? `${this.info.deviceName} ${friendlyName}` : friendlyName;
+                    this.lightServices?.[i]
+                        ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
+                        .updateCharacteristic(Characteristic.On, power);
+
+                    if (brightnessType > 0) this.lightServices?.[i]?.updateCharacteristic(Characteristic.Brightness, bright);
+                    if (colorTemperature !== false) this.lightServices?.[i]?.updateCharacteristic(Characteristic.ColorTemperature, colorTemperature);
+                    if (hue !== false) this.lightServices?.[i]?.updateCharacteristic(Characteristic.Hue, hue);
+                    if (saturation !== false) this.lightServices?.[i]?.updateCharacteristic(Characteristic.Saturation, saturation);
 
 
                     //log info

package/src/mielhvac.js

@@ -414,23 +414,9 @@ class MiElHvac extends EventEmitter {
                     .updateCharacteristic(Characteristic.TemperatureDisplayUnits, useFahrenheit)
                     .updateCharacteristic(Characteristic.SwingMode, swingMode);
 
-                if (obj.targetOperationMode === 0 || obj.targetOperationMode === 2) {
-                    svc.updateCharacteristic(
-                        Characteristic.CoolingThresholdTemperature,
-                        obj.targetOperationMode === 0 ? defaultCoolingSetTemperature : setTemperature
-                    );
-                }
-
-                if (obj.targetOperationMode === 0 || obj.targetOperationMode === 1) {
-                    svc.updateCharacteristic(
-                        Characteristic.HeatingThresholdTemperature,
-                        obj.targetOperationMode === 0 ? defaultHeatingSetTemperature : setTemperature
-                    );
-                }
-
-                if (modelSupportsFanSpeed) {
-                    svc.updateCharacteristic(Characteristic.RotationSpeed, obj.fanSpeed);
-                }
+                if (obj.targetOperationMode === 0 || obj.targetOperationMode === 2) svc.updateCharacteristic(Characteristic.CoolingThresholdTemperature, obj.targetOperationMode === 0 ? defaultCoolingSetTemperature : setTemperature);
+                if (obj.targetOperationMode === 0 || obj.targetOperationMode === 1) svc.updateCharacteristic(Characteristic.HeatingThresholdTemperature, obj.targetOperationMode === 0 ? defaultHeatingSetTemperature : setTemperature);
+                if (modelSupportsFanSpeed) svc.updateCharacteristic(Characteristic.RotationSpeed, obj.fanSpeed);
 
                 if (this.frostProtectEnable) {
                     if (roomTemperature <= this.frostProtectLowTemp && !power) {
@@ -462,11 +448,7 @@ class MiElHvac extends EventEmitter {
                     const sameMode = preset.mode === iseeMode;
 
                     preset.state = power ? (sameMode && sameTemp && sameFan && sameSwingV && sameSwingH) : false;
-
-                    if (this.presetsServices) {
-                        this.presetsServices[index]
-                            .updateCharacteristic(preset.characteristicType, preset.state);
-                    }
+                    this.presetsServices?.[index]?.updateCharacteristic(preset.characteristicType, preset.state);
                 });
             }
 
@@ -563,11 +545,8 @@ class MiElHvac extends EventEmitter {
 
                     button.state = state;
 
-                    if (this.buttonsServices) {
-                        const characteristicType = button.characteristicType;
-                        this.buttonsServices[index]
-                            .updateCharacteristic(characteristicType, state);
-                    }
+                    const characteristicType = button.characteristicType;
+                    this.buttonsServices?.[index]?.updateCharacteristic(characteristicType, state);
                 });
             }
 
@@ -656,25 +635,17 @@ class MiElHvac extends EventEmitter {
                         this.emit('warn', `Unknown sensor mode: ${mode} detected`);
                     }
 
-                    // Update characteristic
-                    if (this.sensorsServices) {
-                        const characteristicType = sensor.characteristicType;
-                        this.sensorsServices[index]?.updateCharacteristic(characteristicType, sensor.state);
-                    }
+                    // Update characteristic{
+                    const characteristicType = sensor.characteristicType;
+                    this.sensorsServices?.[index]?.updateCharacteristic(characteristicType, sensor.state);
                 });
             }
 
             //update room temperature sensor
-            if (this.roomTemperatureSensorService) {
-                this.roomTemperatureSensorService
-                    .updateCharacteristic(Characteristic.CurrentTemperature, roomTemperature);
-            }
+            this.roomTemperatureSensorService?.updateCharacteristic(Characteristic.CurrentTemperature, roomTemperature);
 
             //update outdoor temperature sensor
-            if (this.outdoorTemperatureSensorService) {
-                this.outdoorTemperatureSensorService
-                    .updateCharacteristic(Characteristic.CurrentTemperature, outdoorTemperature);
-            }
+            this.outdoorTemperatureSensorService?.updateCharacteristic(Characteristic.CurrentTemperature, outdoorTemperature);
 
             //log current state
             if (!this.disableLogInfo) {

package/src/sensors.js

@@ -135,49 +135,47 @@ class Sensors extends EventEmitter {
 
                     //update characteristics
                     const servicesMap = [
-                        [this.temperatureServices?.[i], Characteristic.CurrentTemperature, sensor.temperature],
-                        [this.temperatureReferenceServices?.[i], Characteristic.CurrentTemperature, sensor.referenceTemperature],
-                        [this.temperatureObjServices?.[i], Characteristic.CurrentTemperature, sensor.objTemperature],
-                        [this.temperatureAmbServices?.[i], Characteristic.CurrentTemperature, sensor.ambTemperature],
-                        [this.temperatureDewPointServices?.[i], Characteristic.CurrentTemperature, sensor.dewPointTemperature],
-                        [this.humidityServices?.[i], Characteristic.CurrentRelativeHumidity, sensor.humidity],
-                        [this.carbonDioxydeServices?.[i], Characteristic.CarbonDioxideDetected, sensor.carbonDioxyde > 1000],
-                        [this.carbonDioxydeServices?.[i], Characteristic.CarbonDioxideLevel, sensor.carbonDioxyde],
-                        [this.carbonDioxydeServices?.[i], Characteristic.CarbonDioxidePeakLevel, sensor.carbonDioxyde],
-                        [this.ambientLightServices?.[i], Characteristic.CurrentAmbientLightLevel, sensor.ambientLight],
-                        [this.motionServices?.[i], Characteristic.MotionDetected, sensor.motion],
+                        [this.temperatureServices, Characteristic.CurrentTemperature, sensor.temperature],
+                        [this.temperatureReferenceServices, Characteristic.CurrentTemperature, sensor.referenceTemperature],
+                        [this.temperatureObjServices, Characteristic.CurrentTemperature, sensor.objTemperature],
+                        [this.temperatureAmbServices, Characteristic.CurrentTemperature, sensor.ambTemperature],
+                        [this.temperatureDewPointServices, Characteristic.CurrentTemperature, sensor.dewPointTemperature],
+                        [this.humidityServices, Characteristic.CurrentRelativeHumidity, sensor.humidity],
+                        [this.carbonDioxydeServices, Characteristic.CarbonDioxideDetected, sensor.carbonDioxyde > 1000],
+                        [this.carbonDioxydeServices, Characteristic.CarbonDioxideLevel, sensor.carbonDioxyde],
+                        [this.carbonDioxydeServices, Characteristic.CarbonDioxidePeakLevel, sensor.carbonDioxyde],
+                        [this.ambientLightServices, Characteristic.CurrentAmbientLightLevel, sensor.ambientLight],
+                        [this.motionServices, Characteristic.MotionDetected, sensor.motion],
                     ];
 
                     for (const [service, charType, value] of servicesMap) {
-                        const characteristic = service?.getCharacteristic(charType);
-                        if (!characteristic) {
-                            continue;
-                        }
-                        service.updateCharacteristic(charType, value);
+                        const characteristic = service?.[i]?.getCharacteristic(charType);
+                        if (!characteristic) continue;
+
+                        service?.[i]?.updateCharacteristic(charType, value);
                     }
 
                     // energy
                     if (isEnergy) {
                         const energyMap = [
-                            [this.powerAndEnergyServices?.[i], Characteristic.Power, sensor.power],
-                            [this.powerAndEnergyServices?.[i], Characteristic.ApparentPower, sensor.apparentPower],
-                            [this.powerAndEnergyServices?.[i], Characteristic.ReactivePower, sensor.reactivePower],
-                            [this.powerAndEnergyServices?.[i], Characteristic.EnergyToday, sensor.energyToday],
-                            [this.powerAndEnergyServices?.[i], Characteristic.EnergyLastDay, sensor.energyLastDay],
-                            [this.powerAndEnergyServices?.[i], Characteristic.EnergyLifetime, sensor.energyLifetime],
-                            [this.powerAndEnergyServices?.[i], Characteristic.Current, sensor.current],
-                            [this.powerAndEnergyServices?.[i], Characteristic.Voltage, sensor.voltage],
-                            [this.powerAndEnergyServices?.[i], Characteristic.Factor, sensor.factor],
-                            [this.powerAndEnergyServices?.[i], Characteristic.Frequency, sensor.frequency],
-                            [this.powerAndEnergyServices?.[i], Characteristic.ReadingTime, sensor.time],
+                            [this.powerAndEnergyServices, Characteristic.Power, sensor.power],
+                            [this.powerAndEnergyServices, Characteristic.ApparentPower, sensor.apparentPower],
+                            [this.powerAndEnergyServices, Characteristic.ReactivePower, sensor.reactivePower],
+                            [this.powerAndEnergyServices, Characteristic.EnergyToday, sensor.energyToday],
+                            [this.powerAndEnergyServices, Characteristic.EnergyLastDay, sensor.energyLastDay],
+                            [this.powerAndEnergyServices, Characteristic.EnergyLifetime, sensor.energyLifetime],
+                            [this.powerAndEnergyServices, Characteristic.Current, sensor.current],
+                            [this.powerAndEnergyServices, Characteristic.Voltage, sensor.voltage],
+                            [this.powerAndEnergyServices, Characteristic.Factor, sensor.factor],
+                            [this.powerAndEnergyServices, Characteristic.Frequency, sensor.frequency],
+                            [this.powerAndEnergyServices, Characteristic.ReadingTime, sensor.time],
                         ];
 
                         for (const [service, charType, value] of energyMap) {
-                            const characteristic = service?.getCharacteristic(charType);
-                            if (!characteristic) {
-                                continue;
-                            }
-                            service.updateCharacteristic(charType, value);
+                            const characteristic = service?.[i]?.getCharacteristic(charType);
+                            if (!characteristic) continue;
+
+                            service?.[i]?.updateCharacteristic(charType, value);
                         }
                     }
 

package/src/switches.js

@@ -92,17 +92,13 @@ class Switches extends EventEmitter {
                     this.switchesOutlets.push(switchOutlet);
 
                     //update characteristics
-                    const service = this.lightServices?.[i];
-                    if (service) {
-                        const serviceName = this.relaysNamePrefix ? `${this.info.deviceName} ${friendlyName}` : friendlyName;
-                        service.updateCharacteristic(Characteristic.ConfiguredName, serviceName);
-                        service.updateCharacteristic(Characteristic.On, power);
-                    }
+                    const serviceName = this.relaysNamePrefix ? `${this.info.deviceName} ${friendlyName}` : friendlyName;
+                    this.lightServices?.[i]
+                        ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
+                        .updateCharacteristic(Characteristic.On, power);
 
                     //log info
-                    if (!this.disableLogInfo) {
-                        this.emit('info', `${friendlyName}, state: ${power ? 'ON' : 'OFF'}`);
-                    }
+                    if (!this.disableLogInfo) this.emit('info', `${friendlyName}, state: ${power ? 'ON' : 'OFF'}`);
                 }
             }