homebridge-melcloud-control 4.6.7-beta.7 → 4.6.7-beta.9

package/package.json

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

package/src/deviceatw.js

@@ -1798,26 +1798,24 @@ class DeviceAtw extends EventEmitter {
                         zonesSensors: []
                     };
 
-                    //characteristics array
-                    const characteristics = [];
-
-                    //default values
-                    let name = 'Heat Pump'
-                    let operationModeZone = 0;
-                    let currentOperationMode = 0;
-                    let targetOperationMode = 0;
-                    let roomTemperature = 20;
-                    let setTemperature = 20;
-                    let lockPhysicalControl = 0;
-                    let flowTemperature = 0;
-                    let returnTemperature = 0;
-                    let operationModeSetPropsMinValue = 0;
-                    let operationModeSetPropsMaxValue = 3;
-                    let operationModeSetPropsValidValues = [0];
-                    let temperatureSetPropsMinValue = -35;
-                    let temperatureSetPropsMaxValue = 100;
-
                     for (let i = 0; i < zonesCount; i++) {
+                        //characteristics array
+                        const characteristics = [];
+
+                        let name = '';
+                        let operationModeZone = 0;
+                        let currentOperationMode = 0;
+                        let targetOperationMode = 0;
+                        let roomTemperature = null;
+                        let setTemperature = null;
+                        let lockPhysicalControl = 0;
+                        let operationModeSetPropsMinValue = 0;
+                        let operationModeSetPropsMaxValue = 0;
+                        let operationModeSetPropsValidValues = [];
+                        let temperatureSetPropsMinValue = 0;
+                        let temperatureSetPropsMaxValue = 0;
+
+
                         switch (this.displayType) {
                             case 1: //Heater Cooler
                                 switch (i) {
@@ -1927,7 +1925,8 @@ class DeviceAtw extends EventEmitter {
                                     { type: Characteristic.TemperatureDisplayUnits, value: obj.useFahrenheit }
                                 );
 
-                                if (heatCoolModes === 0 || heatCoolModes === 2) characteristics.push({ type: Characteristic.CoolingThresholdTemperature, value: setTemperature });
+                                if (heatCoolModes === 0 || heatCoolModes === 1) characteristics.push({ type: Characteristic.HeatingThresholdTemperature, value: setTemperature });
+                                if ((heatCoolModes === 0 || heatCoolModes === 2) && i !== caseHotWater) characteristics.push({ type: Characteristic.CoolingThresholdTemperature, value: setTemperature });
                                 break;
                             case 2: //Thermostat
                                 switch (i) {
@@ -2034,6 +2033,12 @@ class DeviceAtw extends EventEmitter {
                                 break;
                         };
 
+                        //update services
+                        for (const { type, value } of characteristics) {
+                            if (!this.functions.isValidValue(value)) continue;
+                            this.melCloudServices?.[i]?.updateCharacteristic(type, value);
+                        }
+
                         //add every zone to array
                         const zone = {
                             name: name,
@@ -2093,52 +2098,60 @@ class DeviceAtw extends EventEmitter {
 
                     //update sensors characteristics
                     for (let i = 0; i < zonesSensorsCount; i++) {
+
+                        // helper function to update sensor characteristics
+                        const updateSensorCharacteristics = (service, value) => {
+                            if (this.functions.isValidValue(value)) service?.updateCharacteristic(Characteristic.CurrentTemperature, value);
+                        };
+
+                        // default values
+                        let name = '';
+                        let roomTemperature = null;
+                        let flowTemperature = null;
+                        let returnTemperature = null;
+
                         switch (i) {
-                            case caseHeatPumpSensor: //Heat Pump
+                            case caseHeatPumpSensor: // Heat Pump
                                 name = heatPumpName;
                                 roomTemperature = outdoorTemperature;
                                 flowTemperature = flowTemperatureHeatPump;
                                 returnTemperature = returnTemperatureHeatPump;
 
-                                //updte characteristics
-                                this.roomTemperatureSensorService?.updateCharacteristic(Characteristic.CurrentTemperature, outdoorTemperature);
-                                this.flowTemperatureSensorService?.updateCharacteristic(Characteristic.CurrentTemperature, flowTemperatureHeatPump);
-                                this.returnTemperatureSensorService?.updateCharacteristic(Characteristic.CurrentTemperature, returnTemperatureHeatPump);
+                                updateSensorCharacteristics(this.roomTemperatureSensorService, outdoorTemperature);
+                                updateSensorCharacteristics(this.flowTemperatureSensorService, flowTemperatureHeatPump);
+                                updateSensorCharacteristics(this.returnTemperatureSensorService, returnTemperatureHeatPump);
                                 break;
-                            case caseZone1Sensor: //Zone 1
+                            case caseZone1Sensor: // Zone 1
                                 name = zone1Name;
                                 roomTemperature = roomTemperatureZone1;
                                 flowTemperature = flowTemperatureZone1;
                                 returnTemperature = returnTemperatureZone1;
 
-                                //updte characteristics
-                                this.roomTemperatureZone1SensorService?.updateCharacteristic(Characteristic.CurrentTemperature, roomTemperatureZone1);
-                                this.flowTemperatureZone1SensorService?.updateCharacteristic(Characteristic.CurrentTemperature, flowTemperatureZone1);
-                                this.returnTemperatureZone1SensorService?.updateCharacteristic(Characteristic.CurrentTemperature, returnTemperatureZone1);
+                                updateSensorCharacteristics(this.roomTemperatureZone1SensorService, roomTemperatureZone1);
+                                updateSensorCharacteristics(this.flowTemperatureZone1SensorService, flowTemperatureZone1);
+                                updateSensorCharacteristics(this.returnTemperatureZone1SensorService, returnTemperatureZone1);
                                 break;
-                            case caseHotWaterSensor: //Hot Water
+                            case caseHotWaterSensor: // Hot Water
                                 name = hotWaterName;
                                 roomTemperature = tankWaterTemperature;
                                 flowTemperature = flowTemperatureWaterTank;
                                 returnTemperature = returnTemperatureWaterTank;
 
-                                //updte characteristics
-                                this.roomTemperatureWaterTankSensorService?.updateCharacteristic(Characteristic.CurrentTemperature, tankWaterTemperature);
-                                this.flowTemperatureWaterTankSensorService?.updateCharacteristic(Characteristic.CurrentTemperature, flowTemperatureWaterTank);
-                                this.returnTemperatureWaterTankSensorService?.updateCharacteristic(Characteristic.CurrentTemperature, returnTemperatureWaterTank);
+                                updateSensorCharacteristics(this.roomTemperatureWaterTankSensorService, tankWaterTemperature);
+                                updateSensorCharacteristics(this.flowTemperatureWaterTankSensorService, flowTemperatureWaterTank);
+                                updateSensorCharacteristics(this.returnTemperatureWaterTankSensorService, returnTemperatureWaterTank);
                                 break;
-                            case caseZone2Sensor: //Zone 2
+                            case caseZone2Sensor: // Zone 2
                                 name = zone2Name;
                                 roomTemperature = roomTemperatureZone2;
                                 flowTemperature = flowTemperatureZone2;
                                 returnTemperature = returnTemperatureZone2;
 
-                                //updte characteristics
-                                this.roomTemperatureZone2SensorService?.updateCharacteristic(Characteristic.CurrentTemperature, roomTemperatureZone2);
-                                this.flowTemperatureZone2SensorService?.updateCharacteristic(Characteristic.CurrentTemperature, flowTemperatureZone2);
-                                this.returnTemperatureZone2SensorService?.updateCharacteristic(Characteristic.CurrentTemperature, returnTemperatureZone2);
+                                updateSensorCharacteristics(this.roomTemperatureZone2SensorService, roomTemperatureZone2);
+                                updateSensorCharacteristics(this.flowTemperatureZone2SensorService, flowTemperatureZone2);
+                                updateSensorCharacteristics(this.returnTemperatureZone2SensorService, returnTemperatureZone2);
                                 break;
-                        };
+                        }
 
                         //add every sensor to array
                         const sensor = {
@@ -2177,12 +2190,6 @@ class DeviceAtw extends EventEmitter {
                     }
                     this.accessory = obj;
 
-                    //update services
-                    for (const { type, value } of characteristics) {
-                        if (!this.functions.isValidValue(value)) continue;
-                        this.melCloudServices?.[i]?.updateCharacteristic(type, value);
-                    }
-
                     //other sensors
                     this.inStandbyService?.updateCharacteristic(Characteristic.ContactSensorState, inStandbyMode);
                     this.connectService?.updateCharacteristic(Characteristic.ContactSensorState, isConnected);