homebridge-melcloud-control 4.1.2-beta.89 → 4.1.2-beta.90

package/package.json

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

package/src/deviceata.js

@@ -771,7 +771,7 @@ class DeviceAta extends EventEmitter {
                         .onSet(async (state) => {
                             try {
                                 deviceData.ScheduleEnabled = state;
-                                await this.melCloudAta.send(this.accountType, this.displayType, deviceData);
+                                await this.melCloudAta.send(this.accountType, this.displayType, deviceData, 'scheduleset');
                                 if (this.logInfo) this.emit('info', `${state ? 'Set:' : 'Unset:'} ${name}`);
                             } catch (error) {
                                 if (this.logWarn) this.emit('warn', `Set schedule error: ${error}`);
@@ -1347,7 +1347,7 @@ class DeviceAta extends EventEmitter {
                     //update schedules state
                     if (this.schedules.length > 0) {
                         this.schedules.forEach((schedule, i) => {
-                            const scheduleData = schedulesOnServer.find(p => p[presetsIdKey] === schedule.id);
+                            const scheduleData = schedulesOnServer.find(s => s[presetsIdKey] === schedule.id);
                             schedule.state = scheduleEnabled; //scheduleData.Enabled : false;
 
                             const characteristicType = schedule.characteristicType;

package/src/deviceatw.js

@@ -1136,8 +1136,6 @@ class DeviceAtw extends EventEmitter {
                 if (this.logDebug) this.emit('debug', `Prepare schedules services`);
                 this.schedulesServices = [];
                 this.schedules.forEach((schedule, i) => {
-                    const scheduleData = schedulesOnServer.find(p => p.Id === schedule.id);
-
                     //get preset name
                     const name = schedule.name;
 
@@ -1157,7 +1155,7 @@ class DeviceAtw extends EventEmitter {
                         })
                         .onSet(async (state) => {
                             try {
-                                deviceData.Schedule = state;
+                                deviceData.ScheduleEnabled = state;
                                 await this.melCloudAta.send(this.accountType, this.displayType, deviceData);
                                 if (this.logInfo) this.emit('info', `${state ? 'Set:' : 'Unset:'} ${name}`);
                             } catch (error) {
@@ -1894,8 +1892,8 @@ class DeviceAtw extends EventEmitter {
                     //update schedules state
                     if (this.schedules.length > 0) {
                         this.schedules.forEach((schedule, i) => {
-                            const scheduleData = schedulesOnServer.find(p => p[presetsIdKey] === schedule.id);
-                            schedule.state = scheduleData ? scheduleData.Enabled : false;
+                            const scheduleData = schedulesOnServer.find(s => s[presetsIdKey] === schedule.id);
+                            schedule.state = scheduleEnabled; //scheduleData.Enabled : false;
 
                             const characteristicType = schedule.characteristicType;
                             this.schedulesServices?.[i]?.updateCharacteristic(characteristicType, schedule.state);

package/src/deviceerv.js

@@ -740,8 +740,6 @@ class DeviceErv extends EventEmitter {
                 if (this.logDebug) this.emit('debug', `Prepare schedules services`);
                 this.schedulesServices = [];
                 this.schedules.forEach((schedule, i) => {
-                    const scheduleData = schedulesOnServer.find(p => p.Id === schedule.id);
-
                     //get preset name
                     const name = schedule.name;
 
@@ -761,7 +759,7 @@ class DeviceErv extends EventEmitter {
                         })
                         .onSet(async (state) => {
                             try {
-                                deviceData.Schedule = state;
+                                deviceData.ScheduleEnabled = state;
                                 await this.melCloudAta.send(this.accountType, this.displayType, deviceData);
                                 if (this.logInfo) this.emit('info', `${state ? 'Set:' : 'Unset:'} ${name}`);
                             } catch (error) {
@@ -1183,8 +1181,8 @@ class DeviceErv extends EventEmitter {
                     //update schedules state
                     if (this.schedules.length > 0) {
                         this.schedules.forEach((schedule, i) => {
-                            const scheduleData = schedulesOnServer.find(p => p[presetsIdKey] === schedule.id);
-                            schedule.state = scheduleData ? scheduleData.Enabled : false;
+                            const scheduleData = schedulesOnServer.find(s => s[presetsIdKey] === schedule.id);
+                            schedule.state = scheduleEnabled; //scheduleData.Enabled : false;
 
                             const characteristicType = schedule.characteristicType;
                             this.schedulesServices?.[i]?.updateCharacteristic(characteristicType, schedule.state);

package/src/melcloudata.js

@@ -203,7 +203,7 @@ class MelCloudAta extends EventEmitter {
                         }
                     }
 
-                    const settings = {
+                    const settings = effectiveFlags === 'scheduleset' ? { data: { enabled: deviceData.ScheduleEnabled } } : {
                         data: {
                             Power: deviceData.Device.Power,
                             SetTemperature: deviceData.Device.SetTemperature,
@@ -211,12 +211,11 @@ class MelCloudAta extends EventEmitter {
                             OperationMode: AirConditioner.OperationModeMapEnumToString[deviceData.Device.OperationMode],
                             VaneHorizontalDirection: AirConditioner.VaneHorizontalDirectionMapEnumToString[deviceData.Device.VaneHorizontalDirection],
                             VaneVerticalDirection: AirConditioner.VaneVerticalDirectionMapEnumToString[deviceData.Device.VaneVerticalDirection],
-                            ScheduleEnabled: deviceData.ScheduleEnabled
                         }
                     };
-                    if (this.logDebug) this.emit('debug', `Send Data: ${JSON.stringify(settings.data, null, 2)}`);
+                    if (!this.logDebug) this.emit('warn', `Send Data: ${JSON.stringify(settings.data, null, 2)}`);
 
-                    const path = ApiUrlsHome.SetAta.replace('deviceid', deviceData.DeviceID);
+                    const path = effectiveFlags === 'scheduleset' ? ApiUrlsHome.SetSchedule.replace('deviceid', deviceData.DeviceID) : ApiUrlsHome.SetAta.replace('deviceid', deviceData.DeviceID);
                     await axiosInstancePut(path, settings);
                     this.updateData(deviceData);
                     return true;