homebridge-melcloud-control 3.0.7-beta.13 → 3.0.7-beta.15

package/config.schema.json

@@ -1466,13 +1466,6 @@
                       "key": "accounts[].ataDevices[].type",
                       "readonly": true
                     },
-                    {
-                      "key": "accounts[].ataDevices[]",
-                      "type": "text",
-                      "title": "ID and Type",
-                      "readonly": true,
-                      "template": "{{ accounts[].ataDevices[].id }} - {{ accounts[].ataDevices[].type }}"
-                    },
                     {
                       "key": "accounts[].ataDevices[]",
                       "type": "section",

package/homebridge-ui/public/index.html

@@ -147,15 +147,23 @@
         const info = response.info ?? '';
         const status = response.status;
         const devices = response.data ?? [];
-        const newDevices = [];
+        const newDevices = {
+          ata: [],
+          atw: [],
+          erv: []
+        };
+        let textAta = '';
+        let textAtw = '';
+        let textErv = '';
 
         switch (status) {
           case 0:
             //get device info fom devices
-            devices.forEach((deviceInfo, index) => {
-              const deviceType = deviceInfo.Type;
-              const deviceId = deviceInfo.DeviceID;
-              const deviceName = deviceInfo.DeviceName;
+            devices.forEach((device, index) => {
+              const deviceType = device.Type;
+              const deviceId = device.DeviceID;
+              const deviceName = device.DeviceName;
+              const deviceTypeText = ["Air Conditioner", "Heat Pump", "Unknown", "Energy Recovery Ventilation"][device.Type];
 
               //config account keys
               const accountKeys = Object.keys(pluginConfig[0].accounts[this.deviceIndex]);
@@ -165,7 +173,7 @@
                 const deviceAta = {
                   name: deviceName,
                   id: deviceId,
-                  type: deviceType,
+                  type: deviceTypeText,
                   displayMode: 0,
                   heatDryFanMode: 0,
                   coolDryFanMode: 0,
@@ -180,7 +188,9 @@
                 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);
+                const pushNewDevice = ataDeviceIdExist ? false : newDevices.ata.push(device);
+                const devicesCount = newDevices.ata.length;
+                textAta = `ATA: ${devicesCount}`
               };
 
               //devices atw
@@ -188,7 +198,7 @@
                 const deviceAtw = {
                   name: deviceName,
                   id: deviceId,
-                  type: deviceType,
+                  type: deviceTypeText,
                   displayMode: 0,
                   temperatureSensor: false,
                   temperatureSensorFlow: false,
@@ -208,7 +218,9 @@
                 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);
+                const pushNewDevice = atwDeviceIdExist ? false : newDevices.atw.push(device);
+                const devicesCount = newDevices.ata.length;
+                textAtw = `ATW: ${devicesCount}`
               };
 
               //devices erv
@@ -216,7 +228,7 @@
                 const deviceErv = {
                   name: deviceName,
                   id: deviceId,
-                  type: deviceType,
+                  type: deviceTypeText,
                   displayMode: 0,
                   temperatureSensor: false,
                   temperatureSensorOutdoor: false,
@@ -230,12 +242,14 @@
                 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 pushNewDevice = ervDeviceIdExist ? false : newDevices.erv.push(device);
+                const devicesCount = newDevices.ata.length;
+                textErv = `ERV: ${devicesCount}`
               };
             });
 
-            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.'}`;
+            const newDevicesCount = newDevices.ata.length + newDevices.atw.length + newDevices.erv.length;
+            document.getElementById('info').innerHTML = `Found devices: ${textAta}, ${textAtw}, ${textErv}. ${newDevicesCount === 0 ? '' : 'Now You can start to configure it.'}`;
             document.getElementById('info').style.color = 'green';
 
             await homebridge.updatePluginConfig(pluginConfig);

package/homebridge-ui/server.js

@@ -38,7 +38,8 @@ class PluginUiServer extends HomebridgePluginUiServer {
     } catch (error) {
       return data = {
         info: error,
-        status: 1
+        status: 1,
+        data: data
       };
     };
   };

package/package.json

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