homebridge-melcloud-control 4.10.20-beta.4 → 4.10.20-beta.6

package/package.json

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

package/src/deviceata.js

@@ -316,9 +316,12 @@ class DeviceAta extends EventEmitter {
                             })
                             .onSet(async (value) => {
                                 try {
-                                    const max = numberOfFanSpeeds;
-                                    const minValue = supportsAutomaticFanSpeed ? 0 : 1;
-                                    const clampedValue = Math.min(Math.max(value, minValue), max);
+                                    //0 is the dial's floor, paired by HomeKit itself with Active going false; nothing to send, real speeds start at 1
+                                    if (value === 0) return;
+
+                                    //Auto sits at the top slot, past the highest real speed
+                                    const isAutoSlot = supportsAutomaticFanSpeed && value >= numberOfFanSpeeds + 1;
+                                    const clampedValue = isAutoSlot ? 0 : Math.min(Math.max(value, 1), numberOfFanSpeeds);
                                     const payload = { setFanSpeed: clampedValue };
                                     if (this.logInfo) this.emit('info', `Set fan speed mode: ${AirConditioner.FanSpeedMapEnumToString[clampedValue]}`);
                                     await this.melCloudAta.send(this.accountType, this.displayType, deviceData, payload, AirConditioner.EffectiveFlags.SetFanSpeed);
@@ -1568,15 +1571,15 @@ class DeviceAta extends EventEmitter {
 
                             //fan speed mode
                             if (supportsFanSpeed) {
-                                // ograniczamy wartość do zakresu API
-                                const minValue = supportsAutomaticFanSpeed ? 0 : 1;
-                                const maxValue = numberOfFanSpeeds;
-
-                                // zabezpieczenie przed out-of-bounds
-                                const clampedValue = Math.min(Math.max(setFanSpeed, minValue), maxValue);
-
-                                obj.currentFanSpeed = clampedValue;
-                                obj.fanSpeedSetPropsMinValue = minValue;
+                                //0 is the dial's floor (paired with off), never sent as a real speed; Auto sits at the top slot past the highest real speed
+                                const maxValue = supportsAutomaticFanSpeed ? numberOfFanSpeeds + 1 : numberOfFanSpeeds;
+                                //if the device somehow reports Auto (0) while not actually supporting it, fall through to the normal clamp (never display 0, that's reserved for off)
+                                const isAuto = setFanSpeed === 0 && supportsAutomaticFanSpeed;
+
+                                obj.currentFanSpeed = isAuto
+                                    ? maxValue
+                                    : Math.min(Math.max(setFanSpeed, 1), numberOfFanSpeeds);
+                                obj.fanSpeedSetPropsMinValue = 0;
                                 obj.fanSpeedSetPropsMaxValue = maxValue;
                             }
 

package/src/deviceerv.js

@@ -279,9 +279,12 @@ class DeviceErv extends EventEmitter {
                             })
                             .onSet(async (value) => {
                                 try {
-                                    const max = numberOfFanSpeeds;
-                                    const minValue = supportsAutomaticFanSpeed ? 0 : 1;
-                                    const clampedValue = Math.min(Math.max(value, minValue), max);
+                                    //0 is the dial's floor, paired by HomeKit itself with Active going false; nothing to send, real speeds start at 1
+                                    if (value === 0) return;
+
+                                    //Auto sits at the top slot, past the highest real speed
+                                    const isAutoSlot = supportsAutomaticFanSpeed && value >= numberOfFanSpeeds + 1;
+                                    const clampedValue = isAutoSlot ? 0 : Math.min(Math.max(value, 1), numberOfFanSpeeds);
                                     const payload = { setFanSpeed: clampedValue };
                                     if (this.logInfo) this.emit('info', `Set fan speed mode: ${Ventilation.FanSpeedMapEnumToString[clampedValue]}`);
                                     await this.melCloudErv.send(this.accountType, this.displayType, deviceData, payload, Ventilation.EffectiveFlags.SetFanSpeed);
@@ -1191,15 +1194,15 @@ class DeviceErv extends EventEmitter {
 
                             //fan speed mode
                             if (supportsFanSpeed) {
-                                // ograniczamy wartość do zakresu API
-                                const minValue = supportsAutomaticFanSpeed ? 0 : 1;
-                                const maxValue = numberOfFanSpeeds;
-
-                                // zabezpieczenie przed out-of-bounds
-                                const clampedValue = Math.min(Math.max(setFanSpeed, minValue), maxValue);
-
-                                obj.currentFanSpeed = clampedValue;
-                                obj.fanSpeedSetPropsMinValue = minValue;
+                                //0 is the dial's floor (paired with off), never sent as a real speed; Auto sits at the top slot past the highest real speed
+                                const maxValue = supportsAutomaticFanSpeed ? numberOfFanSpeeds + 1 : numberOfFanSpeeds;
+                                //if the device somehow reports Auto (0) while not actually supporting it, fall through to the normal clamp (never display 0, that's reserved for off)
+                                const isAuto = setFanSpeed === 0 && supportsAutomaticFanSpeed;
+
+                                obj.currentFanSpeed = isAuto
+                                    ? maxValue
+                                    : Math.min(Math.max(setFanSpeed, 1), numberOfFanSpeeds);
+                                obj.fanSpeedSetPropsMinValue = 0;
                                 obj.fanSpeedSetPropsMaxValue = maxValue;
                             }