homebridge-melcloud-control 4.4.1-beta.1 → 4.4.1-beta.2

package/config.schema.json

@@ -419,7 +419,7 @@
                     "title": "Frost Protection Support",
                     "type": "boolean",
                     "default": false,
-                    "description": "This enable extra frost protection control and sensors to use with automations in HomeKit app.",
+                    "description": "This enable frost protection control and sensors to use with automations in HomeKit app.",
                     "condition": {
                       "functionBody": "return model.accounts[arrayIndices[0]].type === 'melcloudhome';"
                     }
@@ -428,7 +428,7 @@
                     "title": "Overheat Protection Support",
                     "type": "boolean",
                     "default": false,
-                    "description": "This enable extra overheat protection control and sensors to use with automations in HomeKit app.",
+                    "description": "This enable overheat protection control and sensors to use with automations in HomeKit app.",
                     "condition": {
                       "functionBody": "return model.accounts[arrayIndices[0]].type === 'melcloudhome';"
                     }
@@ -437,7 +437,7 @@
                     "title": "Holiday Mode Support",
                     "type": "boolean",
                     "default": false,
-                    "description": "This enable extra holiday mode control and sensors to use with automations in HomeKit app.",
+                    "description": "This enable holiday mode control and sensors to use with automations in HomeKit app.",
                     "condition": {
                       "functionBody": "return model.accounts[arrayIndices[0]].type === 'melcloudhome';"
                     }
@@ -1272,20 +1272,20 @@
                     "default": false,
                     "description": "This enable error sensor to use with automations in HomeKit app."
                   },
