homebridge-melcloud-control 2.5.0-beta.78 → 2.5.0-beta.8

package/homebridge-ui/public/index.html

@@ -6,45 +6,18 @@
 <div id="melCloudAccount" style="display: none;" class="card card-body">
   <form id="configForm">
     <div class="text-center">
-      <label id="accountName" style="font-size: 23px">Account</label><br>
+      <label id="accountName" style="font-size: 23px">Account Name</label><br>
       <label id="info" style="text-align: center; font-size: 17px;">MELCloud</label><br><br>
     </div>
     <div class="form-group">
       <label for="name">Name</label>
       <input id="name" type="text" class="form-control"><br>
-      <label for="user">User Name</label>
+      <label for="user">MELCloud User</label>
       <input id="user" type="text" class="form-control"><br>
-      <label for="passwd">Password</label>
-      <input id="passwd" type="password" class="form-control"><br>
+      <label for="passwd">MELCloud Password</label>
+      <input id="passwd" type="text" class="form-control"><br>
       <label for="language">Language</label>
-      <select id="language" name="language" class="form-control"><br>
-        <option value="0">English</option>
-        <option value="1">Български</option>
-        <option value="2">Čeština</option>
-        <option value="3">Dansk</option>
-        <option value="4">Deutsch</option>
-        <option value="5">Eesti</option>
-        <option value="6">Español</option>
-        <option value="7">Français</option>
-        <option value="8">Հայերեն</option>
-        <option value="9">Latviešu</option>
-        <option value="10">Lietuvių</option>
-        <option value="11">Magyar</option>
-        <option value="12">Nederlands</option>
-        <option value="13">Norwegian</option>
-        <option value="14">Polski</option>
-        <option value="15">Português</option>
-        <option value="16">Русский</option>
-        <option value="17">Suomi</option>
-        <option value="18">Svenska</option>
-        <option value="19">Svenska</option>
-        <option value="20">Українська</option>
-        <option value="21">Türkçe</option>
-        <option value="22">Ελληνικά</option>
-        <option value="23">Hrvatski</option>
-        <option value="24">Română</option>
-        <option value="25">Slovenščina</option>
-      </select>
+      <input id="language" type="text" class="form-control"><br>
     </div>
     <div class="text-center">
       <button id="logIn" type="button" class="btn btn-primary">Connect to MELCloud</button>
@@ -83,8 +56,6 @@
           const setRemoveAtribute = j === i ? document.getElementById(`button${j}`).setAttribute("class", "btn btn-secondary") : document.getElementById(`button${j}`).setAttribute("class", "btn btn-primary");
         }
 
-        //const devicesCount = pluginConfig[0].accounts[i].devicesAta.length ?? 0;
-        //document.getElementById('info').innerHTML = `MELCloud configured ${devicesCount} ${devicesCount} ${devicesCount !== 1 ? 'devices' : 'device'}.`;
         document.getElementById('accountName').innerHTML = pluginConfig[0].accounts[i].name || '';
         document.getElementById('name').value = pluginConfig[0].accounts[i].name || '';
         document.getElementById('user').value = pluginConfig[0].accounts[i].user || '';
@@ -92,8 +63,7 @@
         document.getElementById('language').value = pluginConfig[0].accounts[i].language || '';
 
         const accountConfigured = pluginConfig[0].accounts[i].name && pluginConfig[0].accounts[i].user && pluginConfig[0].accounts[i].passwd && pluginConfig[0].accounts[i].language;
-        const setButtonState = accountConfigured ? document.getElementById('logIn').removeAttribute('disabled') : document.getElementById('logIn').setAttribute('disabled');
-        document.getElementById('configButton').setAttribute('disabled');
+        const setButtonName = accountConfigured ? document.getElementById('logIn').removeAttribute('disabled') : document.getElementById('logIn').setAttribute('disabled');
         await homebridge.updatePluginConfig(pluginConfig);
         this.deviceIndex = i;
       });
@@ -112,7 +82,7 @@
       pluginConfig[0].accounts[this.deviceIndex].language = document.querySelector('#language').value;
 
       const accountConfigured = pluginConfig[0].accounts[i].name && pluginConfig[0].accounts[i].user && pluginConfig[0].accounts[i].passwd && pluginConfig[0].accounts[i].language;
