homebridge-melcloud-control 3.8.0-beta.21 → 3.8.0-beta.22

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 +8 -9
  3. package/src/deviceatw.js +17 -18
  4. package/src/deviceerv.js +6 -7
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.21",
4
+ "version": "3.8.0-beta.22",
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
@@ -77,7 +77,6 @@ class DeviceAta extends EventEmitter {
77
77
  const buttonServiceType = ['', Service.Outlet, Service.Switch, Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][displayType];
78
78
  const buttonCharacteristicType = ['', Characteristic.On, Characteristic.On, Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][displayType];
79
79
  button.name = button.name || 'Button'
80
- button.namePrefix = buttonNamePrefix;
81
80
  button.serviceType = buttonServiceType;
82
81
  button.characteristicType = buttonCharacteristicType;
83
82
  button.state = false;
@@ -635,12 +634,12 @@ class DeviceAta extends EventEmitter {
635
634
  const presetData = presetsOnServer.find(p => p.ID === preset.Id);
636
635
 
637
636
  //get preset name
638
- const presetName = preset.name;
637
+ const name = preset.name;
639
638
 
640
639
  //get preset name prefix
641
- const presetNamePrefix = preset.namePrefix;
640
+ const namePrefix = preset.namePrefix;
642
641
 
643
- const serviceName = presetNamePrefix ? `${accessoryName} ${presetName}` : presetName;
642
+ const serviceName = namePrefix ? `${accessoryName} ${name}` : name;
644
643
  const serviceType = preset.serviceType;
645
644
  const characteristicType = preset.characteristicType;
646
645
  const presetService = new serviceType(serviceName, `Preset ${deviceId} ${i}`);
@@ -676,7 +675,7 @@ class DeviceAta extends EventEmitter {
676
675
  };
677
676
 
678
677
  await this.melCloudAta.send(deviceData, this.displayMode);
679
- const info = this.disableLogInfo ? false : this.emit('message', `${state ? 'Set:' : 'Unset:'} ${presetName}`);
678
+ const info = this.disableLogInfo ? false : this.emit('message', `${state ? 'Set:' : 'Unset:'} ${name}`);
680
679
  } catch (error) {
681
680
  this.emit('warn', `Set preset error: ${error}`);
682
681
  };
@@ -698,12 +697,12 @@ class DeviceAta extends EventEmitter {
698
697
  const mode = button.mode;
699
698
 
700
699
  //get button name
701
- const buttonName = button.name;
700
+ const name = button.name;
702
701
 
703
702
  //get button name prefix
704
- const buttonNamePrefix = button.namePrefix;
703
+ const namePrefix = button.namePrefix;
705
704
 
706
- const serviceName = buttonNamePrefix ? `${accessoryName} ${buttonName}` : buttonName;
705
+ const serviceName = namePrefix ? `${accessoryName} ${name}` : name;
707
706
  const serviceType = button.serviceType;
708
707
  const characteristicType = button.characteristicType;
709
708
  const buttonService = new serviceType(serviceName, `Button ${deviceId} ${i}`);
@@ -919,7 +918,7 @@ class DeviceAta extends EventEmitter {
919
918
  };
920
919
 
921
920
  await this.melCloudAta.send(deviceData, this.displayMode);
922
- const info = this.disableLogInfo ? false : this.emit('message', `${state ? `Set: ${buttonName}` : `Unset: ${buttonName}, Set: ${button.previousValue}`}`);
921
+ const info = this.disableLogInfo ? false : this.emit('message', `${state ? `Set: ${name}` : `Unset: ${name}, Set: ${button.previousValue}`}`);
923
922
  } catch (error) {
924
923
  this.emit('warn', `Set button error: ${error}`);
925
924
  };
package/src/deviceatw.js CHANGED
@@ -82,7 +82,6 @@ class DeviceAtw extends EventEmitter {
82
82
  const buttonServiceType = ['', Service.Outlet, Service.Switch, Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][displayType];
83
83
  const buttonCharacteristicType = ['', Characteristic.On, Characteristic.On, Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][displayType];
84
84
  button.name = button.name || 'Button'
85
- button.namePrefix = buttonNamePrefix;
86
85
  button.serviceType = buttonServiceType;
87
86
  button.characteristicType = buttonCharacteristicType;
88
87
  button.state = false;
@@ -368,7 +367,7 @@ class DeviceAtw extends EventEmitter {
368
367
  try {
369
368
  let operationModeText = '';
370
369
  switch (i) {
371
- case 0: //Heat Pump - ON, HEAT, COOL
370
+ case caseHeatPump: //Heat Pump - ON, HEAT, COOL
372
371
  switch (value) {
373
372
  case caseHeatPump: //AUTO
374
373
  deviceData.Device.Power = true;
@@ -860,6 +859,8 @@ class DeviceAtw extends EventEmitter {
860
859
  accessory.addService(this.flowTemperatureSensorService);
861
860
 
862
861
  };
862
+
863
+
863
864
  if (temperatureSensorReturn && this.accessory.zones[i].returnTemperature !== null) {
864
865
  const debug1 = this.enableDebugMode ? this.emit('debug', `Prepare return temperature sensor service`) : false;
865
866
  this.returnTemperatureSensorService = new Service.TemperatureSensor(`${serviceName} Return`, `${zoneName} Temperature Sensor Return ${deviceId} ${i}`);
@@ -1057,12 +1058,12 @@ class DeviceAtw extends EventEmitter {
1057
1058
  const presetData = presetsOnServer.find(p => p.ID === preset.Id);
1058
1059
 
1059
1060
  //get preset name
1060
- const presetName = preset.name;
1061
+ const name = preset.name;
1061
1062
 
1062
1063
  //get preset name prefix
1063
- const presetNamePrefix = preset.namePrefix;
1064
+ const namePrefix = preset.namePrefix;
1064
1065
 
1065
- const serviceName = presetNamePrefix ? `${accessoryName} ${presetName}` : presetName;
1066
+ const serviceName = namePrefix ? `${accessoryName} ${name}` : name;
1066
1067
  const serviceType = preset.serviceType;
1067
1068
  const characteristicType = preset.characteristicType;
1068
1069
  const presetService = new serviceType(serviceName, `Preset ${deviceId} ${i}`);
@@ -1110,7 +1111,7 @@ class DeviceAtw extends EventEmitter {
1110
1111
  };
1111
1112
 
1112
1113
  await this.melCloudAtw.send(deviceData);
1113
- const info = this.disableLogInfo ? false : this.emit('message', `${state ? 'Set:' : 'Unset:'} ${presetName}`);
1114
+ const info = this.disableLogInfo ? false : this.emit('message', `${state ? 'Set:' : 'Unset:'} ${name}`);
1114
1115
  } catch (error) {
1115
1116
  this.emit('warn', `Set preset error: ${error}`);
1116
1117
  };
@@ -1135,12 +1136,12 @@ class DeviceAtw extends EventEmitter {
1135
1136
  const displayType = button.displayType;
1136
1137
 
1137
1138
  //get button name
1138
- const buttonName = button.name;
1139
+ const name = button.name;
1139
1140
 
1140
1141
  //get button name prefix
1141
- const buttonNamePrefix = button.namePrefix;
1142
+ const namePrefix = button.namePrefix;
1142
1143
 
1143
- const serviceName = buttonNamePrefix ? `${accessoryName} ${buttonName}` : buttonName;
1144
+ const serviceName = namePrefix ? `${accessoryName} ${name}` : name;
1144
1145
  const serviceType = button.serviceType;
1145
1146
  const characteristicType = button.characteristicType;
1146
1147
  const buttonService = new serviceType(serviceName, `Button ${deviceId} ${i}`);
@@ -1281,7 +1282,7 @@ class DeviceAtw extends EventEmitter {
1281
1282
  };
1282
1283
 
1283
1284
  await this.melCloudAtw.send(deviceData);
1284
- const info = this.disableLogInfo ? false : this.emit('message', `${state ? `Set: ${buttonName}` : `Unset: ${buttonName}, Set: ${button.previousValue}`}`);
1285
+ const info = this.disableLogInfo ? false : this.emit('message', `${state ? `Set: ${name}` : `Unset: ${name}, Set: ${button.previousValue}`}`);
1285
1286
  } catch (error) {
1286
1287
  this.emit('warn', `Set button error: ${error}`);
1287
1288
  };
@@ -1413,14 +1414,16 @@ class DeviceAtw extends EventEmitter {
1413
1414
  this.accessory.idleZone1 = idleZone1;
1414
1415
  this.accessory.idleZone2 = idleZone2;
1415
1416
  this.accessory.temperatureIncrement = temperatureIncrement;
1417
+ this.accessory.hasHeatPump = hasHeatPump;
1418
+ this.accessory.hasZone1 = hasZone1;
1416
1419
  this.accessory.hasHotWaterTank = hasHotWaterTank;
1417
1420
  this.accessory.hasZone2 = hasZone2;
1418
- this.accessory.zonesCount = zonesCount;
1419
1421
  this.accessory.heatCoolModes = heatCoolModes;
1420
1422
  this.accessory.caseHeatPump = caseHeatPump;
1421
1423
  this.accessory.caseZone1 = caseZone1;
1422
1424
  this.accessory.caseHotWater = caseHotWater;
1423
1425
  this.accessory.caseZone2 = caseZone2;
1426
+ this.accessory.zonesCount = zonesCount;
1424
1427
 
1425
1428
  //default values
1426
1429
  let name = 'Heat Pump'
@@ -1679,13 +1682,9 @@ class DeviceAtw extends EventEmitter {
1679
1682
  this.accessory.zones[i].returnTemperature = returnTemperature;
1680
1683
  this.accessory.zones[i].temperaturesSetPropsMinValue = temperatureSetPropsMinValue;
1681
1684
  this.accessory.zones[i].temperaturesSetPropsMaxValue = temperatureSetPropsMaxValue;
1682
-
1683
- //only on first run
1684
- if (this.startPrepareAccessory) {
1685
- this.accessory.zones[i].operationModesSetPropsMinValue = operationModeSetPropsMinValue;
1686
- this.accessory.zones[i].operationModesSetPropsMaxValue = operationModeSetPropsMaxValue;
1687
- this.accessory.zones[i].operationModesSetPropsValidValues = operationModeSetPropsValidValues;
1688
- };
1685
+ const setPropsMinValue = this.startPrepareAccessory ? this.accessory.zones[i].operationModesSetPropsMinValue = operationModeSetPropsMinValue : false;
1686
+ const setPropsMaxValue = this.startPrepareAccessory ? this.accessory.zones[i].operationModesSetPropsMaxValue = operationModeSetPropsMaxValue : false;
1687
+ const setPropsValidValues = this.startPrepareAccessory ? this.accessory.zones[i].operationModesSetPropsValidValues = operationModeSetPropsValidValues : false;
1689
1688
 
1690
1689
  //update temperature sensors
1691
1690
  switch (i) {
package/src/deviceerv.js CHANGED
@@ -75,7 +75,6 @@ class DeviceErv extends EventEmitter {
75
75
  const buttonServiceType = ['', Service.Outlet, Service.Switch, Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][displayType];
76
76
  const buttonCharacteristicType = ['', Characteristic.On, Characteristic.On, Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][displayType];
77
77
  button.name = button.name || 'Button'
78
- button.namePrefix = buttonNamePrefix;
79
78
  button.serviceType = buttonServiceType;
80
79
  button.characteristicType = buttonCharacteristicType;
81
80
  button.state = false;
@@ -684,12 +683,12 @@ class DeviceErv extends EventEmitter {
684
683
  const presetData = presetsOnServer.find(p => p.ID === preset.Id);
685
684
 
686
685
  //get preset name
687
- const presetName = preset.name;
686
+ const name = preset.name;
688
687
 
689
688
  //get preset name prefix
690
- const presetNamePrefix = preset.namePrefix;
689
+ const namePrefix = preset.namePrefix;
691
690
 
692
- const serviceName = presetNamePrefix ? `${accessoryName} ${presetName}` : presetName;
691
+ const serviceName = namePrefix ? `${accessoryName} ${name}` : name;
693
692
  const serviceType = preset.serviceType;
694
693
  const characteristicType = preset.characteristicType;
695
694
  const presetService = new serviceType(serviceName, `Preset ${deviceId} ${i}`);
@@ -723,7 +722,7 @@ class DeviceErv extends EventEmitter {
723
722
  };
724
723
 
725
724
  await this.melCloudErv.send(deviceData, this.displayMode);
726
- const info = this.disableLogInfo ? false : this.emit('message', `${state ? 'Set:' : 'Unset:'} ${presetName}`);
725
+ const info = this.disableLogInfo ? false : this.emit('message', `${state ? 'Set:' : 'Unset:'} ${name}`);
727
726
  } catch (error) {
728
727
  this.emit('warn', `Set preset error: ${error}`);
729
728
  };
@@ -748,9 +747,9 @@ class DeviceErv extends EventEmitter {
748
747
  const buttonName = button.name;
749
748
 
750
749
  //get button name prefix
751
- const buttonNamePrefix = button.namePrefix;
750
+ const namePrefix = button.namePrefix;
752
751
 
753
- const serviceName = buttonNamePrefix ? `${accessoryName} ${buttonName}` : buttonName;
752
+ const serviceName = namePrefix ? `${accessoryName} ${buttonName}` : buttonName;
754
753
  const serviceType = button.serviceType;
755
754
  const characteristicType = button.characteristicType;
756
755
  const buttonService = new serviceType(serviceName, `Button ${deviceId} ${i}`);