homebridge-melcloud-control 4.0.0-beta.566 → 4.0.0-beta.567

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.566",
+  "version": "4.0.0-beta.567",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/deviceata.js

@@ -606,7 +606,7 @@ class DeviceAta extends EventEmitter {
             };
 
             //error sensor
-            if (this.errorSensor) {
+            if (this.errorSensor && this.accessory.isInError !== null) {
                 if (this.logDebug) this.emit('debug', `Prepare error service`);
                 this.errorService = new Service.ContactSensor(`${serviceName} Error`, `Error Sensor ${deviceId}`);
                 this.errorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -954,6 +954,18 @@ class DeviceAta extends EventEmitter {
                 .on('deviceState', async (deviceData) => {
                     this.deviceData = deviceData;
 
+                    //keys
+                    const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
+                    const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
+                    const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
+                    const supportAirDirectionKey = this.accountType === 'melcloud' ? 'AirDirectionFunction' : 'HasAirDirectionFunction';
+                    const supportSwingKey = this.accountType === 'melcloud' ? 'SwingFunction' : 'HasSwing';
+                    const supportVideWaneKey = this.accountType === 'melcloud' ? 'ModelSupportsWideVane' : 'SupportsWideVane';
+                    const supportAutoKey = this.accountType === 'melcloud' ? 'ModelSupportsAuto' : 'HasAutoOperationMode';
+                    const supportHeatKey = this.accountType === 'melcloud' ? 'ModelSupportsHeat' : 'HasHeatOperationMode';
+                    const supportDryKey = this.accountType === 'melcloud' ? 'ModelSupportsDry' : 'HasDryOperationMode';
+                    const supportCoolKey = this.accountType === 'melcloud' ? 'ModelSupportsCool' : 'HasCoolOperationMode';
+
                     //presets
                     const presetsOnServer = deviceData.Presets ?? [];
 
@@ -964,17 +976,17 @@ class DeviceAta extends EventEmitter {
                     //device info
                     const accountTypeMelcloud = this.accountType === 'melcloud';
                     const supportsAutomaticFanSpeed = deviceData.Device.HasAutomaticFanSpeed ?? false;
-                    const supportsAirDirectionFunction = accountTypeMelcloud ? deviceData.Device.AirDirectionFunction : deviceData.Device.HasAirDirectionFunction;;
-                    const supportsSwingFunction = accountTypeMelcloud ? deviceData.Device.SwingFunction : deviceData.Device.HasSwing;
-                    const supportsWideVane = accountTypeMelcloud ? deviceData.Device.ModelSupportsWideVane : deviceData.Device.SupportsWideVane;
+                    const supportsAirDirectionFunction = deviceData.Device[supportAirDirectionKey];
+                    const supportsSwingFunction = deviceData.Device[supportSwingKey];
+                    const supportsWideVane = deviceData.Device[supportVideWaneKey];
                     const supportsOutdoorTemperature = deviceData.Device.HasOutdoorTemperature ?? false;
                     const supportsFanSpeed = accountTypeMelcloud ? deviceData.Device.ModelSupportsFanSpeed : deviceData.Device.NumberOfFanSpeeds > 0;
-                    const supportsAuto1 = accountTypeMelcloud ? deviceData.Device.ModelSupportsAuto : deviceData.Device.HasAutoOperationMode;
+                    const supportsAuto1 = deviceData.Device[supportAutoKey];
                     const supportsAuto = this.autoDryFanMode >= 1 && supportsAuto1
-                    const supportsHeat1 = accountTypeMelcloud ? deviceData.Device.ModelSupportsHeat : deviceData.Device.HasHeatOperationMode
+                    const supportsHeat1 = deviceData.Device[supportHeatKey];
                     const supportsHeat = this.heatDryFanMode >= 1 && supportsHeat1;
-                    const supportsDry = accountTypeMelcloud ? deviceData.Device.ModelSupportsDry : deviceData.Device.HasDryOperationMode;
-                    const supportsCool1 = accountTypeMelcloud ? deviceData.Device.ModelSupportsCool : deviceData.Device.HasCoolOperationMode;
+                    const supportsDry = deviceData.Device[supportDryKey];
+                    const supportsCool1 = deviceData.Device[supportCoolKey];
                     const supportsCool = this.coolDryFanMode >= 1 && supportsCool1;
                     const numberOfFanSpeeds = supportsFanSpeed ? deviceData.Device.NumberOfFanSpeeds : 0;
                     const minTempHeat = 10;
@@ -983,8 +995,6 @@ class DeviceAta extends EventEmitter {
                     const maxTempCoolDryAuto = 31;
 
                     //device state
-                    const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
-                    const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
                     const power = deviceData.Device.Power ?? false;
                     const inStandbyMode = deviceData.Device.InStandbyMode ?? false;
                     const roomTemperature = deviceData.Device.RoomTemperature;
@@ -1004,7 +1014,7 @@ class DeviceAta extends EventEmitter {
                     const prohibitPower = deviceData.Device.ProhibitPower ?? false;
                     const temperatureStep = deviceData.Device[tempStepKey] ? 0.5 : 1;
                     const outdoorTemperature = deviceData.Device.OutdoorTemperature;
-                    const isInError = deviceData.Device.IsInError ?? false;
+                    const isInError = deviceData.Device[errorKey];
 
                     //accessory
                     const obj = {

package/src/deviceatw.js

@@ -869,7 +869,7 @@ class DeviceAtw extends EventEmitter {
                             };
 
                             //error sensor
-                            if (this.errorSensor) {
+                            if (this.errorSensor && this.accessory.isInError !== null) {
                                 if (this.logDebug) this.emit('debug', `Prepare error service`);
                                 this.errorService = new Service.ContactSensor(`${serviceName} Error`, `Error Sensor ${deviceId}`);
                                 this.errorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -1329,6 +1329,10 @@ class DeviceAtw extends EventEmitter {
                 .on('deviceState', async (deviceData) => {
                     this.deviceData = deviceData;
 
+                    //keys
+                    const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
+                    const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
+
                     //presets
                     const presetsOnServer = deviceData.Presets ?? [];
 
@@ -1340,7 +1344,7 @@ class DeviceAtw extends EventEmitter {
                     const canHeat = deviceData.Device.CanHeat ?? false;
                     const canCool = deviceData.Device.CanCool ?? false;
                     const heatCoolModes = canHeat && canCool ? 0 : canHeat ? 1 : canCool ? 2 : 3;
-                    const temperatureIncrement = deviceData.Device.TemperatureIncrement ?? 1;
+                    const temperatureIncrement = deviceData.Device[tempStepKey] ?? 1;
                     const minSetTemperature = deviceData.Device.MinSetTemperature ?? 10;
                     const maxSetTemperature = deviceData.Device.MaxSetTemperature ?? 30;
                     const maxTankTemperature = deviceData.Device.MaxTankTemperature ?? 70;
@@ -1370,7 +1374,7 @@ class DeviceAtw extends EventEmitter {
                     const holidayMode = deviceData.Device.HolidayMode ?? false;
                     const flowTemperatureHeatPump = deviceData.Device.FlowTemperature;
                     const returnTemperatureHeatPump = deviceData.Device.ReturnTemperature;
-                    const isInError = deviceData.Device.IsInError ?? false;
+                    const isInError = deviceData.Device[errorKey];
 
                     //zone 1
                     const zone1Name = deviceData.Zone1Name ?? 'Zone 1';

package/src/deviceerv.js

@@ -592,32 +592,36 @@ class DeviceErv extends EventEmitter {
             };
 
             //core maintenance
-            this.coreMaintenanceService = new Service.FilterMaintenance(`${serviceName} Core Maintenance`, `CoreMaintenance ${deviceId}`);
-            this.coreMaintenanceService.addOptionalCharacteristic(Characteristic.ConfiguredName);
-            this.coreMaintenanceService.setCharacteristic(Characteristic.ConfiguredName, `${serviceName} Core Maintenance`);
-            this.coreMaintenanceService.getCharacteristic(Characteristic.FilterChangeIndication)
-                .onGet(async () => {
-                    const value = this.accessory.coreMaintenanceRequired;
-                    return value;
-                });
-            this.coreMaintenanceService.getCharacteristic(Characteristic.ResetFilterIndication)
-                .onSet(async (state) => {
-                });
-            accessory.addService(this.coreMaintenanceService);
+            if (this.accessory.coreMaintenanceRequired !== null) {
+                this.coreMaintenanceService = new Service.FilterMaintenance(`${serviceName} Core Maintenance`, `CoreMaintenance ${deviceId}`);
+                this.coreMaintenanceService.addOptionalCharacteristic(Characteristic.ConfiguredName);
+                this.coreMaintenanceService.setCharacteristic(Characteristic.ConfiguredName, `${serviceName} Core Maintenance`);
+                this.coreMaintenanceService.getCharacteristic(Characteristic.FilterChangeIndication)
+                    .onGet(async () => {
+                        const value = this.accessory.coreMaintenanceRequired;
+                        return value;
+                    });
+                this.coreMaintenanceService.getCharacteristic(Characteristic.ResetFilterIndication)
+                    .onSet(async (state) => {
+                    });
+                accessory.addService(this.coreMaintenanceService);
+            }
 
             //filter maintenance
-            this.filterMaintenanceService = new Service.FilterMaintenance(`${serviceName} Filter Maintenance`, `FilterMaintenance ${deviceId}`);
-            this.filterMaintenanceService.addOptionalCharacteristic(Characteristic.ConfiguredName);
-            this.filterMaintenanceService.setCharacteristic(Characteristic.ConfiguredName, `${serviceName} Filter Maintenance`);
-            this.filterMaintenanceService.getCharacteristic(Characteristic.FilterChangeIndication)
-                .onGet(async () => {
-                    const value = this.accessory.filterMaintenanceRequired;
-                    return value;
-                });
-            this.filterMaintenanceService.getCharacteristic(Characteristic.ResetFilterIndication)
-                .onSet(async (state) => {
-                });
-            accessory.addService(this.filterMaintenanceService);
+            if (this.accessory.filterMaintenanceRequired !== null) {
+                this.filterMaintenanceService = new Service.FilterMaintenance(`${serviceName} Filter Maintenance`, `FilterMaintenance ${deviceId}`);
+                this.filterMaintenanceService.addOptionalCharacteristic(Characteristic.ConfiguredName);
+                this.filterMaintenanceService.setCharacteristic(Characteristic.ConfiguredName, `${serviceName} Filter Maintenance`);
+                this.filterMaintenanceService.getCharacteristic(Characteristic.FilterChangeIndication)
+                    .onGet(async () => {
+                        const value = this.accessory.filterMaintenanceRequired;
+                        return value;
+                    });
+                this.filterMaintenanceService.getCharacteristic(Characteristic.ResetFilterIndication)
+                    .onSet(async (state) => {
+                    });
+                accessory.addService(this.filterMaintenanceService);
+            }
 
             //room CO2 sensor
             if (hasCO2Sensor) {
@@ -656,7 +660,7 @@ class DeviceErv extends EventEmitter {
             }
 
             //error sensor
-            if (this.errorSensor) {
+            if (this.errorSensor && this.accessory.isInError !== null) {
                 if (this.logDebug) this.emit('debug', `Prepare error service`);
                 this.errorService = new Service.ContactSensor(`${serviceName} Error`, `Error Sensor ${deviceId}`);
                 this.errorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -874,6 +878,11 @@ class DeviceErv extends EventEmitter {
                 .on('deviceState', async (deviceData) => {
                     this.deviceData = deviceData;
 
+                    //keys
+                    const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
+                    const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
+                    const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
+
                     //presets
                     const presetsOnServer = deviceData.Presets ?? [];
 
@@ -899,18 +908,18 @@ class DeviceErv extends EventEmitter {
                     const hasAutoVentilationMode = deviceData.Device.HasAutoVentilationMode ?? false;
                     const hasBypassVentilationMode = deviceData.Device.HasBypassVentilationMode ?? false;
                     const hasAutomaticFanSpeed = deviceData.Device.HasAutomaticFanSpeed ?? false;
-                    const coreMaintenanceRequired = deviceData.Device.CoreMaintenanceRequired ? 1 : 0;
-                    const filterMaintenanceRequired = deviceData.Device.FilterMaintenanceRequired ? 1 : 0;
+                    const coreMaintenanceRequired = deviceData.Device.CoreMaintenanceRequired;
+                    const filterMaintenanceRequired = deviceData.Device.FilterMaintenanceRequired;
                     const actualVentilationMode = deviceData.Device.ActualVentilationMode;
-                    const numberOfFanSpeeds = deviceData.Device.NumberOfFanSpeeds ?? 0;
-                    const temperatureIncrement = deviceData.Device.TemperatureIncrement ?? 1;
+                    const numberOfFanSpeeds = deviceData.Device.NumberOfFanSpeeds;
+                    const temperatureIncrement = deviceData.Device[tempStepKey] ?? 1;
                     const minTempHeat = 10;
                     const maxTempHeat = 31;
                     const minTempCoolDry = 16;
                     const maxTempCoolDry = 31;
 
                     //device state
-                    const power = deviceData.Device.Power ?? false;
+                    const power = deviceData.Device.Power;
                     const roomTemperature = deviceData.Device.RoomTemperature;
                     const supplyTemperature = deviceData.Device.SupplyTemperature;
                     const outdoorTemperature = deviceData.Device.OutdoorTemperature;
@@ -921,7 +930,7 @@ class DeviceErv extends EventEmitter {
                     const setFanSpeed = deviceData.Device.SetFanSpeed;
                     const operationMode = deviceData.Device.OperationMode;
                     const ventilationMode = deviceData.Device.VentilationMode;
-                    const isInError = deviceData.Device.IsInError ?? false;
+                    const isInError = deviceData.Device[errorKey];
 
                     //accessory
                     const obj = {

package/src/melcloudata.js

@@ -75,13 +75,17 @@ class MelCloudAta extends EventEmitter {
             }
             if (this.logDebug) this.emit('debug', `Device Data: ${JSON.stringify(deviceData, null, 2)}`);
 
+            //keys
+            const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
+            const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
+            const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
+
             //device info
             const hideVaneControls = deviceData.HideVaneControls;
             const hideDryModeControl = deviceData.HideDryModeControl;
             const serialNumber = deviceData.SerialNumber;
 
             //device
-            const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
             const device = deviceData.Device ?? {};
             const prohibitSetTemperature = device.ProhibitSetTemperature;
             const prohibitOperationMode = device.ProhibitOperationMode;
@@ -99,10 +103,11 @@ class MelCloudAta extends EventEmitter {
             const vaneHorizontalSwing = device.VaneHorizontalSwing;
             const operationMode = device.OperationMode;
             const inStandbyMode = device.InStandbyMode;
+            const temperatureIncrement = device[tempStepKey];
             const defaultCoolingSetTemperature = device.DefaultCoolingSetTemperature;
             const defaultHeatingSetTemperature = device.DefaultHeatingSetTemperature;
             const firmwareAppVersion = device.FirmwareAppVersion;
-            const isInError = device.IsInError;
+            const isInError = device[errorKey];
 
             //units
             const units = Array.isArray(device.Units) ? device.Units : [];
@@ -141,6 +146,7 @@ class MelCloudAta extends EventEmitter {
                 VaneVerticalSwing: vaneVerticalSwing,
                 VaneHorizontalDirection: vaneHorizontalDirection,
                 VaneHorizontalSwing: vaneHorizontalSwing,
+                TemperatureIncrement: temperatureIncrement,
                 DefaultCoolingSetTemperature: defaultCoolingSetTemperature,
                 DefaultHeatingSetTemperature: defaultHeatingSetTemperature,
                 ProhibitPower: prohibitPower,

package/src/melcloudatw.js

@@ -67,13 +67,18 @@ class MelCloudAtw extends EventEmitter {
             }
             if (this.logDebug) this.emit('debug', `Device Data: ${JSON.stringify(deviceData, null, 2)}`);
 
+            //keys
+            const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
+            const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
+            const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
+
             //device info
             const serialNumber = deviceData.SerialNumber;
 
             //device
             const device = deviceData.Device ?? {};
             const hasHotWaterTank = device.HasHotWaterTank ?? false;
-            const temperatureIncrement = device.TemperatureIncrement;
+            const temperatureIncrement = device[tempStepKey];
             const roomTemperatureZone1 = device.RoomTemperatureZone1;
             const roomTemperatureZone2 = device.RoomTemperatureZone2;
             const outdoorTemperature = device.OutdoorTemperature;
@@ -100,7 +105,7 @@ class MelCloudAtw extends EventEmitter {
             const idleZone2 = device.IdleZone2 ?? false;
             const firmwareAppVersion = device.FirmwareAppVersion;
             const hasZone2 = device.HasZone2 ?? false;
-            const isInError = device.IsInError;
+            const isInError = device[errorKey];
 
             //units
             const units = Array.isArray(device.Units) ? device.Units : [];

package/src/melclouderv.js

@@ -67,25 +67,30 @@ class MelCloudErv extends EventEmitter {
             }
             if (this.logDebug) this.emit('debug', `Device Data: ${JSON.stringify(deviceData, null, 2)}`);
 
+            //keys
+            const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
+            const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
+            const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
+
             //presets
-            const hideRoomTemperature = deviceData.HideRoomTemperature ?? false;
-            const hideSupplyTemperature = deviceData.HideSupplyTemperature ?? false;
-            const hideOutdoorTemperature = deviceData.HideOutdoorTemperature ?? false;
+            const hideRoomTemperature = deviceData.HideRoomTemperature;
+            const hideSupplyTemperature = deviceData.HideSupplyTemperature;
+            const hideOutdoorTemperature = deviceData.HideOutdoorTemperature;
             const serialNumber = deviceData.SerialNumber;
 
             //device
             const device = deviceData.Device ?? {};
             const pM25SensorStatus = device.PM25SensorStatus;
             const pM25Level = device.PM25Level;
-            const temperatureIncrement = device.TemperatureIncrement;
-            const coreMaintenanceRequired = device.CoreMaintenanceRequired ?? false;
-            const filterMaintenanceRequired = device.FilterMaintenanceRequired ?? false;
-            const power = device.Power ?? false;
+            const temperatureIncrement = device[tempStepKey];
+            const coreMaintenanceRequired = device.CoreMaintenanceRequired;
+            const filterMaintenanceRequired = device.FilterMaintenanceRequired;
+            const power = device.Power;
             const roomTemperature = device.RoomTemperature;
             const supplyTemperature = device.SupplyTemperature;
             const outdoorTemperature = device.OutdoorTemperature;
             const roomCO2Level = device.RoomCO2Level;
-            const nightPurgeMode = device.NightPurgeMode ?? false;
+            const nightPurgeMode = device.NightPurgeMode;
             const setTemperature = device.SetTemperature;
             const actualSupplyFanSpeed = device.ActualSupplyFanSpeed;
             const actualExhaustFanSpeed = device.ActualExhaustFanSpeed;
@@ -95,7 +100,7 @@ class MelCloudErv extends EventEmitter {
             const defaultCoolingSetTemperature = device.DefaultCoolingSetTemperature ?? 23;
             const defaultHeatingSetTemperature = device.DefaultHeatingSetTemperature ?? 21;
             const firmwareAppVersion = device.FirmwareAppVersion;
-            const isInError = device.IsInError;
+            const isInError = device[errorKey];
 
             //units
             const units = Array.isArray(device.Units) ? device.Units : [];