homebridge-melcloud-control 4.6.7-beta.1 → 4.6.7-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/constants.js +1 -1
- package/src/deviceatw.js +11 -10
- package/src/melcloudatw.js +1 -6
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"displayName": "MELCloud Control",
|
|
3
3
|
"name": "homebridge-melcloud-control",
|
|
4
|
-
"version": "4.6.7-beta.
|
|
4
|
+
"version": "4.6.7-beta.3",
|
|
5
5
|
"description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"author": "grzegorz914",
|
package/src/constants.js
CHANGED
|
@@ -113,7 +113,7 @@ export const HeatPump = {
|
|
|
113
113
|
ControlTypeMapEnumToString: { 0: "Heat", 1: "Cool" },
|
|
114
114
|
DefrostMapStringToEnum: { "Normal": 0, "Standby": 1, "Defrost": 2, "Waiting Restart": 3 },
|
|
115
115
|
DefrostMapEnumToString: { 0: "Normal", 1: "Standby", 2: "Defrost", 3: "Waiting Restart" },
|
|
116
|
-
OperationModeMapStringToEnum: { "Idle": 0, "HotWater": 1, "Heating": 2, "Cooling": 3, "HotWaterStorage": 4, "FreezeStat": 5, "Legionella": 6, "HeatEco": 7, "
|
|
116
|
+
OperationModeMapStringToEnum: { "Idle": 0, "HotWater": 1, "Heating": 2, "Cooling": 3, "HotWaterStorage": 4, "FreezeStat": 5, "Legionella": 6, "HeatEco": 7, "Mode1": 8, "Mode2": 9, "Mode3": 10, "HeatUp": 11 },
|
|
117
117
|
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" },
|
|
118
118
|
OperationModeDhwMapStringToEnum: { "Normal": 0, "Eco": 1 },
|
|
119
119
|
OperationModeDhwMapEnumToString: { 0: "Normal", 1: "Eco" },
|
package/src/deviceatw.js
CHANGED
|
@@ -1669,6 +1669,7 @@ class DeviceAtw extends EventEmitter {
|
|
|
1669
1669
|
const supportStandbyKey = accountTypeMelcloud ? 'ModelSupportsStandbyMode' : 'HasStandby';
|
|
1670
1670
|
const supportHeatKey = accountTypeMelcloud ? 'CanHeat' : 'HasHeatMode';
|
|
1671
1671
|
const supportCoolKey = accountTypeMelcloud ? 'CanCool' : 'HasCoolingMode';
|
|
1672
|
+
const supportHotWaterKey = accountTypeMelcloud ? 'HasHotWaterTank' : 'HasHotWater';
|
|
1672
1673
|
|
|
1673
1674
|
//presets schedule
|
|
1674
1675
|
const presetsOnServer = deviceData.Presets ?? [];
|
|
@@ -1684,10 +1685,10 @@ class DeviceAtw extends EventEmitter {
|
|
|
1684
1685
|
const supportsStanbyMode = deviceData.Device[supportStandbyKey];
|
|
1685
1686
|
const supportsHeatPump = ![1, 2, 3, 4, 5, 6, 7, 15].includes(this.hideZone);
|
|
1686
1687
|
const supportsZone1 = ![2, 3, 4, 8, 9, 10, 11, 15].includes(this.hideZone);
|
|
1687
|
-
const supportsHotWaterTank = ![3, 5, 6, 9, 10, 12, 13, 15].includes(this.hideZone) && deviceData.Device
|
|
1688
|
+
const supportsHotWaterTank = ![3, 5, 6, 9, 10, 12, 13, 15].includes(this.hideZone) && deviceData.Device[supportHotWaterKey];
|
|
1688
1689
|
const supportsZone2 = ![4, 6, 7, 10, 11, 13, 14, 15].includes(this.hideZone) && deviceData.Device.HasZone2;
|
|
1689
|
-
const canHeat = deviceData.Device[
|
|
1690
|
-
const canCool = deviceData.Device[
|
|
1690
|
+
const canHeat = deviceData.Device[supportHeatKey] ?? true;
|
|
1691
|
+
const canCool = deviceData.Device[supportCoolKey] ?? false;
|
|
1691
1692
|
const heatCoolModes = canHeat && canCool ? 0 : canHeat ? 1 : canCool ? 2 : 3;
|
|
1692
1693
|
const temperatureIncrement = deviceData.Device[tempStepKey] ?? 1;
|
|
1693
1694
|
const minSetTemperature = deviceData.Device.MinSetTemperature ?? 10;
|
|
@@ -1717,9 +1718,9 @@ class DeviceAtw extends EventEmitter {
|
|
|
1717
1718
|
const inStandbyMode = deviceData.Device.InStandbyMode;
|
|
1718
1719
|
const unitStatus = deviceData.Device.UnitStatus ?? 0;
|
|
1719
1720
|
const operationMode = deviceData.Device.OperationMode;
|
|
1720
|
-
const outdoorTemperature = deviceData.Device.OutdoorTemperature ??
|
|
1721
|
-
const flowTemperatureHeatPump = deviceData.Device.FlowTemperature ??
|
|
1722
|
-
const returnTemperatureHeatPump = deviceData.Device.ReturnTemperature ??
|
|
1721
|
+
const outdoorTemperature = deviceData.Device.OutdoorTemperature ?? deviceData.Device.RoomTemperatureZone1;
|
|
1722
|
+
const flowTemperatureHeatPump = deviceData.Device.FlowTemperature ?? null;
|
|
1723
|
+
const returnTemperatureHeatPump = deviceData.Device.ReturnTemperature ?? null;
|
|
1723
1724
|
const isConnected = accountTypeMelcloud ? !deviceData.Device[connectKey] : deviceData.Device[connectKey];
|
|
1724
1725
|
const isInError = deviceData.Device[errorKey];
|
|
1725
1726
|
|
|
@@ -1742,8 +1743,8 @@ class DeviceAtw extends EventEmitter {
|
|
|
1742
1743
|
const forcedHotWaterMode = deviceData.Device.ForcedHotWaterMode ? 1 : 0;
|
|
1743
1744
|
const ecoHotWater = deviceData.Device.EcoHotWater ?? false;
|
|
1744
1745
|
const prohibitHotWater = deviceData.Device.ProhibitHotWater ?? false;
|
|
1745
|
-
const flowTemperatureWaterTank = deviceData.Device.FlowTemperatureBoiler ??
|
|
1746
|
-
const returnTemperatureWaterTank = deviceData.Device.ReturnTemperatureBoiler ??
|
|
1746
|
+
const flowTemperatureWaterTank = deviceData.Device.FlowTemperatureBoiler ?? null;
|
|
1747
|
+
const returnTemperatureWaterTank = deviceData.Device.ReturnTemperatureBoiler ?? null;
|
|
1747
1748
|
|
|
1748
1749
|
//zone 2
|
|
1749
1750
|
const zone2Name = deviceData.Zone2Name ?? 'Zone 2';
|
|
@@ -1754,8 +1755,8 @@ class DeviceAtw extends EventEmitter {
|
|
|
1754
1755
|
const setCoolFlowTemperatureZone2 = deviceData.Device.SetCoolFlowTemperatureZone2 ?? setTemperatureZone2;
|
|
1755
1756
|
const prohibitZone2 = deviceData.Device.ProhibitZone2 ?? false;
|
|
1756
1757
|
const idleZone2 = deviceData.Device.IdleZone2 ?? false;
|
|
1757
|
-
const flowTemperatureZone2 = deviceData.Device.FlowTemperatureZone2;
|
|
1758
|
-
const returnTemperatureZone2 = deviceData.Device.ReturnTemperatureZone2;
|
|
1758
|
+
const flowTemperatureZone2 = deviceData.Device.FlowTemperatureZone2 ?? null;
|
|
1759
|
+
const returnTemperatureZone2 = deviceData.Device.ReturnTemperatureZone2 ?? null;
|
|
1759
1760
|
|
|
1760
1761
|
//accessory
|
|
1761
1762
|
const obj = {
|
package/src/melcloudatw.js
CHANGED
|
@@ -300,13 +300,8 @@ class MelCloudAtw extends EventEmitter {
|
|
|
300
300
|
operationMode: HeatPump.OperationModeMapEnumToString[deviceData.Device.OperationMode],
|
|
301
301
|
operationModeZone1: HeatPump.OperationModeMapEnumToString[deviceData.Device.OperationModeZone1],
|
|
302
302
|
operationModeZone2: HeatPump.OperationModeMapEnumToString[deviceData.Device.OperationModeZone2],
|
|
303
|
-
opetHeatFlowTemperatureZone1: deviceData.Device.SetHeatFlowTemperatureZone1,
|
|
304
|
-
setHeatFlowTemperatureZone2: deviceData.Device.SetHeatFlowTemperatureZone2,
|
|
305
|
-
setCoolFlowTemperatureZone1: deviceData.Device.SetCoolFlowTemperatureZone1,
|
|
306
|
-
setCoolFlowTemperatureZone2: deviceData.Device.SetCoolFlowTemperatureZone2,
|
|
307
303
|
setTankWaterTemperature: deviceData.Device.SetTankWaterTemperature,
|
|
308
|
-
forcedHotWaterMode: deviceData.Device.ForcedHotWaterMode
|
|
309
|
-
ecoHotWater: deviceData.Device.EcoHotWater,
|
|
304
|
+
forcedHotWaterMode: deviceData.Device.ForcedHotWaterMode
|
|
310
305
|
};
|
|
311
306
|
method = 'PUT';
|
|
312
307
|
path = ApiUrls.Home.Put.Atw.replace('deviceid', deviceData.DeviceID);
|