homebridge-melcloud-control 4.0.0-beta.69 → 4.0.0-beta.70

package/package.json

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

package/src/deviceata.js

@@ -16,7 +16,7 @@ class DeviceAta extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //account config
-        this.account = account;
+        this.accountType = account.displayType;
         this.device = device;
         this.displayMode = device.displayMode;
         this.temperatureSensor = device.temperatureSensor || false;
@@ -919,7 +919,7 @@ class DeviceAta extends EventEmitter {
     async start() {
         try {
             //melcloud device
-            this.melCloudAta = new MelCloudAta(this.account, this.device, this.contextKey, this.devicesFile)
+            this.melCloudAta = new MelCloudAta(this.device, this.contextKey, this.devicesFile)
                 .on('deviceInfo', (manufacturer, modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion) => {
                     if (this.logDeviceInfo && this.displayDeviceInfo) {
                         this.emit('devInfo', `---- ${this.deviceTypeText}: ${this.deviceName} ----`);
@@ -979,7 +979,7 @@ class DeviceAta extends EventEmitter {
                     const actualFanSpeed = deviceData.Device.ActualFanSpeed;
                     const automaticFanSpeed = deviceData.Device.AutomaticFanSpeed;
                     const fanSpeed = deviceData.Device.FanSpeed ?? 0;
-                    const operationMode = deviceData.Device.OperationMode;
+                    const operationMode = this.accountType === 'melcloud' ? deviceData.Device.OperationMode : AirConditioner.OperationModeMap[deviceData.Device.OperationMode];
                     const vaneVerticalDirection = deviceData.Device.VaneVerticalDirection;
                     const vaneVerticalSwing = deviceData.Device.VaneVerticalSwing;
                     const vaneHorizontalDirection = deviceData.Device.VaneHorizontalDirection;

package/src/deviceatw.js

@@ -16,7 +16,6 @@ class DeviceAtw extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //account config
-        this.account = account;
         this.device = device;
         this.displayMode = device.displayMode;
         this.hideZone = device.hideZone;
@@ -1285,7 +1284,7 @@ class DeviceAtw extends EventEmitter {
     async start() {
         try {
             //melcloud device
-            this.melCloudAtw = new MelCloudAtw(this.account, this.device, this.contextKey, this.devicesFile)
+            this.melCloudAtw = new MelCloudAtw(this.device, this.contextKey, this.devicesFile)
                 .on('deviceInfo', (manufacturer, modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion, hasHotWaterTank, hasZone2) => {
                     if (this.logDeviceInfo && this.displayDeviceInfo) {
                         this.emit('devInfo', `---- ${this.deviceTypeText}: ${this.deviceName} ----`);

package/src/deviceerv.js

@@ -16,7 +16,6 @@ class DeviceErv extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //account config
-        this.account = account;
         this.device = device;
         this.displayMode = device.displayMode;
         this.temperatureSensor = device.temperatureSensor || false;
@@ -840,7 +839,7 @@ class DeviceErv extends EventEmitter {
     async start() {
         try {
             //melcloud device
-            this.melCloudErv = new MelCloudErv(this.account, this.device, this.contextKey, this.devicesFile)
+            this.melCloudErv = new MelCloudErv(this.device, this.contextKey, this.devicesFile)
                 .on('deviceInfo', (manufacturer, modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion) => {
                     if (this.logDeviceInfo && this.displayDeviceInfo) {
                         this.emit('devInfo', `---- ${this.deviceTypeText}: ${this.deviceName} ----`);

package/src/melcloudata.js

@@ -3,12 +3,12 @@ import axios from 'axios';
 import EventEmitter from 'events';
 import ImpulseGenerator from './impulsegenerator.js';
 import Functions from './functions.js';
-import { ApiUrls, AirConditioner } from './constants.js';
+import { ApiUrls } from './constants.js';
 
 class MelCloudAta extends EventEmitter {
-    constructor(account, device, contextKey, devicesFile) {
+    constructor(device, contextKey, devicesFile) {
         super();
-        this.accountType = account.displayType
+        this.accountType = device.displayType
         this.deviceId = device.id;
         this.logWarn = device.log?.warn;
         this.logDebug = device.log?.debug;
@@ -93,7 +93,7 @@ class MelCloudAta extends EventEmitter {
             const vaneVerticalSwing = device.VaneVerticalSwing;
             const vaneHorizontalDirection = device.VaneHorizontalDirection;
             const vaneHorizontalSwing = device.VaneHorizontalSwing;
-            const operationMode = this.accountType === 'melcloud' ? device.OperationMode : AirConditioner.OperationModeMap[device.OperationMode];
+            const operationMode = device.OperationMode;
             const inStandbyMode = device.InStandbyMode;
             const defaultCoolingSetTemperature = device.DefaultCoolingSetTemperature;
             const defaultHeatingSetTemperature = device.DefaultHeatingSetTemperature;

package/src/melcloudatw.js

@@ -8,7 +8,6 @@ import { ApiUrls } from './constants.js';
 class MelCloudAtw extends EventEmitter {
     constructor(device, contextKey, devicesFile) {
         super();
-        this.accountType = account.displayType
         this.deviceId = device.id;
         this.logWarn = device.log?.warn;
         this.logDebug = device.log?.debug;

package/src/melclouderv.js

@@ -8,7 +8,6 @@ import { ApiUrls } from './constants.js';
 class MelCloudErv extends EventEmitter {
     constructor(device, contextKey, devicesFile) {
         super();
-        this.accountType = account.displayType
         this.deviceId = device.id;
         this.logWarn = device.log?.warn;
         this.logDebug = device.log?.debug;
@@ -72,7 +71,6 @@ class MelCloudErv extends EventEmitter {
             const deviceData = devicesData.find(device => device.DeviceID === this.deviceId);
             if (this.logDebug) this.emit('debug', `Device Data: ${JSON.stringify(deviceData, null, 2)}`);
 
-
             //presets
             const hideRoomTemperature = deviceData.HideRoomTemperature ?? false;
             const hideSupplyTemperature = deviceData.HideSupplyTemperature ?? false;