Fix for issue #330 - Add new fan accessory with ability to control dual lights

index.js

@@ -20,6 +20,7 @@ const SimpleBlinds2Accessory = require('./lib/SimpleBlinds2Accessory');
 const SimpleHeaterAccessory = require('./lib/SimpleHeaterAccessory');
 const SimpleFanAccessory = require('./lib/SimpleFanAccessory');
 const SimpleFanLightAccessory = require('./lib/SimpleFanLightAccessory');
+const SimpleFanDualLightAccessory = require('./lib/SimpleFanDualLightAccessory');
 const SwitchAccessory = require('./lib/SwitchAccessory');
 const ValveAccessory = require('./lib/ValveAccessory');
 const OilDiffuserAccessory = require('./lib/OilDiffuserAccessory');
@@ -48,6 +49,7 @@ const CLASS_DEF = {
     switch: SwitchAccessory,
     fan: SimpleFanAccessory,
     fanlight: SimpleFanLightAccessory,
+    fanduallight: SimpleFanDualLightAccessory,
     watervalve: ValveAccessory,
     oildiffuser: OilDiffuserAccessory
 };

lib/SimpleFanDualLightAccessory.js

@@ -0,0 +1,199 @@
+const BaseAccessory = require('./BaseAccessory');
+
+class SimpleFanDualLightAccessory extends BaseAccessory {
+    static getCategory(Categories) {
+        return Categories.FANDUALLIGHT;
+    }
+
+    constructor(...props) {
+        super(...props);
+    }
+
+    _registerPlatformAccessory() {
+        const {Service} = this.hap;
+
+        this.accessory.addService(Service.Fan, this.device.context.name);
+        this.accessory.addService(Service.Lightbulb, this.device.context.name + " Light");
+
+        super._registerPlatformAccessory();
+    }
+
+    /***
+     * For fans with dual light, find the DP values for the light on and associated brightness. 
+     * dpLightOn = dp for first light
+     * dpLightOn2 = dp for second light
+     * dpBrightness = brightness level for first light
+     * dpBrightness2 = brightness level for second light
+     * 
+     * First and second light's on/off status and brightness levels are synced together. 
+     */
+    _registerCharacteristics(dps) {
+        const {Service, Characteristic} = this.hap;
+        const serviceFan = this.accessory.getService(Service.Fan);
+        const serviceLightbulb = this.accessory.getService(Service.Lightbulb);
+        this._checkServiceName(serviceFan, this.device.context.name);
+        this._checkServiceName(serviceLightbulb, this.device.context.name + " Light");
+
+        this.dpActive = this._getCustomDP(this.device.context.dpActive) || '1';
+        this.dpRotationSpeed = this._getCustomDP(this.device.context.RotationSpeed) || '3';
+        this.dpLightOn = this._getCustomDP(this.device.context.dpLightOn) || '9';
+        this.dpLightOn2 = this._getCustomDP(this.device.context.dpLightOn2) || '101';
+        this.dpBrightness = this._getCustomDP(this.device.context.dpBrightness) || '10';    
+        this.dpBrightness2 = this._getCustomDP(this.device.context.dpBrightness2) || '102';
+        this.useLight = this._coerceBoolean(this.device.context.useLight, true);
+        this.useBrightness = this._coerceBoolean(this.device.context.useBrightness, true);
+        this.maxSpeed = parseInt(this.device.context.maxSpeed) || 4;
+
+        const characteristicActive = serviceFan.getCharacteristic(Characteristic.On)
+            .updateValue(this._getActive(dps[this.dpActive]))
+            .on('get', this.getActive.bind(this))
+            .on('set', this.setActive.bind(this));
+
+        const characteristicRotationSpeed = serviceFan.getCharacteristic(Characteristic.RotationSpeed)
+            .setProps({
+                minValue: 0,
+                maxValue: this.maxSpeed,
+                minStep: 1
+            })
+            .updateValue(this._getSpeed(dps[this.dpRotationSpeed]))
+            .on('get', this.getSpeed.bind(this))
+            .on('set', this.setSpeed.bind(this));
+
+        let characterLightOn;
+        let characteristicBrightness;
+        if (this.useLight) {
+            characterLightOn = serviceLightbulb.getCharacteristic(Characteristic.On)
+                .updateValue(this._getLightOn(dps[this.dpLightOn]))
+                .on('get', this.getLightOn.bind(this))
+                .on('set', this.setLightOn.bind(this));
+
+
+            if (this.useBrightness) {
+                characteristicBrightness = serviceLightbulb.getCharacteristic(Characteristic.Brightness)
+                    .setProps({
+                        minValue: 0,
+                        maxValue: 1000,
+                        minStep: 100
+                    })
+                    .updateValue(this.convertBrightnessFromTuyaToHomeKit(dps[this.dpBrightness]))
+                    .on('get', this.getBrightness.bind(this))
+                    .on('set', this.setBrightness.bind(this));
+            }
+        }
+
+        this.device.on('change', (changes, state) => {
+            if (changes.hasOwnProperty(this.dpActive) && characteristicActive.value !== changes[this.dpActive])
+                characteristicActive.updateValue(changes[this.dpActive]);
+
+            if (changes.hasOwnProperty(this.dpRotationSpeed) && characteristicRotationSpeed.value !== changes[this.dpRotationSpeed])
+                characteristicRotationSpeed.updateValue(changes[this.dpRotationSpeed]);
+
+            if (changes.hasOwnProperty(this.dpLightOn) && characterLightOn && characterLightOn.value !== changes[this.dpLightOn])
+                characterLightOn.updateValue(changes[this.dpLightOn]);
+
+            if (changes.hasOwnProperty(this.dpBrightness) && characteristicBrightness && characteristicBrightness.value !== changes[this.dpBrightness])
+                characteristicBrightness.updateValue(changes[this.dpBrightness]);
+
+            console.log('[Tuya] SimpleFanLight changed: ' + JSON.stringify(state));
+        });
+    }
+
+/*************************** FAN ***************************/
+// Fan State
+    getActive(callback) {
+        this.getState(this.dpActive, (err, dp) => {
+            if (err) return callback(err);
+
+            callback(null, this._getActive(dp));
+        });
+    }
+
+    _getActive(dp) {
+        const {Characteristic} = this.hap;
+
+        return dp;
+    }
+
+    setActive(value, callback) {
+        const {Characteristic} = this.hap;
+
+        return this.setState(this.dpActive, value, callback);
+
+        callback();
+    }
+
+// Fan Speed
+    getSpeed(callback) {
+        this.getState(this.dpRotationSpeed, (err, dp) => {
+            if (err) return callback(err);
+
+            callback(null, this._getSpeed(dp));
+        });
+    }
+
+    _getSpeed(dp) {
+        const {Characteristic} = this.hap;
+//		console.log("_getSpeed = " + dp);
+        return dp;
+    }
+
+    setSpeed(value, callback) {
+        const {Characteristic} = this.hap;
+        if (value == 0) {
+        	return this.setState(this.dpActive, false, callback);
+        } else {
+        	return this.setState(this.dpRotationSpeed, value.toString(), callback);
+        }
+
+        callback();
+    }
+
+/*************************** LIGHT ***************************/
+// Lightbulb State
+    getLightOn(callback) {
+        this.getState(this.dpLightOn, (err, dp) => {
+            if (err) return callback(err);
+
+            callback(null, this._getLightOn(dp));
+        });
+    }
+
+    _getLightOn(dp) {
+        const {Characteristic} = this.hap;
+
+        return dp;
+    }
+
+    setLightOn(value, callback) {
+        const {Characteristic} = this.hap;
+
+        return this.setMultiState({[this.dpLightOn]: value, [this.dpLightOn2]: value}, callback);
+
+        callback();
+    }
+
+// Lightbulb Brightness
+    getBrightness(callback) {
+        this.getState(this.dpBrightness, (err, dp) => {
+            if (err) return callback(err);
+
+            callback(null, this._getBrightness(dp));
+        });
+    }
+
+    _getBrightness(dp) {
+        const {Characteristic} = this.hap;
+//		console.log("_getBrightness = " + dp);
+        return dp;
+    }
+
+    setBrightness(value, callback) {
+        const {Characteristic} = this.hap;
+//        console.log("setBrightness - Raw value = " + value);
+        return this.setMultiState({[this.dpBrightness]: value, [this.dpBrightness2]: value}, callback);
+
+        callback();
+    }
+}
+
+module.exports = SimpleFanLightAccessory;