homebridge-melcloud-control 4.1.3-beta.3 → 4.1.3-beta.5

package/README.md

@@ -65,7 +65,7 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
       * Vane V mode `AUTO/1/2/3/4/5/SWING`.
       * Fan speed mode `AUTO/1/2/3/4/5`.
       * Presets `SET/UNSET`.
-      * Schedules `ON/OFF`.
+      * Schedule `ON/OFF`.
   * Sensors:
     * For automation and notifications.
       * Power `ON/OFF`.
@@ -80,7 +80,8 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
       * Frost protection.
       * Overheat protection.
       * Holiday mode.
-      * Shedule.
+      * Shedule control.
+      * Shedule active
       * Error
 * Heat Pump:
   * Heater Cooler:
@@ -118,6 +119,7 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
       * Operating mode `HEAT/COOL/CURVE/HOLIDAY/AUTO HOT WATER/ECO HOT WATER/FORCE HOT WATER`.
       * Physical lock controls `LOCK/UNLOCK`.
       * Presets `SET/UNSET`.
+      * Schedule `ON/OFF`.
   * Sensors:
     * For automation and notifications.
       * Power `ON/OFF`.
@@ -130,6 +132,8 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
       * Water tank temperature.
       * Flow Temperature Zone 1, 2, Hot Water.
       * Return Temperature Zone 1, 2, Hot Water.
+      * Shedule control.
+      * Shedule active
       * Error
 * Energy Recovery Ventilation Lossnay:
   * Heater Cooler:
@@ -147,6 +151,7 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
       * Operating mode `LOSSNAY/BYPASS/AUTO/NIGHT PURGE`.
       * Fan speed mode `AUTO/1/2/3/4`.
       * Presets `SET/UNSET`.
+      * Schedule `ON/OFF`.
   * Sensors:
     * For automation and notifications.
       * Power `ON/OFF`.
@@ -160,6 +165,8 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
       * Filter maintenance.
       * CO2 detected and level.
       * PM2.5 air quality and level.
+      * Shedule control.
+      * Shedule active
       * Error
 
 ### HOME app current device mode display
@@ -261,6 +268,7 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
 | `atwDevices[].temperatureReturnWaterTankSensor` | This enable extra `Return Water Tank` temperature sensor to use with automations in HomeKit app. |
 | `atwDevices[].temperatureFlowZone2Sensor` | This enable extra `Flow Zone 2` temperature sensor to use with automations in HomeKit app. |
 | `atwDevices[].temperatureReturnZone2Sensor` | This enable extra `Return Zone 2` temperature sensor to use with automations in HomeKit app. |
+| `atwDevices[].holidayModeSensor` | This enable extra `Holiday Mode` sensor to use with automations in HomeKit app. |
 | `atwDevices[].errorSensor` | This enable `Error` sensors to use with automations in HomeKit app. |
 | `atwDevices[].refreshInterval` | Here set the background devices state refresh time in (sec), default `5s`. |
 | `atwDevices[].presets[]` | Array of ATW device `Presets` created automatically after login to MELCloud from plugin config UI. |
@@ -285,6 +293,7 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
 | `ervDevices[].temperatureSensor` | This enable extra `Room` temperature sensor to use with automations in HomeKit app. |
 | `ervDevices[].temperatureOutdoorSensor` | This enable extra `Outdoor` temperature sensor to use with automations in HomeKit app. |
 | `ervDevices[].temperatureSupplySensor` | This enable extra `Supply` temperature sensor to use with automations in HomeKit app. |
+| `ervDevices[].holidayModeSensor` | This enable extra `Holiday Mode` sensor to use with automations in HomeKit app. |
 | `ervDevices[].errorSensor` | This enable `Error` sensors to use with automations in HomeKit app. |
 | `ervDevices[].refreshInterval` | Here set the background devices state refresh time in (sec), default `5s`. |
 | `ervDevices[].presets[]` | Array of ERV device `Presets` created automatically after login to MELCloud from plugin config UI. |

package/config.schema.json

@@ -1116,15 +1116,6 @@
                       "functionBody": "return model.accounts[arrayIndices[0]].type === 'melcloudhome';"
                     }
                   },
