homebridge-melcloud-control 4.2.3-beta.45 → 4.2.3-beta.47

package/config.schema.json

@@ -646,7 +646,7 @@
                         "name": {
                           "title": "Name",
                           "type": "string",
-                          "default": "Schedule",
+                          "default": "Scene",
                           "description": "Your own name displayed in Homebridge/HomeKit app.",
                           "condition": {
                             "functionBody": "return model.accounts[arrayIndices[0]].ataDevices[arrayIndices[1]].scenes[arrayIndices[2]].displayType > 0;"
@@ -1421,7 +1421,7 @@
                         "name": {
                           "title": "Name",
                           "type": "string",
-                          "default": "Schedule",
+                          "default": "Scene",
                           "description": "Your own name displayed in Homebridge/HomeKit app.",
                           "condition": {
                             "functionBody": "return model.accounts[arrayIndices[0]].atwDevices[arrayIndices[1]].scenes[arrayIndices[2]].displayType > 0;"
@@ -1978,7 +1978,7 @@
                         "name": {
                           "title": "Name",
                           "type": "string",
-                          "default": "Schedule",
+                          "default": "Scene",
                           "description": "Your own name displayed in Homebridge/HomeKit app.",
                           "condition": {
                             "functionBody": "return model.accounts[arrayIndices[0]].ervDevices[arrayIndices[1]].scenes[arrayIndices[2]].displayType > 0;"

package/homebridge-ui/public/index.html

@@ -246,10 +246,11 @@
           }
 
           // Initialize devices arrays
-          const newDevices = { ata: [], ataPresets: [], atw: [], atwPresets: [], erv: [], ervPresets: [] };
+          const newDevices = { ata: [], ataPresets: [], atw: [], atwPresets: [], erv: [], ervPresets: [], scenes: [] };
           const devicesByType = { ata: [], atw: [], erv: [] };
 
           response.Devices.forEach(d => {
+            d.Scenes = response.Scenes ?? [];
             if (d.Type === 0) devicesByType.ata.push(d);
             if (d.Type === 1) devicesByType.atw.push(d);
             if (d.Type === 3) devicesByType.erv.push(d);
@@ -263,7 +264,7 @@
           const removedAtw = removeStaleDevices(account.atwDevices, devicesByType.atw);
           const removedErv = removeStaleDevices(account.ervDevices, devicesByType.erv);
 
-          const handleDevices = (devicesInMelCloud, devicesInConfig, typeString, newArr, newPresets) => {
+          const handleDevices = (devicesInMelCloud, devicesInConfig, typeString, newArr, newPresets, newScenes) => {
             try {
               const configDevicesMap = new Map(devicesInConfig.map(dev => [String(dev.id), dev]));
               const isMelcloud = account.type === 'melcloud';
@@ -286,6 +287,7 @@
                     name: device.DeviceName,
                     presets: [],
                     schedules: [],
+                    scenes: [],
                     buttonsSensors: []
                   };
                   devicesInConfig.push(deviceInConfig);
@@ -326,6 +328,41 @@
                     updateInfo('info2', `Removed ${removedCount} placeholder ${typeKey1} from device ${device.DeviceID}`, 'yellow');
                   }
                 }
+
+                // === Process scenes ===
+                const scenes = device.Scenes || [];
+                const scenesInConfig = deviceInConfig.scenes || [];
+                const sceneIds = new Set(scenesInConfig.map(s => String(s.id)));
+
+                let addedNewScenes = false;
+
+                scenes.forEach((scene, index) => {
+                  const sceneId = String(scene.Id);
+                  if (!sceneIds.has(sceneId)) {
+                    const sceneObj = {
+                      id: sceneId,
+                      displayType: 0,
+                      name: scene.Name || `Scene ${index}`,
+                      namePrefix: false
+                    };
+                    scenesInConfig.push(sceneObj);
+                    newScenes.push(sceneObj);
+                    sceneIds.add(sceneObj);
+                    addedNewScenes = true;
+                  }
+                });
+
+                // === Remove placeholder scenes (id === '0') if new ones were added ===
+                if (addedNewScenes) {
+                  const beforeCount = scenesInConfig.length;
+                  deviceInConfig.scenes = scenesInConfig.filter(s => String(s.id) !== '0');
+                  const removedCount = beforeCount - deviceInConfig.scenes.length;
+
+                  if (removedCount > 0 && removedCount < beforeCount) {
+                    updateInfo('info2', `Removed ${removedCount} placeholder scene from device ${device.DeviceID}`, 'yellow');
+                  }
+                }
+
               });
 
               // Return filtered devicesInConfig to make sure upstream code uses it
@@ -336,12 +373,13 @@
             }
           };
 
-          account.ataDevices = handleDevices(devicesByType.ata, account.ataDevices, "Air Conditioner", newDevices.ata, newDevices.ataPresets);
-          account.atwDevices = handleDevices(devicesByType.atw, account.atwDevices, "Heat Pump", newDevices.atw, newDevices.atwPresets);
-          account.ervDevices = handleDevices(devicesByType.erv, account.ervDevices, "Energy Recovery Ventilation", newDevices.erv, newDevices.ervPresets);
+          account.ataDevices = handleDevices(devicesByType.ata, account.ataDevices, "Air Conditioner", newDevices.ata, newDevices.ataPresets, newDevices.scenes);
+          account.atwDevices = handleDevices(devicesByType.atw, account.atwDevices, "Heat Pump", newDevices.atw, newDevices.atwPresets, newDevices.scenes);
+          account.ervDevices = handleDevices(devicesByType.erv, account.ervDevices, "Energy Recovery Ventilation", newDevices.erv, newDevices.ervPresets, newDevices.scenes);
 
           const newDevicesCount = newDevices.ata.length + newDevices.atw.length + newDevices.erv.length;
           const newPresetsCount = newDevices.ataPresets.length + newDevices.atwPresets.length + newDevices.ervPresets.length;
+          const newScenesCount = newDevices.scenes.length;
           const removedDevicesCount = removedAta.length + removedAtw.length + removedErv.length;
 
           if (!newDevicesCount && !newPresetsCount && !removedDevicesCount) {
@@ -349,8 +387,8 @@
           } 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 ${account.type === 'melcloud' ? 'presets' : 'schedules'}: ATA: ${newDevices.ataPresets.length}, ATW: ${newDevices.atwPresets.length}, ERV: ${newDevices.ervPresets.length}.`, 'green');
+            if (newPresetsCount || newScenesCount)
+              updateInfo('info1', `Found new ${account.type === 'melcloud' ? 'presets' : 'schedules'}: ATA: ${newDevices.ataPresets.length}, ATW: ${newDevices.atwPresets.length}, ERV: ${newDevices.ervPresets.length}, Scenes: ${newDevices.scenes.length}.`, 'green');
             if (removedDevicesCount)
               updateInfo('info2', `Removed devices: ATA: ${removedAta.length}, ATW: ${removedAtw.length}, ERV: ${removedErv.length}.`, 'orange');
           }

package/package.json

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