homebridge-melcloud-control 4.0.0-beta.9 → 4.0.0-beta.90

package/CHANGELOG.md

@@ -16,6 +16,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - do not configure it manually, always using Config UI X
   - required Homebridge v2.0.0 and above
 
+## [4.0.0] - (xx.10.2025)
+
+## Changes
+
+- added support for MELCloud Home [#215](https://github.com/grzegorz914/homebridge-melcloud-control/issues/215)
+- redme updated
+- config schema updated
+- cleanup
+
 ## [3.9.5] - (02.09.2025)
 
 ## Changes

package/README.md

@@ -204,9 +204,10 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
 | Key | Description |
 | --- | --- |
 | `name` | Here set the own account name. |
-| `user` | Here set the MELCloud username. |
-| `passwd` | Here set the MELCloud password. |
-| `language` | Here select the MELCloud language. |
+| `user` | Here set the account username. |
+| `passwd` | Here set the account password. |
+| `language` | Here select the account language. |
+| `displayMode` | Here select the account type `None/Disabled`, `MELCloud`, `MELCloud Home`. |
 | `ataDevices[]` | Array of ATA devices created automatically after login to MELCloud from plugin config UI. |
 | `ataDevices[].id` | Read only data, do not change it. |
 | `ataDevices[].type` | Read only data, do not change it. |

package/config.schema.json

@@ -201,6 +201,32 @@
                 }
               ]
             },