-                  "scheduleSensor": {
-                    "title": "Schedule Enabled",
-                    "type": "boolean",
-                    "default": false,
-                    "description": "This enable extra schedule sensor to use with automations in HomeKit app.",
-                    "condition": {
-                      "functionBody": "return model.accounts[arrayIndices[0]].type === 'melcloudhome';"
-                    }
-                  },
                   "errorSensor": {
                     "title": "Error",
                     "type": "boolean",
@@ -1609,15 +1600,6 @@
                       "functionBody": "return model.accounts[arrayIndices[0]].type === 'melcloudhome';"
                     }
                   },
-                  "scheduleSensor": {
-                    "title": "Schedule Enabled",
-                    "type": "boolean",
-                    "default": false,
-                    "description": "This enable extra schedule sensor to use with automations in HomeKit app.",
-                    "condition": {
-                      "functionBody": "return model.accounts[arrayIndices[0]].type === 'melcloudhome';"
-                    }
-                  },
                   "errorSensor": {
                     "title": "Error",
                     "type": "boolean",
@@ -2411,7 +2393,6 @@
                                   "title": "System",
                                   "items": [
                                     "accounts[].atwDevices[].holidayModeSensor",
-                                    "accounts[].atwDevices[].scheduleSensor",
                                     "accounts[].atwDevices[].errorSensor"
                                   ]
                                 },
@@ -2556,7 +2537,6 @@
                                   "title": "System",
                                   "items": [
                                     "accounts[].ervDevices[].holidayModeSensor",
-                                    "accounts[].ervDevices[].scheduleSensor",
                                     "accounts[].ervDevices[].errorSensor"
                                   ]
                                 },

package/package.json

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

package/src/deviceatw.js