-                  "holidayModeSupport": {
-                    "title": "Holiday Mode Support",
+                  "frostProtectionSupport": {
+                    "title": "Frost Protection Support",
                     "type": "boolean",
                     "default": false,
-                    "description": "This enable extra holiday mode control and sensors to use with automations in HomeKit app.",
+                    "description": "This enable frost protection control and sensors to use with automations in HomeKit app.",
                     "condition": {
                       "functionBody": "return model.accounts[arrayIndices[0]].type === 'melcloudhome';"
                     }
                   },
-                  "frostProtectionSupport": {
-                    "title": "Frost Protection Support",
+                  "holidayModeSupport": {
+                    "title": "Holiday Mode Support",
                     "type": "boolean",
                     "default": false,
-                    "description": "This enable extra frost protection control and sensors to use with automations in HomeKit app.",
+                    "description": "This enable holiday mode control and sensors to use with automations in HomeKit app.",
                     "condition": {
                       "functionBody": "return model.accounts[arrayIndices[0]].type === 'melcloudhome';"
                     }
@@ -1902,7 +1902,7 @@
                     "title": "Holiday Mode Support",
                     "type": "boolean",
                     "default": false,
-                    "description": "This enable extra holiday mode control and sensors to use with automations in HomeKit app.",
+                    "description": "This enable holiday mode control and sensors to use with automations in HomeKit app.",
                     "condition": {
                       "functionBody": "return model.accounts[arrayIndices[0]].type === 'melcloudhome';"
                     }

package/package.json

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

package/src/deviceerv.js

@@ -404,8 +404,8 @@ class DeviceErv extends EventEmitter {
                     if (supportsAutoVentilationMode && supportsCoolOperationMode) {
                         melCloudService.getCharacteristic(Characteristic.CoolingThresholdTemperature)
                             .setProps({
-                                minValue: this.accessory.minTempCoolDry,
-                                maxValue: this.accessory.maxTempCoolDry,
+                                minValue: this.accessory.minTempCoolDryAuto,
+                                maxValue: this.accessory.maxTempCoolDryAuto,
                                 minStep: this.accessory.temperatureIncrement
                             })
                             .onGet(async () => {
@@ -713,7 +713,7 @@ class DeviceErv 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}`);
@@ -721,7 +721,7 @@ class DeviceErv 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) => {
@@ -741,7 +741,7 @@ class DeviceErv 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);
@@ -753,7 +753,7 @@ class DeviceErv 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);
@@ -1150,11 +1150,12 @@ class DeviceErv extends EventEmitter {
 
                     //presets schedule
                     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 holidayMode = deviceData.HolidayMode ?? {};
 
                     //device control
                     const hideRoomTemperature = deviceData.HideRoomTemperature;
@@ -1187,8 +1188,8 @@ class DeviceErv extends EventEmitter {
                     const temperatureIncrement = deviceData.Device[tempStepKey] ?? 1;
                     const minTempHeat = 10;
                     const maxTempHeat = 31;
-                    const minTempCoolDry = 16;
-                    const maxTempCoolDry = 31;
+                    const minTempCoolDryAuto = 16;
+                    const maxTempCoolDryAuto = 31;
 
                     //device state
                     const power = deviceData.Device.Power;
@@ -1210,7 +1211,9 @@ class DeviceErv extends EventEmitter {
                     const obj = {
                         presets: presetsOnServer,
                         schedules: schedulesOnServer,
+                        scheduleEnabled: scheduleEnabled,
                         scenes: scenesOnServer,
+                        holidayMode: holidayMode,
                         supportsRoomTemperature: supportsRoomTemperature,
                         supportsSupplyTemperature: supportsSupplyTemperature,
                         supportsOutdoorTemperature: supportsOutdoorTemperature,
@@ -1227,6 +1230,10 @@ class DeviceErv extends EventEmitter {
                         supportsBypassVentilationMode: supportsBypassVentilationMode,
                         supportsAutomaticFanSpeed: supportsAutomaticFanSpeed,
                         supportsStanbyMode: supportsStanbyMode,
+                        minTempHeat: minTempHeat,
+                        maxTempHeat: maxTempHeat,
+                        minTempCoolDryAuto: minTempCoolDryAuto,
+                        maxTempCoolDryAuto: maxTempCoolDryAuto,
                         coreMaintenanceRequired: coreMaintenanceRequired,
                         filterMaintenanceRequired: filterMaintenanceRequired,
                         actualVentilationMode: actualVentilationMode,
@@ -1246,18 +1253,10 @@ class DeviceErv extends EventEmitter {
                         defaultCoolingSetTemperature: defaultCoolingSetTemperature,
                         lockPhysicalControl: 0,
                         temperatureIncrement: temperatureIncrement,
-                        minTempHeat: minTempHeat,
-                        temperatureIncrement: maxTempHeat,
-                        minTempCoolDry: minTempCoolDry,
-                        maxTempCoolDry: maxTempCoolDry,
                         useFahrenheit: this.accountInfo.useFahrenheit ? 1 : 0,
                         temperatureUnit: TemperatureDisplayUnits[this.accountInfo.useFahrenheit ? 1 : 0],
                         isConnected: isConnected,
-                        isInError: isInError,
-                        scheduleEnabled: scheduleEnabled,
-                        holidayModeEnabled: holidayModeEnabled,
-                        holidayModeActive: holidayModeActive,
-                        scheduleEnabled: scheduleEnabled
+                        isInError: isInError
                     };
 
                     //characteristics array
@@ -1414,10 +1413,10 @@ class DeviceErv extends EventEmitter {
                     this.errorService?.updateCharacteristic(Characteristic.ContactSensorState, isInError);
 
                     //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/melcloudata.js

@@ -231,13 +231,18 @@ class MelCloudAta extends EventEmitter {
                                 HasPendingCommand: true
                             };
                             path = ApiUrls.SetAta;
+                            update = true;
                             break;
                     }
 
                     if (this.logDebug) this.emit('debug', `Send data: ${JSON.stringify(payload, null, 2)}`);
                     await this.client(path, { method: 'POST', data: payload });
 
-                    this.emit('deviceState', deviceData);
+                    if (update) {
+                        setTimeout(() => {
+                            this.emit('deviceState', deviceData);
+                        }, 500);
+                    }
                     return true;
                 case "melcloudhome":
                     switch (flag) {
@@ -320,7 +325,6 @@ class MelCloudAta extends EventEmitter {
                             this.emit('deviceState', deviceData);
                         }, 500);
                     }
-
                     return true;
                 default:
                     return;

package/src/melcloudatw.js

@@ -232,13 +232,18 @@ class MelCloudAtw extends EventEmitter {
                                 HasPendingCommand: true
                             }
                             path = ApiUrls.SetAtw;
+                            update = true;
                             break;
                     }
 
                     if (this.logDebug) this.emit('debug', `Send data: ${JSON.stringify(payload, null, 2)}`);
                     await this.client(path, { method: 'POST', data: payload });
 
-                    this.emit('deviceState', deviceData);
+                    if (update) {
+                        setTimeout(() => {
+                            this.emit('deviceState', deviceData);
+                        }, 500);
+                    }
                     return true;
                 case "melcloudhome":
                     switch (flag) {
@@ -302,7 +307,6 @@ class MelCloudAtw extends EventEmitter {
                             this.emit('deviceState', deviceData);
                         }, 500);
                     }
-
                     return true;
                 default:
                     return;

package/src/melclouderv.js

@@ -182,6 +182,7 @@ class MelCloudErv extends EventEmitter {
             let method = null
             let payload = {};
             let path = '';
+            let update = false;
             switch (accountType) {
                 case "melcloud":
                     switch (flag) {
@@ -231,13 +232,18 @@ class MelCloudErv extends EventEmitter {
                                 HasPendingCommand: true
                             }
                             path = ApiUrls.SetErv;
+                            update = true;
                             break;
                     }
 
                     if (this.logDebug) this.emit('debug', `Send data: ${JSON.stringify(payload, null, 2)}`);
                     await this.client(path, { method: 'POST', data: payload });
 
-                    this.emit('deviceState', deviceData);
+                    if (update) {
+                        setTimeout(() => {
+                            this.emit('deviceState', deviceData);
+                        }, 500);
+                    } this.emit('deviceState', deviceData);
                     return true;
                 case "melcloudhome":
                     switch (flag) {
@@ -255,6 +261,7 @@ class MelCloudErv extends EventEmitter {
                             payload = { enabled: deviceData.ScheduleEnabled };
                             method = 'PUT';
                             path = ApiUrlsHome.PutScheduleEnabled.replace('deviceid', deviceData.DeviceID);
+                            update = true;
                             break;
                         case 'scene':
                             method = 'PUT';
@@ -288,6 +295,11 @@ class MelCloudErv extends EventEmitter {
                     if (this.logDebug) this.emit('debug', `Send data: ${JSON.stringify(payload, null, 2)}`);
                     await this.client(path, { method: method, data: payload });
 
+                    if (update) {
+                        setTimeout(() => {
+                            this.emit('deviceState', deviceData);
+                        }, 500);
+                    }
                     return true;
                 default:
                     return;