homebridge-tasmota-control 1.4.1-beta.9 → 1.5.0

package/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.0] - (31.05.2025)
+
+## Changes
+
+- added support for sensors as a seperate accessory
+- redme updated
+- cleanup
+
 ## [1.4.0] - (30.05.2025)
 
 ## Changes

package/README.md

@@ -76,7 +76,7 @@ Homebridge plugin for Tasmota flashed devices.
   * Light - `Power ON/OFF`, `Dimmer`, `Color Temperature`, `Hue`, `Saturation`
   * Outlet - `Power ON/OFF`
   * Switch - `Power ON/OFF`
-  * Fan - `Power ON/OFF`, `Speed`
+  * Fan - `Fan ON/OFF`, `Speed`, `Light ON/OFF`
   
 * Supported Sensors:
   * Temperature - `Temperature`, `Dew Point`, `Reference`, `Obj`, `Amb`

package/package.json

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

package/src/deviceinfo.js

@@ -72,8 +72,7 @@ class DeviceInfo extends EventEmitter {
                 friendlyNames: friendlyNames,
                 modelName: modelName,
                 serialNumber: addressMac,
-                firmwareRevision: firmwareRevision,
-                relaysCount: friendlyNames.length
+                firmwareRevision: firmwareRevision
             };
             return obj;
         } catch (error) {

package/src/fans.js

@@ -18,6 +18,7 @@ class Fans extends EventEmitter {
         //info
         this.info = info;
         this.serialNumber = serialNumber;
+        this.relaysCount = info.friendlyNames.length;
 
         //other config
         this.lightsNamePrefix = config.lightsNamePrefix || false;
@@ -78,7 +79,7 @@ class Fans extends EventEmitter {
             const statusSts = statusStsSupported ? sensorStatus.StatusSTS : {};
 
             //relays
-            const relaysCount = this.info.relaysCount;
+            const relaysCount = this.relaysCount;
             if (relaysCount > 0) {
                 this.lights = [];
                 this.fans = [];
@@ -177,8 +178,7 @@ class Fans extends EventEmitter {
         this.emit('devInfo', `Hardware: ${this.info.modelName}`);
         this.emit('devInfo', `Serialnr: ${this.serialNumber}`)
         this.emit('devInfo', `Firmware: ${this.info.firmwareRevision}`);
-        this.emit('devInfo', `Relays: ${this.info.relaysCount}`);
-        this.emit('devInfo', `Sensors: ${this.sensorsCount}`);
+        this.emit('devInfo', `Relays: ${this.relaysCount}`);
         this.emit('devInfo', `----------------------------------`);
         return;
     }

package/src/lights.js

@@ -18,10 +18,10 @@ class Lights extends EventEmitter {
         //info
         this.info = info;
         this.serialNumber = serialNumber;
+        this.relaysCount = info.friendlyNames.length;
 
         //other config
         this.lightsNamePrefix = config.lightsNamePrefix || false;
-        this.sensorsNamePrefix = config.sensorsNamePrefix || false;
         this.enableDebugMode = config.enableDebugMode || false;
         this.disableLogInfo = config.disableLogInfo || false;
         this.disableLogDeviceInfo = config.disableLogDeviceInfo || false;
@@ -78,7 +78,7 @@ class Lights extends EventEmitter {
             const statusSts = statusStsSupported ? sensorStatus.StatusSTS : {};
 
             //relays
-            const relaysCount = this.info.relaysCount;
+            const relaysCount = this.relaysCount;
             if (relaysCount > 0) {
                 this.lights = [];
 
@@ -194,7 +194,7 @@ class Lights extends EventEmitter {
         this.emit('devInfo', `Hardware: ${this.info.modelName}`);
         this.emit('devInfo', `Serialnr: ${this.serialNumber}`)
         this.emit('devInfo', `Firmware: ${this.info.firmwareRevision}`);
-        this.emit('devInfo', `Relays: ${this.info.relaysCount}`);
+        this.emit('devInfo', `Relays: ${this.relaysCount}`);
         this.emit('devInfo', `----------------------------------`);
         return;
     }

package/src/sensors.js

@@ -86,19 +86,7 @@ class Sensors extends EventEmitter {
 
             //status SNS
             if (statusSnsSupported) {
-                this.sensorsName = [];
-                this.sensorsTemperature = [];
-                this.sensorsReferenceTemperature = [];
-                this.sensorsObjTemperature = [];
-                this.sensorsAmbTemperature = [];
-                this.sensorsDewPointTemperature = [];
-                this.sensorsHumidity = [];
-                this.sensorsPressure = [];
-                this.sensorsGas = [];
-                this.sensorsCarbonDioxyde = [];
-                this.sensorsAmbientLight = [];
-                this.sensorsMotion = [];
-
+                this.sensors = [];
                 const sensor = Object.entries(statusSns)
                     .filter(([key]) => SensorKeys.some(type => key.includes(type)))
                     .reduce((obj, [key, value]) => {
@@ -107,133 +95,61 @@ class Sensors extends EventEmitter {
                     }, {});
 
                 for (const [key, value] of Object.entries(sensor)) {
-                    const sensorName = key ?? `Sensor`;
                     const sensorData = value;
 
-                    //sensors
-                    const temperature = sensorData.Temperature ?? false;
-                    const referenceTemperature = sensorData.ReferenceTemperature ?? false;
-                    const objTemperature = sensorData.OBJTMP ?? false;
-                    const ambTemperature = sensorData.AMBTMP ?? false;
-                    const dewPointTemperature = sensorData.DewPoint ?? false;
-                    const humidity = sensorData.Humidity ?? false;
-                    const pressure = sensorData.Pressure ?? false;
-                    const gas = sensorData.Gas ?? false;
-                    const carbonDioxyde = sensorData.CarbonDioxyde ?? false;
-                    const ambientLight = sensorData.Ambient ?? false;
-                    const motion = sensorData === 'ON';
-
-                    //energy
-                    const energyTotalStartTime = sensorData.TotalStartTime ?? '';
-                    const energyTotal = sensorData.Total ?? 0;
-                    const energyPeriod = sensorData.Period ?? 0;
-                    const energyYesterday = sensorData.Yesterday ?? 0;
-                    const energyToday = sensorData.Today ?? 0;
-                    const power = sensorData.Power ?? 0;
-                    const apparentPower = sensorData.ApparentPower ?? 0;
-                    const reactivePower = sensorData.ReactivePower ?? 0;
-                    const factor = sensorData.Factor ?? 0;
-                    const voltage = sensorData.Voltage ?? 0;
-                    const current = sensorData.Current ?? 0;
-                    const load = sensorData.Load ?? 0;
+                    //sensor
+                    const obj = {
+                        name: key ?? `Sensor`,
+                        temperature: sensorData.Temperature,
+                        referenceTemperature: sensorData.ReferenceTemperature,
+                        objTemperature: sensorData.OBJTMP,
+                        ambTemperature: sensorData.AMBTMP,
+                        dewPointTemperature: sensorData.DewPoint,
+                        humidity: sensorData.Humidity,
+                        pressure: sensorData.Pressure,
+                        gas: sensorData.Gas,
+                        carbonDioxyde: sensorData.CarbonDioxyde,
+                        ambientLight: sensorData.Ambient,
+                        motion: sensorData === 'ON',
+                        //energy
+                        energyTotalStartTime: sensorData.TotalStartTime ?? '',
+                        energyTotal: sensorData.Total ?? 0,
+                        energyPeriod: sensorData.Period ?? 0,
+                        energyYesterday: sensorData.Yesterday ?? 0,
+                        energyToday: sensorData.Today ?? 0,
+                        power: sensorData.Power ?? 0,
+                        apparentPower: sensorData.ApparentPower ?? 0,
+                        reactivePower: sensorData.ReactivePower ?? 0,
+                        factor: sensorData.Factor ?? 0,
+                        voltage: sensorData.Voltage ?? 0,
+                        current: sensorData.Current ?? 0,
+                        load: sensorData.Load ?? 0,
+                        time: sensorStatus.Time ?? '',
+                        tempUnit: sensorStatus.TempUnit === 'C' ? '°C' : 'F',
+                        pressureUnit: sensorStatus.PressureUnit ?? 'hPa'
+                    }
 
                     //push to array
-                    this.sensorsName.push(sensorName);
-                    const push1 = temperature ? this.sensorsTemperature.push(temperature) : false;
-                    const push2 = referenceTemperature ? this.sensorsReferenceTemperature.push(referenceTemperature) : false;
-                    const push3 = objTemperature ? this.sensorsAmbTemperature.push(objTemperature) : false;
-                    const push4 = ambTemperature ? this.sensorsAmbTemperature.push(ambTemperature) : false;
-                    const push5 = dewPointTemperature ? this.sensorsDewPointTemperature.push(dewPointTemperature) : false;
-                    const push6 = humidity ? this.sensorsHumidity.push(humidity) : false;
-                    const push7 = pressure ? this.sensorsPressure.push(pressure) : false;
-                    const push8 = gas ? this.sensorsGas.push(gas) : false;
-                    const push9 = carbonDioxyde ? this.sensorsCarbonDioxyde.push(carbonDioxyde) : false;
-                    const push10 = ambientLight ? this.sensorsAmbientLight.push(ambientLight) : false;
-                    const push11 = motion ? this.sensorsMotion.push(motion) : false;
+                    this.sensors.push(obj);
                 }
-
-                this.time = sensorStatus.Time ?? '';
-                this.tempUnit = sensorStatus.TempUnit === 'C' ? '°C' : 'F';
-                this.pressureUnit = sensorStatus.PressureUnit ?? 'hPa';
-                this.sensorsTemperatureCount = this.sensorsTemperature.length;
-                this.sensorsReferenceTemperatureCount = this.sensorsReferenceTemperature.length;
-                this.sensorsObjTemperatureCount = this.sensorsObjTemperature.length;
-                this.sensorsAmbTemperatureCount = this.sensorsAmbTemperature.length;
-                this.sensorsDewPointTemperatureCount = this.sensorsDewPointTemperature.length;
-                this.sensorsHumidityCount = this.sensorsHumidity.length;
-                this.sensorsPressureCount = this.sensorsPressure.length;
-                this.sensorsGasCount = this.sensorsGas.length;
-                this.sensorsCarbonDioxydeCount = this.sensorsCarbonDioxyde.length;
-                this.sensorsAmbientLightCount = this.sensorsAmbientLight.length;
-                this.sensorsMotionCount = this.sensorsMotion.length;
-                this.sensorsCount = this.sensorsName.length;
-
+                this.sensorsCount = this.sensors.length;
 
                 //update characteristics
-                if (this.sensorTemperatureServices) {
-                    for (let i = 0; i < this.sensorsTemperatureCount; i++) {
-                        const value = this.sensorsTemperature[i];
-                        this.sensorTemperatureServices[i].updateCharacteristic(Characteristic.CurrentTemperature, value);
-                    }
-                }
-
-                if (this.sensorReferenceTemperatureServices) {
-                    for (let i = 0; i < this.sensorsReferenceTemperatureCount; i++) {
-                        const value = this.sensorsReferenceTemperature[i];
-                        this.sensorReferenceTemperatureServices[i].updateCharacteristic(Characteristic.CurrentTemperature, value);
-                    }
-                }
-
-                if (this.sensorObjTemperatureServices) {
-                    for (let i = 0; i < this.sensorsObjTemperatureCount; i++) {
-                        const value = this.sensorsObjTemperature[i];
-                        this.sensorObjTemperatureServices[i].updateCharacteristic(Characteristic.CurrentTemperature, value);
-                    }
-                }
-
-                if (this.sensorAmbTemperatureServices) {
-                    for (let i = 0; i < this.sensorsAmbTemperatureCount; i++) {
-                        const value = this.sensorsAmbTemperature[i];
-                        this.sensorAmbTemperatureServices[i].updateCharacteristic(Characteristic.CurrentTemperature, value);
-                    }
-                }
-
-                if (this.sensorDewPointTemperatureServices) {
-                    for (let i = 0; i < this.sensorsDewPointTemperatureCount; i++) {
-                        const value = this.sensorsDewPointTemperature[i];
-                        this.sensorDewPointTemperatureServices[i].updateCharacteristic(Characteristic.CurrentTemperature, value);
-                    }
-                }
-
-                if (this.sensorHumidityServices) {
-                    for (let i = 0; i < this.sensorsHumidityCount; i++) {
-                        const value = this.sensorsHumidity[i];
-                        this.sensorHumidityServices[i].updateCharacteristic(Characteristic.CurrentRelativeHumidity, value);
-                    }
-                }
-
-                if (this.sensorCarbonDioxydeServices) {
-                    for (let i = 0; i < this.sensorsCarbonDioxydeCount; i++) {
-                        const state = this.sensorsCarbonDioxyde[i] > 1000;
-                        const value = this.sensorsCarbonDioxyde[i];
-                        this.sensorCarbonDioxydeServices[i]
-                            .updateCharacteristic(Characteristic.CarbonDioxideDetected, state)
-                            .updateCharacteristic(Characteristic.CarbonDioxideLevel, value)
-                            .updateCharacteristic(Characteristic.CarbonDioxidePeakLevel, value);
-                    }
-                }
-
-                if (this.sensorAmbientLightServices) {
-                    for (let i = 0; i < this.sensorsAmbientLightCount; i++) {
-                        const value = this.sensorsAmbientLight[i];
-                        this.sensorAmbientLightServices[i].updateCharacteristic(Characteristic.CurrentAmbientLightLevel, value);
-                    }
-                }
-
-                if (this.sensorMotionServices) {
-                    for (let i = 0; i < this.sensorsMotionCount; i++) {
-                        const state = this.sensorsMotion[i];
-                        this.sensorMotionServices[i].updateCharacteristic(Characteristic.MotionDetected, state);
+                if (this.sensorsCount > 0) {
+                    for (let i = 0; i < this.sensorsCount; i++) {
+                        const sensor = this.sensors[i];
+                        this.sensorTemperatureServices?.[i]?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.temperature);
+                        this.sensorReferenceTemperatureServices?.[i]?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.referenceTemperature);
+                        this.sensorObjTemperatureServices?.[i]?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.objTemperature);
+                        this.sensorAmbTemperatureServices?.[i]?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.ambTemperature);
+                        this.sensorDewPointTemperatureServices?.[i]?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.dewPointTemperature);
+                        this.sensorHumidityServices?.[i]?.updateCharacteristic(Characteristic.CurrentRelativeHumidity, sensor.humidity);
+                        this.sensorCarbonDioxydeServices?.[i]
+                            ?.updateCharacteristic(Characteristic.CarbonDioxideDetected, sensor.carbonDioxyde > 1000)
+                            .updateCharacteristic(Characteristic.CarbonDioxideLevel, sensor.carbonDioxyde)
+                            .updateCharacteristic(Characteristic.CarbonDioxidePeakLevel, sensor.carbonDioxyde);
+                        this.sensorAmbientLightServices?.[i]?.updateCharacteristic(Characteristic.CurrentAmbientLightLevel, sensor.ambientLight);
+                        this.sensorMotionServices?.[i]?.updateCharacteristic(Characteristic.MotionDetected, sensor.motion);
                     }
                 }
             }
@@ -311,208 +227,177 @@ class Sensors extends EventEmitter {
                 const debug = this.enableDebugMode ? this.emit('debug', `Prepare Sensor Services`) : false;
 
                 //temperature
-                const sensorsTemperatureCount = this.sensorsTemperatureCount;
-                if (sensorsTemperatureCount > 0) {
-                    const debug = this.enableDebugMode ? this.emit('debug', `Prepare Temperature Sensor Services`) : false;
-                    this.sensorTemperatureServices = [];
-                    for (let i = 0; i < sensorsTemperatureCount; i++) {
-                        const sensorName = this.sensorsName[i];
+                let i = 0;
+                for (const sensor of this.sensors) {
+                    const sensorName = sensor.name;
+                    if (sensor.temperature !== undefined) {
+                        const debug = this.enableDebugMode ? this.emit('debug', `Prepare Temperature Sensor Services`) : false;
+                        this.sensorTemperatureServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Temperature` : `${sensorName} Temperature`;
                         const sensorTemperatureService = accessory.addService(Service.TemperatureSensor, serviceName, `Temperature Sensor ${i}`);
                         sensorTemperatureService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                         sensorTemperatureService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                         sensorTemperatureService.getCharacteristic(Characteristic.CurrentTemperature)
                             .onGet(async () => {
-                                const value = this.sensorsTemperature[i];
-                                const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} temperature: ${value} °${this.tempUnit}`);
+                                const value = sensor.temperature;
+                                const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} temperature: ${value} °${sensor.tempUnit}`);
                                 return value;
                             });
                         this.sensorTemperatureServices.push(sensorTemperatureService);
                     }
-                }
 
-                //reference temperature
-                const sensorsReferenceTemperatureCount = this.sensorsReferenceTemperatureCount;
-                if (sensorsReferenceTemperatureCount > 0) {
-                    const debug = this.enableDebugMode ? this.emit('debug', `Prepare Reference Temperature Sensor Services`) : false;
-                    this.sensorReferenceTemperatureServices = [];
-                    for (let i = 0; i < sensorsReferenceTemperatureCount; i++) {
-                        const sensorName = this.sensorsName[i];
+                    //reference temperature
+                    if (sensor.referenceTemperature !== undefined) {
+                        const debug = this.enableDebugMode ? this.emit('debug', `Prepare Reference Temperature Sensor Services`) : false;
+                        this.sensorReferenceTemperatureServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Reference Temperature` : `${sensorName} Reference Temperature`;
                         const sensorReferenceTemperatureService = accessory.addService(Service.TemperatureSensor, serviceName, `Reference Temperature Sensor ${i}`);
                         sensorReferenceTemperatureService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                         sensorReferenceTemperatureService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                         sensorReferenceTemperatureService.getCharacteristic(Characteristic.CurrentTemperature)
                             .onGet(async () => {
-                                const value = this.sensorsReferenceTemperature[i];
-                                const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} reference temperature: ${value} °${this.tempUnit}`);
+                                const value = sensor.referenceTemperature;
+                                const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} reference temperature: ${value} °${sensor.tempUnit}`);
                                 return value;
                             });
                         this.sensorReferenceTemperatureServices.push(sensorReferenceTemperatureService);
                     }
-                }
 
-                //object temperature
-                const sensorsObjTemperatureCount = this.sensorsObjTemperatureCount;
-                if (sensorsObjTemperatureCount > 0) {
-                    const debug = this.enableDebugMode ? this.emit('debug', `Prepare Obj Temperature Sensor Services`) : false;
-                    this.sensorObjTemperatureServices = [];
-                    for (let i = 0; i < sensorsObjTemperatureCount; i++) {
-                        const sensorName = this.sensorsName[i];
+                    //object temperature
+                    if (sensor.objTemperature !== undefined) {
+                        const debug = this.enableDebugMode ? this.emit('debug', `Prepare Obj Temperature Sensor Services`) : false;
+                        this.sensorObjTemperatureServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Obj Temperature` : `${sensorName} Obj Temperature`;
                         const sensorObjTemperatureService = accessory.addService(Service.TemperatureSensor, serviceName, `Obj Temperature Sensor ${i}`);
                         sensorObjTemperatureService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                         sensorObjTemperatureService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                         sensorObjTemperatureService.getCharacteristic(Characteristic.CurrentTemperature)
                             .onGet(async () => {
-                                const value = this.sensorsObjTemperature[i];
-                                const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} obj temperature: ${value} °${this.tempUnit}`);
+                                const value = sensor.objTemperature;
+                                const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} obj temperature: ${value} °${sensor.tempUnit}`);
                                 return value;
                             });
                         this.sensorObjTemperatureServices.push(sensorObjTemperatureService);
                     }
-                }
 
-                //ambient temperature
-                const sensorsAmbTemperatureCount = this.sensorsAmbTemperatureCount;
-                if (sensorsAmbTemperatureCount > 0) {
-                    const debug = this.enableDebugMode ? this.emit('debug', `Prepare Amb Temperature Sensor Services`) : false;
-                    this.sensorAmbTemperatureServices = [];
-                    for (let i = 0; i < sensorsAmbTemperatureCount; i++) {
-                        const sensorName = this.sensorsName[i];
+                    //ambient temperature
+                    if (sensor.ambTemperature !== undefined) {
+                        const debug = this.enableDebugMode ? this.emit('debug', `Prepare Amb Temperature Sensor Services`) : false;
+                        this.sensorAmbTemperatureServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Amb Temperature` : `${sensorName} Amb Temperature`;
                         const sensorAmbTemperatureService = accessory.addService(Service.TemperatureSensor, serviceName, `Amb Temperature Sensor ${i}`);
                         sensorAmbTemperatureService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                         sensorAmbTemperatureService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                         sensorAmbTemperatureService.getCharacteristic(Characteristic.CurrentTemperature)
                             .onGet(async () => {
-                                const value = this.sensorsAmbTemperature[i];
-                                const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} amb temperature: ${value} °${this.tempUnit}`);
+                                const value = sensor.ambTemperature;
+                                const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} amb temperature: ${value} °${sensor.tempUnit}`);
                                 return value;
                             });
                         this.sensorAmbTemperatureServices.push(sensorAmbTemperatureService);
                     }
-                }
 
-                //dew point temperature
-                const sensorsDewPointTemperatureCount = this.sensorsDewPointTemperatureCount;
-                if (sensorsDewPointTemperatureCount > 0) {
-                    const debug = this.enableDebugMode ? this.emit('debug', `Prepare Dew Point Temperature Sensor Services`) : false;
-                    this.sensorDewPointTemperatureServices = [];
-                    for (let i = 0; i < sensorsDewPointTemperatureCount; i++) {
-                        const sensorName = this.sensorsName[i];
+                    //dew point temperature
+                    if (sensor.dewPointTemperature !== undefined) {
+                        const debug = this.enableDebugMode ? this.emit('debug', `Prepare Dew Point Temperature Sensor Services`) : false;
+                        this.sensorDewPointTemperatureServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Dew Point` : `${sensorName} Dew Point`;
                         const sensorDewPointTemperatureService = accessory.addService(Service.TemperatureSensor, serviceName, `Dew Point Temperature Sensor ${i}`);
                         sensorDewPointTemperatureService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                         sensorDewPointTemperatureService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                         sensorDewPointTemperatureService.getCharacteristic(Characteristic.CurrentTemperature)
                             .onGet(async () => {
-                                const value = this.sensorsDewPointTemperature[i];
-                                const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} dew point: ${value} °${this.tempUnit}`);
+                                const value = sensor.dewPointTemperature;
+                                const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} dew point: ${value} °${sensor.tempUnit}`);
                                 return value;
                             });
                         this.sensorDewPointTemperatureServices.push(sensorDewPointTemperatureService);
                     }
-                }
 
-                //humidity
-                const sensorsHumidityCount = this.sensorsHumidityCount;
-                if (sensorsHumidityCount > 0) {
-                    const debug = this.enableDebugMode ? this.emit('debug', `Prepare Humidity Sensor Services`) : false;
-                    this.sensorHumidityServices = [];
-                    for (let i = 0; i < sensorsHumidityCount; i++) {
-                        const sensorName = this.sensorsName[i];
+                    //humidity
+                    if (sensor.humidity !== undefined) {
+                        const debug = this.enableDebugMode ? this.emit('debug', `Prepare Humidity Sensor Services`) : false;
+                        this.sensorHumidityServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Humidity` : `${sensorName} Humidity`;
                         const sensorHumidityService = accessory.addService(Service.HumiditySensor, serviceName, `Humidity Sensor ${i}`);
                         sensorHumidityService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                         sensorHumidityService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                         sensorHumidityService.getCharacteristic(Characteristic.CurrentRelativeHumidity)
                             .onGet(async () => {
-                                const value = this.sensorsHumidity[i];
+                                const value = sensor.humidity;
                                 const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} humidity: ${value} %`);
                                 return value;
                             });
                         this.sensorHumidityServices.push(sensorHumidityService);
                     }
-                }
 
-                //pressure
+                    //pressure
 
-                //gas
+                    //gas
 
-                //carbon dioxyde
-                const sensorsCarbonDioxydeCount = this.sensorsCarbonDioxydeCount;
-                if (sensorsCarbonDioxydeCount > 0) {
-                    const debug = this.enableDebugMode ? this.emit('debug', `Prepare Carbon Dioxyde Sensor Services`) : false;
-                    this.sensorCarbonDioxydeServices = [];
-                    for (let i = 0; i < sensorsCarbonDioxydeCount; i++) {
-                        const sensorName = this.sensorsName[i];
+                    //carbon dioxyde
+                    if (sensor.carbonDioxyde !== undefined) {
+                        const debug = this.enableDebugMode ? this.emit('debug', `Prepare Carbon Dioxyde Sensor Services`) : false;
+                        this.sensorCarbonDioxydeServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Carbon Dioxyde` : `${sensorName} Carbon Dioxyde`;
                         const sensorCarbonDioxydeService = accessory.addService(Service.CarbonDioxideSensor, serviceName, `Carbon Dioxyde Sensor ${i}`);
                         sensorCarbonDioxydeService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                         sensorCarbonDioxydeService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                         sensorCarbonDioxydeService.getCharacteristic(Characteristic.CarbonDioxideDetected)
                             .onGet(async () => {
-                                const state = this.sensorsCarbonDioxyde[i] > 1000;
+                                const state = sensor.carbonDioxyde > 1000;
                                 const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} carbon dioxyde detected: ${state ? 'Yes' : 'No'}`);
                                 return state;
                             });
                         sensorCarbonDioxydeService.getCharacteristic(Characteristic.CarbonDioxideLevel)
                             .onGet(async () => {
-                                const value = this.sensorsCarbonDioxyde[i];
+                                const value = sensor.carbonDioxyde;
                                 const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} carbon dioxyde level: ${value} ppm`);
                                 return value;
                             });
                         sensorCarbonDioxydeService.getCharacteristic(Characteristic.CarbonDioxidePeakLevel)
                             .onGet(async () => {
-                                const value = this.sensorsCarbonDioxyde[i];
+                                const value = sensor.carbonDioxyde;
                                 const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} carbon dioxyde peak level: ${value} ppm`);
                                 return value;
                             });
                         this.sensorCarbonDioxydeServices.push(sensorCarbonDioxydeService);
                     }
-                }
 
-                //ambient light
-                const sensorsAmbientLightCount = this.sensorsAmbientLightCount;
-                if (sensorsAmbientLightCount > 0) {
-                    const debug = this.enableDebugMode ? this.emit('debug', `Prepare Ambient Light Sensor Services`) : false;
-                    this.sensorAmbientLightServices = [];
-                    for (let i = 0; i < sensorsAmbientLightCount; i++) {
-                        const sensorName = this.sensorsName[i];
+                    //ambient light
+                    if (sensor.ambientLight !== undefined) {
+                        const debug = this.enableDebugMode ? this.emit('debug', `Prepare Ambient Light Sensor Services`) : false;
+                        this.sensorAmbientLightServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Ambient Light` : `${sensorName} Ambient Light`;
                         const sensorAmbientLightService = accessory.addService(Service.LightSensor, serviceName, `Ambient Light Sensor ${i}`);
                         sensorAmbientLightService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                         sensorAmbientLightService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                         sensorAmbientLightService.getCharacteristic(Characteristic.CurrentAmbientLightLevel)
                             .onGet(async () => {
-                                const value = this.sensorsAmbientLight[i];
+                                const value = sensor.ambientLight;
                                 const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} ambient light: ${value} lx`);
                                 return value;
                             });
                         this.sensorAmbientLightServices.push(sensorAmbientLightService);
                     }
-                }
 
-                //motion
-                const sensorsMotionCount = this.sensorsMotionCount;
-                if (sensorsMotionCount > 0) {
-                    const debug = this.enableDebugMode ? this.emit('debug', `Prepare Motion Sensor Services`) : false;
-                    this.sensorMotionServices = [];
-                    for (let i = 0; i < sensorsMotionCount; i++) {
-                        const sensorName = this.sensorsName[i];
+                    //motion
+                    if (sensor.motion !== undefined) {
+                        const debug = this.enableDebugMode ? this.emit('debug', `Prepare Motion Sensor Services`) : false;
+                        this.sensorMotionServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Motion` : `${sensorName} Motion`;
                         const sensorMotionService = accessory.addService(Service.MotionSensor, serviceName, `Motion Sensor ${i}`);
                         sensorMotionService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                         sensorMotionService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                         sensorMotionService.getCharacteristic(Characteristic.MotionDetected)
                             .onGet(async () => {
-                                const state = this.sensorsMotion[i];
+                                const state = sensor.motion;
                                 const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} motion: ${state ? 'ON' : 'OFF'}`);
                                 return state;
                             });
                         this.sensorMotionServices.push(sensorMotionService);
                     }
+                    i++;
                 }
             }
 

package/src/switches.js

@@ -18,6 +18,7 @@ class Switches extends EventEmitter {
         //info
         this.info = info;
         this.serialNumber = serialNumber;
+        this.relaysCount = info.friendlyNames.length;
 
         //other config
         this.relaysDisplayType = config.relaysDisplayType || 0;
@@ -65,7 +66,7 @@ class Switches extends EventEmitter {
             const debug = this.enableDebugMode ? this.emit('debug', `Power status: ${JSON.stringify(powerStatus, null, 2)}`) : false;
 
             //relays
-            const relaysCount = this.info.relaysCount;
+            const relaysCount = this.relaysCount;
             if (relaysCount > 0) {
                 this.switchesOutlets = [];
 
@@ -137,7 +138,7 @@ class Switches extends EventEmitter {
         this.emit('devInfo', `Hardware: ${this.info.modelName}`);
         this.emit('devInfo', `Serialnr: ${this.serialNumber}`)
         this.emit('devInfo', `Firmware: ${this.info.firmwareRevision}`);
-        this.emit('devInfo', `Relays: ${this.info.relaysCount}`);
+        this.emit('devInfo', `Relays: ${this.relaysCount}`);
         this.emit('devInfo', `----------------------------------`);
         return;
     }