homebridge-melcloud-control 4.4.0-beta.2 → 4.4.0-beta.21

package/package.json

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

package/src/deviceata.js

@@ -758,7 +758,8 @@ class DeviceAta extends EventEmitter {
                     })
                     .onSet(async (value) => {
                         try {
-                            let { min, max } = await this.functions.normalizeFrostProtection(deviceData.FrostProtection.Min, value);
+                            let { min, max } = await this.functions.adjustTempProtection(deviceData.FrostProtection.Min, deviceData.FrostProtection.Max, value, 'max', 4, 14, 6, 16);
+                            deviceData.FrostProtection.Min = min;
                             deviceData.FrostProtection.Max = max;
                             if (this.logInfo) this.emit('info', `Set frost protection max. temperature: ${max}${this.accessory.temperatureUnit}`);
                             await this.melCloudAta.send(this.accountType, this.displayType, deviceData, 'frostprotection');
@@ -778,9 +779,9 @@ class DeviceAta extends EventEmitter {
                     })
                     .onSet(async (value) => {
                         try {
-                            let { min, max } = await this.functions.normalizeFrostProtection(value, deviceData.FrostProtection.Max);
+                            let { min, max } = await this.functions.adjustTempProtection(deviceData.FrostProtection.Min, deviceData.FrostProtection.Max, value, 'min', 4, 14, 6, 16);
                             deviceData.FrostProtection.Min = min;
-                            ;
+                            deviceData.FrostProtection.Max = max;
                             if (this.logInfo) this.emit('info', `Set frost protection min. temperature: ${min}${this.accessory.temperatureUnit}`);
                             await this.melCloudAta.send(this.accountType, this.displayType, deviceData, 'frostprotection');
                         } catch (error) {
@@ -876,7 +877,8 @@ class DeviceAta extends EventEmitter {
                     })
                     .onSet(async (value) => {
                         try {
-                            let { min, max } = await this.functions.normalizeOverheatProtection(deviceData.OverheatProtection.Min, value);
+                            let { min, max } = await this.functions.adjustTempProtection(deviceData.OverheatProtection.Min, deviceData.OverheatProtection.Max, value, 'max', 31, 38, 33, 40);
+                            deviceData.OverheatProtection.Min = min;
                             deviceData.OverheatProtection.Max = max;
                             if (this.logInfo) this.emit('info', `Set overheat protection max. temperature: ${max}${this.accessory.temperatureUnit}`);
                             await this.melCloudAta.send(this.accountType, this.displayType, deviceData, 'overheatprotection');
@@ -896,8 +898,9 @@ class DeviceAta extends EventEmitter {
                     })
                     .onSet(async (value) => {
                         try {
-                            let { min, max } = await this.functions.normalizeOverheatProtection(value, deviceData.OverheatProtection.Max);
+                            let { min, max } = await this.functions.adjustTempProtection(deviceData.OverheatProtection.Min, deviceData.OverheatProtection.Max, value, 'min', 31, 38, 33, 40);
                             deviceData.OverheatProtection.Min = min;
+                            deviceData.OverheatProtection.Max = max;
                             if (this.logInfo) this.emit('info', `Set overheat protection min. temperature: ${min}${this.accessory.temperatureUnit}`);
                             await this.melCloudAta.send(this.accountType, this.displayType, deviceData, 'overheatprotection');
                         } catch (error) {

package/src/deviceatw.js

@@ -1115,8 +1115,10 @@ class DeviceAtw extends EventEmitter {
                     })
                     .onSet(async (value) => {
                         try {
-                            deviceData.FrostProtection.Max = value;
-                            if (this.logInfo) this.emit('info', `Set frost protection max. temperature: ${value}${this.accessory.temperatureUnit}`);
+                            let { min, max } = await this.functions.adjustTempProtection(deviceData.FrostProtection.Min, deviceData.FrostProtection.Max, value, 4, 14, 6, 16);
+                            deviceData.FrostProtection.Min = min;
+                            deviceData.FrostProtection.Max = max;
+                            if (this.logInfo) this.emit('info', `Set frost protection max. temperature: ${max}${this.accessory.temperatureUnit}`);
                             await this.melCloudAta.send(this.accountType, this.displayType, deviceData, 'frostprotection');
                         } catch (error) {
                             if (this.logWarn) this.emit('warn', `Set frost protection max. temperature error: ${error}`);
@@ -1134,8 +1136,10 @@ class DeviceAtw extends EventEmitter {
                     })
                     .onSet(async (value) => {
                         try {
-                            deviceData.FrostProtection.Min = value;
-                            if (this.logInfo) this.emit('info', `Set frost protection min. temperature: ${value}${this.accessory.temperatureUnit}`);
+                            let { min, max } = await this.functions.adjustTempProtection(deviceData.FrostProtection.Min, deviceData.FrostProtection.Max, value, 4, 14, 6, 16);
+                            deviceData.FrostProtection.Min = min;
+                            deviceData.FrostProtection.Max = max;
+                            if (this.logInfo) this.emit('info', `Set frost protection min. temperature: ${min}${this.accessory.temperatureUnit}`);
                             await this.melCloudAta.send(this.accountType, this.displayType, deviceData, 'frostprotection');
                         } catch (error) {
                             if (this.logWarn) this.emit('warn', `Set frost protection min. temperature error: ${error}`);
@@ -2189,7 +2193,7 @@ class DeviceAtw extends EventEmitter {
                     if (this.frostProtectionSupport && frostProtection.Enabled !== null) {
                         this.frostProtectionControlService?.updateCharacteristic(Characteristic.Active, frostProtection.Enabled);
                         this.frostProtectionControlService?.updateCharacteristic(Characteristic.CurrentHeaterCoolerState, frostProtection.Active ? 2 : 1);
-                        this.frostProtectionControlService?.updateCharacteristic(Characteristic.TargetHeaterCoolerState, frostProtection.Active ? 2 : 1);
+                        this.frostProtectionControlService?.updateCharacteristic(Characteristic.TargetHeaterCoolerState, 0);
                         this.frostProtectionControlService?.updateCharacteristic(Characteristic.CurrentTemperature, roomTemperature);
                         this.frostProtectionControlService?.updateCharacteristic(Characteristic.CoolingThresholdTemperature, frostProtection.Max);
                         this.frostProtectionControlService?.updateCharacteristic(Characteristic.HeatingThresholdTemperature, frostProtection.Min);

package/src/functions.js

@@ -238,47 +238,49 @@ class Functions extends EventEmitter {
         );
     }
 
-    async normalizeFrostProtection(min, max) {
-        // Clamp to allowed ranges
-        min = Math.min(Math.max(min, 4), 14);
-        max = Math.min(Math.max(max, 6), 16);
-
-        // Ensure difference of at least 2 degrees
-        if (max - min < 2) {
-            // Try increasing max if possible
-            const newMax = min + 2;
-            if (newMax <= 16) {
-                max = newMax;
-            } else {
-                // Otherwise lower min
-                const newMin = max - 2;
-                min = Math.max(newMin, 4);
+    async adjustTempProtection(oldMin, oldMax, newValue, type, minRangeMin, maxRangeMin, minRangeMax, maxRangeMax) {
+        let min = oldMin;
+        let max = oldMax;
+
+        if (type === "min") {
+            min = Math.min(Math.max(newValue, minRangeMin), maxRangeMin);
+
+            if (min > oldMin && max - min < 2) {
+                max = Math.min(min + 2, maxRangeMax);
+
+                // jeśli max uderza w górną granicę → obniż min o 2
+                if (max === maxRangeMax && max - min < 2) {
+                    min = Math.max(min - 2, minRangeMin);
+                }
+
+                return { min, max };
             }
+
+            // min maleje → zwracamy tylko min
+            return { min, max };
         }
 
-        return { min, max };
-    }
+        if (type === "max") {
+            max = Math.min(Math.max(newValue, minRangeMax), maxRangeMax);
+
+            if (max < oldMax && max - min < 2) {
+                min = Math.max(max - 2, minRangeMin);
+
+                // jeśli min uderza w dolną granicę → podbij max o 2
+                if (min === minRangeMin && max - min < 2) {
+                    max = Math.min(max + 2, maxRangeMax);
+                }
 
-    async normalizeOverheatProtection(min, max) {
-        // Clamp to allowed ranges
-        min = Math.min(Math.max(min, 31), 38);
-        max = Math.min(Math.max(max, 33), 40);
-
-        // Ensure difference of at least 2 degrees
-        if (max - min < 2) {
-            // Try increasing max if possible
-            const newMax = min + 2;
-            if (newMax <= 40) {
-                max = newMax;
-            } else {
-                // Otherwise lower min
-                const newMin = max - 2;
-                min = Math.max(newMin, 31);
+                return { min, max };
             }
+
+            // max rośnie → zwracamy tylko max
+            return { min, max };
         }
 
         return { min, max };
     }
+
 }
 
 export default Functions

package/src/melcloudata.js

@@ -24,6 +24,7 @@ class MelCloudAta extends EventEmitter {
         //set default values
         this.deviceData = {};
         this.client = melcloud.client;
+        this.lock = false;
 
         //handle melcloud events
         let deviceData = null;
@@ -31,6 +32,8 @@ class MelCloudAta extends EventEmitter {
             this.client = client;
         }).on('devicesList', async (devicesData) => {
             try {
+                if (this.lock) return;
+
                 deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
                 if (!deviceData) return;
                 deviceData.Scenes = devicesData.Scenes ?? [];
@@ -44,7 +47,7 @@ class MelCloudAta extends EventEmitter {
         }).on('webSocket', async (parsedMessage) => {
             try {
                 const messageData = parsedMessage?.[0]?.Data;
-                if (!messageData || !deviceData) return;
+                if (!messageData || !deviceData || this.lock) return;
 
                 let updateState = false;
                 const unitId = messageData?.id;
@@ -196,6 +199,7 @@ class MelCloudAta extends EventEmitter {
             let method = null
             let payload = {};
             let path = '';
+            let update = false;
             switch (accountType) {
                 case "melcloud":
                     switch (flag) {
@@ -248,6 +252,7 @@ class MelCloudAta extends EventEmitter {
                             };
                             method = 'POST';
                             path = ApiUrlsHome.PostProtectionFrost;
+                            update = true;
                             break;
                         case 'overheatprotection':
                             payload = {
@@ -258,6 +263,7 @@ class MelCloudAta extends EventEmitter {
                             };
                             method = 'POST';
                             path = ApiUrlsHome.PostProtectionOverheat;
+                            update = true;
                             break;
                         case 'holidaymode':
                             payload = {
@@ -309,6 +315,7 @@ class MelCloudAta extends EventEmitter {
                     //send payload
                     if (this.logDebug) this.emit('debug', `Send data: ${JSON.stringify(payload, null, 2)}`);
                     await this.client(path, { method: method, data: payload });
+                    if (update) this.update(deviceData);
 
                     return true;
                 default:
@@ -318,6 +325,14 @@ class MelCloudAta extends EventEmitter {
             throw new Error(`Send data error: ${error.message}`);
         }
     }
+
+    update(deviceData) {
+        this.lock = true;
+        this.emit('deviceState', deviceData)
+        setTimeout(() => {
+            this.lock = false;
+        }, 5000);
+    }
 }
 
 export default MelCloudAta;