homebridge-melcloud-control 3.8.0-beta.8 → 3.8.0-beta.9

package/config.schema.json

@@ -1867,7 +1867,7 @@
                     }
                   ],
                   "condition": {
-                    "functionBody": "return model.accounts[arrayIndices].ataDevices.length >= 1;"
+                    "functionBody": "return model.accounts[arrayIndices].ataDevices.length > 0;"
                   }
                 },
                 {
@@ -1876,7 +1876,7 @@
                   "title": "{{ value.title }}",
                   "items": [],
                   "condition": {
-                    "functionBody": "return model.accounts[arrayIndices].ataDevices.length < 1;"
+                    "functionBody": "return model.accounts[arrayIndices].ataDevices.length === 0;"
                   }
                 }
               ]
@@ -1974,7 +1974,7 @@
                     }
                   ],
                   "condition": {
-                    "functionBody": "return model.accounts[arrayIndices].atwDevices.length >= 1;"
+                    "functionBody": "return model.accounts[arrayIndices].atwDevices.length > 0;"
                   }
                 },
                 {
@@ -1983,7 +1983,7 @@
                   "title": "{{ value.title }}",
                   "items": [],
                   "condition": {
-                    "functionBody": "return model.accounts[arrayIndices].atwDevices.length < 1;"
+                    "functionBody": "return model.accounts[arrayIndices].atwDevices.length === 0;"
                   }
                 }
               ]
@@ -2074,7 +2074,7 @@
                     }
                   ],
                   "condition": {
-                    "functionBody": "return model.accounts[arrayIndices].ervDevices.length >= 1;"
+                    "functionBody": "return model.accounts[arrayIndices].ervDevices.length > 0;"
                   }
                 },
                 {
@@ -2083,7 +2083,7 @@
                   "title": "{{ value.title }}",
                   "items": [],
                   "condition": {
-                    "functionBody": "return model.accounts[arrayIndices].ervDevices.length < 1;"
+                    "functionBody": "return model.accounts[arrayIndices].ervDevices.length === 0;"
                   }
                 }
               ]

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "3.8.0-beta.8",
+  "version": "3.8.0-beta.9",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/deviceata.js

@@ -971,7 +971,7 @@ class DeviceAta extends EventEmitter {
                     this.firmwareRevision = firmwareAppVersion;
                     this.displayDeviceInfo = false;
                 })
-                .on('deviceState', (deviceData) => {
+                .on('deviceState', async (deviceData) => {
                     this.deviceData = deviceData;
 
                     //presets
@@ -1369,6 +1369,13 @@ class DeviceAta extends EventEmitter {
                         this.emit('message', `Temperature display unit: ${this.accessory.temperatureUnit}`);
                         this.emit('message', `Lock physical controls: ${this.accessory.lockPhysicalControl ? 'LOCKED' : 'UNLOCKED'}`);
                     };
+
+                    //prepare accessory
+                    if (this.startPrepareAccessory) {
+                        const accessory = await this.prepareAccessory(this.accountInfo, deviceData, this.deviceId, this.deviceTypeText, this.deviceName, this.accountName);
+                        this.emit('publishAccessory', accessory);
+                        this.startPrepareAccessory = false;
+                    }
                 })
                 .on('success', (success) => {
                     this.emit('success', success);
@@ -1396,18 +1403,7 @@ class DeviceAta extends EventEmitter {
             const startExternalIntegrations = this.restFul.enable || this.mqtt.enable ? await this.externalIntegrations() : false;
 
             //check state
-            const deviceData = await this.melCloudAta.checkState();
-
-            if (deviceData === false) {
-                return null;
-            }
-
-            //prepare accessory
-            if (this.startPrepareAccessory) {
-                const accessory = await this.prepareAccessory(this.accountInfo, deviceData, this.deviceId, this.deviceTypeText, this.deviceName, this.accountName);
-                this.emit('publishAccessory', accessory);
-                this.startPrepareAccessory = false;
-            }
+            await this.melCloudAta.checkState();
 
             return true;
         } catch (error) {

package/src/deviceatw.js

@@ -1331,7 +1331,7 @@ class DeviceAtw extends EventEmitter {
                 this.firmwareRevision = firmwareAppVersion;
                 this.displayDeviceInfo = false;
             })
-                .on('deviceState', (deviceData) => {
+                .on('deviceState', async (deviceData) => {
                     this.deviceData = deviceData;
 
                     //presets
@@ -1920,6 +1920,13 @@ class DeviceAtw extends EventEmitter {
                             };
                         };
                     };
+
+                    //prepare accessory
+                    if (this.startPrepareAccessory) {
+                        const accessory = await this.prepareAccessory(this.accountInfo, deviceData, this.deviceId, this.deviceTypeText, this.deviceName, this.accountName);
+                        this.emit('publishAccessory', accessory);
+                        this.startPrepareAccessory = false;
+                    }
                 })
                 .on('success', (success) => {
                     this.emit('success', success);
@@ -1947,18 +1954,7 @@ class DeviceAtw extends EventEmitter {
             const startExternalIntegrations = this.restFul.enable || this.mqtt.enable ? await this.externalIntegrations() : false;
 
             //check state
-            const deviceData = await this.melCloudAtw.checkState();
-
-            if (deviceData === false) {
-                return null;
-            }
-
-            //prepare accessory
-            if (this.startPrepareAccessory) {
-                const accessory = await this.prepareAccessory(this.accountInfo, deviceData, this.deviceId, this.deviceTypeText, this.deviceName, this.accountName);
-                this.emit('publishAccessory', accessory);
-                this.startPrepareAccessory = false;
-            }
+            await this.melCloudAtw.checkState();
 
             return true;
         } catch (error) {

package/src/deviceerv.js

@@ -889,7 +889,7 @@ class DeviceErv extends EventEmitter {
                 this.firmwareRevision = firmwareAppVersion;
                 this.displayDeviceInfo = false;
             })
-                .on('deviceState', (deviceData) => {
+                .on('deviceState', async (deviceData) => {
                     this.deviceData = deviceData;
 
                     //presets
@@ -1234,6 +1234,13 @@ class DeviceErv extends EventEmitter {
                         const info7 = hasPM25Sensor ? this.emit('message', `PM2.5 air quality: ${Ventilation.PM25AirQuality[pM25AirQuality]}`) : false;
                         const info8 = hasPM25Sensor ? this.emit('message', `PM2.5 level: ${pM25Level} µg/m`) : false;
                     };
+
+                    //prepare accessory
+                    if (this.startPrepareAccessory) {
+                        const accessory = await this.prepareAccessory(this.accountInfo, deviceData, this.deviceId, this.deviceTypeText, this.deviceName, this.accountName);
+                        this.emit('publishAccessory', accessory);
+                        this.startPrepareAccessory = false;
+                    }
                 })
                 .on('success', (success) => {
                     this.emit('success', success);
@@ -1261,18 +1268,7 @@ class DeviceErv extends EventEmitter {
             const startExternalIntegrations = this.restFul.enable || this.mqtt.enable ? await this.externalIntegrations() : false;
 
             //check state
-            const deviceData = await this.melCloudErv.checkState();
-
-            if (deviceData === false) {
-                return null;
-            }
-
-            //prepare accessory
-            if (this.startPrepareAccessory) {
-                const accessory = await this.prepareAccessory(this.accountInfo, deviceData, this.deviceId, this.deviceTypeText, this.deviceName, this.accountName);
-                this.emit('publishAccessory', accessory);
-                this.startPrepareAccessory = false;
-            }
+            await this.melCloudErv.checkState();
 
             return true;
         } catch (error) {