homebridge-melcloud-control 3.3.12-beta.0 → 3.3.12-beta.2

package/index.js

@@ -95,7 +95,6 @@ class MelCloudPlatform {
 					const response = await melCloud.connect();
 					const accountInfo = response.accountInfo;
 					const contextKey = response.contextKey;
-					const useFahrenheit = response.useFahrenheit;
 
 					//check devices list
 					const devices = await melCloud.chackDevicesList(contextKey);
@@ -117,7 +116,7 @@ class MelCloudPlatform {
 
 							const deviceName = device.name;
 							const deviceTypeText = device.typeString;
-							const airConditioner = new DeviceAta(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, devicesFile, deviceRefreshInterval, useFahrenheit)
+							const airConditioner = new DeviceAta(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, devicesFile, deviceRefreshInterval)
 							airConditioner.on('publishAccessory', (accessory) => {
 
 								//publish device
@@ -162,7 +161,7 @@ class MelCloudPlatform {
 
 							const deviceName = device.name;
 							const deviceTypeText = device.typeString;
-							const heatPump = new DeviceAtw(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, devicesFile, deviceRefreshInterval, useFahrenheit)
+							const heatPump = new DeviceAtw(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, devicesFile, deviceRefreshInterval)
 							heatPump.on('publishAccessory', (accessory) => {
 
 								//publish device
@@ -207,7 +206,7 @@ class MelCloudPlatform {
 
 							const deviceName = device.name;
 							const deviceTypeText = device.typeString;
-							const energyRecoveryVentilation = new DeviceErv(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, devicesFile, deviceRefreshInterval, useFahrenheit)
+							const energyRecoveryVentilation = new DeviceErv(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, devicesFile, deviceRefreshInterval)
 							energyRecoveryVentilation.on('publishAccessory', (accessory) => {
 
 								//publish device

package/package.json

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

package/src/deviceata.js

@@ -7,7 +7,7 @@ const CONSTANTS = require('./constants.json');
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class DeviceAta extends EventEmitter {
-    constructor(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, devicesFile, refreshInterval, useFahrenheit) {
+    constructor(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, devicesFile, refreshInterval) {
         super();
 
         Accessory = api.platformAccessory;
@@ -96,8 +96,6 @@ class DeviceAta extends EventEmitter {
         this.accessory.currentOperationMode = 0;
         this.accessory.targetOperationMode = 0;
         this.accessory.fanSpeed = 0;
-        this.accessory.useFahrenheit = useFahrenheit ? 1 : 0;
-        this.accessory.temperatureUnit = CONSTANTS.TemperatureDisplayUnits[this.accessory.useFahrenheit];
     };
 
     async start() {
@@ -210,6 +208,9 @@ class DeviceAta extends EventEmitter {
                     this.displayDeviceInfo = false;
                 })
                 .on('deviceState', async (deviceData) => {
+                    //use fahrenheit
+                    const useFahrenheit = deviceData.useFahrenheit ? 1 : 0;
+                    
                     //presets
                     const presetsOnServer = deviceData.Presets ?? [];
 
@@ -242,10 +243,12 @@ class DeviceAta extends EventEmitter {
                     const automaticFanSpeed = deviceData.Device.AutomaticFanSpeed;
                     const fanSpeed = deviceData.Device.FanSpeed;
                     const operationMode = deviceData.Device.OperationMode;
-                    const vaneVerticalDirection = deviceData.Device.VaneVerticalSwing;
-                    const vaneVerticalSwing = deviceData.Device.VaneVerticalDirection;
+                    const vaneVerticalDirection = deviceData.Device.VaneVerticalDirection;
+                    const vaneVerticalSwing = deviceData.Device.VaneVerticalSwing;
+                    this.emit('message', `swing v: ${vaneVerticalSwing}`);
                     const vaneHorizontalDirection = deviceData.Device.VaneHorizontalDirection;
                     const vaneHorizontalSwing = deviceData.Device.VaneHorizontalSwing;
+                    this.emit('message', `swing h: ${vaneHorizontalSwing}`);
                     const prohibitSetTemperature = deviceData.Device.ProhibitSetTemperature ?? false;
                     const prohibitOperationMode = deviceData.Device.ProhibitOperationMode ?? false;
                     const prohibitPower = deviceData.Device.ProhibitPower ?? false;
@@ -253,22 +256,25 @@ class DeviceAta extends EventEmitter {
                     const outdoorTemperature = deviceData.Device.OutdoorTemperature;
 
                     //accessory
+                    this.accessory.useFahrenheit = useFahrenheit;
+                    this.accessory.temperatureUnit = CONSTANTS.TemperatureDisplayUnits[useFahrenheit];
                     this.accessory.presets = presetsOnServer;
+                    this.accessory.hasAutomaticFanSpeed = hasAutomaticFanSpeed;
+                    this.accessory.airDirectionFunction = airDirectionFunction;
+                    this.accessory.swingFunction = swingFunction;
+                    this.accessory.hasOutdoorTemperature = hasOutdoorTemperature;
+                    this.accessory.numberOfFanSpeeds = numberOfFanSpeeds;
                     this.accessory.modelSupportsFanSpeed = modelSupportsFanSpeed;
                     this.accessory.modelSupportsAuto = modelSupportsAuto;
                     this.accessory.modelSupportsHeat = modelSupportsHeat;
                     this.accessory.modelSupportsDry = modelSupportsDry;
                     this.accessory.modelSupportsCool = modelSupportsCool;
-                    this.accessory.hasAutomaticFanSpeed = hasAutomaticFanSpeed;
-                    this.accessory.hasOutdoorTemperature = hasOutdoorTemperature;
-                    this.accessory.numberOfFanSpeeds = numberOfFanSpeeds;
-                    this.accessory.swingFunction = swingFunction;
                     this.accessory.power = power ? 1 : 0;
                     this.accessory.inStandbyMode = inStandbyMode;
                     this.accessory.operationMode = operationMode;
-                    this.accessory.setTemperature = setTemperature;
                     this.accessory.roomTemperature = roomTemperature;
                     this.accessory.outdoorTemperature = outdoorTemperature;
+                    this.accessory.setTemperature = setTemperature;
                     this.accessory.defaultHeatingSetTemperature = defaultHeatingSetTemperature;
                     this.accessory.defaultCoolingSetTemperature = defaultCoolingSetTemperature;
                     this.accessory.actualFanSpeed = actualFanSpeed;

package/src/deviceatw.js

@@ -7,7 +7,7 @@ const CONSTANTS = require('./constants.json');
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class DeviceAtw extends EventEmitter {
-    constructor(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, devicesFile, refreshInterval, useFahrenheit) {
+    constructor(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, devicesFile, refreshInterval) {
         super();
 
         Accessory = api.platformAccessory;
@@ -97,8 +97,6 @@ class DeviceAtw extends EventEmitter {
 
         //accessory
         this.accessory = { zones: [{}, {}, {}, {}] };
-        this.accessory.useFahrenheit = useFahrenheit ? 1 : 0;
-        this.accessory.temperatureUnit = CONSTANTS.TemperatureDisplayUnits[this.accessory.useFahrenheit];
     };
 
     async start() {
@@ -213,9 +211,12 @@ class DeviceAtw extends EventEmitter {
                     this.displayDeviceInfo = false;
                 })
                 .on('deviceState', async (deviceData) => {
-                                        //presets
-                                        const presetsOnServer = deviceData.Presets ?? [];
-                                        
+                    //use fahrenheit
+                    const useFahrenheit = deviceData.useFahrenheit ? 1 : 0;
+
+                    //presets
+                    const presetsOnServer = deviceData.Presets ?? [];
+
                     //device info
                     const heatPumpName = 'Heat Pump';
                     const hotWaterName = 'Hot Water';
@@ -273,6 +274,8 @@ class DeviceAtw extends EventEmitter {
                     const idleZone2 = deviceData.Device.IdleZone2 ?? false;
 
                     //accessory
+                    this.accessory.useFahrenheit = useFahrenheit;
+                    this.accessory.temperatureUnit = CONSTANTS.TemperatureDisplayUnits[useFahrenheit]
                     this.accessory.power = power ? 1 : 0;
                     this.accessory.operationMode = operationMode;
                     this.accessory.operationModeZone1 = operationModeZone1;

package/src/deviceerv.js

@@ -7,7 +7,7 @@ const CONSTANTS = require('./constants.json');
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class DeviceErv extends EventEmitter {
-    constructor(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, devicesFile, refreshInterval, useFahrenheit) {
+    constructor(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, devicesFile, refreshInterval) {
         super();
 
         Accessory = api.platformAccessory;
@@ -94,8 +94,6 @@ class DeviceErv extends EventEmitter {
         this.accessory.currentOperationMode = 0;
         this.accessory.targetOperationMode = 0;
         this.accessory.fanSpeed = 0;
-        this.accessory.useFahrenheit = useFahrenheit ? 1 : 0;
-        this.accessory.temperatureUnit = CONSTANTS.TemperatureDisplayUnits[this.accessory.useFahrenheit];
     };
 
     async start() {
@@ -207,6 +205,9 @@ class DeviceErv extends EventEmitter {
                     this.displayDeviceInfo = false;
                 })
                 .on('deviceState', async (deviceData) => {
+                    //use fahrenheit
+                    const useFahrenheit = deviceData.useFahrenheit ? 1 : 0;
+
                     //presets
                     const presetsOnServer = deviceData.Presets ?? [];
 
@@ -253,6 +254,8 @@ class DeviceErv extends EventEmitter {
                     const ventilationMode = deviceData.Device.VentilationMode;
 
                     //accessory
+                    this.accessory.useFahrenheit = useFahrenheit;
+                    this.accessory.temperatureUnit = CONSTANTS.TemperatureDisplayUnits[useFahrenheit];
                     this.accessory.presets = presetsOnServer;
                     this.accessory.hasRoomTemperature = hasRoomTemperature;
                     this.accessory.hasSupplyTemperature = hasSupplyTemperature;

package/src/melcloud.js

@@ -63,6 +63,7 @@ class MelCloud extends EventEmitter {
             const accountInfo = account.LoginData;
             const contextKey = accountInfo.ContextKey;
             const useFahrenheit = accountInfo.UseFahrenheit ?? false;
+            this.useFahrenheit = useFahrenheit;
             this.contextKey = contextKey;
 
             //remove sensitive data
@@ -108,8 +109,7 @@ class MelCloud extends EventEmitter {
 
             const obj = {
                 accountInfo: accountInfo,
-                contextKey: contextKey,
-                useFahrenheit: useFahrenheit
+                contextKey: contextKey
             }
 
             return obj;
@@ -165,6 +165,10 @@ class MelCloud extends EventEmitter {
 
                 //add all devices to the devices array
                 devices.push(...allDevices);
+
+                for (const device of devices) {
+                    device.useFahrenheit = this.useFahrenheit
+                }
             }
 
             const devicesCount = devices.length;

package/src/melcloudata.js

@@ -55,6 +55,7 @@ class MelCloudAta extends EventEmitter {
             const debug = this.debugLog ? this.emit('debug', `Device Data: ${JSON.stringify(deviceData, null, 2)}`) : false;
 
             //device info
+            const useFahrenheit = deviceData.useFahrenheit;
             const deviceId = deviceData.DeviceID;
             const deviceName = deviceData.DeviceName;
             const buildingId = deviceData.BuildingID;
@@ -309,6 +310,7 @@ class MelCloudAta extends EventEmitter {
             };
 
             const deviceState = {
+                UseFahrenheit: useFahrenheit,
                 Power: power,
                 Offlin: offline,
                 InStandbyMode: inStandbyMode,

package/src/melcloudatw.js

@@ -55,6 +55,7 @@ class MelCloudAtw extends EventEmitter {
             const debug = this.debugLog ? this.emit('debug', `Device Data: ${JSON.stringify(deviceData, null, 2)}`) : false;
 
             //device info
+            const useFahrenheit = deviceData.useFahrenheit;
             const deviceId = deviceData.DeviceID;
             const deviceName = deviceData.DeviceName;
             const buildingId = deviceData.BuildingID;
@@ -370,6 +371,7 @@ class MelCloudAtw extends EventEmitter {
             };
 
             const deviceState = {
+                UseFahrenheit: useFahrenheit,
                 Power: power,
                 Offlin: offline,
                 IdleZone1: idleZone1,

package/src/melclouderv.js

@@ -55,6 +55,7 @@ class MelCloudErv extends EventEmitter {
             const debug = this.debugLog ? this.emit('debug', `Device Data: ${JSON.stringify(deviceData, null, 2)}`) : false;
 
             //deviceData
+            const useFahrenheit = deviceData.useFahrenheit;
             const deviceId = deviceData.DeviceID;
             const deviceName = deviceData.DeviceName;
             const buildingId = deviceData.BuildingID;
@@ -297,6 +298,7 @@ class MelCloudErv extends EventEmitter {
             };
 
             const deviceState = {
+                UseFahrenheit: useFahrenheit,
                 Power: power,
                 Offlin: offline,
                 RoomTemperature: roomTemperature,