-      const setButtonState = accountConfigured ? document.getElementById('logIn').removeAttribute('disabled') : document.getElementById('logIn').setAttribute('disabled');
+      const setButtonMode = accountConfigured ? document.getElementById('logIn').removeAttribute('disabled') : document.getElementById('logIn').setAttribute('disabled');
 
       await homebridge.updatePluginConfig(pluginConfig);
       await homebridge.savePluginConfig(pluginConfig);
@@ -136,119 +106,55 @@
         const user = pluginConfig[0].accounts[this.deviceIndex].user;
         const passwd = pluginConfig[0].accounts[this.deviceIndex].passwd;
         const language = pluginConfig[0].accounts[this.deviceIndex].language;
+        const enableDebugMode = pluginConfig[0].accounts[this.deviceIndex].enableDebugMode;
+        const refreshInterval = pluginConfig[0].accounts[this.deviceIndex].refreshInterval;
 
         const payload = {
           accountName: accountName,
           user: user,
           passwd: passwd,
-          language: language
+          language: language,
+          enableDebugMode: enableDebugMode,
+          refreshInterval: refreshInterval
         };
         const response = await homebridge.request('/connect', payload);
-        const info = response.info ?? '';
+        const info = response.info;
         const status = response.status;
         const devices = response.data ?? [];
-        const newDevices = [];
 
         switch (status) {
           case 0:
             //get device info fom devices
-            devices.forEach((deviceInfo, index) => {
-              const deviceType = deviceInfo.Type;
+            for (const deviceInfo of devices) {
               const deviceId = deviceInfo.DeviceID;
               const deviceName = deviceInfo.DeviceName;
+            };
 
-              //config account keys
-              const accountKeys = Object.keys(pluginConfig[0].accounts[this.deviceIndex]);
-
-              //devices ata
-              if (deviceType === 0) {
-                const deviceAta = {
-                  name: deviceName,
-                  id: deviceId,
-                  type: deviceType,
-                  displayMode: 0,
-                  heatDryFanMode: 0,
-                  coolDryFanMode: 0,
-                  autoDryFanMode: 0,
-                  presets: false,
-                  temperatureSensor: false,
-                  temperatureSensorOutdoor: false,
-                  buttonsSensors: []
-                };
-
-                const ataDevicesExist = pluginConfig[0].accounts[this.deviceIndex].ataDevices ?? false;
-                const ataDevices = ataDevicesExist ? pluginConfig[0].accounts[this.deviceIndex].ataDevices : pluginConfig[0].accounts[this.deviceIndex].ataDevices = [];
-                const ataDeviceIdExist = ataDevices.some(device => device.id === deviceId);
-                const pushTypeAta = ataDeviceIdExist ? false : ataDevices.push(deviceAta);
-                const pushNewDevice = ataDeviceIdExist ? false : newDevices.push(deviceId);
-              };
-
-              //devices atw
-              if (deviceType === 1) {
-                const deviceAtw = {
-                  name: deviceName,
-                  id: deviceId,
-                  type: deviceType,
-                  displayMode: 0,
-                  temperatureSensor: false,
-                  temperatureSensorFlow: false,
-                  temperatureSensorReturn: false,
-                  temperatureSensorFlowZone1: false,
-                  temperatureSensorReturnZone1: false,
-                  temperatureSensorFlowWaterTank: false,
-                  temperatureSensorReturnWaterTank: false,
-                  temperatureSensorFlowZone2: false,
-                  temperatureSensorReturnZone2: false,
-                  presets: false,
-                  temperatureSensor: false,
-                  temperatureSensorOutdoor: false,
-                  buttonsSensors: []
-                };
-                const atwDevicesExist = pluginConfig[0].accounts[this.deviceIndex].atwDevices ?? false;
-                const atwDevices = atwDevicesExist ? pluginConfig[0].accounts[this.deviceIndex].atwDevices : pluginConfig[0].accounts[this.deviceIndex].atwDevices = [];
-                const atwDeviceIdExist = atwDevices.some(device => device.id === deviceId);
-                const pushTypeatw = atwDeviceIdExist ? false : atwDevices.push(deviceAtw);
-                const pushNewDevice = atwDeviceIdExist ? false : newDevices.push(deviceId);
-              };
-
-              //devices erv
-              if (deviceType === 3) {
-                const deviceErv = {
-                  name: deviceName,
-                  id: deviceId,
-                  type: deviceType,
-                  displayMode: 0,
-                  temperatureSensor: false,
-                  temperatureSensorOutdoor: false,
-                  temperatureSensorSupply: false,
-                  presets: false,
-                  temperatureSensor: false,
-                  temperatureSensorOutdoor: false,
-                  buttonsSensors: []
-                };
-                const ervDevicesExist = pluginConfig[0].accounts[this.deviceIndex].ervDevices ?? false;
-                const ervDevices = ervDevicesExist ? pluginConfig[0].accounts[this.deviceIndex].ervDevices : pluginConfig[0].accounts[this.deviceIndex].ervDevices = [];
-                const ervDeviceIdExist = ervDevices.some(device => device.id === deviceId);
-                const pushTypeerv = ervDeviceIdExist ? false : ervDevices.push(deviceErv);
-                const pushNewDevice = ervDeviceIdExist ? false : newDevices.push(deviceId);
-              };
-            });
-
-            const devicesCount = newDevices.length;
-            document.getElementById('info').innerHTML = `Check devices complete, found ${devicesCount} ${devicesCount !== 1 ? 'new devices' : 'new device'}. ${devicesCount === 0 ? '' : 'Now You can start to configure it.'}`;
+            document.getElementById('info').innerHTML = `${info} Found: ${devices.length} devices. Now You can start to configure it.`;
             document.getElementById('info').style.color = 'green';
-
             await homebridge.updatePluginConfig(pluginConfig);
             await homebridge.savePluginConfig(pluginConfig);
             break;
           case 1:
             document.getElementById('info').innerHTML = info;
-            document.getElementById('info').style.color = 'red';
+            document.getElementById('info').style.color = 'green';
             break;
-          default:
-            document.getElementById('info').innerHTML = `Received unknown status: ${status}, please try again.`;
+          case 2:
+            document.getElementById('info').innerHTML = info;
+            document.getElementById('info').style.color = 'white';
+            break;
+          case 3:
+            document.getElementById('info').innerHTML = info;
+            document.getElementById('info').style.color = 'gray';
+            break;
+          case 4:
+            document.getElementById('info').innerHTML = info;
             document.getElementById('info').style.color = 'yellow';
             break;
+          case 5:
+            document.getElementById('info').innerHTML = info;
+            document.getElementById('info').style.color = 'red';
+            break;
         };
 
         homebridge.hideSpinner();

