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

package/index.js

@@ -83,10 +83,13 @@ class tasmotaPlatform {
             return;
           }
 
+          let i = 0;
           for (const type of info.deviceTypes) {
+            const serialNumber = i === 0 ? info.serialNumber : `${info.serialNumber}${i}`;
+
             let deviceType;
             switch (type) {
-              case 0://mielhvac
+              case 0: //mielhvac
                 //check files exists, if not then create it
                 try {
                   const postFix = device.host.split('.').join('');
@@ -108,22 +111,22 @@ class tasmotaPlatform {
                   return;
                 }
 
-                deviceType = new MiElHvac(api, device, info, refreshInterval);
+                deviceType = new MiElHvac(api, device, info, serialNumber, refreshInterval);
                 break;
               case 1: //switches
-                deviceType = new Switches(api, device, info, refreshInterval);
+                deviceType = new Switches(api, device, info, serialNumber, refreshInterval);
                 break;
               case 2: //lights
-                deviceType = new Lights(api, device, info, refreshInterval);
+                deviceType = new Lights(api, device, info, serialNumber, refreshInterval);
                 break;
               case 3: //fans
-                deviceType = new Fans(api, device, info, refreshInterval);
+                deviceType = new Fans(api, device, info, serialNumber, refreshInterval);
                 break;
               case 4: //sensors
-                deviceType = new Sensors(api, device, info, refreshInterval);
+                deviceType = new Sensors(api, device, info, serialNumber, refreshInterval);
                 break;
               default:
-                const emitLog = disableLogWarn ? false : log.warn(`Device: ${host} ${deviceName}, unknown device: ${info.deviceType}.`);
+                const emitLog = disableLogWarn ? false : log.warn(`Device: ${host} ${deviceName}, unknown device: ${info.deviceTypes}.`);
                 return;
             }
 
@@ -168,6 +171,7 @@ class tasmotaPlatform {
 
             //start impulse generator
             await impulseGenerator.start([{ name: 'start', sampling: 45000 }]);
+            i++;
           }
         } catch (error) {
           const emitLog = disableLogError ? false : log.error(`Device: ${host} ${deviceName}, Did finish launching error: ${error}.`);

package/package.json

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

package/src/deviceinfo.js

@@ -64,16 +64,15 @@ class DeviceInfo extends EventEmitter {
             const mielhvac = statusSnsKeys.includes('MiElHVAC') ? types.push(0) : false;
             const lights = statusStsKeys.some(key => LightKeys.includes(key)) ? types.push(2) : false;
             const fans = statusStsKeys.includes('FanSpeed') ? types.push(3) : false;
+            const switches = !mielhvac && !lights && !fans ? types.push(1) : false
             const sensors = statusSnsKeys.some(key => SensorKeys.includes(key)) ? types.push(4) : false;
-            const switches = !mielhvac && !lights && !fans && !sensors ? types.push(1) : false
             const obj = {
                 deviceTypes: types,
                 deviceName: deviceName,
                 friendlyNames: friendlyNames,
                 modelName: modelName,
                 serialNumber: addressMac,
-                firmwareRevision: firmwareRevision,
-                relaysCount: friendlyNames.length
+                firmwareRevision: firmwareRevision
             };
             return obj;
         } catch (error) {

package/src/fans.js

@@ -6,7 +6,7 @@ import { ApiCommands } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class Fans extends EventEmitter {
-    constructor(api, config, info, refreshInterval) {
+    constructor(api, config, info, serialNumber, refreshInterval) {
         super();
 
         Accessory = api.platformAccessory;
@@ -17,6 +17,8 @@ class Fans extends EventEmitter {
 
         //info
         this.info = info;
+        this.serialNumber = serialNumber;
+        this.relaysCount = info.friendlyNames.length;
 
         //other config
         this.lightsNamePrefix = config.lightsNamePrefix || false;
@@ -77,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 = [];
@@ -174,10 +176,9 @@ class Fans extends EventEmitter {
         this.emit('devInfo', `----- ${this.info.deviceName} -----`);
         this.emit('devInfo', `Manufacturer: Tasmota`);
         this.emit('devInfo', `Hardware: ${this.info.modelName}`);
-        this.emit('devInfo', `Serialnr: ${this.info.serialNumber}`)
+        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;
     }
@@ -189,7 +190,7 @@ class Fans extends EventEmitter {
         try {
             //accessory
             const accessoryName = this.info.deviceName;
-            const accessoryUUID = AccessoryUUID.generate(this.info.serialNumber);
+            const accessoryUUID = AccessoryUUID.generate(this.serialNumber);
             const accessoryCategory = Categories.FAN;
             const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
 
@@ -198,7 +199,7 @@ class Fans extends EventEmitter {
             accessory.getService(Service.AccessoryInformation)
                 .setCharacteristic(Characteristic.Manufacturer, 'Tasmota')
                 .setCharacteristic(Characteristic.Model, this.info.modelName ?? 'Model Name')
-                .setCharacteristic(Characteristic.SerialNumber, this.info.serialNumber ?? 'Serial Number')
+                .setCharacteristic(Characteristic.SerialNumber, this.serialNumber ?? 'Serial Number')
                 .setCharacteristic(Characteristic.FirmwareRevision, this.info.firmwareRevision.replace(/[a-zA-Z]/g, '') ?? '0')
                 .setCharacteristic(Characteristic.ConfiguredName, accessoryName);
 

package/src/lights.js

@@ -6,7 +6,7 @@ import { ApiCommands } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class Lights extends EventEmitter {
-    constructor(api, config, info, refreshInterval) {
+    constructor(api, config, info, serialNumber, refreshInterval) {
         super();
 
         Accessory = api.platformAccessory;
@@ -17,6 +17,8 @@ class Lights extends EventEmitter {
 
         //info
         this.info = info;
+        this.serialNumber = serialNumber;
+        this.relaysCount = info.friendlyNames.length;
 
         //other config
         this.lightsNamePrefix = config.lightsNamePrefix || false;
@@ -77,7 +79,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 = [];
 
@@ -191,9 +193,9 @@ class Lights extends EventEmitter {
         this.emit('devInfo', `----- ${this.info.deviceName} -----`);
         this.emit('devInfo', `Manufacturer: Tasmota`);
         this.emit('devInfo', `Hardware: ${this.info.modelName}`);
-        this.emit('devInfo', `Serialnr: ${this.info.serialNumber}`)
+        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;
     }
@@ -205,7 +207,7 @@ class Lights extends EventEmitter {
         try {
             //accessory
             const accessoryName = this.info.deviceName;
-            const accessoryUUID = AccessoryUUID.generate(this.info.serialNumber);
+            const accessoryUUID = AccessoryUUID.generate(this.serialNumber);
             const accessoryCategory = Categories.LIGHTBULB
             const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
 
@@ -214,7 +216,7 @@ class Lights extends EventEmitter {
             accessory.getService(Service.AccessoryInformation)
                 .setCharacteristic(Characteristic.Manufacturer, 'Tasmota')
                 .setCharacteristic(Characteristic.Model, this.info.modelName ?? 'Model Name')
-                .setCharacteristic(Characteristic.SerialNumber, this.info.serialNumber ?? 'Serial Number')
+                .setCharacteristic(Characteristic.SerialNumber, this.serialNumber ?? 'Serial Number')
                 .setCharacteristic(Characteristic.FirmwareRevision, this.info.firmwareRevision.replace(/[a-zA-Z]/g, '') ?? '0')
                 .setCharacteristic(Characteristic.ConfiguredName, accessoryName);
 

package/src/mielhvac.js

@@ -6,7 +6,7 @@ import { ApiCommands, MiElHVAC, TemperatureDisplayUnits } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class MiElHvac extends EventEmitter {
-    constructor(api, config, info, refreshInterval) {
+    constructor(api, config, info, serialNumber, refreshInterval) {
         super();
 
         Accessory = api.platformAccessory;
@@ -17,6 +17,7 @@ class MiElHvac extends EventEmitter {
 
         //info
         this.info = info;
+        this.serialNumber = serialNumber;
 
         //mitsubishi ac
         const miElHvac = config.miElHvac ?? {};
@@ -811,7 +812,7 @@ class MiElHvac extends EventEmitter {
         this.emit('devInfo', `----- ${this.info.deviceName} -----`);
         this.emit('devInfo', `Manufacturer: Tasmota`);
         this.emit('devInfo', `Hardware: ${this.info.modelName}`);
-        this.emit('devInfo', `Serialnr: ${this.info.serialNumber}`)
+        this.emit('devInfo', `Serialnr: ${this.serialNumber}`)
         this.emit('devInfo', `Firmware: ${this.info.firmwareRevision}`);
         this.emit('devInfo', `Sensor: MiELHVAC`);
         this.emit('devInfo', `----------------------------------`);
@@ -825,7 +826,7 @@ class MiElHvac extends EventEmitter {
         try {
             //accessory
             const accessoryName = this.info.deviceName;
-            const accessoryUUID = AccessoryUUID.generate(this.info.serialNumber);
+            const accessoryUUID = AccessoryUUID.generate(this.serialNumber);
             const accessoryCategory = Categories.AIR_CONDITIONER
             const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
 
@@ -834,7 +835,7 @@ class MiElHvac extends EventEmitter {
             accessory.getService(Service.AccessoryInformation)
                 .setCharacteristic(Characteristic.Manufacturer, 'Tasmota')
                 .setCharacteristic(Characteristic.Model, this.info.modelName ?? 'Model Name')
-                .setCharacteristic(Characteristic.SerialNumber, this.info.serialNumber ?? 'Serial Number')
+                .setCharacteristic(Characteristic.SerialNumber, this.serialNumber ?? 'Serial Number')
                 .setCharacteristic(Characteristic.FirmwareRevision, this.info.firmwareRevision.replace(/[a-zA-Z]/g, '') ?? '0')
                 .setCharacteristic(Characteristic.ConfiguredName, accessoryName);
 
@@ -846,7 +847,7 @@ class MiElHvac extends EventEmitter {
             const coolDryFanMode = [MiElHVAC.SetMode.cool, MiElHVAC.SetMode.cool, MiElHVAC.SetMode.dry, MiElHVAC.SetMode.fan][this.coolDryFanMode]; //NONE, COOL, DRY, FAN
 
             //services
-            this.miElHvacService = new Service.HeaterCooler(accessoryName, `HeaterCooler ${this.info.serialNumber}`);
+            this.miElHvacService = new Service.HeaterCooler(accessoryName, `HeaterCooler ${this.serialNumber}`);
             this.miElHvacService.setPrimaryService(true);
             this.miElHvacService.getCharacteristic(Characteristic.Active)
                 .onGet(async () => {

package/src/sensors.js

@@ -6,7 +6,7 @@ import { ApiCommands, SensorKeys } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class Sensors extends EventEmitter {
-    constructor(api, config, info, refreshInterval) {
+    constructor(api, config, info, serialNumber, refreshInterval) {
         super();
 
         Accessory = api.platformAccessory;
@@ -17,6 +17,7 @@ class Sensors extends EventEmitter {
 
         //info
         this.info = info;
+        this.serialNumber = serialNumber;
 
         //other config
         this.sensorsNamePrefix = config.sensorsNamePrefix || false;
@@ -85,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]) => {
@@ -106,133 +95,63 @@ 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;
+                    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
+                    }
 
                     //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);
                     }
                 }
             }
@@ -278,7 +197,7 @@ class Sensors extends EventEmitter {
         this.emit('devInfo', `----- ${this.info.deviceName} -----`);
         this.emit('devInfo', `Manufacturer: Tasmota`);
         this.emit('devInfo', `Hardware: ${this.info.modelName}`);
-        this.emit('devInfo', `Serialnr: ${this.info.serialNumber}`)
+        this.emit('devInfo', `Serialnr: ${this.serialNumber}`)
         this.emit('devInfo', `Firmware: ${this.info.firmwareRevision}`);
         this.emit('devInfo', `Sensors: ${this.sensorsCount}`);
         this.emit('devInfo', `----------------------------------`);
@@ -292,7 +211,7 @@ class Sensors extends EventEmitter {
         try {
             //accessory
             const accessoryName = this.info.deviceName;
-            const accessoryUUID = AccessoryUUID.generate(this.info.serialNumber);
+            const accessoryUUID = AccessoryUUID.generate(this.serialNumber);
             const accessoryCategory = Categories.SENSOR;
             const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
 
@@ -301,7 +220,7 @@ class Sensors extends EventEmitter {
             accessory.getService(Service.AccessoryInformation)
                 .setCharacteristic(Characteristic.Manufacturer, 'Tasmota')
                 .setCharacteristic(Characteristic.Model, this.info.modelName ?? 'Model Name')
-                .setCharacteristic(Characteristic.SerialNumber, this.info.serialNumber ?? 'Serial Number')
+                .setCharacteristic(Characteristic.SerialNumber, this.serialNumber ?? 'Serial Number')
                 .setCharacteristic(Characteristic.FirmwareRevision, this.info.firmwareRevision.replace(/[a-zA-Z]/g, '') ?? '0')
                 .setCharacteristic(Characteristic.ConfiguredName, accessoryName);
 
@@ -310,12 +229,11 @@ 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];
+                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);
@@ -328,15 +246,11 @@ class Sensors extends EventEmitter {
                             });
                         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);
@@ -349,15 +263,11 @@ class Sensors extends EventEmitter {
                             });
                         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);
@@ -370,15 +280,11 @@ class Sensors extends EventEmitter {
                             });
                         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);
@@ -391,15 +297,11 @@ class Sensors extends EventEmitter {
                             });
                         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);
@@ -412,15 +314,11 @@ class Sensors extends EventEmitter {
                             });
                         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);
@@ -433,19 +331,15 @@ class Sensors extends EventEmitter {
                             });
                         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);
@@ -470,15 +364,11 @@ class Sensors extends EventEmitter {
                             });
                         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);
@@ -491,15 +381,11 @@ class Sensors extends EventEmitter {
                             });
                         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);

package/src/switches.js

@@ -6,7 +6,7 @@ import { ApiCommands } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class Switches extends EventEmitter {
-    constructor(api, config, info, refreshInterval) {
+    constructor(api, config, info, serialNumber, refreshInterval) {
         super();
 
         Accessory = api.platformAccessory;
@@ -17,6 +17,8 @@ class Switches extends EventEmitter {
 
         //info
         this.info = info;
+        this.serialNumber = serialNumber;
+        this.relaysCount = info.friendlyNames.length;
 
         //other config
         this.relaysDisplayType = config.relaysDisplayType || 0;
@@ -64,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 = [];
 
@@ -134,9 +136,9 @@ class Switches extends EventEmitter {
         this.emit('devInfo', `----- ${this.info.deviceName} -----`);
         this.emit('devInfo', `Manufacturer: Tasmota`);
         this.emit('devInfo', `Hardware: ${this.info.modelName}`);
-        this.emit('devInfo', `Serialnr: ${this.info.serialNumber}`)
+        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;
     }
@@ -148,7 +150,7 @@ class Switches extends EventEmitter {
         try {
             //accessory
             const accessoryName = this.info.deviceName;
-            const accessoryUUID = AccessoryUUID.generate(this.info.serialNumber);
+            const accessoryUUID = AccessoryUUID.generate(this.serialNumber);
             const accessoryCategory = this.relaysDisplayType === 0 ? Categories.OUTLET : Categories.SWITCH;
             const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
 
@@ -157,7 +159,7 @@ class Switches extends EventEmitter {
             accessory.getService(Service.AccessoryInformation)
                 .setCharacteristic(Characteristic.Manufacturer, 'Tasmota')
                 .setCharacteristic(Characteristic.Model, this.info.modelName ?? 'Model Name')
-                .setCharacteristic(Characteristic.SerialNumber, this.info.serialNumber ?? 'Serial Number')
+                .setCharacteristic(Characteristic.SerialNumber, this.serialNumber ?? 'Serial Number')
                 .setCharacteristic(Characteristic.FirmwareRevision, this.info.firmwareRevision.replace(/[a-zA-Z]/g, '') ?? '0')
                 .setCharacteristic(Characteristic.ConfiguredName, accessoryName);