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

package/README.md

@@ -272,7 +272,7 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
 | `ataDevices[].buttonsSensors[]` | Array of buttons sensors. |
 | `ataDevices[].buttonsSensors[].name` | Here set `Button Name` which You want expose to the `Homebridge/HomeKit`. |
 | `ataDevices[].buttonsSensors[].mode` | Here select button mode, VH - Vane Horizontal, VV - Vane Horizontal. |
-| `ataDevices[].buttonsSensors[].displayType` | Here select display type in HomeKit, `0 - None/Disabled`, `1 - Outlet`, `2 - Switch`, `3 - Motion Sensor`, `4 - Occupancy Sensor`, `5 - Contact Sensor`. |
+| `ataDevices[].buttonsSensors[].displayType` | Here select display type in HomeKit, `0 - None/Disabled`, `1 - Motion Sensor`, `2 - Occupancy Sensor`, `3 - Contact Sensor`, `4 - Switch + Motion Sensor`, `5 - Switch +Occupancy Sensor`, `6 - Switch +Contact Sensor`. |
 | `ataDevices[].buttonsSensors[].namePrefix` | Here enable/disable the accessory name as a prefix for button/sensor name. |
 | `atwDevices[]` | Array of ATA devices created automatically after login to MELCloud from plugin config UI. |
 | `atwDevices[].id` | Read only data, do not change it. |
@@ -309,7 +309,7 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
 | `atwDevices[].buttonsSensors[]` | Array of buttons sensors. |
 | `atwDevices[].buttonsSensors[].name` | Here set `Button Name` which You want expose to the `Homebridge/HomeKit`. |
 | `atwDevices[].buttonsSensors[].mode` | Here select button mode. |
-| `atwDevices[].buttonsSensors[].displayType` | Here select display type in HomeKit, `0 - None/Disabled`, `1 - Outlet`, `2 - Switch`, `3 - Motion Sensor`, `4 - Occupancy Sensor`, `5 - Contact Sensor`. |
+| `atwDevices[].buttonsSensors[].displayType` | Here select display type in HomeKit, `0 - None/Disabled`, `1 - Motion Sensor`, `2 - Occupancy Sensor`, `3 - Contact Sensor`, `4 - Switch + Motion Sensor`, `5 - Switch +Occupancy Sensor`, `6 - Switch +Contact Sensor`. |
 | `atwDevices[].buttonsSensors[].namePrefix` | Here enable/disable the accessory name as a prefix for button/sensor name. |
 | `ervDevices[]` | Array of ATA devices created automatically after login to MELCloud from plugin config UI. |
 | `ervDevices[].id` | Read only data, do not change it. |
@@ -339,7 +339,7 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
 | `ervDevices[].buttonsSensors[]` | Array of buttons sensors. |
 | `ervDevices[].buttonsSensors[].name` | Here set `Button Name` which You want expose to the `Homebridge/HomeKit`. |
 | `ervDevices[].buttonsSensors[].mode` | Here select button mode. |
-| `ervDevices[].buttonsSensors[].displayType` | Here select display type in HomeKit, `0 - None/Disabled`, `1 - Outlet`, `2 - Switch`, `3 - Motion Sensor`, `4 - Occupancy Sensor`, `5 - Contact Sensor`. |
+| `ervDevices[].buttonsSensors[].displayType` | Here select display type in HomeKit, `0 - None/Disabled`, `1 - Motion Sensor`, `2 - Occupancy Sensor`, `3 - Contact Sensor`, `4 - Switch + Motion Sensor`, `5 - Switch +Occupancy Sensor`, `6 - Switch +Contact Sensor`. |
 | `ervDevices[].buttonsSensors[].namePrefix` | Here enable/disable the accessory name as a prefix for button/sensor name. |
 | `refreshInterval` | Here set the background account data refresh time in (sec) , only for old MELCLoud, default `120s`. |
 | `log{}` | Log object. |

package/package.json

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

package/src/deviceatw.js

