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

package/package.json

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

package/src/constants.js

@@ -18,7 +18,7 @@ export const ApiUrls = {
 };
 
 export const ApiUrlsHome = {
-    LoginUrl:"https://live-melcloudhome.auth.eu-west-1.amazoncognito.com/login?client_id=3g4d5l5kivuqi7oia68gib7uso&redirect_uri=https%3A%2F%2Fauth.melcloudhome.com%2Fsignin-oidc-meu&response_type=code&scope=openid%20profile&response_mode=form_post",
+    LoginUrl: "https://live-melcloudhome.auth.eu-west-1.amazoncognito.com/login?client_id=3g4d5l5kivuqi7oia68gib7uso&redirect_uri=https%3A%2F%2Fauth.melcloudhome.com%2Fsignin-oidc-meu&response_type=code&scope=openid%20profile&response_mode=form_post",
     BaseURL: 'https://melcloudhome.com',
     GetUserContext: "/api/user/context",
     SetAta: "/api/ataunit/deviceid",
@@ -37,7 +37,7 @@ export const TemperatureDisplayUnits = ["°C", "°F"];
 
 export const AirConditioner = {
     System: ["AIR CONDITIONER OFF", "AIR CONDITIONER ON", "AIR CONDITIONER OFFLINE"],
-    DriveMode: [
+    OperationMode: [
         "0", "HEAT", "DRY", "COOL", "4", "5", "6", "FAN", "AUTO",
         "ISEE HEAT", "ISEE DRY", "ISEE COOL"
     ],
@@ -74,7 +74,8 @@ export const AirConditioner = {
         Presets: 287,
         HolidayMode: 131072,
         All: 281483566710825
-    }
+    },
+    OperationModeMap: { "0": 0, "Heat": 1, "Dry": 2, "Cool": 3, "4": 4, "5": 5, "6": 6, "Fan": 7, "Auto": 8, "Isee Heat": 9, "Isee Dry": 10, "Isee Cool": 11 },
 };
 
 export const HeatPump = {

package/src/deviceata.js

@@ -16,6 +16,7 @@ class DeviceAta extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //account config
+        this.account = account;
         this.device = device;
         this.displayMode = device.displayMode;
         this.temperatureSensor = device.temperatureSensor || false;
@@ -327,7 +328,7 @@ class DeviceAta extends EventEmitter {
 
                                 deviceData.Device.EffectiveFlags = AirConditioner.EffectiveFlags.OperationModeSetTemperature;
                                 await this.melCloudAta.send(deviceData, this.displayMode);
-                                const operationModeText = AirConditioner.DriveMode[deviceData.Device.OperationMode];
+                                const operationModeText = AirConditioner.OperationMode[deviceData.Device.OperationMode];
                                 if (this.logInfo) this.emit('info', `Set operation mode: ${operationModeText}`);
                             } catch (error) {
                                 if (this.logWarn) this.emit('warn', `Set operation mode error: ${error}`);
@@ -522,7 +523,7 @@ class DeviceAta extends EventEmitter {
                                 };
 
                                 await this.melCloudAta.send(deviceData, this.displayMode);
-                                const operationModeText = AirConditioner.DriveMode[deviceData.Device.OperationMode];
+                                const operationModeText = AirConditioner.OperationMode[deviceData.Device.OperationMode];
                                 if (this.logInfo) this.emit('info', `Set operation mode: ${operationModeText}`);
                             } catch (error) {
                                 if (this.logWarn) this.emit('warn', `Set operation mode error: ${error}`);
@@ -918,7 +919,7 @@ class DeviceAta extends EventEmitter {
     async start() {
         try {
             //melcloud device
-            this.melCloudAta = new MelCloudAta(this.device, this.contextKey, this.devicesFile)
+            this.melCloudAta = new MelCloudAta(this.account, 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} ----`);
@@ -1312,7 +1313,7 @@ class DeviceAta extends EventEmitter {
                     //log current state
                     if (this.logInfo) {
                         this.emit('info', `Power: ${power ? 'ON' : 'OFF'}`);
-                        this.emit('info', `Target operation mode: ${AirConditioner.DriveMode[operationMode]}`);
+                        this.emit('info', `Target operation mode: ${AirConditioner.OperationMode[operationMode]}`);
                         this.emit('info', `Current operation mode: ${this.displayMode === 1 ? AirConditioner.CurrentOperationModeHeatherCooler[obj.currentOperationMode] : AirConditioner.CurrentOperationModeThermostat[obj.currentOperationMode]}`);
                         this.emit('info', `Target temperature: ${setTemperature}${obj.temperatureUnit}`);
                         this.emit('info', `Current temperature: ${roomTemperature}${obj.temperatureUnit}`);

package/src/deviceatw.js

@@ -16,6 +16,7 @@ class DeviceAtw extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //account config
+        this.account = account;
         this.device = device;
         this.displayMode = device.displayMode;
         this.hideZone = device.hideZone;
@@ -1284,7 +1285,7 @@ class DeviceAtw extends EventEmitter {
     async start() {
         try {
             //melcloud device
-            this.melCloudAtw = new MelCloudAtw(this.device, this.contextKey, this.devicesFile)
+            this.melCloudAtw = new MelCloudAtw(this.account, 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,6 +16,7 @@ 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;
@@ -839,7 +840,7 @@ class DeviceErv extends EventEmitter {
     async start() {
         try {
             //melcloud device
-            this.melCloudErv = new MelCloudErv(this.device, this.contextKey, this.devicesFile)
+            this.melCloudErv = new MelCloudErv(this.account, 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,11 +3,12 @@ import axios from 'axios';
 import EventEmitter from 'events';
 import ImpulseGenerator from './impulsegenerator.js';
 import Functions from './functions.js';
-import { ApiUrls } from './constants.js';
+import { ApiUrls, AirConditioner } from './constants.js';
 
 class MelCloudAta extends EventEmitter {
-    constructor(device, contextKey, devicesFile) {
+    constructor(account, device, contextKey, devicesFile) {
         super();
+        this.accountType = account.displayType
         this.deviceId = device.id;
         this.logWarn = device.log?.warn;
         this.logDebug = device.log?.debug;
@@ -92,7 +93,7 @@ class MelCloudAta extends EventEmitter {
             const vaneVerticalSwing = device.VaneVerticalSwing;
             const vaneHorizontalDirection = device.VaneHorizontalDirection;
             const vaneHorizontalSwing = device.VaneHorizontalSwing;
-            const operationMode = device.OperationMode;
+            const operationMode = this.accountType === 'melcloud' ? device.OperationMode : AirConditioner.OperationModeMap[device.OperationMode];
             const inStandbyMode = device.InStandbyMode;
             const defaultCoolingSetTemperature = device.DefaultCoolingSetTemperature;
             const defaultHeatingSetTemperature = device.DefaultHeatingSetTemperature;

package/src/melcloudatw.js

@@ -8,6 +8,7 @@ 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,6 +8,7 @@ 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;