homebridge-tasmota-control 0.7.2-beta.1 → 0.7.2

package/package.json

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

package/src/constans.json

@@ -40,6 +40,8 @@
         "Humidity",
         "DewPoint",
         "Pressure",
-        "Gas"
+        "Gas",
+        "CarbonDioxyde",
+        "Ambient"
     ]
 }

package/src/tasmotadevice.js

@@ -44,8 +44,6 @@ class TasmotaDevice {
         this.sensorsDewPointCount = 0;
         this.sensorsPressureCount = 0;
         this.sensorsGasCount = 0;
-        this.sensorsCarbonDioxydeCount = 0;
-        this.sensorsAmbientLightCount = 0;
 
         //variable
         this.startPrepareAccessory = true;
@@ -126,22 +124,23 @@ class TasmotaDevice {
                 const addressMac = deviceInfo.StatusNET.Mac;
 
                 //status sns
-                const sensorTypes = CONSTANS.StatusSNS;
-                const sensor = Object.entries(deviceInfo.StatusSNS)
-                    .filter(([key]) => sensorTypes.includes(key))
-                    .reduce((obj, [key, value]) => {
-                        obj[key] = value;
-                        return obj;
-                    }, {});
-
-                const debug3 = this.enableDebugMode ? this.log(`Device: ${this.host} ${this.name}, debug sensors: ${JSON.stringify(sensor, null, 2)}`) : false;
-                for (const [key, value] of Object.entries(sensor)) {
-                    const debug = this.enableDebugMode ? this.log(`Device: ${this.host} ${this.name}, debug key: ${key} value: ${JSON.stringify(value, null, 2)}`) : false;
-                    const obj = {
-                        'name': key,
-                        'data': value
+                const statusSNSSupported = deviceInfoKeys.includes('StatusSNS') ?? false;
+                if (statusSNSSupported) {
+                    const sensorTypes = CONSTANS.StatusSNS;
+                    const sensor = Object.entries(deviceInfo.StatusSNS)
+                        .filter(([key]) => sensorTypes.some(type => key.includes(type)))
+                        .reduce((obj, [key, value]) => {
+                            obj[key] = value;
+                            return obj;
+                        }, {});
+
+                    for (const [key, value] of Object.entries(sensor)) {
+                        const obj = {
+                            'name': key,
+                            'data': value
+                        }
+                        this.sensors.push(obj);
                     }
-                    this.sensors.push(obj);
                 }
                 const sensorsCount = this.sensors.length;
 
@@ -206,8 +205,6 @@ class TasmotaDevice {
                     this.sensorsDewPoint = [];
                     this.sensorsPressure = [];
                     this.sensorsGas = [];
-                    this.sensorsCarbonDioxyde = [];
-                    this.sensorsAmbientLight = [];
 
                     const sensorsStatusData = await this.axiosInstance(CONSTANS.ApiCommands.Status);
                     const sensorsStatus = sensorsStatusData.data.StatusSNS;
@@ -230,8 +227,6 @@ class TasmotaDevice {
                         const push3 = dewPoint !== false && dewPoint !== undefined && dewPoint !== null ? this.sensorsDewPoint.push(dewPoint) : false;
                         const push4 = pressure !== false && pressure !== undefined && pressure !== null ? this.sensorsPressure.push(pressure) : false;
                         const push5 = gas !== false && gas !== undefined && gas !== null ? this.sensorsGas.push(gas) : false;
-                        const push6 = carbonDioxyde !== false && carbonDioxyde !== undefined && carbonDioxyde !== null ? this.sensorsCarbonDioxyde.push(carbonDioxyde) : false;
-                        const push7 = ambientLight !== false && ambientLight !== undefined && ambientLight !== null ? this.sensorsAmbientLight.push(ambientLight) : false;
                     };
 
                     this.sensorsTemperatureCount = this.sensorsTemperature.length;
@@ -239,8 +234,6 @@ class TasmotaDevice {
                     this.sensorsDewPointCount = this.sensorsDewPoint.length;
                     this.sensorsPressureCount = this.sensorsPressure.length;
                     this.sensorsGasCount = this.sensorsGas.length;
-                    this.sensorsCarbonDioxydeCount = this.sensorsCarbonDioxyde.length;
-                    this.sensorsAmbientLightCount = this.sensorsAmbientLight.length;
                     this.tempUnit = sensorsStatus.TempUnit ?? 'C';
                     this.pressureUnit = sensorsStatus.PressureUnit ?? 'hPa';
 
@@ -269,25 +262,6 @@ class TasmotaDevice {
                                 .updateCharacteristic(Characteristic.CurrentTemperature, dewPoint);
                         };
                     };
-
-                    if (this.sensorCarbonDioxydeServices && this.sensorsCarbonDioxydeCount > 0) {
-                        for (let i = 0; i < this.sensorsCarbonDioxydeCount; i++) {
-                            const carbonDioxydeDetected = this.sensorsCarbonDioxyde[i] > 1000;
-                            const carbonDioxydeLevel = this.sensorsCarbonDioxyde[i];
-                            this.sensorCarbonDioxydeServices[i]
-                                .updateCharacteristic(Characteristic.CarbonDioxideDetected, carbonDioxydeDetected)
-                                .updateCharacteristic(Characteristic.CarbonDioxideLevel, carbonDioxydeLevel)
-                                .updateCharacteristic(Characteristic.CarbonDioxidePeakLevel, carbonDioxydeLevel);
-                        };
-                    };
-
-                    if (this.sensorAmbientLightServices && this.sensorsAmbientLightCount > 0) {
-                        for (let i = 0; i < this.sensorsAmbientLightCount; i++) {
-                            const ambientLight = this.sensorsAmbientLight[i];
-                            this.sensorAmbientLightServices[i]
-                                .updateCharacteristic(Characteristic.CurrentAmbientLightLevel, ambientLight);
-                        };
-                    };
                 };
 
                 resolve();
@@ -416,7 +390,7 @@ class TasmotaDevice {
                             sensorDewPointService.getCharacteristic(Characteristic.CurrentTemperature)
                                 .onGet(async () => {
                                     const value = this.sensorsDewPoint[i];
-                                    const logInfo = this.disableLogInfo ? false : this.log(`Device: ${this.host}, ${accessoryName}, sensor:${sensorName} 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);
@@ -429,61 +403,8 @@ class TasmotaDevice {
                     //gas
 
                     //carbon dioxyde
-                    const sensorsCarbonDioxydeCount = this.sensorsCarbonDioxydeCount;
-                    if (sensorsCarbonDioxydeCount > 0) {
-                        const debug = this.enableDebugMode ? this.log('Prepare Carbon Dioxyde Sensor Services') : false;
-                        this.sensorCarbonDioxydeServices = [];
-                        for (let i = 0; i < sensorsCarbonDioxydeCount; i++) {
-                            const sensorName = this.sensorsName[i];
-                            const serviceName = `${accessoryName} ${sensorName} Carbon Dioxyde`;
-                            const sensorCarbonDioxydeService = new 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 logInfo = this.disableLogInfo ? false : this.log(`Device: ${this.host}, ${accessoryName}, sensor:${sensorName} carbon dioxyde detected: ${state ? 'Yes' : 'No'}`);
-                                    return state;
-                                });
-                            sensorCarbonDioxydeService.getCharacteristic(Characteristic.CarbonDioxideLevel)
-                                .onGet(async () => {
-                                    const value = this.sensorsCarbonDioxyde[i];
-                                    const logInfo = this.disableLogInfo ? false : this.log(`Device: ${this.host}, ${accessoryName}, sensor:${sensorName} carbon dioxyde level: ${value} ppm`);
-                                    return value;
-                                });
-                            sensorCarbonDioxydeService.getCharacteristic(Characteristic.CarbonDioxidePeakLevel)
-                                .onGet(async () => {
-                                    const value = this.sensorsCarbonDioxyde[i];
-                                    const logInfo = this.disableLogInfo ? false : this.log(`Device: ${this.host}, ${accessoryName}, sensor:${sensorName} carbon dioxyde peak level: ${value} ppm`);
-                                    return value;
-                                });
-                            this.sensorCarbonDioxydeServices.push(sensorCarbonDioxydeService);
-                            accessory.addService(sensorCarbonDioxydeService);
-                        };
-                    }
-                };
 
-                //ambient light
-                const sensorsAmbientLightCount = this.sensorsAmbientLightCount;
-                if (sensorsAmbientLightCount > 0) {
-                    const debug = this.enableDebugMode ? this.log('Prepare Ambient Light Sensor Services') : false;
-                    this.sensorAmbientLightServices = [];
-                    for (let i = 0; i < sensorsAmbientLightCount; i++) {
-                        const sensorName = this.sensorsName[i];
-                        const serviceName = `${accessoryName} ${sensorName} Ambient Light`;
-                        const sensorAmbientLightService = new 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 logInfo = this.disableLogInfo ? false : this.log(`Device: ${this.host}, ${accessoryName}, sensor:${sensorName} ambient light: ${value} lx`);
-                                return value;
-                            });
-                        this.sensorAmbientLightServices.push(sensorAmbientLightService);
-                        accessory.addService(sensorAmbientLightService);
-                    };
-                }
+                };
 
                 resolve(accessory);
             } catch (error) {