homebridge-melcloud-control 3.8.0-beta.36 → 3.8.0-beta.38

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 (2) hide show
  1. package/package.json +1 -1
  2. package/src/deviceatw.js +44 -41
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "displayName": "MELCloud Control",
3
3
  "name": "homebridge-melcloud-control",
4
- "version": "3.8.0-beta.36",
4
+ "version": "3.8.0-beta.38",
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/deviceatw.js CHANGED
@@ -301,15 +301,6 @@ class DeviceAtw extends EventEmitter {
301
301
  const caseZone1Sensor = this.accessory.caseZone1Sensor;
302
302
  const caseHotWaterSensor = this.accessory.caseHotWaterSensor;
303
303
  const caseZone2Sensor = this.accessory.caseZone2Sensor;
304
- const temperatureSensor = this.temperatureSensor;
305
- const temperatureSensorFlow = this.temperatureSensorFlow;
306
- const temperatureSensorReturn = this.temperatureSensorReturn;
307
- const temperatureSensorFlowZone1 = this.temperatureSensorFlowZone1;
308
- const temperatureSensorReturnZone1 = this.temperatureSensorReturnZone1;
309
- const temperatureSensorFlowWaterTank = this.temperatureSensorFlowWaterTank;
310
- const temperatureSensorReturnWaterTank = this.temperatureSensorReturnWaterTank;
311
- const temperatureSensorFlowZone2 = this.temperatureSensorFlowZone2;
312
- const temperatureSensorReturnZone2 = this.temperatureSensorReturnZone2;
313
304
 
314
305
  //accessory
315
306
  const debug = this.enableDebugMode ? this.emit('debug', `Prepare accessory`) : false;
@@ -831,14 +822,14 @@ class DeviceAtw extends EventEmitter {
831
822
  });
832
823
  };
833
824
 