+            "displayType": {
+              "title": "Account Type",
+              "type": "string",
+              "default": "disabled",
+              "description": "Here select the language used in MELCloud account.",
+              "oneOf": [
+                {
+                  "title": "None/Disabled",
+                  "enum": [
+                    "disabled"
+                  ]
+                },
+                {
+                  "title": "MELCLoud",
+                  "enum": [
+                    "melcloud"
+                  ]
+                },
+                {
+                  "title": "MELCLoud Home",
+                  "enum": [
+                    "melcloudhome"
+                  ]
+                }
+              ]
+            },
             "ataDevices": {
               "title": "Devices ATA",
               "type": "array",
@@ -209,8 +235,8 @@
                 "properties": {
                   "id": {
                     "title": "ID",
-                    "type": "integer",
-                    "default": 0,
+                    "type": "string",
+                    "default": "0",
                     "readonly": true
                   },
                   "type": {
@@ -778,8 +804,8 @@
                 "properties": {
                   "id": {
                     "title": "ID",
-                    "type": "integer",
-                    "default": 0,
+                    "type": "string",
+                    "default": "0",
                     "readonly": true
                   },
                   "type": {
@@ -1313,8 +1339,8 @@
                 "properties": {
                   "id": {
                     "title": "ID",
-                    "type": "integer",
-                    "default": 0,
+                    "type": "string",
+                    "default": "0",
                     "readonly": true
                   },
                   "type": {
@@ -1798,7 +1824,8 @@
             "name",
             "user",
             "passwd",
-            "language"
+            "language",
+            "displayType"
           ]
         }
       }
@@ -1817,13 +1844,14 @@
           "type": "password"
         },
         "accounts[].language",
+        "accounts[].displayType",
         {
           "key": "accounts[]",
           "type": "tabarray",
           "title": "{{ value.title }}",
           "items": [
             {
-              "key": "accounts[]",
+              "key": "accounts[].ataDevices",
               "title": "Air Conditioner",
               "items": [
                 {

package/homebridge-ui/public/index.html

@@ -76,41 +76,53 @@
           </select>
         </div>
 
+        <div class="mb-2">
+          <label for="displayType" class="form-label">Account Type</label>
+          <select id="displayType" name="displayType" class="form-control">
+            <option value="disabled">None/Disabled</option>
+            <option value="melcloud">MELCloud</option>
+            <option value="melcloudhome">MELCloud Home</option>
+          </select>
+        </div>
+
         <div class="text-center">
           <button id="logIn" type="button" class="btn btn-secondary">Connect to MELCloud</button>
           <button id="configButton" type="button" class="btn btn-secondary"><i class="fas fa-gear"></i></button>
         </div>
       </form>
+      <div id="accountButton" class="text-center mt-2"></div>
     </div>
-
-    <div id="accountButton" class="mt-2"></div>
   </div>
 
   <script>
     (async () => {
       const pluginConfig = await homebridge.getPluginConfig();
+
+      // Ensure proper structure on load
       if (!pluginConfig.length) {
-        pluginConfig.push({});
+        pluginConfig.push({ accounts: [] });
         await homebridge.updatePluginConfig(pluginConfig);
         homebridge.showSchemaForm();
         return;
       }
+      pluginConfig[0].accounts ??= [];
 
-      this.deviceIndex = 0;
-
+      this.accountIndex = 0;
       const accountsCount = pluginConfig[0].accounts.length;
+
       for (let i = 0; i < accountsCount; i++) {
+        const acc = pluginConfig[0].accounts[i];
         const button = document.createElement("button");
         button.type = "button";
         button.id = `button${i}`;
         button.className = "btn btn-primary";
         button.style.textTransform = 'none';
-        button.innerText = pluginConfig[0].accounts[i].name;
+        button.innerText = acc.name;
         document.getElementById("accountButton").appendChild(button);
 
         button.addEventListener('click', async () => {
           for (let j = 0; j < accountsCount; j++) {
-            document.getElementById(`button${j}`).className = (j === i ? 'btn btn-secondary' : 'btn btn-primary');
+            document.getElementById(`button${j}`).className = (j === i ? 'btn btn-primary' : 'btn btn-secondary');
           }
 
           const acc = pluginConfig[0].accounts[i];
@@ -118,24 +130,30 @@
           document.getElementById('name').value = acc.name || '';
           document.getElementById('user').value = acc.user || '';
           document.getElementById('passwd').value = acc.passwd || '';
-          document.getElementById('language').value = acc.language || '';
-          document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language);
-          this.deviceIndex = i;
+          document.getElementById('language').value = acc.language || '0';
+          document.getElementById('displayType').value = acc.displayType || 'disabled';
+          document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language && acc.displayType);
         });
 
-        if (i === accountsCount - 1) document.getElementById(`button0`).click();
+        if (i === accountsCount - 1 && accountsCount > 0)
+          document.getElementById(`button0`).click();
+
+        this.accountIndex = i;
       }
 
       document.getElementById('melCloudAccount').style.display = 'block';
 
+      // Safe update
       document.getElementById('configForm').addEventListener('input', async () => {
-        const acc = pluginConfig[0].accounts[this.deviceIndex];
+        const acc = pluginConfig[0].accounts[this.accountIndex];
+        if (!acc) return;
         acc.name = document.querySelector('#name').value;
         acc.user = document.querySelector('#user').value;
         acc.passwd = document.querySelector('#passwd').value;
         acc.language = document.querySelector('#language').value;
+        acc.displayType = document.querySelector('#displayType').value;
 
-        document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language);
+        document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language && acc.displayType);
 
         await homebridge.updatePluginConfig(pluginConfig);
         await homebridge.savePluginConfig(pluginConfig);
@@ -167,9 +185,10 @@
       function removeStaleDevices(configDevices, melcloudDevices) {
         const melcloudIds = melcloudDevices.map(d => d.DeviceID);
         const removedDevices = [];
+
         for (let i = configDevices.length - 1; i >= 0; i--) {
           const device = configDevices[i];
-          if (device.id !== 0 && !melcloudIds.includes(device.id)) {
+          if (device.id !== "0" && !melcloudIds.includes(device.id)) {
             removedDevices.push(device);
             configDevices.splice(i, 1);
           }
@@ -191,8 +210,8 @@
         updateInfo('info', 'Connecting...', 'yellow');
 
         try {
-          const acc = pluginConfig[0].accounts[this.deviceIndex];
-          const payload = { accountName: acc.name, user: acc.user, passwd: acc.passwd, language: acc.language };
+          const acc = pluginConfig[0].accounts[this.accountIndex];
+          const payload = { accountName: acc.name, user: acc.user, passwd: acc.passwd, language: acc.language, displayType: acc.displayType };
           const devicesInMelCloud = await homebridge.request('/connect', payload);
 
           // Initialize devices arrays
@@ -213,24 +232,36 @@
           const removedAtw = removeStaleDevices(acc.atwDevices, devicesByType.atw);
           const removedErv = removeStaleDevices(acc.ervDevices, devicesByType.erv);
 
-          // Function to handle device & presets
           const handleDevices = (devicesInCloud, devicesInConfig, typeString, newArr, newPresets) => {
             devicesInCloud.forEach(device => {
               const { DeviceID: id, Type: type, DeviceName: name, Presets: presets = [] } = device;
-              const devObj = { id, type, typeString, name, displayMode: 1, presets: [], buttonsSensors: [] };
+              const devObj = structuredClone({
+                id,
+                type,
+                typeString,
+                name,
+                displayMode: 1,
+                presets: [],
+                buttonsSensors: []
+              });
+
               if (!devicesInConfig.some(d => d.id === id)) {
                 devicesInConfig.push(devObj);
-                newArr.push(devObj);
+                newArr.push(structuredClone(devObj));
               }
-              presets.forEach(p => {
-                p.id = p.ID;
-                p.name = p.NumberDescription;
-                p.displayType = 0;
-                p.namePrefix = false;
+
+              presets.forEach(preset => {
+                const p = structuredClone({
+                  id: preset.ID,
+                  name: preset.NumberDescription,
+                  displayType: 0,
+                  namePrefix: false
+                });
+
                 const devConfig = devicesInConfig.find(d => d.id === id);
-                if (devConfig && !devConfig.presets.some(x => x.id === p.ID)) {
+                if (devConfig && !devConfig.presets.some(x => x.id === p.id)) {
                   devConfig.presets.push(p);
-                  newPresets.push(p);
+                  newPresets.push(structuredClone(p));
                 }
               });
             });
@@ -238,9 +269,8 @@
 
           handleDevices(devicesByType.ata, acc.ataDevices, "Air Conditioner", newDevices.ata, newDevices.ataPresets);
           handleDevices(devicesByType.atw, acc.atwDevices, "Heat Pump", newDevices.atw, newDevices.atwPresets);
-          handleDevices(devicesByType.erv, acc.ervDevices, "Energy Recovery ventiltion", newDevices.erv, newDevices.ervPresets);
+          handleDevices(devicesByType.erv, acc.ervDevices, "Energy Recovery Ventilation", newDevices.erv, newDevices.ervPresets);
 
-          // Display summary
           const newDevicesCount = newDevices.ata.length + newDevices.atw.length + newDevices.erv.length;
           const newPresetsCount = newDevices.ataPresets.length + newDevices.atwPresets.length + newDevices.ervPresets.length;
           const removedDevicesCount = removedAta.length + removedAtw.length + removedErv.length;
@@ -248,9 +278,12 @@
           if (!newDevicesCount && !newPresetsCount && !removedDevicesCount) {
             updateInfo('info', 'No changes detected.', 'white');
           } else {
-            if (newDevicesCount) updateInfo('info', `Found new devices: ATA: ${newDevices.ata.length}, ATW: ${newDevices.atw.length}, ERV: ${newDevices.erv.length}.`, 'green');
-            if (newPresetsCount) updateInfo('info1', `Found new presets: ATA: ${newDevices.ataPresets.length}, ATW: ${newDevices.atwPresets.length}, ERV: ${newDevices.ervPresets.length}.`, 'green');
-            if (removedDevicesCount) updateInfo('info2', `Removed devices: ATA: ${removedAta.length}, ATW: ${removedAtw.length}, ERV: ${removedErv.length}.`, 'orange');
+            if (newDevicesCount)
+              updateInfo('info', `Found new devices: ATA: ${newDevices.ata.length}, ATW: ${newDevices.atw.length}, ERV: ${newDevices.erv.length}.`, 'green');
+            if (newPresetsCount)
+              updateInfo('info1', `Found new presets: ATA: ${newDevices.ataPresets.length}, ATW: ${newDevices.atwPresets.length}, ERV: ${newDevices.ervPresets.length}.`, 'green');
+            if (removedDevicesCount)
+              updateInfo('info2', `Removed devices: ATA: ${removedAta.length}, ATW: ${removedAtw.length}, ERV: ${removedErv.length}.`, 'orange');
           }
 
           await homebridge.updatePluginConfig(pluginConfig);
@@ -259,7 +292,7 @@
 
         } catch (error) {
           updateInfo('info', 'Check Your credentials data and try again.', 'yellow');
-          updateInfo('info1', `Error: ${error}`, 'red');
+          updateInfo('info1', `Error: ${JSON.stringify(error)}`, 'red');
           document.getElementById('logIn').className = "btn btn-secondary";
         } finally {
           homebridge.hideSpinner();

package/homebridge-ui/server.js

@@ -17,14 +17,15 @@ class PluginUiServer extends HomebridgePluginUiServer {
     const user = payload.user;
     const passwd = payload.passwd;
     const language = payload.language;
+    const displayType = payload.displayType;
     const accountFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Account`;
     const buildingsFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Buildings`;
     const devicesFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Devices`;
-    const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, false, true);
+    const melCloud = new MelCloud(displayType, user, passwd, language, accountFile, buildingsFile, devicesFile, false, true);
 
     try {
-      const response = await melCloud.connect();
-      const devices = await melCloud.checkDevicesList(response.contextKey);
+      const accountInfo = await melCloud.connect();
+      const devices = await melCloud.checkDevicesList(accountInfo.ContextKey);
       return devices;
     } catch (error) {
       throw new Error(`MELCloud error: ${error.message ?? error}.`);

package/index.js

@@ -30,6 +30,9 @@ class MelCloudPlatform {
 		api.on('didFinishLaunching', async () => {
 			//loop through accounts
 			for (const account of config.accounts) {
+				const displayType = account.displayType || 'disabled';
+				if (displayType === 'disabled') continue;
+
 				const accountName = account.name;
 				const user = account.user;
 				const passwd = account.passwd;
@@ -64,7 +67,7 @@ class MelCloudPlatform {
 						passwd: 'removed',
 						mqtt: {
 							auth: {
-								...device.mqtt?.auth,
+								...account.mqtt?.auth,
 								passwd: 'removed',
 							}
 						},
@@ -76,7 +79,6 @@ class MelCloudPlatform {
 				const accountFile = `${prefDir}/${accountName}_Account`;
 				const buildingsFile = `${prefDir}/${accountName}_Buildings`;
 				const devicesFile = `${prefDir}/${accountName}_Devices`;
-				const cookiesFile = `${prefDir}/${accountName}cookies`;
 
 
 				//set account refresh interval
@@ -88,31 +90,26 @@ class MelCloudPlatform {
 						.on('start', async () => {
 							try {
 								//melcloud account
-								const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, cookiesFile, logLevel.warn, logLevel.debug, false)
+								const melCloud = new MelCloud(displayType, user, passwd, language, accountFile, buildingsFile, devicesFile, logLevel.warn, logLevel.debug, false)
 									.on('success', (msg) => logLevel.success && log.success(`${accountName}, ${msg}`))
 									.on('info', (msg) => logLevel.info && log.info(`${accountName}, ${msg}`))
 									.on('debug', (msg) => logLevel.debug && log.info(`${accountName}, debug: ${msg}`))
 									.on('warn', (msg) => logLevel.warn && log.warn(`${accountName}, ${msg}`))
 									.on('error', (msg) => logLevel.error && log.error(`${accountName}, ${msg}`));
 
-								await melCloud.connectHomeCookies()
-								return;
-
-
 								//connect
-								let response;
+								let accountInfo;
 								try {
-									response = await melCloud.connect();
+									accountInfo = await melCloud.connect();
 								} catch (error) {
 									if (logLevel.error) log.error(`${accountName}, Connect error: ${error.message ?? error}`);
 									return;
 								}
 
-								const accountInfo = response.accountInfo ?? false;
-								const contextKey = response.contextKey ?? false;
-								const useFahrenheit = response.useFahrenheit ?? false;
+								const contextKey = accountInfo.ContextKey;
+								const useFahrenheit = accountInfo.UseFahrenheit;
 
-								if (contextKey === false) {
+								if (!contextKey) {
 									return;
 								}
 
@@ -135,9 +132,9 @@ class MelCloudPlatform {
 
 								for (const device of devices) {
 									//chack device from config exist on melcloud
-									const deviceId = device.id;
+									device.id = displayType === 'melcloud' ? parseInt(device.id) : device.id;
 									const displayMode = device.displayMode > 0;
-									const deviceExistInMelCloud = devicesInMelcloud.some(dev => dev.DeviceID === deviceId);
+									const deviceExistInMelCloud = devicesInMelcloud.some(dev => dev.DeviceID === device.id);
 									if (!deviceExistInMelCloud || !displayMode) {
 										continue;
 									}

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.9",
+  "version": "4.0.0-beta.90",
   "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.accountMelcloud = account.displayType === 'melcloud' ? true : false;
         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}`);
@@ -925,8 +926,8 @@ class DeviceAta extends EventEmitter {
                         this.emit('devInfo', `Account: ${this.accountName}`);
                         if (modelIndoor) this.emit('devInfo', `Indoor: ${modelIndoor}`);
                         if (modelOutdoor) this.emit('devInfo', `Outdoor: ${modelOutdoor}`);
-                        this.emit('devInfo', `Serial: ${serialNumber}`);
-                        this.emit('devInfo', `Firmware: ${firmwareAppVersion}`);
+                        if (serialNumber) this.emit('devInfo', `Serial: ${serialNumber}`);
+                        if (firmwareAppVersion) this.emit('devInfo', `Firmware: ${firmwareAppVersion}`);
                         this.emit('devInfo', `Manufacturer: ${manufacturer}`);
                         this.emit('devInfo', '----------------------------------');
                         this.displayDeviceInfo = false;
@@ -952,16 +953,16 @@ class DeviceAta extends EventEmitter {
 
                     //device info
                     const hasAutomaticFanSpeed = deviceData.Device.HasAutomaticFanSpeed ?? false;
-                    const airDirectionFunction = deviceData.Device.AirDirectionFunction ?? false;
-                    const swingFunction = deviceData.Device.SwingFunction ?? false;
+                    const airDirectionFunction = this.accountMelcloud ? deviceData.Device.AirDirectionFunction : deviceData.Device.HasAirDirectionFunction;;
+                    const swingFunction = this.accountMelcloud ? deviceData.Device.SwingFunction : deviceData.Device.HasSwing;
                     const hasOutdoorTemperature = deviceData.Device.HasOutdoorTemperature ?? false;
-                    const numberOfFanSpeeds = deviceData.Device.NumberOfFanSpeeds ?? 0;
-                    const modelSupportsFanSpeed = deviceData.Device.ModelSupportsFanSpeed ?? false;
-                    const modelSupportsAuto1 = deviceData.Device.ModelSupportsAuto ?? false;
+                    const modelSupportsFanSpeed = deviceData.Device.ModelSupportsFanSpeed || deviceData.Device.NumberOfFanSpeeds > 0;
+                    const numberOfFanSpeeds = modelSupportsFanSpeed ? deviceData.Device.NumberOfFanSpeeds : 0;
+                    const modelSupportsAuto1 = this.accountMelcloud ? deviceData.Device.ModelSupportsAuto : deviceData.Device.HasAutoOperationMode;
                     const modelSupportsAuto = this.autoDryFanMode >= 1 && modelSupportsAuto1
-                    const modelSupportsHeat1 = deviceData.Device.ModelSupportsHeat ?? false;
+                    const modelSupportsHeat1 = this.accountMelcloud ? deviceData.Device.ModelSupportsHeat : deviceData.Device.HasHeatOperationMode
                     const modelSupportsHeat = this.heatDryFanMode >= 1 && modelSupportsHeat1;
-                    const modelSupportsDry = deviceData.Device.ModelSupportsDry ?? false;
+                    const modelSupportsDry = this.accountMelcloud ? deviceData.Device.ModelSupportsDry : deviceData.Device.HasDryOperationMode;
                     const modelSupportsCool = this.coolDryFanMode >= 1;
                     const minTempHeat = 10;
                     const maxTempHeat = 31;
@@ -977,8 +978,8 @@ class DeviceAta extends EventEmitter {
                     const defaultCoolingSetTemperature = deviceData.Device.DefaultCoolingSetTemperature ?? 23;
                     const actualFanSpeed = deviceData.Device.ActualFanSpeed;
                     const automaticFanSpeed = deviceData.Device.AutomaticFanSpeed;
-                    const fanSpeed = deviceData.Device.FanSpeed ?? 0;
-                    const operationMode = deviceData.Device.OperationMode;
+                    const fanSpeed = this.accountMelcloud ? deviceData.Device.FanSpeed : deviceData.Device.SetFanSpeed;
+                    const operationMode = this.accountMelcloud ? deviceData.Device.OperationMode : AirConditioner.OperationModeMap[deviceData.Device.OperationMode];
                     const vaneVerticalDirection = deviceData.Device.VaneVerticalDirection;
                     const vaneVerticalSwing = deviceData.Device.VaneVerticalSwing;
                     const vaneHorizontalDirection = deviceData.Device.VaneHorizontalDirection;
@@ -1108,9 +1109,9 @@ class DeviceAta extends EventEmitter {
                                 .updateCharacteristic(Characteristic.LockPhysicalControls, obj.lockPhysicalControl)
                                 .updateCharacteristic(Characteristic.TemperatureDisplayUnits, obj.useFahrenheit)
                                 .updateCharacteristic(Characteristic.CoolingThresholdTemperature, defaultCoolingSetTemperature);
-                            const updateDefHeat = modelSupportsHeat ? this.melCloudService?.updateCharacteristic(Characteristic.HeatingThresholdTemperature, defaultHeatingSetTemperature) : false;
-                            const updateRS = modelSupportsFanSpeed ? this.melCloudService?.updateCharacteristic(Characteristic.RotationSpeed, obj.fanSpeed) : false;
-                            const updateSM = swingFunction ? this.melCloudService?.updateCharacteristic(Characteristic.SwingMode, obj.swingMode) : false;
+                            if (modelSupportsHeat) this.melCloudService?.updateCharacteristic(Characteristic.HeatingThresholdTemperature, defaultHeatingSetTemperature);
+                            if (modelSupportsFanSpeed) this.melCloudService?.updateCharacteristic(Characteristic.RotationSpeed, obj.fanSpeed);
+                            if (swingFunction) this.melCloudService?.updateCharacteristic(Characteristic.SwingMode, obj.swingMode);
                             break;
                         case 2: //Thermostat
                             switch (operationMode) {
@@ -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}`);