homebridge-melcloud-control 4.2.6-beta.13 → 4.2.6-beta.15

package/README.md

@@ -86,8 +86,6 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
       * Outdoor temperature.
       * Frost protection.
       * Overheat protection.
-      * Frost protection.
-      * Overheat protection.
       * Holiday mode.
       * Shedules control.
       * Shedule active.
@@ -255,7 +253,7 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
 | `ataDevices[].inStandbySensor` | This enable `In Standby Mode` sensor to use with automations in HomeKit app. |
 | `ataDevices[].connectSensor` | This enable `Connect State` sensor to use with automations in HomeKit app. |
 | `ataDevices[].errorSensor` | This enable `Error` sensor to use with automations in HomeKit app. |
-| `ataDevices[].frostProtectionSupport` | This enable extra `Frost Protectio` control and sensors to use with automations in HomeKit app. |
+| `ataDevices[].frostProtectionSupport` | This enable extra `Frost Protection` control and sensors to use with automations in HomeKit app. |
 | `ataDevices[].overheatProtectionSupport` | This enable extra `Overheat Protection` control and sensors to use with automations in HomeKit app. |
 | `ataDevices[].holidayModeSupport` | This enable extra `Holiday Mode` control and sensors to use with automations in HomeKit app. |
 | `ataDevices[].refreshInterval` | Here set the background devices state refresh time in (sec), default `5s`. |

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.2.6-beta.13",
+  "version": "4.2.6-beta.15",
   "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 = {};
 
@@ -1469,6 +1475,9 @@ class DeviceAta extends EventEmitter {
                         scheduleEnabled: scheduleEnabled
                     };
 