834
- //temperature sensor services zones
825
+ //sensor services
835
826
  if (zonesSensorsCount > 0) {
836
827
  this.accessory.zonesSensors.forEach((zone, i) => {
837
828
  const zoneName = zone.name
838
829
  const serviceName = `${deviceTypeText} ${accessoryName}: ${zoneName}`;
839
830
  switch (i) {
840
831
  case caseHeatPumpSensor: //Heat Pump
841
- if (temperatureSensor && zone.roomTemperature !== null) {
832
+ if (zone.roomTemperature !== null) {
842
833
  const debug = this.enableDebugMode ? this.emit('debug', `${zoneName}, Prepare temperature sensor service`) : false;
843
834
  this.roomTemperatureSensorService = new Service.TemperatureSensor(`${serviceName}`, `${zoneName} Temperature Sensor ${deviceId} ${i}`);
844
835
  this.roomTemperatureSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -856,7 +847,7 @@ class DeviceAtw extends EventEmitter {
856
847
  accessory.addService(this.roomTemperatureSensorService);
857
848
  };
858
849
 
859
- if (temperatureSensorFlow && zone.flowTemperature !== null) {
850
+ if (zone.flowTemperature !== null) {
860
851
  const debug = this.enableDebugMode ? this.emit('debug', `Prepare flow temperature sensor service`) : false;
861
852
  this.flowTemperatureSensorService = new Service.TemperatureSensor(`${serviceName} Flow`, `${zoneName} Temperature Sensor Flow ${deviceId} ${i}`);
862
853
  this.flowTemperatureSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -875,7 +866,7 @@ class DeviceAtw extends EventEmitter {
875
866
 
876
867
  };
877
868
 
878
- if (temperatureSensorReturn && zone.returnTemperature !== null) {
869
+ if (zone.returnTemperature !== null) {
879
870
  const debug1 = this.enableDebugMode ? this.emit('debug', `Prepare return temperature sensor service`) : false;
880
871
  this.returnTemperatureSensorService = new Service.TemperatureSensor(`${serviceName} Return`, `${zoneName} Temperature Sensor Return ${deviceId} ${i}`);
881
872
  this.returnTemperatureSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -894,7 +885,7 @@ class DeviceAtw extends EventEmitter {
894
885
  };
895
886
  break;
896
887
  case caseZone1Sensor: //Zone 1
897
- if (temperatureSensor && zone.roomTemperature !== null) {
888
+ if (zone.roomTemperature !== null) {
898
889
  const debug = this.enableDebugMode ? this.emit('debug', `${zoneName}, Prepare temperature sensor service`) : false;
899
890
  this.roomTemperatureZone1SensorService = new Service.TemperatureSensor(`${serviceName}`, `${zoneName} Temperature Sensor ${deviceId} ${i}`);
900
891
  this.roomTemperatureZone1SensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -912,7 +903,7 @@ class DeviceAtw extends EventEmitter {
912
903
  accessory.addService(this.roomTemperatureZone1SensorService);
913
904
  };
914
905
 
915
- if (temperatureSensorFlowZone1 && zone.flowTemperature !== null) {
906
+ if (zone.flowTemperature !== null) {
916
907
  const debug2 = this.enableDebugMode ? this.emit('debug', `Prepare flow temperature zone 1 sensor service`) : false;
917
908
  this.flowTemperatureZone1SensorService = new Service.TemperatureSensor(`${serviceName} Flow`, `${zoneName} Temperature Sensor Flow ${deviceId} ${i}`);
918
909
  this.flowTemperatureZone1SensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -930,7 +921,7 @@ class DeviceAtw extends EventEmitter {
930
921
  accessory.addService(this.flowTemperatureZone1SensorService);
931
922
  };
932
923
 
933
- if (temperatureSensorReturnZone1 && zone.returnTemperature !== null) {
924
+ if (zone.returnTemperature !== null) {
934
925
  const debug3 = this.enableDebugMode ? this.emit('debug', `Prepare return temperature zone 1 sensor service`) : false;
935
926
  this.returnTemperatureZone1SensorService = new Service.TemperatureSensor(`${serviceName} Return`, `${zoneName} Temperature Sensor Return ${deviceId} ${i}`);
936
927
  this.returnTemperatureZone1SensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -949,7 +940,7 @@ class DeviceAtw extends EventEmitter {
949
940
  };
950
941
  break;
951
942
  case caseHotWaterSensor: //Hot Water
952
- if (temperatureSensor && zone.roomTemperature !== null) {
943
+ if (zone.roomTemperature !== null) {
953
944
  const debug = this.enableDebugMode ? this.emit('debug', `${zoneName}, Prepare temperature sensor service`) : false;
954
945
  this.roomTemperatureWaterTankSensorService = new Service.TemperatureSensor(`${serviceName}`, `${zoneName} Temperature Sensor ${deviceId} ${i}`);
955
946
  this.roomTemperatureWaterTankSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -967,7 +958,7 @@ class DeviceAtw extends EventEmitter {
967
958
  accessory.addService(this.roomTemperatureWaterTankSensorService);
968
959
  };
969
960
 
970
- if (temperatureSensorFlowWaterTank && zone.flowTemperature !== null) {
961
+ if (zone.flowTemperature !== null) {
971
962
  const debug = this.enableDebugMode ? this.emit('debug', `Prepare flow temperature water tank sensor service`) : false;
972
963
  this.flowTemperatureWaterTankSensorService = new Service.TemperatureSensor(`${serviceName} Flow`, `${zoneName} Temperature Sensor Flow ${deviceId} ${i}`);
973
964
  this.flowTemperatureWaterTankSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -985,7 +976,7 @@ class DeviceAtw extends EventEmitter {
985
976
  accessory.addService(this.flowTemperatureWaterTankSensorService);
986
977
  };
987
978
 
988
- if (temperatureSensorReturnWaterTank && zone.returnTemperature !== null) {
979
+ if (zone.returnTemperature !== null) {
989
980
  const debug1 = this.enableDebugMode ? this.emit('debug', `Prepare return temperature water tank sensor service`) : false;
990
981
  this.returnTemperatureWaterTankSensorService = new Service.TemperatureSensor(`${serviceName} Return`, `${zoneName} Temperature Sensor Return ${deviceId} ${i}`);
991
982
  this.returnTemperatureWaterTankSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -1004,7 +995,7 @@ class DeviceAtw extends EventEmitter {
1004
995
  };
1005
996
  break;
1006
997
  case caseZone2Sensor: //Zone 2
1007
- if (temperatureSensor && zone.roomTemperature !== null) {
998
+ if (zone.roomTemperature !== null) {
1008
999
  const debug = this.enableDebugMode ? this.emit('debug', `${zoneName}, Prepare temperature sensor service`) : false;
1009
1000
  this.roomTemperatureZone2SensorService = new Service.TemperatureSensor(`${serviceName}`, `${zoneName} Temperature Sensor ${deviceId} ${i}`);
1010
1001
  this.roomTemperatureZone2SensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -1022,7 +1013,7 @@ class DeviceAtw extends EventEmitter {
1022
1013
  accessory.addService(this.roomTemperatureZone2SensorService);
1023
1014
  };
1024
1015
 
1025
- if (temperatureSensorFlowZone2 && zone.flowTemperature !== null) {
1016
+ if (zone.flowTemperature !== null) {
1026
1017
  const debug = this.enableDebugMode ? this.emit('debug', `Prepare flow temperature zone 2 sensor service`) : false;
1027
1018
  this.flowTemperatureZone2SensorService = new Service.TemperatureSensor(`${serviceName} Flow`, `${zoneName} Temperature Sensor Flow${deviceId} ${i}`);
1028
1019
  this.flowTemperatureZone2SensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -1040,7 +1031,7 @@ class DeviceAtw extends EventEmitter {
1040
1031
  accessory.addService(this.flowTemperatureZone2SensorService);
1041
1032
  };
1042
1033
 
1043
- if (temperatureSensorReturnZone2 && zone.returnTemperature !== null) {
1034
+ if (zone.returnTemperature !== null) {
1044
1035
  const debug1 = this.enableDebugMode ? this.emit('debug', `Prepare return temperature zone 2 sensor service`) : false;
1045
1036
  this.returnTemperatureZone2SensorService = new Service.TemperatureSensor(`${serviceName} Return`, `${zoneName} Temperature Sensor Return${deviceId} ${i}`);
1046
1037
  this.returnTemperatureZone2SensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -1463,7 +1454,6 @@ class DeviceAtw extends EventEmitter {
1463
1454
  let operationModeSetPropsValidValues = [0];
1464
1455
  let temperatureSetPropsMinValue = -35;
1465
1456
  let temperatureSetPropsMaxValue = 100;
1466
- let roomTemperatureSensor = 20;
1467
1457
 
1468
1458
  for (let i = 0; i < zonesCount; i++) {
1469
1459
  switch (this.displayMode) {
@@ -1684,7 +1674,7 @@ class DeviceAtw extends EventEmitter {
1684
1674
  break;
1685
1675
  };
1686
1676
 
1687
- //add value to arrays
1677
+ //add value to zones arrays
1688
1678
  this.accessory.zones[i].name = name;
1689
1679
  this.accessory.zones[i].operationMode = operationModeZone;
1690
1680
  this.accessory.zones[i].currentOperationMode = currentOperationMode;
@@ -1737,29 +1727,38 @@ class DeviceAtw extends EventEmitter {
1737
1727
  };
1738
1728
  };
1739
1729
 
1740
- //update temperature sensors characteristics
1730
+ //update sensors characteristics
1741
1731
  for (let i = 0; i < zonesSensorsCount; i++) {
1742
1732
  switch (i) {
1743
1733
  case caseHeatPumpSensor: //Heat Pump
1734
+ name = heatPumpName;
1735
+ roomTemperature = outdoorTemperature;
1736
+ flowTemperature = flowTemperatureHeatPump;
1737
+ returnTemperature = returnTemperatureHeatPump;
1738
+
1739
+ //updte characteristics
1744
1740
  if (this.roomTemperatureSensorService) {
1745
1741
  this.roomTemperatureSensorService
1746
- .updateCharacteristic(Characteristic.CurrentTemperature, roomTemperature)
1742
+ .updateCharacteristic(Characteristic.CurrentTemperature, outdoorTemperature)
1747
1743
  };
1748
1744
 
1749
1745
  if (this.flowTemperatureSensorService) {
1750
1746
  this.flowTemperatureSensorService
1751
- .updateCharacteristic(Characteristic.CurrentTemperature, flowTemperature)
1747
+ .updateCharacteristic(Characteristic.CurrentTemperature, flowTemperatureHeatPump)
1752
1748
  };
1753
1749
 
1754
1750
  if (this.returnTemperatureSensorService) {
1755
1751
  this.returnTemperatureSensorService
1756
- .updateCharacteristic(Characteristic.CurrentTemperature, returnTemperature)
1752
+ .updateCharacteristic(Characteristic.CurrentTemperature, returnTemperatureHeatPump)
1757
1753
  };
1758
- roomTemperatureSensor = outdoorTemperature;
1759
- flowTemperature = flowTemperatureHeatPump;
1760
- returnTemperature = returnTemperatureHeatPump;
1761
1754
  break;
1762
1755
  case caseZone1Sensor: //Zone 1
1756
+ name = zone1Name;
1757
+ roomTemperature = roomTemperatureZone1;
1758
+ flowTemperature = flowTemperatureZone1;
1759
+ returnTemperature = returnTemperatureZone1;
1760
+
1761
+ //updte characteristics
1763
1762
  if (this.roomTemperatureZone1SensorService) {
1764
1763
  this.roomTemperatureZone1SensorService
1765
1764
  .updateCharacteristic(Characteristic.CurrentTemperature, roomTemperatureZone1)
@@ -1774,11 +1773,14 @@ class DeviceAtw extends EventEmitter {
1774
1773
  this.returnTemperatureZone1SensorService
1775
1774
  .updateCharacteristic(Characteristic.CurrentTemperature, returnTemperatureZone1)
1776
1775
  };
1777
- roomTemperatureSensor = roomTemperatureZone1;
1778
- flowTemperature = flowTemperatureZone1;
1779
- returnTemperature = returnTemperatureZone1;
1780
1776
  break;
1781
1777
  case caseHotWaterSensor: //Hot Water
1778
+ name = hotWaterName;
1779
+ roomTemperature = tankWaterTemperature;
1780
+ flowTemperature = flowTemperatureWaterTank;
1781
+ returnTemperature = returnTemperatureWaterTank;
1782
+
1783
+ //updte characteristics
1782
1784
  if (this.roomTemperatureWaterTankSensorService) {
1783
1785
  this.roomTemperatureWaterTankSensorService
1784
1786
  .updateCharacteristic(Characteristic.CurrentTemperature, tankWaterTemperature)
@@ -1793,11 +1795,14 @@ class DeviceAtw extends EventEmitter {
1793
1795
  this.returnTemperatureWaterTankSensorService
1794
1796
  .updateCharacteristic(Characteristic.CurrentTemperature, returnTemperatureWaterTank)
1795
1797
  };
1796
- roomTemperatureSensor = tankWaterTemperature;
1797
- flowTemperature = flowTemperatureWaterTank;
1798
- returnTemperature = returnTemperatureWaterTank;
1799
1798
  break;
1800
1799
  case caseZone2Sensor: //Zone 2
1800
+ name = zone2Name;
1801
+ roomTemperature = roomTemperatureZone2;
1802
+ flowTemperature = flowTemperatureZone2;
1803
+ returnTemperature = returnTemperatureZone2;
1804
+
1805
+ //updte characteristics
1801
1806
  if (this.roomTemperatureZone2SensorService) {
1802
1807
  this.roomTemperatureZone2SensorService
1803
1808
  .updateCharacteristic(Characteristic.CurrentTemperature, roomTemperatureZone2)
@@ -1812,13 +1817,11 @@ class DeviceAtw extends EventEmitter {
1812
1817
  this.returnTemperatureZone2SensorService
1813
1818
  .updateCharacteristic(Characteristic.CurrentTemperature, returnTemperatureZone2)
1814
1819
  };
1815
- roomTemperatureSensor = roomTemperatureZone2;
1816
- flowTemperature = flowTemperatureZone2;
1817
- returnTemperature = returnTemperatureZone2;
1818
1820
  break;
1819
1821
  };
1820
1822
 
1821
- this.accessory.zonesSensors[i].roomTemperature = roomTemperatureSensor;
1823
+ //add value to sensors arrays
1824
+ this.accessory.zonesSensors[i].roomTemperature = roomTemperature;
1822
1825
  this.accessory.zonesSensors[i].flowTemperature = flowTemperature;
1823
1826
  this.accessory.zonesSensors[i].returnTemperature = returnTemperature;
1824
1827