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

package/homebridge-ui/public/index.html

@@ -246,7 +246,7 @@
           }
 
           // Initialize devices arrays
-          const newDevices = { ata: [], ataPresets: [], atw: [], atwPresets: [], erv: [], ervPresets: [], scenes: [] };
+          const newDevices = { ata: [], ataPresets: [], ataSchedules: [], atw: [], atwPresets: [], atwSchedules: [], erv: [], ervPresets: [], ervSchedules: [], scenes: [] };
           const devicesByType = { ata: [], atw: [], erv: [] };
 
           response.Devices.forEach(d => {
@@ -264,7 +264,7 @@
           const removedAtw = removeStaleDevices(account.atwDevices, devicesByType.atw);
           const removedErv = removeStaleDevices(account.ervDevices, devicesByType.erv);
 
-          const handleDevices = (devicesInMelCloud, devicesInConfig, typeString, newArr, newPresets, newScenes) => {
+          const handleDevices = (devicesInMelCloud, devicesInConfig, typeString, newArr, newPresets, newSchedules, newScenes) => {
             try {
               const configDevicesMap = new Map(devicesInConfig.map(dev => [String(dev.id), dev]));
               const isMelcloud = account.type === 'melcloud';
@@ -296,19 +296,18 @@
                 }
 
                 // === Process presets/schedules ===
-                const presets = device[typeKey] || [];
-                const presetsInConfig = deviceInConfig[typeKey1] || [];
+                const presets = device.Presets || [];
+                const presetsInConfig = deviceInConfig.presets || [];
                 const presetIds = new Set(presetsInConfig.map(p => String(p.id)));
 
                 let addedNewPreset = false;
-
                 presets.forEach((preset, index) => {
-                  const presetId = String(preset[idKey]);
+                  const presetId = String(preset.ID);
                   if (!presetIds.has(presetId)) {
                     const presetObj = {
                       id: presetId,
                       displayType: 0,
-                      name: preset.NumberDescription || `Schedule ${index}`,
+                      name: preset.NumberDescription || `Preset ${index}`,
                       namePrefix: false
                     };
                     presetsInConfig.push(presetObj);
@@ -321,11 +320,44 @@
                 // === Remove placeholder presets/schedules (id === '0') if new ones were added ===
                 if (addedNewPreset) {
                   const beforeCount = presetsInConfig.length;
-                  deviceInConfig[typeKey1] = presetsInConfig.filter(p => String(p.id) !== '0');
-                  const removedCount = beforeCount - deviceInConfig[typeKey1].length;
+                  deviceInConfig.presets = presetsInConfig.filter(p => String(p.id) !== '0');
+                  const removedCount = beforeCount - deviceInConfig.presets.length;
+
+                  if (removedCount > 0 && removedCount < beforeCount) {
+                    updateInfo('info2', `Removed ${removedCount} placeholder preset from device ${device.DeviceID}`, 'yellow');
+                  }
+                }
+
+                // === Process presets/schedules ===
+                const schedules = device.Schedules || [];
+                const schedulesInConfig = deviceInConfig.schedules || [];
+                const scheduleIds = new Set(schedulesInConfig.map(s => String(s.id)));
+
+                let addedNewSchedule = false;
+                schedules.forEach((schedule, index) => {
+                  const scheduleId = String(schedule.Id);
+                  if (!scheduleIds.has(scheduleId)) {
+                    const presetObj = {
+                      id: scheduleId,
+                      displayType: 0,
+                      name: `Schedule ${index}`,
+                      namePrefix: false
+                    };
+                    schedulesInConfig.push(presetObj);
+                    newPresets.push(presetObj);
+                    scheduleIds.add(scheduleId);
+                    addedNewSchedule = true;
+                  }
+                });
+
+                // === Remove placeholder schedules (id === '0') if new ones were added ===
+                if (addedNewSchedule) {
+                  const beforeCount = schedulesInConfig.length;
+                  deviceInConfig.schedules = schedulesInConfig.filter(s => String(s.id) !== '0');
+                  const removedCount = beforeCount - deviceInConfig.schedules.length;
 
                   if (removedCount > 0 && removedCount < beforeCount) {
-                    updateInfo('info2', `Removed ${removedCount} placeholder ${typeKey1} from device ${device.DeviceID}`, 'yellow');
+                    updateInfo('info2', `Removed ${removedCount} placeholder schedule from device ${device.DeviceID}`, 'yellow');
                   }
                 }
 
@@ -335,7 +367,6 @@
                 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)) {
@@ -373,12 +404,13 @@
             }
           };
 
-          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);
+          account.ataDevices = handleDevices(devicesByType.ata, account.ataDevices, "Air Conditioner", newDevices.ata, newDevices.ataPresets, newDevices.ataSchedules, newDevices.scenes);
+          account.atwDevices = handleDevices(devicesByType.atw, account.atwDevices, "Heat Pump", newDevices.atw, newDevices.atwPresets, newDevices.atwSchedules, newDevices.scenes);
+          account.ervDevices = handleDevices(devicesByType.erv, account.ervDevices, "Energy Recovery Ventilation", newDevices.erv, newDevices.ervPresets, newDevices.ervSchedules, 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 newSchedulesCount = newDevices.ataSchedules.length + newDevices.atwSchedules.length + newDevices.ervSchedules.length;
           const newScenesCount = newDevices.scenes.length;
           const removedDevicesCount = removedAta.length + removedAtw.length + removedErv.length;
 
@@ -387,7 +419,7 @@
           } else {
             if (newDevicesCount)
               updateInfo('info', `Found new devices: ATA: ${newDevices.ata.length}, ATW: ${newDevices.atw.length}, ERV: ${newDevices.erv.length}.`, 'green');
-            if (newPresetsCount || newScenesCount)
+            if (newPresetsCount || newScenesCount || newSchedulesCount)
               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.47",
+  "version": "4.2.3-beta.49",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/deviceata.js

@@ -59,7 +59,7 @@ class DeviceAta extends EventEmitter {
 
         //presets configured
         for (const preset of this.presets) {
-            preset.name = preset.name || 'Preset'
+            preset.name = preset.name;
             preset.serviceType = [null, Service.Outlet, Service.Switch, Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][preset.displayType];
             preset.characteristicType = [null, Characteristic.On, Characteristic.On, Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][preset.displayType];
             preset.state = false;
@@ -68,7 +68,7 @@ class DeviceAta extends EventEmitter {
 
         //schedules configured
         for (const schedule of this.schedules) {
-            schedule.name = schedule.name || 'Schedule'
+            schedule.name = schedule.name;
             schedule.serviceType = [null, Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][schedule.displayType];
             schedule.characteristicType = [null, Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][schedule.displayType];
             schedule.state = false;
@@ -76,7 +76,7 @@ class DeviceAta extends EventEmitter {
 
         //scenes configured
         for (const scene of this.scenes) {
-            scene.name = schedule.name || 'Schedule'
+            scene.name = scene.name;
             scene.serviceType = [null, Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][scene.displayType];
             scene.characteristicType = [null, Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][scene.displayType];
             scene.state = false;