homebridge-melcloud-control 4.2.6-beta.14 → 4.2.6-beta.16

package/package.json

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

package/src/deviceata.js

@@ -2,6 +2,7 @@ import EventEmitter from 'events';
 import MelCloudAta from './melcloudata.js';
 import RestFul from './restful.js';
 import Mqtt from './mqtt.js';
+import Functions from './functions.js';
 import { TemperatureDisplayUnits, AirConditioner } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
@@ -96,6 +97,11 @@ class DeviceAta extends EventEmitter {
             button.previousValue = null;
         }
 
+        this.functions = new Functions(this.logWarn, this.logError, this.logDebug)
+            .on('warn', warn => this.emit('warn', warn))
+            .on('error', error => this.emit('error', error))
+            .on('debug', debug => this.emit('debug', debug));
+
         //device data
         this.deviceData = {};
 
@@ -1535,7 +1541,6 @@ class DeviceAta extends EventEmitter {
                                 obj.currentFanSpeed = speeds[setFanSpeed];
                                 obj.fanSpeedSetPropsMaxValue = supportsAutomaticFanSpeed ? max + 1 : max;
                             }
-                            this.accessory = obj;
 
                             //create characteristics
                             characteristics.push(
@@ -1609,7 +1614,6 @@ class DeviceAta extends EventEmitter {
                             obj.operationModeSetPropsMinValue = 0
                             obj.operationModeSetPropsMaxValue = supportsAuto && supportsHeat ? 3 : !supportsAuto && supportsHeat ? 2 : supportsAuto && !supportsHeat ? 3 : 2;
                             obj.operationModeSetPropsValidValues = supportsAuto && supportsHeat ? [0, 1, 2, 3] : !supportsAuto && supportsHeat ? [0, 1, 2] : supportsAuto && !supportsHeat ? [0, 2, 3] : [0, 2];
-                            this.accessory = obj;
 
                             //create characteristics
                             characteristics.push(
@@ -1621,6 +1625,7 @@ class DeviceAta extends EventEmitter {
                             );
                             break;
                     };
+                    this.accessory = obj;
 
                     //update services
                     for (const { type, value } of characteristics) {

package/src/deviceatw.js

@@ -2,6 +2,7 @@ import EventEmitter from 'events';
 import MelCloudAtw from './melcloudatw.js';
 import RestFul from './restful.js';
 import Mqtt from './mqtt.js';
+import Functions from './functions.js';
 import { TemperatureDisplayUnits, HeatPump } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
@@ -97,6 +98,11 @@ class DeviceAtw extends EventEmitter {
             button.previousValue = null;
         }
 
+        this.functions = new Functions(this.logWarn, this.logError, this.logDebug)
+            .on('warn', warn => this.emit('warn', warn))
+            .on('error', error => this.emit('error', error))
+            .on('debug', debug => this.emit('debug', debug));
+
         //device data
         this.deviceData = {};
 
@@ -1907,12 +1913,6 @@ class DeviceAtw extends EventEmitter {
                                 break;
                         };
 
-                        //update services
-                        for (const { type, value } of characteristics) {
-                            if (!this.functions.isValidValue(value)) continue;
-                            this.melCloudService?.[i]?.updateCharacteristic(type, value);
-                        }
-
                         //add every zone to array
                         const zone = {
                             name: name,
@@ -2055,6 +2055,12 @@ class DeviceAtw extends EventEmitter {
                     };
                     this.accessory = obj;
 
+                    //update services
+                    for (const { type, value } of characteristics) {
+                        if (!this.functions.isValidValue(value)) continue;
+                        this.melCloudService?.[i]?.updateCharacteristic(type, value);
+                    }
+
                     //other sensors
                     this.inStandbyService?.updateCharacteristic(Characteristic.ContactSensorState, inStandbyMode);
                     this.connectService?.updateCharacteristic(Characteristic.ContactSensorState, isConnected);

package/src/deviceerv.js

@@ -2,6 +2,7 @@ import EventEmitter from 'events';
 import MelCloudErv from './melclouderv.js';
 import RestFul from './restful.js';
 import Mqtt from './mqtt.js';
+import Functions from './functions.js';
 import { TemperatureDisplayUnits, Ventilation } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
@@ -90,6 +91,11 @@ class DeviceErv extends EventEmitter {
             button.previousValue = null;
         }
 
+        this.functions = new Functions(this.logWarn, this.logError, this.logDebug)
+            .on('warn', warn => this.emit('warn', warn))
+            .on('error', error => this.emit('error', error))
+            .on('debug', debug => this.emit('debug', debug));
+
         //device data
         this.deviceData = {};
 
@@ -1314,7 +1320,6 @@ class DeviceErv extends EventEmitter {
                                 obj.fanSpeed = speeds[setFanSpeed];
                                 obj.fanSpeedSetPropsMaxValue = supportsAutomaticFanSpeed ? max + 1 : max;
                             }
-                            this.accessory = obj;
 
                             //create characteristics
                             characteristics.push(
@@ -1365,7 +1370,6 @@ class DeviceErv extends EventEmitter {
                             obj.operationModeSetPropsMinValue = supportsAutoVentilationMode ? 0 : 0;
                             obj.operationModeSetPropsMaxValue = supportsAutoVentilationMode ? 3 : 2;
                             obj.operationModeSetPropsValidValues = supportsAutoVentilationMode ? (supportsBypassVentilationMode ? [0, 1, 2, 3] : [0, 2, 3]) : (supportsBypassVentilationMode ? [0, 1, 2] : [0, 2]);
-                            this.accessory = obj;
 
                             //update characteristics
                             this.melCloudService
@@ -1386,6 +1390,8 @@ class DeviceErv extends EventEmitter {
                             break;
                     };
 
+                    this.accessory = obj;
+
                     //update services
                     for (const { type, value } of characteristics) {
                         if (!this.functions.isValidValue(value)) continue;