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

package/package.json

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

package/src/deviceata.js

@@ -934,7 +934,7 @@ class DeviceAta extends EventEmitter {
             }
 
             //holiday mode
-            if (this.holidayModeSupport && this.accessory.holidayModeEnabled !== null) {
+            if (this.holidayModeSupport && this.accessory.holidayMode.Enabled !== null) {
                 //control
                 if (this.logDebug) this.emit('debug', `Prepare holiday mode control service`);
                 this.holidayModeControlService = new Service.Switch(`${serviceName} Holiday Mode`, `holidayModeControlService${deviceId}`);
@@ -942,7 +942,7 @@ class DeviceAta extends EventEmitter {
                 this.holidayModeControlService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Holiday Mode`);
                 this.holidayModeControlService.getCharacteristic(Characteristic.On)
                     .onGet(async () => {
-                        const state = this.accessory.holidayModeEnabled;
+                        const state = this.accessory.holidayMode.Enabled;
                         return state;
                     })
                     .onSet(async (state) => {
@@ -962,7 +962,7 @@ class DeviceAta extends EventEmitter {
                 this.holidayModeControlSensorService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Holiday Mode Control`);
                 this.holidayModeControlSensorService.getCharacteristic(Characteristic.ContactSensorState)
                     .onGet(async () => {
-                        const state = this.accessory.holidayModeEnabled;
+                        const state = this.accessory.holidayMode.Enabled;
                         return state;
                     })
                 accessory.addService(this.holidayModeControlSensorService);
@@ -974,7 +974,7 @@ class DeviceAta extends EventEmitter {
                 this.holidayModeSensorService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Holiday Mode`);
                 this.holidayModeSensorService.getCharacteristic(Characteristic.ContactSensorState)
                     .onGet(async () => {
-                        const state = this.accessory.holidayModeActive;
+                        const state = this.accessory.holidayMode.Active;
                         return state;
                     })
                 accessory.addService(this.holidayModeSensorService);
@@ -1506,15 +1506,14 @@ class DeviceAta extends EventEmitter {
 
                     //presets schedules
                     const presetsOnServer = deviceData.Presets ?? [];
-                    const scheduleEnabled = deviceData.ScheduleEnabled;
                     const schedulesOnServer = deviceData.Schedule ?? [];
+                    const scheduleEnabled = deviceData.ScheduleEnabled;
                     const scenesOnServer = deviceData.Scenes ?? [];
-                    const holidayModeEnabled = deviceData.HolidayMode?.Enabled;
-                    const holidayModeActive = deviceData.HolidayMode?.Active ?? false;
 
                     //protection
                     const frostProtection = deviceData.FrostProtection ?? {};
                     const overheatProtection = deviceData.OverheatProtection ?? {};
+                    const holidayMode = deviceData.HolidayMode ?? {};
 
                     //device control
                     const hideVaneControls = deviceData.HideVaneControls ?? false;
@@ -1569,7 +1568,11 @@ class DeviceAta extends EventEmitter {
                     const obj = {
                         presets: presetsOnServer,
                         schedules: schedulesOnServer,
+                        scheduleEnabled: scheduleEnabled,
                         scenes: scenesOnServer,
+                        frostProtection: frostProtection,
+                        overheatProtection: overheatProtection,
+                        holidayMode: holidayMode,
                         supportsAutomaticFanSpeed: supportsAutomaticFanSpeed,
                         supportsAirDirectionFunction: supportsAirDirectionFunction,
                         supportsSwingFunction: supportsSwingFunction,
@@ -1606,12 +1609,7 @@ class DeviceAta extends EventEmitter {
                         useFahrenheit: this.accountInfo.useFahrenheit ? 1 : 0,
                         temperatureUnit: TemperatureDisplayUnits[this.accountInfo.useFahrenheit ? 1 : 0],
                         isConnected: isConnected,
-                        isInError: isInError,
-                        frostProtection: frostProtection,
-                        overheatProtection: overheatProtection,
-                        holidayModeEnabled: holidayModeEnabled,
-                        holidayModeActive: holidayModeActive,
-                        scheduleEnabled: scheduleEnabled
+                        isInError: isInError
                     };
 
                     //characteristics array
@@ -1796,10 +1794,10 @@ class DeviceAta extends EventEmitter {
                     }
 
                     //holiday mode
-                    if (this.holidayModeSupport && holidayModeEnabled !== null) {
-                        this.holidayModeControlService?.updateCharacteristic(Characteristic.On, holidayModeEnabled);
-                        this.holidayModeControlSensorService?.updateCharacteristic(Characteristic.ContactSensorState, holidayModeEnabled);
-                        this.holidayModeSensorService?.updateCharacteristic(Characteristic.ContactSensorState, holidayModeActive);
+                    if (this.holidayModeSupport && holidayMode.Enabled !== null) {
+                        this.holidayModeControlService?.updateCharacteristic(Characteristic.On, holidayMode.Enabled);
+                        this.holidayModeControlSensorService?.updateCharacteristic(Characteristic.ContactSensorState, holidayMode.Enabled);
+                        this.holidayModeSensorService?.updateCharacteristic(Characteristic.ContactSensorState, holidayMode.Active);
                     }
 
                     //presets

package/src/deviceatw.js

@@ -1173,7 +1173,7 @@ class DeviceAtw extends EventEmitter {
             }
 
             //holiday mode
-            if (this.holidayModeSupport && this.accessory.holidayModeEnabled !== null) {
+            if (this.holidayModeSupport && this.accessory.holidayMode.Enabled !== null) {
                 //control
                 if (this.logDebug) this.emit('debug', `Prepare holiday mode control service`);
                 this.holidayModeControlService = new Service.Switch(`${serviceName} Holiday Mode`, `holidayModeControlService${deviceId}`);
@@ -1181,7 +1181,7 @@ class DeviceAtw extends EventEmitter {
                 this.holidayModeControlService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Holiday Mode`);
                 this.holidayModeControlService.getCharacteristic(Characteristic.On)
                     .onGet(async () => {
-                        const state = this.accessory.holidayModeEnabled;
+                        const state = this.accessory.holidayMode.Enabled;
                         return state;
                     })
                     .onSet(async (state) => {
@@ -1201,7 +1201,7 @@ class DeviceAtw extends EventEmitter {
                 this.holidayModeControlSensorService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Holiday Mode Control`);
                 this.holidayModeControlSensorService.getCharacteristic(Characteristic.ContactSensorState)
                     .onGet(async () => {
-                        const state = this.accessory.holidayModeEnabled;
+                        const state = this.accessory.holidayMode.Enabled;
                         return state;
                     })
                 accessory.addService(this.holidayModeControlSensorService);
@@ -1213,7 +1213,7 @@ class DeviceAtw extends EventEmitter {
                 this.holidayModeSensorService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Holiday Mode State`);
                 this.holidayModeSensorService.getCharacteristic(Characteristic.ContactSensorState)
                     .onGet(async () => {
-                        const state = this.accessory.holidayModeActive;
+                        const state = this.accessory.holidayMode.Active;
                         return state;
                     })
                 accessory.addService(this.holidayModeSensorService);
@@ -1676,12 +1676,10 @@ class DeviceAtw extends EventEmitter {
                     const scheduleEnabled = deviceData.ScheduleEnabled;
                     const schedulesOnServer = deviceData.Schedule ?? [];
                     const scenesOnServer = deviceData.Scenes ?? [];
-                    const holidayMode = deviceData.Device.HolidayMode;
-                    const holidayModeEnabled = accountTypeMelcloud ? holidayMode : deviceData.HolidayMode?.Enabled;
-                    const holidayModeActive = deviceData.HolidayMode?.Active ?? false;
 
                     //protection
                     const frostProtection = deviceData.FrostProtection ?? {};
+                    const holidayMode = deviceData.HolidayMode ?? {};
 
                     //device info
                     const supportsStanbyMode = deviceData.Device[supportStandbyKey];
@@ -1763,7 +1761,10 @@ class DeviceAtw extends EventEmitter {
                     const obj = {
                         presets: presetsOnServer,
                         schedules: schedulesOnServer,
+                        scheduleEnabled: scheduleEnabled,
                         scenes: scenesOnServer,
+                        frostProtection: frostProtection,
+                        holidayMode: holidayMode,
                         power: power,
                         inStandbyMode: inStandbyMode,
                         unitStatus: unitStatus,
@@ -1790,11 +1791,6 @@ class DeviceAtw extends EventEmitter {
                         temperatureUnit: TemperatureDisplayUnits[this.accountInfo.useFahrenheit ? 1 : 0],
                         isConnected: isConnected,
                         isInError: isInError,
-                        frostProtection: frostProtection,
-                        scheduleEnabled: scheduleEnabled,
-                        holidayModeEnabled: holidayModeEnabled,
-                        holidayModeActive: holidayModeActive,
-                        scheduleEnabled: scheduleEnabled,
                         zones: [],
                         zonesSensors: []
                     };
@@ -2202,10 +2198,10 @@ class DeviceAtw extends EventEmitter {
                     }
 
                     //holiday mode
-                    if (this.holidayModeSupport && holidayModeEnabled !== null) {
-                        this.holidayModeControlService?.updateCharacteristic(Characteristic.On, holidayModeEnabled);
-                        this.holidayModeControlSensorService?.updateCharacteristic(Characteristic.ContactSensorState, holidayModeEnabled);
-                        this.holidayModeSensorService?.updateCharacteristic(Characteristic.ContactSensorState, holidayModeActive);
+                    if (this.holidayModeSupport && holidayMode.Enabled !== null) {
+                        this.holidayModeControlService?.updateCharacteristic(Characteristic.On, holidayMode.Enabled);
+                        this.holidayModeControlSensorService?.updateCharacteristic(Characteristic.ContactSensorState, holidayMode.Enabled);
+                        this.holidayModeSensorService?.updateCharacteristic(Characteristic.ContactSensorState, holidayMode.Active);
                     }
 
                     //presets
@@ -2290,7 +2286,7 @@ class DeviceAtw extends EventEmitter {
                                     button.state = power ? (operationMode === 1) : false;
                                     break;
                                 case 53: //HOLIDAY
-                                    button.state = power ? (holidayModeEnabled === true) : false;
+                                    button.state = power ? (holidayMode.Enabled === true) : false;
                                     break;
                                 case 10: //ALL ZONES PHYSICAL LOCK CONTROL
                                     button.state = power ? (prohibitZone1 === true && prohibitHotWater === true && prohibitZone2 === true) : false;

package/src/functions.js

@@ -238,14 +238,14 @@ class Functions extends EventEmitter {
         );
     }
 
-    async adjustTempProtection(oldMin, oldMax, newValue, type, minRangeMin, maxRangeMin, minRangeMax, maxRangeMax) {
-        let min = oldMin;
-        let max = oldMax;
+    async adjustTempProtection(currentMin, currentMax, value, type, minRangeMin, maxRangeMin, minRangeMax, maxRangeMax) {
+        let min = currentMin;
+        let max = currentMax;
 
         if (type === "min") {
-            min = Math.min(Math.max(newValue, minRangeMin), maxRangeMin);
+            min = Math.min(Math.max(value, minRangeMin), maxRangeMin);
 
-            if (min > oldMin && max - min < 2) {
+            if (min > currentMin && max - min < 2) {
                 max = Math.min(min + 2, maxRangeMax);
 
                 // jeśli max uderza w górną granicę → obniż min o 2
@@ -261,9 +261,9 @@ class Functions extends EventEmitter {
         }
 
         if (type === "max") {
-            max = Math.min(Math.max(newValue, minRangeMax), maxRangeMax);
+            max = Math.min(Math.max(value, minRangeMax), maxRangeMax);
 
-            if (max < oldMax && max - min < 2) {
+            if (max < currentMax && max - min < 2) {
                 min = Math.max(max - 2, minRangeMin);
 
                 // jeśli min uderza w dolną granicę → podbij max o 2