homebridge-melcloud-control 4.6.7-beta.4 → 4.6.7-beta.6

package/package.json

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

package/src/constants.js

@@ -117,8 +117,8 @@ export const HeatPump = {
     OperationModeMapEnumToString: { 0: "Idle", 1: "HotWater", 2: "Heating", 3: "Cooling", 4: "HotWaterStorage", 5: "FreezeStat", 6: "Legionella", 7: "HeatEco", 8: "Mode1", 9: "Mode2", 10: "Mode3", 11: "HeatUp" },
     OperationModeDhwMapStringToEnum: { "Normal": 0, "Eco": 1 },
     OperationModeDhwMapEnumToString: { 0: "Normal", 1: "Eco" },
-    ForceDhwMapStringToEnum: { "Normal": 0, "Heat Now": 1 },
-    ForceDhwMapEnumToString: { 0: "Normal", 1: "Heat Now" },
+    ForceDhwMapStringToEnum: { "Normal": 0, "HeatNow": 1 },
+    ForceDhwMapEnumToString: { 0: "Normal", 1: "HeatNow" },
     HolidayMapStringToEnum: { "Normal": 0, "Holiday": 1 },
     HolidayMapEnumToString: { 0: "Normal", 1: "Holiday" },
     OperationModeZoneMapStringToEnum: { "HeatThermostat": 0, "HeatFlowTemperature": 1, "HeatCurve": 2, "CoolThermostat": 3, "CoolFlowTemperature": 4, "FlorDryUp": 5, "Idle": 6 },

package/src/deviceatw.js

@@ -1721,8 +1721,6 @@ class DeviceAtw extends EventEmitter {
                     const outdoorTemperature = deviceData.Device.OutdoorTemperature ?? deviceData.Device.RoomTemperatureZone1;
                     const flowTemperatureHeatPump = deviceData.Device.FlowTemperature ?? null;
                     const returnTemperatureHeatPump = deviceData.Device.ReturnTemperature ?? null;
-                    const isConnected = accountTypeMelcloud ? !deviceData.Device[connectKey] : deviceData.Device[connectKey];
-                    const isInError = deviceData.Device[errorKey];
 
                     //zone 1
                     const zone1Name = deviceData.Zone1Name ?? 'Zone 1';
@@ -1733,8 +1731,8 @@ class DeviceAtw extends EventEmitter {
                     const setCoolFlowTemperatureZone1 = deviceData.Device.SetCoolFlowTemperatureZone1 ?? setTemperatureZone1;
                     const prohibitZone1 = deviceData.Device.ProhibitZone1 ?? false;
                     const idleZone1 = deviceData.Device.IdleZone1 ?? false;
-                    const flowTemperatureZone1 = deviceData.Device.FlowTemperatureZone1;
-                    const returnTemperatureZone1 = deviceData.Device.ReturnTemperatureZone1;
+                    const flowTemperatureZone1 = deviceData.Device.FlowTemperatureZone1 ?? roomTemperatureZone1; // fallback to set temperature melcloud home
+                    const returnTemperatureZone1 = deviceData.Device.ReturnTemperatureZone1 ?? null;
 
                     //hot water
                     const hotWaterName = 'Hot Water';
@@ -1755,9 +1753,13 @@ class DeviceAtw extends EventEmitter {
                     const setCoolFlowTemperatureZone2 = deviceData.Device.SetCoolFlowTemperatureZone2 ?? setTemperatureZone2;
                     const prohibitZone2 = deviceData.Device.ProhibitZone2 ?? false;
                     const idleZone2 = deviceData.Device.IdleZone2 ?? false;
-                    const flowTemperatureZone2 = deviceData.Device.FlowTemperatureZone2 ?? null;
+                    const flowTemperatureZone2 = deviceData.Device.FlowTemperatureZone2 ?? roomTemperatureZone2; // fallback to set temperature melcloud home
                     const returnTemperatureZone2 = deviceData.Device.ReturnTemperatureZone2 ?? null;
 
+                    //device
+                    const isConnected = accountTypeMelcloud ? !deviceData.Device[connectKey] : deviceData.Device[connectKey];
+                    const isInError = deviceData.Device[errorKey];
+
                     //accessory
                     const obj = {
                         presets: presetsOnServer,

package/src/melcloudata.js

@@ -161,8 +161,6 @@ class MelCloudAta extends EventEmitter {
 
             //units
             const units = Array.isArray(deviceData.Device?.Units) ? deviceData.Device?.Units : [];
-            const unitsCount = units.length;
-
             const { indoor, outdoor } = units.reduce((acc, unit) => {
                 const target = unit.IsIndoor ? 'indoor' : 'outdoor';
                 acc[target] = {

package/src/melcloudatw.js

@@ -122,19 +122,18 @@ class MelCloudAtw extends EventEmitter {
                 deviceData.Device.OperationMode = HeatPump.OperationModeMapStringToEnum[deviceData.Device.OperationMode] ?? deviceData.Device.OperationMode;
                 deviceData.Device.OperationModeZone1 = HeatPump.OperationModeZoneMapStringToEnum[deviceData.Device.OperationModeZone1] ?? deviceData.Device.OperationModeZone1;
                 deviceData.Device.OperationModeZone2 = HeatPump.OperationModeZoneMapStringToEnum[deviceData.Device.OperationModeZone2] ?? deviceData.Device.OperationModeZone2;
+                deviceData.Device.HasHotWaterTank = deviceData.Device.HasHotWater ?? false;
             }
             if (this.logDebug) this.emit('debug', `Device Data: ${JSON.stringify(deviceData, null, 2)}`);
 
             //device
             const serialNumber = deviceData.SerialNumber || '4.0.0';
             const firmwareAppVersion = deviceData.Device?.FirmwareAppVersion || '4.0.0';
-            const hasHotWaterTank = deviceData.Device?.HasHotWaterTank;
-            const hasZone2 = deviceData.Device?.HasZone2;
+            const hasHotWaterTank = deviceData.Device?.HasHotWaterTank || false;
+            const hasZone2 = deviceData.Device?.HasZone2 || false;
 
             //units
             const units = Array.isArray(deviceData.Device?.Units) ? deviceData.Device?.Units : [];
-            const unitsCount = units.length;
-
             const { indoor, outdoor } = units.reduce((acc, unit) => {
                 const target = unit.IsIndoor ? 'indoor' : 'outdoor';
                 acc[target] = {