homebridge-melcloud-control 4.1.2-beta.2 → 4.1.2-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.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/src/deviceata.js +3 -2
  3. package/src/deviceatw.js +5 -3
  4. package/src/deviceerv.js +5 -3
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "displayName": "MELCloud Control",
3
3
  "name": "homebridge-melcloud-control",
4
- "version": "4.1.2-beta.2",
4
+ "version": "4.1.2-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/deviceata.js CHANGED
@@ -684,7 +684,7 @@ class DeviceAta extends EventEmitter {
684
684
  if (this.logDebug) this.emit('debug', `Prepare presets services`);
685
685
  this.presetsServices = [];
686
686
  this.presets.forEach((preset, i) => {
687
- const presetData = presetsOnServer.find(p => p.ID === preset.Id);
687
+ const presetData = presetsOnServer.find(p => p.ID === preset.id);
688
688
 
689
689
  //get preset name
690
690
  const name = preset.name;
@@ -1017,6 +1017,7 @@ class DeviceAta extends EventEmitter {
1017
1017
 
1018
1018
  //keys
1019
1019
  const presetsKey = this.accountType === 'melcloud' ? 'Presets' : 'Schedule';
1020
+ const presetsIdKey = account.type === 'melcloud' ? 'ID' : 'Id';
1020
1021
  const setTempKey = this.accountType === 'melcloud' ? 'SetTemperature' : 'SetPoint';
1021
1022
  const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
1022
1023
  const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
@@ -1283,7 +1284,7 @@ class DeviceAta extends EventEmitter {
1283
1284
  //update presets state
1284
1285
  if (this.presets.length > 0) {
1285
1286
  this.presets.forEach((preset, i) => {
1286
- const presetData = presetsOnServer.find(p => p.ID === preset.Id);
1287
+ const presetData = presetsOnServer.find(p => p[presetsIdKey] === preset.id);
1287
1288
 
1288
1289
  preset.state = presetData ? (presetData.Power === power
1289
1290
  && presetData[setTempKey] === setTemperature
package/src/deviceatw.js CHANGED
@@ -1056,7 +1056,7 @@ class DeviceAtw extends EventEmitter {
1056
1056
  if (this.logDebug) this.emit('debug', `Prepare presets services`);
1057
1057
  this.presetsServices = [];
1058
1058
  this.presets.forEach((preset, i) => {
1059
- const presetData = presetsOnServer.find(p => p.ID === preset.Id);
1059
+ const presetData = presetsOnServer.find(p => p.ID === preset.id);
1060
1060
 
1061
1061
  //get preset name
1062
1062
  const name = preset.name;
@@ -1330,11 +1330,13 @@ class DeviceAtw extends EventEmitter {
1330
1330
  this.deviceData = deviceData;
1331
1331
 
1332
1332
  //keys
1333
+ const presetsKey = this.accountType === 'melcloud' ? 'Presets' : 'Schedule';
1334
+ const presetsIdKey = account.type === 'melcloud' ? 'ID' : 'Id';
1333
1335
  const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
1334
1336
  const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
1335
1337
 
1336
1338
  //presets
1337
- const presetsOnServer = deviceData.Presets ?? [];
1339
+ const presetsOnServer = deviceData[presetsKey] ?? [];
1338
1340
 
1339
1341
  //device info
1340
1342
  const hasHeatPump = ![1, 2, 3, 4, 5, 6, 7, 15].includes(this.hideZone);
@@ -1816,7 +1818,7 @@ class DeviceAtw extends EventEmitter {
1816
1818
  //update presets state
1817
1819
  if (this.presets.length > 0) {
1818
1820
  this.presets.forEach((preset, i) => {
1819
- const presetData = presetsOnServer.find(p => p.ID === preset.Id);
1821
+ const presetData = presetsOnServer.find(p => p[presetsIdKey] === preset.id);
1820
1822
 
1821
1823
  preset.state = presetData ? (presetData.Power === power
1822
1824
  && presetData.EcoHotWater === ecoHotWater
package/src/deviceerv.js CHANGED
@@ -675,7 +675,7 @@ class DeviceErv extends EventEmitter {
675
675
  if (this.logDebug) this.emit('debug', `Prepare presets services`);
676
676
  this.presetsServices = [];
677
677
  this.presets.forEach((preset, i) => {
678
- const presetData = presetsOnServer.find(p => p.ID === preset.Id);
678
+ const presetData = presetsOnServer.find(p => p.ID === preset.id);
679
679
 
680
680
  //get preset name
681
681
  const name = preset.name;
@@ -876,12 +876,14 @@ class DeviceErv extends EventEmitter {
876
876
  this.deviceData = deviceData;
877
877
 
878
878
  //keys
879
+ const presetsKey = this.accountType === 'melcloud' ? 'Presets' : 'Schedule';
880
+ const presetsIdKey = account.type === 'melcloud' ? 'ID' : 'Id';
879
881
  const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
880
882
  const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
881
883
  const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
882
884
 
883
885
  //presets
884
- const presetsOnServer = deviceData.Presets ?? [];
886
+ const presetsOnServer = deviceData[presetsKey] ?? [];
885
887
 
886
888
  //device control
887
889
  const hideRoomTemperature = deviceData.HideRoomTemperature;
@@ -1113,7 +1115,7 @@ class DeviceErv extends EventEmitter {
1113
1115
  //update presets state
1114
1116
  if (this.presets.length > 0) {
1115
1117
  this.presets.forEach((preset, i) => {
1116
- const presetData = presetsOnServer.find(p => p.ID === preset.Id);
1118
+ const presetData = presetsOnServer.find(p => p[presetsIdKey] === preset.id);
1117
1119
 
1118
1120
  preset.state = presetData ? (presetData.Power === power
1119
1121
  && presetData.SetTemperature === setTemperature