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

package/README.md

@@ -230,7 +230,6 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
 | `ataDevices[].frostProtectionSensor` | This enable extra `Frost Protectio` sensor to use with automations in HomeKit app. |
 | `ataDevices[].overHeatProtectionSensor` | This enable extra `Overheat Protection` sensor to use with automations in HomeKit app. |
 | `ataDevices[].holidayModeSensor` | This enable extra `Holiday Mode` sensor to use with automations in HomeKit app. |
-| `ataDevices[].scheduleSensor` | This enable extra `Shedule` sensor to use with automations in HomeKit app. |
 | `ataDevices[].errorSensor` | This enable `Error` sensor to use with automations in HomeKit app. |
 | `ataDevices[].refreshInterval` | Here set the background devices state refresh time in (sec), default `5s`. |
 | `ataDevices[].presets[]` | Array of ATA device `Presets` created automatically after login to MELCloud from plugin config UI. |

package/config.schema.json

@@ -422,15 +422,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",
@@ -541,7 +532,7 @@
                           "title": "Display Type",
                           "type": "integer",
                           "minimum": 0,
-                          "maximum": 5,
+                          "maximum": 3,
                           "default": 0,
                           "description": "Select the characteristic type to be displayed in HomeKit app.",
                           "anyOf": [
@@ -551,34 +542,22 @@
                                 0
                               ]
                             },
-                            {
-                              "title": "Outlet",
-                              "enum": [
-                                1
-                              ]
-                            },
-                            {
-                              "title": "Switch",
-                              "enum": [
-                                2
-                              ]
-                            },
                             {
                               "title": "Motion Sensor",
                               "enum": [
-                                3
+                                1
                               ]
                             },
                             {
                               "title": "Occupancy Sensor",
                               "enum": [
-                                4
+                                2
                               ]
                             },
                             {
                               "title": "Contact Sensor",
                               "enum": [
-                                5
+                                3
                               ]
                             }
                           ]
@@ -2281,7 +2260,6 @@
                                     "accounts[].ataDevices[].frostProtectionSensor",
                                     "accounts[].ataDevices[].overheatProtectionSensor",
                                     "accounts[].ataDevices[].holidayModeSensor",
-                                    "accounts[].ataDevices[].scheduleSensor",
                                     "accounts[].ataDevices[].errorSensor"
                                   ]
                                 },

package/package.json

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

package/src/deviceata.js

@@ -32,7 +32,6 @@ class DeviceAta extends EventEmitter {
         this.frostProtectionSensor = device.frostProtectionSensor || false;
         this.overheatProtectionSensor = device.overheatProtectionSensor || false;
         this.holidayModeSensor = device.holidayModeSensor || false;
-        this.scheduleSensor = device.scheduleSensor || false;
         this.errorSensor = device.errorSensor || false;
         this.heatDryFanMode = device.heatDryFanMode || 1; //NONE, HEAT, DRY, FAN
         this.coolDryFanMode = device.coolDryFanMode || 1; //NONE, COOL, DRY, FAN
@@ -65,8 +64,8 @@ class DeviceAta extends EventEmitter {
         //schedules configured
         for (const schedule of this.schedules) {
             schedule.name = schedule.name || 'Schedule'
-            schedule.serviceType = [null, Service.Outlet, Service.Switch, Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][schedule.displayType];
-            schedule.characteristicType = [null, Characteristic.On, Characteristic.On, Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][schedule.displayType];
+            schedule.serviceType = [null, Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][schedule.displayType];
+            schedule.characteristicType = [null, Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][schedule.displayType];
             schedule.state = false;
         }
 
@@ -661,20 +660,6 @@ class DeviceAta 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`);
@@ -747,7 +732,7 @@ class DeviceAta 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) => {
@@ -757,25 +742,52 @@ class DeviceAta 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);
@@ -1324,7 +1336,6 @@ class DeviceAta extends EventEmitter {
                     this.frostProtectionSensorService?.updateCharacteristic(Characteristic.ContactSensorState, frostProtectionActive);
                     this.overheatProtectionSensorService?.updateCharacteristic(Characteristic.ContactSensorState, overheatProtectionActive);
                     this.holidayModeSensorService?.updateCharacteristic(Characteristic.ContactSensorState, holidayModeActive);
-                    this.scheduleSensorService?.updateCharacteristic(Characteristic.ContactSensorState, scheduleEnabled);
                     this.errorService?.updateCharacteristic(Characteristic.ContactSensorState, isInError);
 
                     //update presets state
@@ -1345,10 +1356,14 @@ class DeviceAta 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);