homebridge-melcloud-control 4.1.3-beta.10 → 4.1.3-beta.12

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 +4 -4
  3. package/src/deviceatw.js +6 -4
  4. package/src/deviceerv.js +11 -11
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.3-beta.10",
4
+ "version": "4.1.3-beta.12",
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
@@ -648,9 +648,9 @@ class DeviceAta extends EventEmitter {
648
648
  //holiday mode
649
649
  if (this.accessory.holidayModeEnabled !== null) {
650
650
  if (this.logDebug) this.emit('debug', `Prepare holiday mode control service`);
651
- this.holidayModeControlService = new Service.Switch(serviceName, `Holiday Mode Control ${deviceId} ${i}`);
651
+ this.holidayModeControlService = new Service.Switch(`${serviceName} Holiday Mode`, `Holiday Mode Control ${deviceId}`);
652
652
  this.holidayModeControlService.addOptionalCharacteristic(Characteristic.ConfiguredName);
653
- this.holidayModeControlService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Holiday Mode Control`);
653
+ this.holidayModeControlService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Holiday Mode`);
654
654
  this.holidayModeControlService.getCharacteristic(Characteristic.On)
655
655
  .onGet(async () => {
656
656
  const state = this.accessory.holidayModeEnabled;
@@ -1109,7 +1109,7 @@ class DeviceAta extends EventEmitter {
1109
1109
  const schedulesOnServer = deviceData.Schedule ?? [];
1110
1110
  const presetsOnServer = deviceData.Presets ?? [];
1111
1111
  const holidayModeEnabled = deviceData.HolidayMode?.Enabled;
1112
- const holidayModeActive = deviceData.HolidayMode?.Active;
1112
+ const holidayModeActive = deviceData.HolidayMode?.Active ?? false;
1113
1113
 
1114
1114
  //protection
1115
1115
  const frostProtectionEnabled = deviceData.FrostProtection?.Enabled;
@@ -1353,7 +1353,7 @@ class DeviceAta extends EventEmitter {
1353
1353
  this.outdoorTemperatureSensorService?.updateCharacteristic(Characteristic.CurrentTemperature, outdoorTemperature);
1354
1354
  this.frostProtectionSensorService?.updateCharacteristic(Characteristic.ContactSensorState, frostProtectionActive);
1355
1355
  this.overheatProtectionSensorService?.updateCharacteristic(Characteristic.ContactSensorState, overheatProtectionActive);
1356
- this.holidayModeControlService?.updateCharacteristic(Characteristic.ContactSensorState, holidayModeEnabled);
1356
+ this.holidayModeControlService?.updateCharacteristic(Characteristic.On, holidayModeEnabled);
1357
1357
  this.holidayModeSensorService?.updateCharacteristic(Characteristic.ContactSensorState, holidayModeActive);
1358
1358
  this.errorService?.updateCharacteristic(Characteristic.ContactSensorState, isInError);
1359
1359
 
package/src/deviceatw.js CHANGED
@@ -1050,9 +1050,10 @@ class DeviceAtw extends EventEmitter {
1050
1050
  //holiday mode
1051
1051
  if (this.accessory.holidayModeEnabled !== null) {
1052
1052
  if (this.logDebug) this.emit('debug', `Prepare holiday mode control service`);
1053
- this.holidayModeControlService = new Service.Switch(serviceName, `Holiday Mode Control ${deviceId} ${i}`);
1053
+ const serviceName = `${deviceTypeText} ${accessoryName}`;
1054
+ this.holidayModeControlService = new Service.Switch(`${serviceName} Holiday Mode`, `Holiday Mode Control ${deviceId}`);
1054
1055
  this.holidayModeControlService.addOptionalCharacteristic(Characteristic.ConfiguredName);
1055
- this.holidayModeControlService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Holiday Mode Control`);
1056
+ this.holidayModeControlService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Holiday Mode`);
1056
1057
  this.holidayModeControlService.getCharacteristic(Characteristic.On)
1057
1058
  .onGet(async () => {
1058
1059
  const state = this.accessory.holidayModeEnabled;
@@ -1084,6 +1085,7 @@ class DeviceAtw extends EventEmitter {
1084
1085
  //error sensor
1085
1086
  if (this.errorSensor && this.accessory.isInError !== null) {
1086
1087
  if (this.logDebug) this.emit('debug', `Prepare error service`);
1088
+ const serviceName = `${deviceTypeText} ${accessoryName}`;
1087
1089
  this.errorService = new Service.ContactSensor(`${serviceName} Error`, `Error Sensor ${deviceId}`);
1088
1090
  this.errorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
1089
1091
  this.errorService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Error`);
@@ -1447,7 +1449,7 @@ class DeviceAtw extends EventEmitter {
1447
1449
  const schedulesOnServer = deviceData.Schedule ?? [];
1448
1450
  const presetsOnServer = deviceData.Presets ?? [];
1449
1451
  const holidayModeEnabled = deviceData.HolidayMode?.Enabled;
1450
- const holidayModeActive = deviceData.HolidayMode?.Active;
1452
+ const holidayModeActive = deviceData.HolidayMode?.Active ?? false;
1451
1453
 
1452
1454
  //device info
1453
1455
  const hasHeatPump = ![1, 2, 3, 4, 5, 6, 7, 15].includes(this.hideZone);
@@ -1931,7 +1933,7 @@ class DeviceAtw extends EventEmitter {
1931
1933
  this.accessory = obj;
1932
1934
 
1933
1935
  //update sensors state
1934
- this.holidayModeControlService?.updateCharacteristic(Characteristic.ContactSensorState, holidayModeEnabled);
1936
+ this.holidayModeControlService?.updateCharacteristic(Characteristic.On, holidayModeEnabled);
1935
1937
  this.holidayModeSensorService?.updateCharacteristic(Characteristic.ContactSensorState, holidayModeActive);
1936
1938
  this.errorService?.updateCharacteristic(Characteristic.ContactSensorState, isInError);
1937
1939
 
package/src/deviceerv.js CHANGED
@@ -546,7 +546,7 @@ class DeviceErv extends EventEmitter {
546
546
  if (this.logDebug) this.emit('debug', `Prepare room temperature sensor service`);
547
547
  this.roomTemperatureSensorService = new Service.TemperatureSensor(`${serviceName} Room`, `Room Temperature Sensor ${deviceId}`);
548
548
  this.roomTemperatureSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
549
- this.roomTemperatureSensorService.setCharacteristic(Characteristic.ConfiguredName, `${serviceName} Room`);
549
+ this.roomTemperatureSensorService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Room`);
550
550
  this.roomTemperatureSensorService.getCharacteristic(Characteristic.CurrentTemperature)
551
551
  .setProps({
552
552
  minValue: -35,
@@ -565,7 +565,7 @@ class DeviceErv extends EventEmitter {
565
565
  if (this.logDebug) this.emit('debug', `Prepare supply temperature sensor service`);
566
566
  this.supplyTemperatureSensorService = new Service.TemperatureSensor(`${serviceName} Supply`, `Supply Temperature Sensor ${deviceId}`);
567
567
  this.supplyTemperatureSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
568
- this.supplyTemperatureSensorService.setCharacteristic(Characteristic.ConfiguredName, `${serviceName} Supply`);
568
+ this.supplyTemperatureSensorService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Supply`);
569
569
  this.supplyTemperatureSensorService.getCharacteristic(Characteristic.CurrentTemperature)
570
570
  .setProps({
571
571
  minValue: -35,
@@ -584,7 +584,7 @@ class DeviceErv extends EventEmitter {
584
584
  if (this.logDebug) this.emit('debug', `Prepare outdoor temperature sensor service`);
585
585
  this.outdoorTemperatureSensorService = new Service.TemperatureSensor(`${serviceName} Outdoor`, `Outdoor Temperature Sensor ${deviceId}`);
586
586
  this.outdoorTemperatureSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
587
- this.outdoorTemperatureSensorService.setCharacteristic(Characteristic.ConfiguredName, `${serviceName} Outdoor`);
587
+ this.outdoorTemperatureSensorService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Outdoor`);
588
588
  this.outdoorTemperatureSensorService.getCharacteristic(Characteristic.CurrentTemperature)
589
589
  .setProps({
590
590
  minValue: -35,
@@ -602,7 +602,7 @@ class DeviceErv extends EventEmitter {
602
602
  if (this.accessory.coreMaintenanceRequired !== null) {
603
603
  this.coreMaintenanceService = new Service.FilterMaintenance(`${serviceName} Core Maintenance`, `CoreMaintenance ${deviceId}`);
604
604
  this.coreMaintenanceService.addOptionalCharacteristic(Characteristic.ConfiguredName);
605
- this.coreMaintenanceService.setCharacteristic(Characteristic.ConfiguredName, `${serviceName} Core Maintenance`);
605
+ this.coreMaintenanceService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Core Maintenance`);
606
606
  this.coreMaintenanceService.getCharacteristic(Characteristic.FilterChangeIndication)
607
607
  .onGet(async () => {
608
608
  const value = this.accessory.coreMaintenanceRequired;
@@ -618,7 +618,7 @@ class DeviceErv extends EventEmitter {
618
618
  if (this.accessory.filterMaintenanceRequired !== null) {
619
619
  this.filterMaintenanceService = new Service.FilterMaintenance(`${serviceName} Filter Maintenance`, `FilterMaintenance ${deviceId}`);
620
620
  this.filterMaintenanceService.addOptionalCharacteristic(Characteristic.ConfiguredName);
621
- this.filterMaintenanceService.setCharacteristic(Characteristic.ConfiguredName, `${serviceName} Filter Maintenance`);
621
+ this.filterMaintenanceService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Filter Maintenance`);
622
622
  this.filterMaintenanceService.getCharacteristic(Characteristic.FilterChangeIndication)
623
623
  .onGet(async () => {
624
624
  const value = this.accessory.filterMaintenanceRequired;
@@ -634,7 +634,7 @@ class DeviceErv extends EventEmitter {
634
634
  if (hasCO2Sensor) {
635
635
  this.carbonDioxideSensorService = new Service.CarbonDioxideSensor(`${serviceName} CO2 Sensor`, `CO2Sensor ${deviceId}`);
636
636
  this.carbonDioxideSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
637
- this.carbonDioxideSensorService.setCharacteristic(Characteristic.ConfiguredName, `${serviceName} CO2 Sensor`);
637
+ this.carbonDioxideSensorService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} CO2 Sensor`);
638
638
  this.carbonDioxideSensorService.getCharacteristic(Characteristic.CarbonDioxideDetected)
639
639
  .onGet(async () => {
640
640
  const value = this.accessory.roomCO2Detected;
@@ -652,7 +652,7 @@ class DeviceErv extends EventEmitter {
652
652
  if (hasPM25Sensor) {
653
653
  this.airQualitySensorService = new Service.AirQualitySensor(`${serviceName} PM2.5 Sensor`, `PM25Sensor ${deviceId}`);
654
654
  this.airQualitySensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
655
- this.airQualitySensorService.setCharacteristic(Characteristic.ConfiguredName, `${serviceName} PM2.5 Sensor`);
655
+ this.airQualitySensorService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} PM2.5 Sensor`);
656
656
  this.airQualitySensorService.getCharacteristic(Characteristic.AirQuality)
657
657
  .onGet(async () => {
658
658
  const value = this.accessory.pM25AirQuality;
@@ -669,9 +669,9 @@ class DeviceErv extends EventEmitter {
669
669
  //holiday mode
670
670
  if (this.accessory.holidayModeEnabled !== null) {
671
671
  if (this.logDebug) this.emit('debug', `Prepare holiday mode control service`);
672
- this.holidayModeControlService = new Service.Switch(serviceName, `Holiday Mode Control ${deviceId} ${i}`);
672
+ this.holidayModeControlService = new Service.Switch(`${serviceName} Holiday Mode`, `Holiday Mode Control ${deviceId}`);
673
673
  this.holidayModeControlService.addOptionalCharacteristic(Characteristic.ConfiguredName);
674
- this.holidayModeControlService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Holiday Mode Control`);
674
+ this.holidayModeControlService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Holiday Mode`);
675
675
  this.holidayModeControlService.getCharacteristic(Characteristic.On)
676
676
  .onGet(async () => {
677
677
  const state = this.accessory.holidayModeEnabled;
@@ -993,7 +993,7 @@ class DeviceErv extends EventEmitter {
993
993
  const schedulesOnServer = deviceData.Schedule ?? [];
994
994
  const presetsOnServer = deviceData.Presets ?? [];
995
995
  const holidayModeEnabled = deviceData.HolidayMode?.Enabled;
996
- const holidayModeActive = deviceData.HolidayMode?.Active;
996
+ const holidayModeActive = deviceData.HolidayMode?.Active ?? false;
997
997
 
998
998
  //device control
999
999
  const hideRoomTemperature = deviceData.HideRoomTemperature;
@@ -1225,7 +1225,7 @@ class DeviceErv extends EventEmitter {
1225
1225
  .updateCharacteristic(Characteristic.PM2_5Density, pM25Level);
1226
1226
 
1227
1227
  //error sensor
1228
- this.holidayModeControlService?.updateCharacteristic(Characteristic.ContactSensorState, holidayModeEnabled);
1228
+ this.holidayModeControlService?.updateCharacteristic(Characteristic.On, holidayModeEnabled);
1229
1229
  this.holidayModeSensorService?.updateCharacteristic(Characteristic.ContactSensorState, holidayModeActive);
1230
1230
  this.errorService?.updateCharacteristic(Characteristic.ContactSensorState, isInError);
1231
1231