package/homebridge-ui/server.js

@@ -19,26 +19,62 @@ class PluginUiServer extends HomebridgePluginUiServer {
     const user = payload.user;
     const passwd = payload.passwd;
     const language = payload.language;
+    const enableDebugMode = payload.enableDebugMode;
+    const refreshInterval = payload.refreshInterval;
     const accountInfoFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Account`;
     const deviceInfoFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Device_`;
     const buildingsFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Buildings`;
+    let data = {};
 
     try {
-      let data = {};
-      const melCloud = new MelCloud(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, false, 0, true);
-      const contextKey = await melCloud.connect();
-      const devices = await melCloud.chackDevicesList(contextKey);
-      return data = {
-        info: '',
-        status: 0,
-        data: devices
-      };
+      const melCloud = new MelCloud(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval, true);
+      melCloud.on('devicesList', (devices) => {
+        data = {
+          info: 'Check devices list complete.',
+          status: 0,
+          data: devices
+        };
+      })
+        .on('success', (message) => {
+          data = {
+            info: message,
+            status: 1
+          };
+        })
+        .on('message', (message) => {
+          data = {
+            info: message,
+            status: 2
+          };
+        })
+        .on('debug', (debug) => {
+          data = {
+            info: debug,
+            status: 3
+          };
+        })
+        .on('warn', (warn) => {
+          data = {
+            info: warn,
+            status: 4
+          };
+        })
+        .on('error', async (error) => {
+          data = {
+            info: error,
+            status: 5
+          };
+        });
+
+      return data;
     } catch (error) {
-      return data = {
+      data = {
         info: error,
-        status: 1
+        status: 5
       };
+      return data;
     };
+
   };
 };
 

package/index.js

@@ -38,6 +38,11 @@ class MelCloudPlatform {
 				}
 				accountsName.push(accountName);
 
+				//hide devices
+				const ataHideDeviceById = account.ataHideDeviceById || [];
+				const atwHideDeviceById = account.atwHideDeviceById || [];
+				const ervHideDeviceById = account.ervHideDeviceById || [];
+
 				//debug config
 				const enableDebugMode = account.enableDebugMode || false;
 				const debug = enableDebugMode ? log.info(`Account: ${accountName}, did finish launching.`) : false;
@@ -57,7 +62,7 @@ class MelCloudPlatform {
 				const prefDir = path.join(api.user.storagePath(), 'melcloud');
 				const accountInfoFile = `${prefDir}/${accountName}_Account`;
 				const buildingsFile = `${prefDir}/${accountName}_Buildings`;
-				const deviceFile = `${prefDir}/${accountName}_Device_`;
+				const deviceInfoFile = `${prefDir}/${accountName}_Device_`;
 
 				//create directory if it doesn't exist
 				try {
@@ -73,131 +78,116 @@ class MelCloudPlatform {
 				const deviceRefreshInterval = account.deviceRefreshInterval * 1000 || 5000;
 
 				//melcloud account
-				const melCloud = new MelCloud(user, passwd, language, accountInfoFile, buildingsFile, deviceFile, enableDebugMode, refreshInterval, false);
-				melCloud.on('checkDevicesListComplete', (accountInfo, contextKey) => {
-
-					//Air Conditioner
-					for (const device of account.ataDevices) {
-						const id = device.id ?? false;
-
-						//check id exist
-						if (!id) {
-							continue;
-						};
-
-						const deviceId = id.toString();
-						const deviceType = device.type;
-						const deviceName = device.name;
-						const deviceTypeText = CONSTANTS.DeviceType[deviceType];
-						const deviceInfoFile = `${prefDir}/${accountName}_Device_${deviceId}`;
-						const airConditioner = new DeviceAta(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, accountInfoFile, deviceInfoFile, deviceRefreshInterval)
-						airConditioner.on('publishAccessory', (accessory) => {
-
-							//publish device
-							api.publishExternalAccessories(CONSTANTS.PluginName, [accessory]);
-							log.success(`${accountName}, ${deviceTypeText} ${deviceName}, published as external accessory.`);
-						})
-							.on('devInfo', (devInfo) => {
-								log.info(devInfo);
-							})
-							.on('success', (message) => {
-								log.success(`${deviceTypeText}, ${deviceName}, ${message}`);
-							})
-							.on('message', (message) => {
-								log.info(`${deviceTypeText}, ${deviceName}, ${message}`);
-							})
-							.on('debug', (debug) => {
-								log.info(`${deviceTypeText}, ${deviceName}, debug: ${debug}`);
-							})
-							.on('warn', (warn) => {
-								log.warn(`${deviceTypeText}, ${deviceName}, ${warn}`);
-							})
-							.on('error', (error) => {
-								log.error(`${deviceTypeText}, ${deviceName}, ${error}`);
-							});
-					};
-
-					//Heat Pump
-					for (const device of account.atwDevices) {
-						const id = device.id ?? false;
-
-						//check id exist
-						if (!id) {
-							continue;
-						};
-
-						const deviceId = id.toString();
-						const deviceType = device.type;
-						const deviceName = device.name;
-						const deviceTypeText = CONSTANTS.DeviceType[deviceType];
-						const deviceInfoFile = `${prefDir}/${accountName}_Device_${deviceId}`;
-						const heatPump = new DeviceAtw(api, account, melCloud, device, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, accountInfoFile, deviceInfoFile, deviceRefreshInterval)
-						heatPump.on('publishAccessory', (accessory) => {
-
-							//publish device
-							api.publishExternalAccessories(CONSTANTS.PluginName, [accessory]);
-							log.success(`${accountName}, ${deviceTypeText} ${deviceName}, published as external accessory.`);
-						})
-							.on('devInfo', (devInfo) => {
-								log.info(devInfo);
-							})
-							.on('success', (message) => {
-								log.success(`${deviceTypeText}, ${deviceName}, ${message}`);
+				const melCloud = new MelCloud(user, passwd, language, accountInfoFile, buildingsFile, deviceInfoFile, enableDebugMode, refreshInterval, false);
+				melCloud.on('checkDevicesListComplete', (accountInfo, contextKey, deviceInfo) => {
+					const deviceId = deviceInfo.DeviceID.toString();
+					const deviceType = deviceInfo.Type;
+					const deviceName = deviceInfo.DeviceName;
+					const deviceTypeText = CONSTANTS.DeviceType[deviceType];
+					const deviceInfoFile = `${prefDir}/${accountName}_Device_${deviceId}`;
+
+					//melcloud devices
+					switch (deviceType) {
+						case 0: //Air Conditioner
+							const ataHideDevice = ataHideDeviceById.some(device => device.id === deviceId) ?? false;
+							if (ataHideDevice) {
+								return;
+							};
+
+							const airConditioner = new DeviceAta(api, account, melCloud, accountInfo, accountName, contextKey, deviceId, deviceName, deviceTypeText, accountInfoFile, deviceInfoFile, deviceRefreshInterval)
+							airConditioner.on('publishAccessory', (accessory) => {
+
+								//publish device
+								api.publishExternalAccessories(CONSTANTS.PluginName, [accessory]);
+								log.success(`${accountName}, ${deviceTypeText} ${deviceName}, published as external accessory.`);
 							})
-							.on('message', (message) => {
-								log.info(`${deviceTypeText}, ${deviceName}, ${message}`);
+								.on('devInfo', (devInfo) => {
+									log.info(devInfo);
+								})
+								.on('success', (message) => {
+									log.success(`${deviceTypeText}, ${deviceName}, ${message}`);
+								})
+								.on('message', (message) => {
+									log.info(`${deviceTypeText}, ${deviceName}, ${message}`);
+								})
+								.on('debug', (debug) => {
+									log.info(`${deviceTypeText}, ${deviceName}, debug: ${debug}`);
+								})
+								.on('warn', (warn) => {
+									log.warn(`${deviceTypeText}, ${deviceName}, ${warn}`);
+								})
+								.on('error', (error) => {
+									log.error(`${deviceTypeText}, ${deviceName}, ${error}`);
+								});
+							break;
+						case 1: //Heat Pump
+							const atwHideDevice = atwHideDeviceById.some(device => device.id === deviceId) ?? false;
+							if (atwHideDevice) {
+								return;
+							};
+
+							const heatPump = new DeviceAtw(api, account, melCloud, accountInfo, accountName, contextKey, deviceId, deviceName, deviceTypeText, accountInfoFile, deviceInfoFile, deviceRefreshInterval)
+							heatPump.on('publishAccessory', (accessory) => {
+
+								//publish device
+								api.publishExternalAccessories(CONSTANTS.PluginName, [accessory]);
+								log.success(`${accountName}, ${deviceTypeText} ${deviceName}, published as external accessory.`);
 							})
-							.on('debug', (debug) => {
-								log.info(`${deviceTypeText}, ${deviceName}, debug: ${debug}`);
+								.on('devInfo', (devInfo) => {
+									log.info(devInfo);
+								})
+								.on('success', (message) => {
+									log.success(`${deviceTypeText}, ${deviceName}, ${message}`);
+								})
+								.on('message', (message) => {
+									log.info(`${deviceTypeText}, ${deviceName}, ${message}`);
+								})
+								.on('debug', (debug) => {
+									log.info(`${deviceTypeText}, ${deviceName}, debug: ${debug}`);
+								})
+								.on('warn', (warn) => {
+									log.warn(`${deviceTypeText}, ${deviceName}, ${warn}`);
+								})
+								.on('error', (error) => {
+									log.error(`${deviceTypeText}, ${deviceName}, ${error}`);
+								});
+							break;
+						case 3: //Energy Recovery Ventilation
+							const ervHideDevice = ervHideDeviceById.some(device => device.id === deviceId) ?? false;
+							if (ervHideDevice) {
+								return;
+							};
+
+							const energyRecoveryVentilation = new DeviceErv(api, account, melCloud, accountInfo, accountName, contextKey, deviceId, deviceName, deviceTypeText, accountInfoFile, deviceInfoFile, deviceRefreshInterval)
+							energyRecoveryVentilation.on('publishAccessory', (accessory) => {
+
+								//publish device
+								api.publishExternalAccessories(CONSTANTS.PluginName, [accessory]);
+								log.success(`${accountName}, ${deviceTypeText} ${deviceName}, published as external accessory.`);
 							})
-							.on('warn', (warn) => {
-								log.warn(`${deviceTypeText}, ${deviceName}, ${warn}`);
-							})
-							.on('error', (error) => {
-								log.error(`${deviceTypeText}, ${deviceName}, ${error}`);
-							});
-					};
-
-					//Energy Recovery Ventilation
-					for (const device of account.ervDevices) {
-						const id = device.id ?? false;
-
-						//check id exist
-						if (!id) {
-							continue;
-						};
-
-						const deviceId = id.toString();
-						const deviceType = device.type;
-						const deviceName = device.name;
-						const deviceTypeText = CONSTANTS.DeviceType[deviceType];
-						const deviceInfoFile = `${prefDir}/${accountName}_Device_${deviceId}`;
-						const energyRecoveryVentilation = new DeviceErv(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, accountInfoFile, deviceInfoFile, deviceRefreshInterval)
-						energyRecoveryVentilation.on('publishAccessory', (accessory) => {
-
-							//publish device
-							api.publishExternalAccessories(CONSTANTS.PluginName, [accessory]);
-							log.success(`${accountName}, ${deviceTypeText} ${deviceName}, published as external accessory.`);
-						})
-							.on('devInfo', (devInfo) => {
-								log.info(devInfo);
-							})
-							.on('success', (message) => {
-								log.success(`${deviceTypeText}, ${deviceName}, ${message}`);
-							})
-							.on('message', (message) => {
-								log.info(`${deviceTypeText}, ${deviceName}, ${message}`);
-							})
-							.on('debug', (debug) => {
-								log.info(`${deviceTypeText}, ${deviceName}, debug: ${debug}`);
-							})
-							.on('warn', (warn) => {
-								log.warn(`${deviceTypeText}, ${deviceName}, ${warn}`);
-							})
-							.on('error', (error) => {
-								log.error(`${deviceTypeText}, ${deviceName}, ${error}`);
-							});
-					};
+								.on('devInfo', (devInfo) => {
+									log.info(devInfo);
+								})
+								.on('success', (message) => {
+									log.success(`${deviceTypeText}, ${deviceName}, ${message}`);
+								})
+								.on('message', (message) => {
+									log.info(`${deviceTypeText}, ${deviceName}, ${message}`);
+								})
+								.on('debug', (debug) => {
+									log.info(`${deviceTypeText}, ${deviceName}, debug: ${debug}`);
+								})
+								.on('warn', (warn) => {
+									log.warn(`${deviceTypeText}, ${deviceName}, ${warn}`);
+								})
+								.on('error', (error) => {
+									log.error(`${deviceTypeText}, ${deviceName}, ${error}`);
+								});
+							break;
+						default:
+							log(`Unknown device type: ${deviceType},`);
+							break;
+					}
 				})
 					.on('success', (message) => {
 						log.success(`Account ${accountName}, ${message}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "2.5.0-beta.78",
+  "version": "2.5.0-beta.8",
   "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, accountInfoFile, deviceInfoFile, refreshInterval) {
+    constructor(api, account, melCloud, accountInfo, accountName, contextKey, deviceId, deviceName, deviceTypeText, accountInfoFile, deviceInfoFile, deviceRefreshInterval) {
         super();
 
         Accessory = api.platformAccessory;
@@ -17,14 +17,14 @@ class DeviceAta extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //account config
-        this.displayMode = device.displayMode || 0;
-        this.temperatureSensor = device.temperatureSensor || false;
-        this.temperatureSensorOutdoor = device.temperatureSensorOutdoor || false;
-        this.presetsEnabled = device.presets || false;
-        this.heatDryFanMode = device.heatDryFanMode || 1; //NONE, HEAT, DRY, FAN
-        this.coolDryFanMode = device.coolDryFanMode || 1; //NONE, COOL, DRY, FAN
-        this.autoDryFanMode = device.autoDryFanMode || 1; //NONE, AUTO, DRY, FAN
-        this.buttons = device.buttons || [];
+        this.displayMode = account.ataDisplayMode || 0;
+        this.temperatureSensor = account.ataTemperatureSensor || false;
+        this.temperatureSensorOutdoor = account.ataTemperatureSensorOutdoor || false;
+        this.presetsEnabled = account.ataPresets || false;
+        this.heatDryFanMode = account.ataHeatDryFanMode || 1; //NONE, HEAT, DRY, FAN
+        this.coolDryFanMode = account.ataCoolDryFanMode || 1; //NONE, COOL, DRY, FAN
+        this.autoDryFanMode = account.ataAutoDryFanMode || 1; //NONE, AUTO, DRY, FAN
+        this.buttons = account.ataButtons || [];
         this.disableLogInfo = account.disableLogInfo || false;
         this.disableLogDeviceInfo = account.disableLogDeviceInfo || false;
         this.enableDebugMode = account.enableDebugMode || false;
@@ -69,7 +69,7 @@ class DeviceAta extends EventEmitter {
             accountInfoFile: accountInfoFile,
             deviceInfoFile: deviceInfoFile,
             debugLog: account.enableDebugMode,
-            refreshInterval: refreshInterval
+            refreshInterval: deviceRefreshInterval
         });
 
         this.melCloudAta.on('externalIntegrations', (deviceData, deviceState) => {

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, accountInfoFile, deviceInfoFile, refreshInterval) {
+    constructor(api, account, melCloud, accountInfo, accountName, contextKey, deviceId, deviceName, deviceTypeText, accountInfoFile, deviceInfoFile, deviceRefreshInterval) {
         super();
 
         Accessory = api.platformAccessory;
@@ -17,18 +17,18 @@ class DeviceAtw extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //account config
-        this.displayMode = device.displayMode || 0;
-        this.temperatureSensor = device.temperatureSensor || false;
-        this.temperatureSensorFlow = device.temperatureSensorFlow || false;
-        this.temperatureSensorReturn = device.temperatureSensorReturn || false;
-        this.temperatureSensorFlowZone1 = device.temperatureSensorFlowZone1 || false;
-        this.temperatureSensorReturnZone1 = device.temperatureSensorFlowWaterTank || false;
-        this.temperatureSensorFlowWaterTank = device.temperatureSensorFlowZone1 || false;
-        this.temperatureSensorReturnWaterTank = device.temperatureSensorReturnWaterTank || false;
-        this.temperatureSensorFlowZone2 = device.temperatureSensorFlowZone2 || false;
-        this.temperatureSensorReturnZone2 = device.temperatureSensorReturnZone2 || false;
-        this.presetsEnabled = device.presets || false;
-        this.buttons = device.buttons || [];
+        this.displayMode = account.atwDisplayMode || 0;
+        this.temperatureSensor = account.atwTemperatureSensor || false;
+        this.temperatureSensorFlow = account.atwTemperatureSensorFlow || false;
+        this.temperatureSensorReturn = account.atwTemperatureSensorReturn || false;
+        this.temperatureSensorFlowZone1 = account.atwTemperatureSensorFlowZone1 || false;
+        this.temperatureSensorReturnZone1 = account.atwTemperatureSensorFlowWaterTank || false;
+        this.temperatureSensorFlowWaterTank = account.atwTemperatureSensorFlowZone1 || false;
+        this.temperatureSensorReturnWaterTank = account.atwTemperatureSensorReturnWaterTank || false;
+        this.temperatureSensorFlowZone2 = account.atwTemperatureSensorFlowZone2 || false;
+        this.temperatureSensorReturnZone2 = account.atwTemperatureSensorReturnZone2 || false;
+        this.presetsEnabled = account.atwPresets || false;
+        this.buttons = account.atwButtons || [];
         this.disableLogInfo = account.disableLogInfo || false;
         this.disableLogDeviceInfo = account.disableLogDeviceInfo || false;
         this.enableDebugMode = account.enableDebugMode || false;
@@ -73,7 +73,7 @@ class DeviceAtw extends EventEmitter {
             accountInfoFile: accountInfoFile,
             deviceInfoFile: deviceInfoFile,
             debugLog: account.enableDebugMode,
-            refreshInterval: refreshInterval
+            refreshInterval: deviceRefreshInterval
         });
 
         this.melCloudAtw.on('externalIntegrations', (deviceData, deviceState) => {