homebridge-tuya-plus 3.13.0 → 3.13.1-dev.1

package/lib/SimpleFanLightAccessory.js

@@ -1,8 +1,19 @@
 const BaseAccessory = require('./BaseAccessory');
 
+// HomeKit color temperature is expressed in mireds (reciprocal megakelvin):
+// LOW mireds = cool/blue, HIGH mireds = warm/orange.
+// Tuya's standard `temp_value` DP runs the other way: 0 = warmest, scale = coolest.
+// The two scales must therefore be inverted when converting between them.
+// Defaults below describe a typical CCT lamp range of ~2700K..6500K.
+const DEFAULT_MIN_WHITE_COLOR = 154; // ~6500K (coolest, lowest mired)
+const DEFAULT_MAX_WHITE_COLOR = 370; // ~2700K (warmest, highest mired)
+const COLOR_TEMP_TUYA_SCALE = 1000;  // Tuya temp_value range: 0 (warm) .. 1000 (cool)
+
 class SimpleFanLightAccessory extends BaseAccessory {
     static getCategory(Categories) {
-        return Categories.FANLIGHT;
+        // HAP has no combined fan+light category; the fan is the primary
+        // service, so categorise as a FAN (matches SimpleFanAccessory).
+        return Categories.FAN;
     }
 
     constructor(...props) {
@@ -34,10 +45,24 @@ class SimpleFanLightAccessory extends BaseAccessory {
         this.useLight = this._coerceBoolean(this.device.context.useLight, true);
         this.useBrightness = this._coerceBoolean(this.device.context.useBrightness, true);
         this.useColorTemp = this._coerceBoolean(this.device.context.useColorTemp, true);
+
+        let minWhiteColor = parseInt(this.device.context.minWhiteColor);
+        let maxWhiteColor = parseInt(this.device.context.maxWhiteColor);
+        if (isNaN(minWhiteColor)) minWhiteColor = DEFAULT_MIN_WHITE_COLOR;
+        if (isNaN(maxWhiteColor)) maxWhiteColor = DEFAULT_MAX_WHITE_COLOR;
+        if (maxWhiteColor <= minWhiteColor) {
+            this.log.warn(`${this.device.context.name}: maxWhiteColor (${maxWhiteColor}) must be greater than minWhiteColor (${minWhiteColor}); falling back to defaults.`);
+            minWhiteColor = DEFAULT_MIN_WHITE_COLOR;
+            maxWhiteColor = DEFAULT_MAX_WHITE_COLOR;
+        }
+        this.minWhiteColor = minWhiteColor;
+        this.maxWhiteColor = maxWhiteColor;
+
         this.maxSpeed = parseInt(this.device.context.maxSpeed) || 6;
         this.fanDefaultSpeed = parseInt(this.device.context.fanDefaultSpeed) || 1;
         this.fanCurrentSpeed = 0;
         this.useStrings = this._coerceBoolean(this.device.context.useStrings, true);
+        this.singleDpWrites = this._coerceBoolean(this.device.context.singleDpWrites, false);
 
         const characteristicFanOn = serviceFan.getCharacteristic(Characteristic.On)
             .updateValue(this._getFanOn(dps[this.dpFanOn]))
@@ -79,7 +104,7 @@ class SimpleFanLightAccessory extends BaseAccessory {
 
             if (this.useColorTemp) {
                 characteristicColorTemp = serviceLightbulb.getCharacteristic(Characteristic.ColorTemperature)
-                    .setProps({ minValue: 140, maxValue: 500 })
+                    .setProps({ minValue: this.minWhiteColor, maxValue: this.maxWhiteColor })
                     .updateValue(this.convertColorTempFromTuyaToHomeKit(dps[this.dpColorTemp]))
                     .onGet(() => this.getColorTemp())
                     .onSet(value => this.setColorTemp(value));
@@ -126,6 +151,17 @@ class SimpleFanLightAccessory extends BaseAccessory {
         return !!dp;
     }
 
+    // Fan on/speed touch two DPs (60 + 62) at once. By default we send them in a
+    // single legacy control packet, which is what most fans expect. Some firmwares
+    // (e.g. certain `fsd` ceiling fans) silently ignore any LAN packet carrying more
+    // than one DP, so when `singleDpWrites` is set we send each DP as its own packet
+    // instead — mirroring how Tuya's own cloud issues these commands.
+    _writeFanState(payload) {
+        return this.singleDpWrites
+            ? this.setMultiStateAsync(payload)
+            : this.setMultiStateLegacyAsync(payload);
+    }
+
     setFanOn(value) {
         if (value === false) {
             this.fanCurrentSpeed = 0;
@@ -136,7 +172,7 @@ class SimpleFanLightAccessory extends BaseAccessory {
                 [this.dpFanOn]: true,
                 [this.dpRotationSpeed]: this.useStrings ? target.toString() : target
             };
-            return this.setMultiStateLegacyAsync(payload);
+            return this._writeFanState(payload);
         }
     }
 
@@ -150,7 +186,7 @@ class SimpleFanLightAccessory extends BaseAccessory {
                 [this.dpFanOn]: false,
                 [this.dpRotationSpeed]: this.useStrings ? this.fanDefaultSpeed.toString() : this.fanDefaultSpeed
             };
-            return this.setMultiStateLegacyAsync(payload);
+            return this._writeFanState(payload);
         } else {
             const tuya = this.convertRotationSpeedFromHomeKitToTuya(value);
             this.fanCurrentSpeed = tuya;
@@ -158,7 +194,7 @@ class SimpleFanLightAccessory extends BaseAccessory {
                 [this.dpFanOn]: true,
                 [this.dpRotationSpeed]: this.useStrings ? tuya.toString() : tuya
             };
-            return this.setMultiStateLegacyAsync(payload);
+            return this._writeFanState(payload);
         }
     }
 
@@ -238,19 +274,25 @@ class SimpleFanLightAccessory extends BaseAccessory {
     }
 
     convertColorTempFromTuyaToHomeKit(value) {
+        const min = this.minWhiteColor ?? DEFAULT_MIN_WHITE_COLOR;
+        const max = this.maxWhiteColor ?? DEFAULT_MAX_WHITE_COLOR;
         let v = parseInt(value);
         if (isNaN(v)) v = 0;
-        v = Math.max(0, Math.min(1000, v));
-        const hk = Math.round(140 + (v * (500 - 140)) / 1000);
-        return Math.max(140, Math.min(500, hk));
+        v = Math.max(0, Math.min(COLOR_TEMP_TUYA_SCALE, v));
+        // Invert: Tuya 0 (warm) -> max mireds (warm); Tuya scale (cool) -> min mireds (cool).
+        const hk = Math.round(max - (v * (max - min)) / COLOR_TEMP_TUYA_SCALE);
+        return Math.max(min, Math.min(max, hk));
     }
 
     convertColorTempFromHomeKitToTuya(value) {
+        const min = this.minWhiteColor ?? DEFAULT_MIN_WHITE_COLOR;
+        const max = this.maxWhiteColor ?? DEFAULT_MAX_WHITE_COLOR;
         let v = parseInt(value);
-        if (isNaN(v)) v = 140;
-        v = Math.max(140, Math.min(500, v));
-        const tuya = Math.round(((v - 140) * 1000) / (500 - 140));
-        return Math.max(0, Math.min(1000, tuya));
+        if (isNaN(v)) v = min;
+        v = Math.max(min, Math.min(max, v));
+        // Invert: max mireds (warm) -> Tuya 0 (warm); min mireds (cool) -> Tuya scale (cool).
+        const tuya = Math.round(((max - v) * COLOR_TEMP_TUYA_SCALE) / (max - min));
+        return Math.max(0, Math.min(COLOR_TEMP_TUYA_SCALE, tuya));
     }
 }