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

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.4.0-beta.13",
+  "version": "4.4.0-beta.15",
   "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,7 @@ class DeviceAta extends EventEmitter {
                     })
                     .onSet(async (value) => {
                         try {
-                            let { min, max } = await this.functions.adjustTempProtection(deviceData.FrostProtection.Min, deviceData.FrostProtection.Max, value, 4, 14, 6, 16);
+                            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}`);
@@ -779,7 +779,7 @@ class DeviceAta extends EventEmitter {
                     })
                     .onSet(async (value) => {
                         try {
-                            let { min, max } = await this.functions.adjustTempProtection(deviceData.FrostProtection.Min, deviceData.FrostProtection.Max, value, 4, 14, 6, 16);
+                            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}`);
@@ -877,7 +877,7 @@ class DeviceAta extends EventEmitter {
                     })
                     .onSet(async (value) => {
                         try {
-                            let { min, max } = await this.functions.adjustTempProtection(deviceData.OverheatProtection.Min, deviceData.OverheatProtection.Max, value, 31, 38, 33, 40);
+                            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}`);
@@ -898,7 +898,7 @@ class DeviceAta extends EventEmitter {
                     })
                     .onSet(async (value) => {
                         try {
-                            let { min, max } = await this.functions.adjustTempProtection(deviceData.OverheatProtection.Min, deviceData.OverheatProtection.Max, value, 31, 38, 33, 40);
+                            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}`);

package/src/functions.js

@@ -238,37 +238,49 @@ class Functions extends EventEmitter {
         );
     }
 
-    async adjustTempProtection(oldMin, oldMax, newValue, minRangeMin, maxRangeMin, minRangeMax, maxRangeMax) {
+    async adjustTempProtection(oldMin, oldMax, newValue, type, minRangeMin, maxRangeMin, minRangeMax, maxRangeMax) {
         let min = oldMin;
         let max = oldMax;
 
-        // Zmiana MIN
-        if (newValue !== oldMin) {
+        if (type === "min") {
             min = Math.min(Math.max(newValue, minRangeMin), maxRangeMin);
 
-            // jeśli min rośnie i różnica < 2 → podbij max
             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 };
             }
 
-            // jeśli min maleje → nic nie ruszamy w max
+            // min maleje → zwracamy tylko min
+            return { min };
         }
-        // Zmiana MAX
-        else if (newValue !== oldMax) {
+
+        if (type === "max") {
             max = Math.min(Math.max(newValue, minRangeMax), maxRangeMax);
 
-            // jeśli max maleje i różnica < 2 → obniż min
             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);
+                }
+
+                return { min, max };
             }
 
-            // jeśli max rośnie → nic nie ruszamy w min
+            // max rośnie → zwracamy tylko max
+            return { max };
         }
 
         return { min, max };
     }
 
-
 }
 
 export default Functions