homebridge-melcloud-control 4.2.0-beta.1 → 4.2.0-beta.2

package/package.json

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

package/src/deviceata.js

@@ -26,22 +26,24 @@ class DeviceAta extends EventEmitter {
 
         //device config
         this.device = device;
+        this.deviceId = device.id;
+        this.deviceName = device.name;
+        this.deviceTypeText = device.typeString;
         this.displayType = device.displayType;
+        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.temperatureSensor = device.temperatureSensor || false;
         this.temperatureOutdoorSensor = device.temperatureOutdoorSensor || false;
         this.errorSensor = device.errorSensor || false;
         this.frostProtectionSupport = device.frostProtectionSupport || false;
         this.overheatProtectionSupport = device.overheatProtectionSupport || false;
         this.holidayModeSupport = device.holidayModeSupport || 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.presets = this.accountType === 'melcloud' ? (device.presets || []).filter(preset => (preset.displayType ?? 0) > 0 && preset.id !== '0') : [];
         this.schedules = this.accountType === 'melcloudhome' ? (device.schedules || []).filter(schedule => (schedule.displayType ?? 0) > 0 && schedule.id !== '0') : [];
         this.buttons = (device.buttonsSensors || []).filter(sensor => (sensor.displayType ?? 0) > 0);
-        this.deviceId = device.id;
-        this.deviceName = device.name;
-        this.deviceTypeText = device.typeString;
+
+        //files
         this.devicesFile = devicesFile;
         this.defaultTempsFile = defaultTempsFile;
         this.displayDeviceInfo = true;

package/src/deviceatw.js

@@ -1114,9 +1114,8 @@ class DeviceAtw extends EventEmitter {
             if (this.presets.length > 0) {
                 if (this.logDebug) this.emit('debug', `Prepare presets services`);
                 this.presetsServices = [];
-                const presetsIdKey = this.accountType === 'melcloud' ? 'ID' : 'Id';
                 this.presets.forEach((preset, i) => {
-                    const presetData = presetsOnServer.find(p => p[presetsIdKey] === preset.id);
+                    const presetData = presetsOnServer.find(p => p.ID === preset.id);
 
                     //get preset name
                     const name = preset.name;
@@ -1452,7 +1451,6 @@ class DeviceAtw extends EventEmitter {
                     this.deviceData = deviceData;
 
                     //keys
-                    const presetsIdKey = this.accountType === 'melcloud' ? 'ID' : 'Id';
                     const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
                     const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
 
@@ -1957,7 +1955,7 @@ class DeviceAtw extends EventEmitter {
                     //presets
                     if (this.presets.length > 0) {
                         this.presets.forEach((preset, i) => {
-                            const presetData = presetsOnServer.find(p => p[presetsIdKey] === preset.id);
+                            const presetData = presetsOnServer.find(p => p.ID === preset.id);
 
                             preset.state = presetData ? (presetData.Power === power
                                 && presetData.EcoHotWater === ecoHotWater
@@ -1984,7 +1982,7 @@ class DeviceAtw extends EventEmitter {
                             if (i === 0) this.schedulesControlService?.updateCharacteristic(Characteristic.On, scheduleEnabled);
 
                             //sensors
-                            const scheduleData = schedulesOnServer.find(s => s[presetsIdKey] === schedule.id);
+                            const scheduleData = schedulesOnServer.find(s => s.Id === schedule.id);
                             schedule.state = scheduleEnabled ? scheduleData.Enabled ?? false : false;
 
                             const characteristicType = schedule.characteristicType;

package/src/deviceerv.js

@@ -996,8 +996,6 @@ class DeviceErv extends EventEmitter {
                     this.deviceData = deviceData;
 
                     //keys
-                    const presetsIdKey = this.accountType === 'melcloud' ? 'ID' : 'Id';
-                    const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
                     const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
                     const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
 
@@ -1250,7 +1248,7 @@ class DeviceErv extends EventEmitter {
                     //presets
                     if (this.presets.length > 0) {
                         this.presets.forEach((preset, i) => {
-                            const presetData = presetsOnServer.find(p => p[presetsIdKey] === preset.id);
+                            const presetData = presetsOnServer.find(p => p.ID === preset.id);
 
                             preset.state = presetData ? (presetData.Power === power
                                 && presetData.SetTemperature === setTemperature
@@ -1270,7 +1268,7 @@ class DeviceErv extends EventEmitter {
                             if (i === 0) this.schedulesControlService?.updateCharacteristic(Characteristic.On, scheduleEnabled);
 
                             //sensors
-                            const scheduleData = schedulesOnServer.find(s => s[presetsIdKey] === schedule.id);
+                            const scheduleData = schedulesOnServer.find(s => s.Id === schedule.id);
                             schedule.state = scheduleEnabled ? scheduleData.Enabled ?? false : false;
 
                             const characteristicType = schedule.characteristicType;

package/src/melcloudata.js

@@ -284,7 +284,7 @@ class MelCloudAta extends EventEmitter {
     updateData(deviceData) {
         setTimeout(() => {
             this.emit('deviceState', deviceData);
-        }, 500);
+        }, 300);
     }
 
 };

package/src/melcloudatw.js

@@ -254,7 +254,7 @@ class MelCloudAtw extends EventEmitter {
     updateData(deviceData) {
         setTimeout(() => {
             this.emit('deviceState', deviceData);
-        }, 500);
+        }, 300);
     }
 };
 export default MelCloudAtw;

package/src/melclouderv.js

@@ -262,7 +262,7 @@ class MelCloudErv extends EventEmitter {
     updateData(deviceData) {
         setTimeout(() => {
             this.emit('deviceState', deviceData);
-        }, 500);
+        }, 300);
     }
 };
 export default MelCloudErv;