+                    //characteristics array
+                    const characteristics = [];
+
                     //operating mode 0, HEAT, DRY, COOL, 4, 5, 6, FAN, AUTO, ISEE HEAT, ISEE DRY, ISEE COOL
                     switch (this.displayType) {
                         case 1: //Heater Cooler
@@ -1534,18 +1543,20 @@ class DeviceAta extends EventEmitter {
                             }
                             this.accessory = obj;
 
-                            //update characteristics
-                            this.melCloudService
-                                ?.updateCharacteristic(Characteristic.Active, power)
-                                .updateCharacteristic(Characteristic.CurrentHeaterCoolerState, obj.currentOperationMode)
-                                .updateCharacteristic(Characteristic.TargetHeaterCoolerState, obj.targetOperationMode)
-                                .updateCharacteristic(Characteristic.CurrentTemperature, roomTemperature)
-                                .updateCharacteristic(Characteristic.LockPhysicalControls, obj.lockPhysicalControl)
-                                .updateCharacteristic(Characteristic.TemperatureDisplayUnits, obj.useFahrenheit)
-                                .updateCharacteristic(Characteristic.CoolingThresholdTemperature, operationMode === 8 ? defaultCoolingSetTemperature : setTemperature);
-                            if (supportsHeat) this.melCloudService?.updateCharacteristic(Characteristic.HeatingThresholdTemperature, operationMode === 8 ? defaultHeatingSetTemperature : setTemperature);
-                            if (supportsFanSpeed) this.melCloudService?.updateCharacteristic(Characteristic.RotationSpeed, obj.currentFanSpeed);
-                            if (supportsSwingFunction) this.melCloudService?.updateCharacteristic(Characteristic.SwingMode, obj.currentSwingMode);
+                            //create characteristics
+                            characteristics.push(
+                                { type: Characteristic.Active, value: power },
+                                { type: Characteristic.CurrentHeaterCoolerState, value: obj.currentOperationMode },
+                                { type: Characteristic.TargetHeaterCoolerState, value: obj.targetOperationMode },
+                                { type: Characteristic.CurrentTemperature, value: roomTemperature },
+                                { type: Characteristic.LockPhysicalControls, value: obj.lockPhysicalControl },
+                                { type: Characteristic.TemperatureDisplayUnits, value: obj.useFahrenheit },
+                                { type: Characteristic.CoolingThresholdTemperature, value: operationMode === 8 ? defaultCoolingSetTemperature : setTemperature }
+                            );
+
+                            if (supportsHeat) characteristics.push({ type: Characteristic.HeatingThresholdTemperature, value: operationMode === 8 ? defaultHeatingSetTemperature : setTemperature });
+                            if (supportsFanSpeed) characteristics.push({ type: Characteristic.RotationSpeed, value: obj.currentFanSpeed });
+                            if (supportsSwingFunction) characteristics.push({ type: Characteristic.SwingMode, value: obj.currentSwingMode });
                             break;
                         case 2: //Thermostat
                             // Helper for mapping target operation in DRY / FAN modes
@@ -1606,16 +1617,23 @@ class DeviceAta extends EventEmitter {
                             obj.operationModeSetPropsValidValues = supportsAuto && supportsHeat ? [0, 1, 2, 3] : !supportsAuto && supportsHeat ? [0, 1, 2] : supportsAuto && !supportsHeat ? [0, 2, 3] : [0, 2];
                             this.accessory = obj;
 
-                            //update characteristics
-                            this.melCloudService
-                                ?.updateCharacteristic(Characteristic.CurrentHeatingCoolingState, obj.currentOperationMode)
-                                .updateCharacteristic(Characteristic.TargetHeatingCoolingState, obj.targetOperationMode)
-                                .updateCharacteristic(Characteristic.CurrentTemperature, roomTemperature)
-                                .updateCharacteristic(Characteristic.TargetTemperature, setTemperature)
-                                .updateCharacteristic(Characteristic.TemperatureDisplayUnits, obj.useFahrenheit);
+                            //create characteristics
+                            characteristics.push(
+                                { type: Characteristic.CurrentHeatingCoolingState, value: obj.currentOperationMode },
+                                { type: Characteristic.TargetHeatingCoolingState, value: obj.targetOperationMode },
+                                { type: Characteristic.CurrentTemperature, value: roomTemperature },
+                                { type: Characteristic.TargetTemperature, value: setTemperature },
+                                { type: Characteristic.TemperatureDisplayUnits, value: obj.useFahrenheit }
+                            );
                             break;
                     };
 
+                    //update services
+                    for (const { type, value } of characteristics) {
+                        if (!this.functions.isValidValue(value)) continue;
+                        this.melCloudService?.updateCharacteristic(type, value);
+                    }
+
                     //other sensors
                     this.roomTemperatureSensorService?.updateCharacteristic(Characteristic.CurrentTemperature, roomTemperature);
                     this.outdoorTemperatureSensorService?.updateCharacteristic(Characteristic.CurrentTemperature, outdoorTemperature);

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 = {};
 
@@ -1671,6 +1677,9 @@ class DeviceAtw extends EventEmitter {
                         zonesSensors: []
                     };
 
+                    //characteristics array
+                    const characteristics = [];
+
                     //default values
                     let name = 'Heat Pump'
                     let operationModeZone = 0;
@@ -1787,15 +1796,17 @@ class DeviceAtw extends EventEmitter {
                                         break;
                                 };
 
-                                //update characteristics
-                                this.melCloudServices?.[i]
-                                    ?.updateCharacteristic(Characteristic.Active, power)
-                                    .updateCharacteristic(Characteristic.CurrentHeaterCoolerState, currentOperationMode)
-                                    .updateCharacteristic(Characteristic.TargetHeaterCoolerState, targetOperationMode)
-                                    .updateCharacteristic(Characteristic.CurrentTemperature, roomTemperature)
-                                    .updateCharacteristic(Characteristic.LockPhysicalControls, lockPhysicalControl)
-                                    .updateCharacteristic(Characteristic.TemperatureDisplayUnits, obj.useFahrenheit);
-                                if (heatCoolModes === 0 || heatCoolModes === 2) this.melCloudServices?.[i]?.updateCharacteristic(Characteristic.CoolingThresholdTemperature, setTemperature);
+                                //create characteristics
+                                characteristics.push(
+                                    { type: Characteristic.Active, value: power },
+                                    { type: Characteristic.CurrentHeaterCoolerState, value: currentOperationMode },
+                                    { type: Characteristic.TargetHeaterCoolerState, value: targetOperationMode },
+                                    { type: Characteristic.CurrentTemperature, value: roomTemperature },
+                                    { type: Characteristic.LockPhysicalControls, value: lockPhysicalControl },
+                                    { type: Characteristic.TemperatureDisplayUnits, value: obj.useFahrenheit }
+                                );
+
+                                if (heatCoolModes === 0 || heatCoolModes === 2) characteristics.push({ type: Characteristic.CoolingThresholdTemperature, value: setTemperature });
                                 break;
                             case 2: //Thermostat
                                 switch (i) {
@@ -1891,16 +1902,23 @@ class DeviceAtw extends EventEmitter {
                                         break;
                                 };
 
-                                //update characteristics
-                                this.melCloudServices?.[i]
-                                    ?.updateCharacteristic(Characteristic.CurrentHeatingCoolingState, currentOperationMode)
-                                    .updateCharacteristic(Characteristic.TargetHeatingCoolingState, targetOperationMode)
-                                    .updateCharacteristic(Characteristic.CurrentTemperature, roomTemperature)
-                                    .updateCharacteristic(Characteristic.TargetTemperature, setTemperature)
-                                    .updateCharacteristic(Characteristic.TemperatureDisplayUnits, obj.useFahrenheit);
+                                //create characteristics
+                                characteristics.push(
+                                    { type: Characteristic.CurrentHeatingCoolingState, value: currentOperationMode },
+                                    { type: Characteristic.TargetHeatingCoolingState, value: targetOperationMode },
+                                    { type: Characteristic.CurrentTemperature, value: roomTemperature },
+                                    { type: Characteristic.TargetTemperature, value: setTemperature },
+                                    { type: Characteristic.TemperatureDisplayUnits, value: obj.useFahrenheit }
+                                );
                                 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,

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 = {};
 
@@ -1257,6 +1263,9 @@ class DeviceErv extends EventEmitter {
                         scheduleEnabled: scheduleEnabled
                     };
 
+                    //characteristics array
+                    const characteristics = [];
+
                     //ventilation mode - 0, HEAT, 2, COOL, 4, 5, 6, FAN, AUTO
                     switch (this.displayType) {
                         case 1: //Heater Cooler
@@ -1313,17 +1322,19 @@ class DeviceErv extends EventEmitter {
                             }
                             this.accessory = obj;
 
-                            //update characteristics
-                            this.melCloudService
-                                ?.updateCharacteristic(Characteristic.Active, power)
-                                .updateCharacteristic(Characteristic.CurrentHeaterCoolerState, obj.currentOperationMode)
-                                .updateCharacteristic(Characteristic.TargetHeaterCoolerState, obj.targetOperationMode)
-                                .updateCharacteristic(Characteristic.CurrentTemperature, roomTemperature)
-                                .updateCharacteristic(Characteristic.RotationSpeed, obj.fanSpeed)
-                                .updateCharacteristic(Characteristic.LockPhysicalControls, obj.lockPhysicalControl)
-                                .updateCharacteristic(Characteristic.TemperatureDisplayUnits, obj.useFahrenheit);
-                            if (supportsCoolOperationMode) this.melCloudService?.updateCharacteristic(Characteristic.CoolingThresholdTemperature, defaultCoolingSetTemperature);
-                            if (supportsHeatOperationMode) this.melCloudService?.updateCharacteristic(Characteristic.HeatingThresholdTemperature, defaultHeatingSetTemperature);
+                            //create characteristics
+                            characteristics.push(
+                                { type: Characteristic.Active, value: power },
+                                { type: Characteristic.CurrentHeaterCoolerState, value: obj.currentOperationMode },
+                                { type: Characteristic.TargetHeaterCoolerState, value: obj.targetOperationMode },
+                                { type: Characteristic.CurrentTemperature, value: roomTemperature },
+                                { type: Characteristic.RotationSpeed, value: obj.fanSpeed },
+                                { type: Characteristic.LockPhysicalControls, value: obj.lockPhysicalControl },
+                                { type: Characteristic.TemperatureDisplayUnits, value: obj.useFahrenheit },
+                            );
+
+                            if (supportsCoolOperationMode) characteristics.push({ type: Characteristic.CoolingThresholdTemperature, value: defaultCoolingSetTemperature });
+                            if (supportsHeatOperationMode) characteristics.push({ type: Characteristic.HeatingThresholdTemperature, value: defaultHeatingSetTemperature });
                             break;
                         case 2: //Thermostat
                             //operation mode - 0, HEAT, 2, COOL, 4, 5, 6, FAN, AUTO
@@ -1369,9 +1380,24 @@ class DeviceErv extends EventEmitter {
                                 .updateCharacteristic(Characteristic.CurrentTemperature, roomTemperature)
                                 .updateCharacteristic(Characteristic.TargetTemperature, setTemperature)
                                 .updateCharacteristic(Characteristic.TemperatureDisplayUnits, obj.useFahrenheit);
+
+                            //create characteristics
+                            characteristics.push(
+                                { type: Characteristic.CurrentHeatingCoolingState, value: obj.currentOperationMode },
+                                { type: Characteristic.TargetHeatingCoolingState, value: obj.targetOperationMode },
+                                { type: Characteristic.CurrentTemperature, value: roomTemperature },
+                                { type: Characteristic.TargetTemperature, value: setTemperature },
+                                { type: Characteristic.TemperatureDisplayUnits, value: obj.useFahrenheit },
+                            );
                             break;
                     };
 
+                    //update services
+                    for (const { type, value } of characteristics) {
+                        if (!this.functions.isValidValue(value)) continue;
+                        this.melCloudService?.updateCharacteristic(type, value);
+                    }
+
                     //update temperature sensors
                     this.roomTemperatureSensorService?.updateCharacteristic(Characteristic.CurrentTemperature, roomTemperature);
                     this.outdoorTemperatureSensorService?.updateCharacteristic(Characteristic.CurrentTemperature, outdoorTemperature);

package/src/functions.js

@@ -156,5 +156,9 @@ class Functions extends EventEmitter {
         }
     }
 
+    isValidValue(v) {
+        return v !== undefined && v !== null && !(typeof v === 'number' && Number.isNaN(v));
+    }
+
 }
 export default Functions