homebridge-melcloud-control 4.2.2-beta.6 → 4.2.2-beta.7

package/package.json

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

package/src/deviceata.js

@@ -1221,17 +1221,18 @@ class DeviceAta extends EventEmitter {
                     this.deviceData = deviceData;
 
                     //keys
-                    const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
-                    const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
-                    const connectKey = this.accountType === 'melcloud' ? 'Offline' : 'IsConnected';
-                    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';
+                    const accountTypeMelcloud = this.accountType === 'melcloud';
+                    const fanKey = accountTypeMelcloud ? 'FanSpeed' : 'SetFanSpeed';
+                    const tempStepKey = accountTypeMelcloud ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
+                    const connectKey = accountTypeMelcloud ? 'Offline' : 'IsConnected';
+                    const errorKey = accountTypeMelcloud ? 'HasError' : 'IsInError';
+                    const supportAirDirectionKey = accountTypeMelcloud ? 'AirDirectionFunction' : 'HasAirDirectionFunction';
+                    const supportSwingKey = accountTypeMelcloud ? 'SwingFunction' : 'HasSwing';
+                    const supportVideWaneKey = accountTypeMelcloud ? 'ModelSupportsWideVane' : 'SupportsWideVane';
+                    const supportAutoKey = accountTypeMelcloud ? 'ModelSupportsAuto' : 'HasAutoOperationMode';
+                    const supportHeatKey = accountTypeMelcloud ? 'ModelSupportsHeat' : 'HasHeatOperationMode';
+                    const supportDryKey = accountTypeMelcloud ? 'ModelSupportsDry' : 'HasDryOperationMode';
+                    const supportCoolKey = accountTypeMelcloud ? 'ModelSupportsCool' : 'HasCoolOperationMode';
 
                     //presets schedules
                     const scheduleEnabled = deviceData.ScheduleEnabled;
@@ -1251,7 +1252,6 @@ class DeviceAta extends EventEmitter {
                     const hideDryModeControl = deviceData.HideDryModeControl ?? false;
 
                     //device info
-                    const accountTypeMelcloud = this.accountType === 'melcloud';
                     const supportsAutomaticFanSpeed = deviceData.Device.HasAutomaticFanSpeed ?? false;
                     const supportsAirDirectionFunction = deviceData.Device[supportAirDirectionKey];
                     const supportsSwingFunction = deviceData.Device[supportSwingKey];
@@ -1291,7 +1291,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 isConnected = deviceData.Device[connectKey];
+                    const isConnected = accountTypeMelcloud ? !deviceData.Device[connectKey] : deviceData.Device[connectKey];
                     const isInError = deviceData.Device[errorKey];
 
                     //accessory

package/src/deviceatw.js

@@ -1486,6 +1486,7 @@ class DeviceAtw extends EventEmitter {
                     this.deviceData = deviceData;
 
                     //keys
+                    const accountTypeMelcloud = this.accountType === 'melcloud';
                     const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
                     const connectKey = this.accountType === 'melcloud' ? 'Offline' : 'IsConnected';
                     const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
@@ -1535,7 +1536,7 @@ class DeviceAtw extends EventEmitter {
                     const holidayMode = deviceData.Device.HolidayMode ?? false;
                     const flowTemperatureHeatPump = deviceData.Device.FlowTemperature;
                     const returnTemperatureHeatPump = deviceData.Device.ReturnTemperature;
-                     const isConnected = deviceData.Device[connectKey];
+                    const isConnected = accountTypeMelcloud ? !deviceData.Device[connectKey] : deviceData.Device[connectKey];
                     const isInError = deviceData.Device[errorKey];
 
                     //zone 1

package/src/deviceerv.js

@@ -1031,6 +1031,7 @@ class DeviceErv extends EventEmitter {
                     this.deviceData = deviceData;
 
                     //keys
+                    const accountTypeMelcloud = this.accountType === 'melcloud';
                     const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
                     const connectKey = this.accountType === 'melcloud' ? 'Offline' : 'IsConnected';
                     const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
@@ -1086,7 +1087,7 @@ class DeviceErv extends EventEmitter {
                     const setFanSpeed = deviceData.Device.SetFanSpeed;
                     const operationMode = deviceData.Device.OperationMode;
                     const ventilationMode = deviceData.Device.VentilationMode;
-                    const isConnected = deviceData.Device[connectKey];
+                    const isConnected = accountTypeMelcloud ? !deviceData.Device[connectKey] : deviceData.Device[connectKey];
                     const isInError = deviceData.Device[errorKey];
 
                     //accessory