homebridge-tasmota-control 1.6.15-beta.3 → 1.6.15-beta.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Tasmota Control",
   "name": "homebridge-tasmota-control",
-  "version": "1.6.15-beta.3",
+  "version": "1.6.15-beta.4",
   "description": "Homebridge plugin to control Tasmota flashed devices.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/mielhvac.js

@@ -347,59 +347,46 @@ class MiElHvac extends EventEmitter {
 
 
             if (modelSupportsFanSpeed) {
-                // Map fan speed string to index
                 const fanSpeedMap = {
                     'auto': 0,
                     'quiet': 1,
                     '1': 2,
                     '2': 3,
                     '3': 4,
-                    '4': 5,
+                    '4': 5
                 };
 
-                // Get mapped index, fallback to 0 if not found
-                const fanSpeedIndex = fanSpeedMap[fanSpeed] ?? 0;
-
-                // Function to generate speed arrays dynamically
-                const generateSpeedArray = (count, hasAuto) => {
-                    // if hasAuto, first element is count+1 (offset), else 0
-                    // Then numbers 1 .. count-1 (except 0 and auto)
-                    // your original arrays always have [hasAuto ? count+1 : 0, 1, 2, ..., count-1]
-                    // So let's build that:
-                    const arr = [];
-                    if (hasAuto) {
-                        arr.push(count + 1); // e.g. 3+1=4 for 3 speeds
-                    } else {
-                        arr.push(0);
-                    }
-                    for (let i = 1; i < count; i++) {
-                        arr.push(i);
+                const fanIndex = fanSpeedMap[fanSpeed];
+                obj.fanSpeed = 0;
+                obj.fanSpeedSetPropsMaxValue = 0;
+
+                if (typeof fanIndex === 'number') {
+                    switch (numberOfFanSpeeds) {
+                        case 2:
+                            obj.fanSpeed = hasAutomaticFanSpeed ? [3, 1, 2][fanIndex] ?? 1 : [0, 1, 2][fanIndex] ?? 1;
+                            obj.fanSpeedSetPropsMaxValue = hasAutomaticFanSpeed ? 3 : 2;
+                            break;
+
+                        case 3:
+                            obj.fanSpeed = hasAutomaticFanSpeed ? [4, 1, 2, 3][fanIndex] ?? 1 : [0, 1, 2, 3][fanIndex] ?? 1;
+                            obj.fanSpeedSetPropsMaxValue = hasAutomaticFanSpeed ? 4 : 3;
+                            break;
+
+                        case 4:
+                            obj.fanSpeed = hasAutomaticFanSpeed ? [5, 1, 2, 3, 4][fanIndex] ?? 1 : [0, 1, 2, 3, 4][fanIndex] ?? 1;
+                            obj.fanSpeedSetPropsMaxValue = hasAutomaticFanSpeed ? 5 : 4;
+                            break;
+
+                        case 5:
+                            obj.fanSpeed = hasAutomaticFanSpeed ? [6, 1, 2, 3, 4, 5][fanIndex] ?? 1 : [0, 1, 2, 3, 4, 5][fanIndex] ?? 1;
+                            obj.fanSpeedSetPropsMaxValue = hasAutomaticFanSpeed ? 6 : 5;
+                            break;
                     }
-                    return arr;
-                };
 
-                switch (numberOfFanSpeeds) {
-                    case 2:
-                        obj.fanSpeed = generateSpeedArray(3, hasAutomaticFanSpeed)[fanSpeedIndex];
-                        obj.fanSpeedSetPropsMaxValue = hasAutomaticFanSpeed ? 3 : 2;
-                        break;
-                    case 3:
-                        obj.fanSpeed = generateSpeedArray(4, hasAutomaticFanSpeed)[fanSpeedIndex];
-                        obj.fanSpeedSetPropsMaxValue = hasAutomaticFanSpeed ? 4 : 3;
-                        break;
-                    case 4:
-                        obj.fanSpeed = generateSpeedArray(5, hasAutomaticFanSpeed)[fanSpeedIndex];
-                        obj.fanSpeedSetPropsMaxValue = hasAutomaticFanSpeed ? 5 : 4;
-                        break;
-                    case 5:
-                        obj.fanSpeed = generateSpeedArray(6, hasAutomaticFanSpeed)[fanSpeedIndex];
-                        obj.fanSpeedSetPropsMaxValue = hasAutomaticFanSpeed ? 6 : 5;
-                        break;
-                    default:
-                        // Fallback for unexpected fan speed count
-                        obj.fanSpeed = 0;
-                        obj.fanSpeedSetPropsMaxValue = 0;
-                        break;
+                    // Cap value to max
+                    if (obj.fanSpeed > obj.fanSpeedSetPropsMaxValue) {
+                        obj.fanSpeed = obj.fanSpeedSetPropsMaxValue;
+                    }
                 }
             }