@@ -1378,9 +1378,6 @@ class DeviceAtw extends EventEmitter {
                     //get button mode
                     const mode = button.mode;
 
-                    //get button display type
-                    const displayType = button.displayType;
-
                     //get button name
                     const name = button.name;
 
@@ -1394,10 +1391,10 @@ class DeviceAtw extends EventEmitter {
                     //control
                     if (button.displayType > 3) {
                         if (this.logDebug) this.emit('debug', `Prepare button control ${name} service`);
-                        const buttonControlService = new serviceType(serviceName, `buttonControlService${deviceId} ${i}`);
+                        const buttonControlService = new serviceType(serviceName1, `buttonControlService${deviceId} ${i}`);
                         buttonControlService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                         buttonControlService.setCharacteristic(Characteristic.ConfiguredName, serviceName1);
-                        buttonControlService.getCharacteristic(characteristicType)
+                        buttonControlService.getCharacteristic(Characteristic.On)
                             .onGet(async () => {
                                 const state = button.state;
                                 return state;
@@ -1552,9 +1549,9 @@ class DeviceAtw extends EventEmitter {
 
                     //sensor
                     if (this.logDebug) this.emit('debug', `Prepare button control sensor ${name} service`);
-                    const buttonControlSensorService = new serviceType(serviceName, `buttonControlSensorService${deviceId} ${i}`);
+                    const buttonControlSensorService = new serviceType(serviceName1, `buttonControlSensorService${deviceId} ${i}`);
                     buttonControlSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
-                    buttonControlSensorService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
+                    buttonControlSensorService.setCharacteristic(Characteristic.ConfiguredName, serviceName1);
                     buttonControlSensorService.getCharacteristic(characteristicType)
                         .onGet(async () => {
                             const state = button.state;

package/src/deviceerv.js

@@ -983,12 +983,12 @@ class DeviceErv extends EventEmitter {
                     const mode = button.mode;
 
                     //get button name
-                    const buttonName = button.name;
+                    const name = button.name;
 
                     //get button name prefix
                     const namePrefix = button.namePrefix;
 
-                    const serviceName1 = namePrefix ? `${accessoryName} ${buttonName}` : buttonName;
+                    const serviceName1 = namePrefix ? `${accessoryName} ${name}` : name;
                     const serviceType = button.serviceType;
                     const characteristicType = button.characteristicType;
 
@@ -1082,7 +1082,7 @@ class DeviceErv extends EventEmitter {
                                             break;
                                     };
 
-                                    if (this.logInfo) this.emit('info', `${state ? `Set: ${buttonName}` : `Unset: ${buttonName}, Set: ${button.previousValue}`}`);
+                                    if (this.logInfo) this.emit('info', `${state ? `Set: ${name}` : `Unset: ${name}, Set: ${button.previousValue}`}`);
                                     await this.melCloudErv.send(this.accountType, this.displayType, deviceData, flag);
                                 } catch (error) {
                                     if (this.logWarn) this.emit('warn', `Set button error: ${error}`);
@@ -1094,9 +1094,9 @@ class DeviceErv extends EventEmitter {
 
                     //sensor
                     if (this.logDebug) this.emit('debug', `Prepare button control sensor ${name} service`);
-                    const buttonControlSensorService = new serviceType(serviceName, `buttonControlSensorService${deviceId} ${i}`);
+                    const buttonControlSensorService = new serviceType(serviceName1, `buttonControlSensorService${deviceId} ${i}`);
                     buttonControlSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
-                    buttonControlSensorService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
+                    buttonControlSensorService.setCharacteristic(Characteristic.ConfiguredName, serviceName1);
                     buttonControlSensorService.getCharacteristic(characteristicType)
                         .onGet(async () => {
                             const state = button.state;

package/src/melcloudata.js

@@ -54,11 +54,10 @@ class MelCloudAta extends EventEmitter {
             //read device info from file
             const devicesData = await this.functions.readData(this.devicesFile, true);
             this.headers = devicesData.Headers;
-            const scenes = devicesData.Scenes ?? [];
             const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
 
             if (this.accountType === 'melcloudhome') {
-                deviceData.Scenes = scenes;
+                deviceData.Scenes = devicesData.Scenes ?? [];
                 deviceData.Device.OperationMode = AirConditioner.OperationModeMapStringToEnum[deviceData.Device.OperationMode] ?? deviceData.Device.OperationMode;
                 deviceData.Device.ActualFanSpeed = AirConditioner.FanSpeedMapStringToEnum[deviceData.Device.ActualFanSpeed] ?? deviceData.Device.ActualFanSpeed;
                 deviceData.Device.SetFanSpeed = AirConditioner.FanSpeedMapStringToEnum[deviceData.Device.SetFanSpeed] ?? deviceData.Device.SetFanSpeed;
@@ -244,7 +243,7 @@ class MelCloudAta extends EventEmitter {
                             };
                             method = 'PUT';
                             path = ApiUrlsHome.PutAta.replace('deviceid', deviceData.DeviceID);
-                            this.headers.Referer = ApiUrlsHome.Referers.PutDeviceSettings
+                            this.headers.Referer = ApiUrlsHome.Referers.PutDeviceSettings;
                             break
                     }
 

package/src/melcloudatw.js

@@ -54,11 +54,10 @@ class MelCloudAtw extends EventEmitter {
             //read device info from file
             const devicesData = await this.functions.readData(this.devicesFile, true);
             this.headers = devicesData.Headers;
-            const scenes = devicesData.Scenes ?? [];
             const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
 
             if (this.accountType === 'melcloudhome') {
-                deviceData.Scenes = scenes;
+                deviceData.Scenes = devicesData.Scenes ?? [];
             }
 
             const safeConfig = {
@@ -221,7 +220,7 @@ class MelCloudAtw extends EventEmitter {
                             };
                             method = 'PUT';
                             path = ApiUrlsHome.PutAtw.replace('deviceid', deviceData.DeviceID);
-                            this.headers.Referer = ApiUrlsHome.Referers.PutDeviceSettings
+                            this.headers.Referer = ApiUrlsHome.Referers.PutDeviceSettings;
                             break
                     }
 

package/src/melclouderv.js

@@ -54,11 +54,10 @@ class MelCloudErv extends EventEmitter {
             //read device info from file
             const devicesData = await this.functions.readData(this.devicesFile, true);
             this.headers = devicesData.Headers;
-            const scenes = devicesData.Scenes ?? [];
             const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
 
             if (this.accountType === 'melcloudhome') {
-                deviceData.Scenes = scenes;
+                deviceData.Scenes = devicesData.Scenes ?? [];
 
                 //read default temps
                 const temps = await this.functions.readData(this.defaultTempsFile, true);
@@ -228,7 +227,7 @@ class MelCloudErv extends EventEmitter {
                             };
                             method = 'PUT';
                             path = ApiUrlsHome.PutErv.replace('deviceid', deviceData.DeviceID);
-                            this.headers.Referer = ApiUrlsHome.Referers.PutDeviceSettings
+                            this.headers.Referer = ApiUrlsHome.Referers.PutDeviceSettings;
                             break
                     }