homebridge-tasmota-control 0.6.2-beta.0 → 0.6.2-beta.2

package/package.json

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

package/src/tasmotadevice.js

@@ -104,9 +104,14 @@ class TasmotaDevice {
             //status sns
             this.statusSNSSupported = deviceInfoKeys.includes('StatusSNS');
             CONSTANS.StatusSNS.forEach(sensor => {
-                const subSensor = sensor.substring(0, 7);
-                const sensorData = deviceInfo.StatusSNS[subSensor] ?? false;
-                const push = sensorData ? this.sensors.push(sensorData) : false;
+                const sensorName = sensor.substring(0, 7);
+                const sensorData = deviceInfo.StatusSNS[sensorName] ?? false;
+
+                const obj = {
+                    'name': sensorName,
+                    'data': sensorData
+                }
+                const push = sensorData !== false && sensorData !== undefined && sensorData !== null ? this.sensors.push(obj) : false;
             });
             const sensorsCount = this.sensors.length
 
@@ -164,6 +169,7 @@ class TasmotaDevice {
             //sensors
             const sensorsCount = this.sensorsCount;
             if (sensorsCount > 0) {
+                this.sensorsName = [];
                 this.sensorsTemperature = [];
                 this.sensorsHumidity = [];
                 this.sensorsDewPoint = [];
@@ -175,20 +181,20 @@ class TasmotaDevice {
                 const debug = this.enableDebugMode ? this.log(`Device: ${this.host} ${this.name}, debug ${sensorsCount === 1 ? 'sensor' : 'sensors'} status: ${JSON.stringify(sensorsStatus, null, 2)}`) : false;
 
                 for (let i = 0; i < sensorsCount; i++) {
-                    const sensor = this.sensors[i];
-                    const temperature = sensor.Temperature ?? false;
-                    const humidity = sensor.Humidity ?? false;
-                    const dewPoint = sensor.DewPoint ?? false;
-                    const pressure = sensor.Pressure ?? false;
-                    const gas = sensor.Gas ?? false;
-
-                    const debug = this.enableDebugMode ? this.log(`Device: ${this.host} ${this.name}, debug temperature: ${temperature}`) : false;
-
-                    const push = !temperature ? false : this.sensorsTemperature.push(temperature);
-                    const push1 = !humidity ? false : this.sensorsHumidity.push(humidity);
-                    const push2 = !dewPoint ? false : this.sensorsDewPoint.push(dewPoint);
-                    const push3 = !pressure ? false : this.sensorsPressure.push(pressure);
-                    const push4 = !gas ? false : this.sensorsGas.push(gas);
+                    const sensorName = this.sensors[i].name;
+                    const sensorData = this.sensors[i].data;
+                    const temperature = sensorData.Temperature ?? false;
+                    const humidity = sensorData.Humidity ?? false;
+                    const dewPoint = sensorData.DewPoint ?? false;
+                    const pressure = sensorData.Pressure ?? false;
+                    const gas = sensorData.Gas ?? false;
+
+                    const push = sensorName !== false && sensorName !== undefined && sensorName !== null ? this.sensorsName.push(sensorName) : false;
+                    const push1 = temperature !== false && temperature !== undefined && temperature !== null ? this.sensorsTemperature.push(temperature) : false;
+                    const push2 = humidity !== false && temperature !== undefined && temperature !== null ? this.sensorsHumidity.push(humidity) : false;
+                    const push3 = dewPoint !== false && temperature !== undefined && temperature !== null ? this.sensorsDewPoint.push(dewPoint) : false;
+                    const push4 = pressure !== false && temperature !== undefined && temperature !== null ? this.sensorsPressure.push(pressure) : false;
+                    const push5 = gas !== false && temperature !== undefined && temperature !== null ? this.sensorsGas.push(gas) : false;
                 };
 
                 this.sensorsTemperatureCount = this.sensorsTemperature.length;
@@ -313,14 +319,15 @@ class TasmotaDevice {
                         const debug = this.enableDebugMode ? this.log('Prepare Temperature Sensor Services') : false;
                         this.sensorTemperatureServices = [];
                         for (let i = 0; i < sensorsTemperatureCount; i++) {
-                            const serviceName = `${accessoryName} Temperature`;
+                            const sensorName = this.sensorsName[i];
+                            const serviceName = `${accessoryName} ${sensorName} Temperature`;
                             const sensorTemperatureService = new 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.log(`Device: ${this.host}, ${accessoryName}, temperature: ${value} °${this.tempUnit}`);
+                                    const logInfo = this.disableLogInfo ? false : this.log(`Device: ${this.host}, ${accessoryName}, sensor:${sensorName} temperature: ${value} °${this.tempUnit}`);
                                     return value;
                                 });
                             this.sensorTemperatureServices.push(sensorTemperatureService);
@@ -334,14 +341,15 @@ class TasmotaDevice {
                         const debug = this.enableDebugMode ? this.log('Prepare Humidity Sensor Services') : false;
                         this.sensorHumidityServices = [];
                         for (let i = 0; i < sensorsHumidityCount; i++) {
-                            const serviceName = `${accessoryName} Humidity`;
+                            const sensorName = this.sensorsName[i];
+                            const serviceName = `${accessoryName} ${sensorName} Humidity`;
                             const sensorHumidityService = new 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 logInfo = this.disableLogInfo ? false : this.log(`Device: ${this.host}, ${accessoryName}, humidity: ${value} %`);
+                                    const logInfo = this.disableLogInfo ? false : this.log(`Device: ${this.host}, ${accessoryName}, sensor: ${sensorName} humidity: ${value} %`);
                                     return value;
                                 });
                             this.sensorHumidityServices.push(sensorHumidityService);
@@ -355,14 +363,15 @@ class TasmotaDevice {
                         const debug = this.enableDebugMode ? this.log('Prepare Dew Point Sensor Services') : false;
                         this.sensorDewPointServices = [];
                         for (let i = 0; i < sensorsDewPointCount; i++) {
-                            const serviceName = `${accessoryName} Dew Point`;
+                            const sensorName = this.sensorsName[i];
+                            const serviceName = `${accessoryName} ${sensorName} Dew Point`;
                             const sensorDewPointService = new Service.TemperatureSensor(serviceName, `Dew Point Sensor${i}`);
                             sensorDewPointService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                             sensorDewPointService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                             sensorDewPointService.getCharacteristic(Characteristic.CurrentTemperature)
                                 .onGet(async () => {
                                     const value = this.sensorsDewPoint[i];
-                                    const logInfo = this.disableLogInfo ? false : this.log(`Device: ${this.host}, ${accessoryName}, dew point: ${value} °${this.tempUnit}`);
+                                    const logInfo = this.disableLogInfo ? false : this.log(`Device: ${this.host}, ${accessoryName}, sensor:${sensorName} dew point: ${value} °${this.tempUnit}`);
                                     return value;
                                 });
                             this.sensorDewPointServices.push(sensorDewPointService);
@@ -373,7 +382,7 @@ class TasmotaDevice {
                     //pressure
 
                     //gas
-                }
+                };
 
                 resolve(accessory);
             } catch (error) {