homebridge-melcloud-control 4.4.0-beta.0 → 4.4.0-beta.10

package/package.json

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

package/src/deviceata.js

@@ -758,8 +758,10 @@ class DeviceAta 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}`);
@@ -777,8 +779,10 @@ class DeviceAta 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}`);
@@ -873,8 +877,10 @@ class DeviceAta extends EventEmitter {
                     })
                     .onSet(async (value) => {
                         try {
-                            deviceData.OverheatProtection.Max = value;
-                            if (this.logInfo) this.emit('info', `Set overheat protection max. temperature: ${value}${this.accessory.temperatureUnit}`);
+                            let { min, max } = await this.functions.adjustTempProtection(deviceData.OverheatProtection.Min, deviceData.OverheatProtection.Max, value, 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');
                         } catch (error) {
                             if (this.logWarn) this.emit('warn', `Set overheat protection max. temperature error: ${error}`);
@@ -892,8 +898,10 @@ class DeviceAta extends EventEmitter {
                     })
                     .onSet(async (value) => {
                         try {
-                            deviceData.OverheatProtection.Min = value;
-                            if (this.logInfo) this.emit('info', `Set overheat protection min. temperature: ${value}${this.accessory.temperatureUnit}`);
+                            let { min, max } = await this.functions.adjustTempProtection(deviceData.OverheatProtection.Min, deviceData.OverheatProtection.Max, value, 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) {
                             if (this.logWarn) this.emit('warn', `Set overheat protection min. temperature error: ${error}`);
@@ -1767,7 +1775,7 @@ class DeviceAta 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);
@@ -1779,7 +1787,7 @@ class DeviceAta extends EventEmitter {
                     if (this.overheatProtectionSupport && overheatProtection.Enabled !== null) {
                         this.overheatProtectionControlService?.updateCharacteristic(Characteristic.Active, overheatProtection.Enabled);
                         this.overheatProtectionControlService?.updateCharacteristic(Characteristic.CurrentHeaterCoolerState, overheatProtection.Active ? 2 : 1);
-                        this.overheatProtectionControlService?.updateCharacteristic(Characteristic.TargetHeaterCoolerState, overheatProtection.Active ? 2 : 1);
+                        this.overheatProtectionControlService?.updateCharacteristic(Characteristic.TargetHeaterCoolerState, 0);
                         this.overheatProtectionControlService?.updateCharacteristic(Characteristic.CurrentTemperature, roomTemperature);
                         this.overheatProtectionControlService?.updateCharacteristic(Characteristic.CoolingThresholdTemperature, overheatProtection.Max);
                         this.overheatProtectionControlService?.updateCharacteristic(Characteristic.HeatingThresholdTemperature, overheatProtection.Min);

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 <= 18) {
-                max = newMax;
-            } else {
-                // Otherwise lower min
-                const newMin = max - 2;
-                min = Math.max(newMin, 4);
+    async adjustTempProtectionSingle(oldMin, oldMax, newValue, minRangeMin, maxRangeMin, minRangeMax, maxRangeMax) {
+        let min = oldMin;
+        let max = oldMax;
+
+        // Wykryj, którą wartość zmieniono
+        if (newValue !== oldMin) {
+            // użytkownik zmienił MIN
+            min = Math.min(Math.max(newValue, minRangeMin), maxRangeMin);
+
+            if (max - min < 2) {
+                // podnieś MAX, ale nie przekraczając maxRangeMax
+                max = Math.min(min + 2, maxRangeMax);
             }
-        }
-
-        return { min, max };
-    }
+        } else if (newValue !== oldMax) {
+            // użytkownik zmienił 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 <= 18) {
-                max = newMax;
-            } else {
-                // Otherwise lower min
-                const newMin = max - 2;
-                min = Math.max(newMin, 4);
+            if (max - min < 2) {
+                // obniż MIN, ale nie przekraczając minRangeMin
+                min = Math.max(max - 2, minRangeMin);
             }
         }
 
         return { min, max };
     }
+
+
 }
 
 export default Functions

package/src/melcloudata.js

@@ -240,22 +240,20 @@ class MelCloudAta extends EventEmitter {
                 case "melcloudhome":
                     switch (flag) {
                         case 'frostprotection':
-                            let { frostMin, frostMax } = await this.functions.normalizeFrostProtection(deviceData.FrostProtection.Min, deviceData.FrostProtection.Max);
                             payload = {
                                 enabled: deviceData.FrostProtection.Enabled,
-                                min: frostMin,
-                                max: frostMax,
+                                min: deviceData.FrostProtection.Min,
+                                max: deviceData.FrostProtection.Max,
                                 units: { ATA: [deviceData.DeviceID] }
                             };
                             method = 'POST';
                             path = ApiUrlsHome.PostProtectionFrost;
                             break;
                         case 'overheatprotection':
-                            let { overMin, overMax } = await this.functions.normalizeOverheatProtection(deviceData.OverheatProtection.Min, deviceData.OverheatProtection.Max);
                             payload = {
                                 enabled: deviceData.OverheatProtection.Enabled,
-                                min: overMin,
-                                max: overMax,
+                                min: deviceData.OverheatProtection.Min,
+                                max: deviceData.OverheatProtection.Max,
                                 units: { ATA: [deviceData.DeviceID] }
                             };
                             method = 'POST';
@@ -311,6 +309,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 });
+                    this.update(deviceData);
 
                     return true;
                 default:
@@ -320,6 +319,12 @@ class MelCloudAta extends EventEmitter {
             throw new Error(`Send data error: ${error.message}`);
         }
     }
+
+    update(deviceData) {
+        setTimeout(() => {
+            this.emit('deviceState', deviceData)
+        }, 500);
+    }
 }
 
 export default MelCloudAta;