@@ -38,7 +38,6 @@ class DeviceAtw extends EventEmitter {
         this.temperatureFlowZone2Sensor = device.temperatureFlowZone2Sensor || false;
         this.temperatureReturnZone2Sensor = device.temperatureReturnZone2Sensor || false;
         this.holidayModeSensor = device.holidayModeSensor || false;
-        this.scheduleSensor = device.scheduleSensor || false;
         this.errorSensor = device.errorSensor || false;
         this.presets = this.accountType === 'melcloud' ? (device.presets || []).filter(preset => (preset.displayType ?? 0) > 0 && preset.id !== '0') : [];
         this.schedules = this.accountType === 'melcloudhome' ? (device.schedules || []).filter(schedule => (schedule.displayType ?? 0) > 0 && schedule.id !== '0') : [];
@@ -1063,20 +1062,6 @@ class DeviceAtw extends EventEmitter {
                 accessory.addService(this.holidayModeSensorService);
             }
 
-            //schedule sensor
-            if (this.scheduleSensor && this.accessory.scheduleEnabled !== null) {
-                if (this.logDebug) this.emit('debug', `Prepare schedule service`);
-                this.scheduleSensorService = new Service.ContactSensor(`${serviceName} Schedule`, `Schedule Sensor ${deviceId}`);
-                this.scheduleSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
-                this.scheduleSensorService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Schedule`);
-                this.scheduleSensorService.getCharacteristic(Characteristic.ContactSensorState)
-                    .onGet(async () => {
-                        const state = this.accessory.scheduleEnabled;
-                        return state;
-                    })
-                accessory.addService(this.scheduleSensorService);
-            }
-
             //error sensor
             if (this.errorSensor && this.accessory.isInError !== null) {
                 if (this.logDebug) this.emit('debug', `Prepare error service`);
@@ -1162,7 +1147,7 @@ class DeviceAtw extends EventEmitter {
             };
 
             //schedules services
-            if (this.schedules.length > 0) {
+            if (this.schedules.length > 0 && this.accessory.scheduleEnabled !== null) {
                 if (this.logDebug) this.emit('debug', `Prepare schedules services`);
                 this.schedulesServices = [];
                 this.schedules.forEach((schedule, i) => {
@@ -1172,25 +1157,52 @@ class DeviceAtw extends EventEmitter {
                     //get preset name prefix
                     const namePrefix = schedule.namePrefix;
 
+                    //control
+                    if (i === 0) {
+                        if (this.logDebug) this.emit('debug', `Prepare schedule control service`);
+                        const serviceNameSchedule = namePrefix ? `${accessoryName} Schedule Control` : `Schedule Control`;
+                        this.schedulesControlService = new Service.Switch(serviceNameSchedule, `Schedule Control ${deviceId} ${i}`);
+                        this.schedulesControlService.addOptionalCharacteristic(Characteristic.ConfiguredName);
+                        this.schedulesControlService.setCharacteristic(Characteristic.ConfiguredName, serviceNameSchedule);
+                        this.schedulesControlService.getCharacteristic(Characteristic.On)
+                            .onGet(async () => {
+                                const state = this.accessory.scheduleEnabled;
+                                return state;
+                            })
+                            .onSet(async (state) => {
+                                try {
+                                    deviceData.ScheduleEnabled = state;
+                                    await this.melCloudAta.send(this.accountType, this.displayType, deviceData, 'scheduleenabled');
+                                    if (this.logInfo) this.emit('info', `Schedule: ${state ? 'Enabled' : 'Disabled'}`);
+                                } catch (error) {
+                                    if (this.logWarn) this.emit('warn', `Set schedule error: ${error}`);
+                                };
+                            });
+                        accessory.addService(this.schedulesControlService);
+
+                        if (this.logDebug) this.emit('debug', `Prepare schedule control sensor service`);
+                        this.scheduleSensorService = new Service.ContactSensor(serviceNameSchedule, `Schedule Control Sensor ${deviceId}`);
+                        this.scheduleSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
+                        this.scheduleSensorService.setCharacteristic(Characteristic.ConfiguredName, serviceNameSchedule);
+                        this.scheduleSensorService.getCharacteristic(Characteristic.ContactSensorState)
+                            .onGet(async () => {
+                                const state = this.accessory.scheduleEnabled;
+                                return state;
+                            })
+                        accessory.addService(this.scheduleSensorService);
+                    }
+
+                    //sensors
                     const serviceName = namePrefix ? `${accessoryName} ${name}` : name;
                     const serviceType = schedule.serviceType;
                     const characteristicType = schedule.characteristicType;
-                    const scheduleService = new serviceType(serviceName, `Schedule ${deviceId} ${i}`);
+                    const scheduleService = new serviceType(serviceName, `Schedule Sensor ${deviceId} ${i}`);
                     scheduleService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                     scheduleService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                     scheduleService.getCharacteristic(characteristicType)
                         .onGet(async () => {
                             const state = schedule.state;
                             return state;
-                        })
-                        .onSet(async (state) => {
-                            try {
-                                deviceData.ScheduleEnabled = state;
-                                await this.melCloudAta.send(this.accountType, this.displayType, deviceData, 'scheduleenabled');
-                                if (this.logInfo) this.emit('info', `${state ? 'Set:' : 'Unset:'} ${name}`);
-                            } catch (error) {
-                                if (this.logWarn) this.emit('warn', `Set schedule error: ${error}`);
-                            };
                         });
                     this.schedulesServices.push(scheduleService);
                     accessory.addService(scheduleService);
@@ -1901,7 +1913,6 @@ class DeviceAtw extends EventEmitter {
 
                     //update sensors state
                     this.holidayModeSensorService?.updateCharacteristic(Characteristic.ContactSensorState, holidayModeActive);
-                    this.scheduleSensorService?.updateCharacteristic(Characteristic.ContactSensorState, scheduleEnabled);
                     this.errorService?.updateCharacteristic(Characteristic.ContactSensorState, isInError);
 
                     //update presets state
@@ -1928,10 +1939,14 @@ class DeviceAtw extends EventEmitter {
                     };
 
                     //update schedules state
-                    if (this.schedules.length > 0) {
+                    if (this.schedules.length > 0 && scheduleEnabled !== null) {
                         this.schedules.forEach((schedule, i) => {
+                            //control
+                            if (i === 0) this.schedulesControlService?.updateCharacteristic(characteristicType, scheduleEnabled);
+
+                            //sensors
                             const scheduleData = schedulesOnServer.find(s => s[presetsIdKey] === schedule.id);
-                            schedule.state = scheduleEnabled; //scheduleData.Enabled : false;
+                            schedule.state = scheduleEnabled ? scheduleData.Enabled ?? false : false;
 
                             const characteristicType = schedule.characteristicType;
                             this.schedulesServices?.[i]?.updateCharacteristic(characteristicType, schedule.state);

package/src/deviceerv.js

@@ -31,7 +31,6 @@ class DeviceErv extends EventEmitter {
         this.temperatureOutdoorSensor = device.temperatureOutdoorSensor || false;
         this.temperatureSupplySensor = device.temperatureSupplySensor || false;
         this.holidayModeSensor = device.holidayModeSensor || false;
-        this.scheduleSensor = device.scheduleSensor || false;
         this.errorSensor = device.errorSensor || false;
         this.presets = this.accountType === 'melcloud' ? (device.presets || []).filter(preset => (preset.displayType ?? 0) > 0 && preset.id !== '0') : [];
         this.schedules = this.accountType === 'melcloudhome' ? (device.schedules || []).filter(schedule => (schedule.displayType ?? 0) > 0 && schedule.id !== '0') : [];
@@ -682,20 +681,6 @@ class DeviceErv extends EventEmitter {
                 accessory.addService(this.holidayModeSensorService);
             }
 
-            //schedule sensor
-            if (this.scheduleSensor && this.accessory.scheduleEnabled !== null) {
-                if (this.logDebug) this.emit('debug', `Prepare schedule service`);
-                this.scheduleSensorService = new Service.ContactSensor(`${serviceName} Schedule`, `Schedule Sensor ${deviceId}`);
-                this.scheduleSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
-                this.scheduleSensorService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Schedule`);
-                this.scheduleSensorService.getCharacteristic(Characteristic.ContactSensorState)
-                    .onGet(async () => {
-                        const state = this.accessory.scheduleEnabled;
-                        return state;
-                    })
-                accessory.addService(this.scheduleSensorService);
-            }
-
             //error sensor
             if (this.errorSensor && this.accessory.isInError !== null) {
                 if (this.logDebug) this.emit('debug', `Prepare error service`);
@@ -766,7 +751,7 @@ class DeviceErv extends EventEmitter {
             };
 
             //schedules services
-            if (this.schedules.length > 0) {
+            if (this.schedules.length > 0 && this.accessory.scheduleEnabled !== null) {
                 if (this.logDebug) this.emit('debug', `Prepare schedules services`);
                 this.schedulesServices = [];
                 this.schedules.forEach((schedule, i) => {
@@ -776,25 +761,52 @@ class DeviceErv extends EventEmitter {
                     //get preset name prefix
                     const namePrefix = schedule.namePrefix;
 
+                    //control
+                    if (i === 0) {
+                        if (this.logDebug) this.emit('debug', `Prepare schedule control service`);
+                        const serviceNameSchedule = namePrefix ? `${accessoryName} Schedule Control` : `Schedule Control`;
+                        this.schedulesControlService = new Service.Switch(serviceNameSchedule, `Schedule Control ${deviceId} ${i}`);
+                        this.schedulesControlService.addOptionalCharacteristic(Characteristic.ConfiguredName);
+                        this.schedulesControlService.setCharacteristic(Characteristic.ConfiguredName, serviceNameSchedule);
+                        this.schedulesControlService.getCharacteristic(Characteristic.On)
+                            .onGet(async () => {
+                                const state = this.accessory.scheduleEnabled;
+                                return state;
+                            })
+                            .onSet(async (state) => {
+                                try {
+                                    deviceData.ScheduleEnabled = state;
+                                    await this.melCloudAta.send(this.accountType, this.displayType, deviceData, 'scheduleenabled');
+                                    if (this.logInfo) this.emit('info', `Schedule: ${state ? 'Enabled' : 'Disabled'}`);
+                                } catch (error) {
+                                    if (this.logWarn) this.emit('warn', `Set schedule error: ${error}`);
+                                };
+                            });
+                        accessory.addService(this.schedulesControlService);
+
+                        if (this.logDebug) this.emit('debug', `Prepare schedule control sensor service`);
+                        this.scheduleSensorService = new Service.ContactSensor(serviceNameSchedule, `Schedule Control Sensor ${deviceId}`);
+                        this.scheduleSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
+                        this.scheduleSensorService.setCharacteristic(Characteristic.ConfiguredName, serviceNameSchedule);
+                        this.scheduleSensorService.getCharacteristic(Characteristic.ContactSensorState)
+                            .onGet(async () => {
+                                const state = this.accessory.scheduleEnabled;
+                                return state;
+                            })
+                        accessory.addService(this.scheduleSensorService);
+                    }
+
+                    //sensors
                     const serviceName = namePrefix ? `${accessoryName} ${name}` : name;
                     const serviceType = schedule.serviceType;
                     const characteristicType = schedule.characteristicType;
-                    const scheduleService = new serviceType(serviceName, `Schedule ${deviceId} ${i}`);
+                    const scheduleService = new serviceType(serviceName, `Schedule Sensor ${deviceId} ${i}`);
                     scheduleService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                     scheduleService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                     scheduleService.getCharacteristic(characteristicType)
                         .onGet(async () => {
                             const state = schedule.state;
                             return state;
-                        })
-                        .onSet(async (state) => {
-                            try {
-                                deviceData.ScheduleEnabled = state;
-                                await this.melCloudAta.send(this.accountType, this.displayType, deviceData, 'scheduleenabled');
-                                if (this.logInfo) this.emit('info', `${state ? 'Set:' : 'Unset:'} ${name}`);
-                            } catch (error) {
-                                if (this.logWarn) this.emit('warn', `Set schedule error: ${error}`);
-                            };
                         });
                     this.schedulesServices.push(scheduleService);
                     accessory.addService(scheduleService);
@@ -1195,7 +1207,6 @@ class DeviceErv extends EventEmitter {
 
                     //error sensor
                     this.holidayModeSensorService?.updateCharacteristic(Characteristic.ContactSensorState, holidayModeActive);
-                    this.scheduleSensorService?.updateCharacteristic(Characteristic.ContactSensorState, scheduleEnabled);
                     this.errorService?.updateCharacteristic(Characteristic.ContactSensorState, isInError);
 
                     //update presets state
@@ -1215,10 +1226,14 @@ class DeviceErv extends EventEmitter {
                     };
 
                     //update schedules state
-                    if (this.schedules.length > 0) {
+                    if (this.schedules.length > 0 && scheduleEnabled !== null) {
                         this.schedules.forEach((schedule, i) => {
+                            //control
+                            if (i === 0) this.schedulesControlService?.updateCharacteristic(characteristicType, scheduleEnabled);
+
+                            //sensors
                             const scheduleData = schedulesOnServer.find(s => s[presetsIdKey] === schedule.id);
-                            schedule.state = scheduleEnabled; //scheduleData.Enabled : false;
+                            schedule.state = scheduleEnabled ? scheduleData.Enabled ?? false : false;
 
                             const characteristicType = schedule.characteristicType;
                             this.schedulesServices?.[i]?.updateCharacteristic(characteristicType, schedule.state);

package/src/melcloudata.js

@@ -237,11 +237,7 @@ class MelCloudAta extends EventEmitter {
                     return;
             }
         } catch (error) {
-            // Return 500 for schedule hovewer working correct
-            if (error?.response?.status === 500) {
-                return true;
-            }
-
+            if (error.response?.status === 500) return true; // Return 500 for schedule hovewer working correct
             throw new Error(`Send data error: ${error.message}`);
         }
     }

package/src/melcloudatw.js

@@ -236,11 +236,7 @@ class MelCloudAtw extends EventEmitter {
                     return;
             }
         } catch (error) {
-            // Return 500 for schedule hovewer working correct
-            if (error?.response?.status === 500) {
-                return true;
-            }
-
+            if (error.response?.status === 500) return true; // Return 500 for schedule hovewer working correct
             throw new Error(`Send data error: ${error.message}`);
         }
     }

package/src/melclouderv.js

@@ -244,11 +244,7 @@ class MelCloudErv extends EventEmitter {
                     return;
             }
         } catch (error) {
-            // Return 500 for schedule hovewer working correct
-            if (error?.response?.status === 500) {
-                return true;
-            }
-
+            if (error.response?.status === 500) return true; // Return 500 for schedule hovewer working correct
             throw new Error(`Send data error: ${error.message}`);
         }
     }