homebridge-melcloud-control 4.4.0-beta.5 → 4.4.0-beta.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.4.0-beta.5",
+  "version": "4.4.0-beta.9",
   "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.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}`);
@@ -779,7 +779,7 @@ 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}`);
@@ -877,7 +877,7 @@ 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}`);
@@ -898,7 +898,7 @@ 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}`);

package/src/functions.js

@@ -238,47 +238,33 @@ 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") {
+            // użytkownik zmienia MIN
+            min = Math.min(Math.max(newValue, minRangeMin), maxRangeMin);
+
+            // jeśli różnica jest za mała → podnieś MAX
+            if (max - min < 2) {
+                max = Math.min(min + 2, maxRangeMax);
             }
         }
 
-        return { min, max };
-    }
+        if (type === "max") {
+            // użytkownik zmienia MAX
+            max = Math.min(Math.max(newValue, minRangeMax), 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);
+            // jeśli różnica jest za mała → obniż MIN
+            if (max - min < 2) {
+                min = Math.max(max - 2, minRangeMin);
             }
         }
 
         return { min, max };
     }
+
 }
 
 export default Functions