homebridge-tuya-plus 3.1.2 → 3.2.0

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,7 +3,7 @@ name: Bug report
 about: Create a report to help us improve
 title: ''
 labels: bug
-assignees: iRayanKhan
+assignees: adrianjagielak
 
 ---
 

package/Readme.MD

@@ -8,7 +8,6 @@
 # homebridge-tuya-plus
 
 [![npm](https://img.shields.io/npm/v/homebridge-tuya-plus.svg)](https://www.npmjs.com/package/homebridge-tuya-plus)
-[![npm](https://img.shields.io/npm/dt/homebridge-tuya-plus.svg)](https://www.npmjs.com/package/homebridge-tuya-plus)
 
 
 </span>
@@ -29,22 +28,22 @@ A community-maintained Homebridge plugin for controlling Tuya devices locally ov
 ## Supported Device Types
 > Click the number next to your device to find the possible DataPoint "DP" values, then add as needed to your config.
 
-* Air Conditioner<sup>[1](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types#air-conditioners)</sup> 
+* Air Conditioner<sup>[1](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#air-conditioners)</sup> 
 * Air Purifiers<sup>[2]()</sup>
-* Convectors<sup>[3](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types#heat-convectors)</sup>
-* Dehumidifers<sup>[4](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types)</sup>
-* Dimmers<sup>[5](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types#simple-dimmers)</sup>
-* Fan<sup>[6](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types)</sup>
-* Fan v2<sup>[7](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types)</sup>
-* Garages<sup>[8](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types#garage-doors)</sup>
-* Heaters<sup>[9](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types)</sup>
+* Convectors<sup>[3](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#heat-convectors)</sup>
+* Dehumidifers<sup>[4](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md)</sup>
+* Dimmers<sup>[5](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#simple-dimmers)</sup>
+* Fan<sup>[6](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md)</sup>
+* Fan v2<sup>[7](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md)</sup>
+* Garages<sup>[8](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#garage-doors)</sup>
+* Heaters<sup>[9](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md)</sup>
 * Lights
-  * On/Off<sup>[10](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types)</sup>
-  * Brightness<sup>[11](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types#tunable-white-light-bulbs)</sup>
-  * Color<sup>[12](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types#white-and-color-light-bulbs)</sup> (Hue, Saturation, Adaptive Lighting)
-* Oil Diffusers<sup>[13](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types)</sup>
-* Outlets<sup>[14](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types#outlets)</sup>
-* Switches<sup>[15](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types)</sup>
+  * On/Off<sup>[10](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md)</sup>
+  * Brightness<sup>[11](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#tunable-white-light-bulbs)</sup>
+  * Color<sup>[12](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#white-and-color-light-bulbs)</sup> (Hue, Saturation, Adaptive Lighting)
+* Oil Diffusers<sup>[13](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md)</sup>
+* Outlets<sup>[14](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#outlets)</sup>
+* Switches<sup>[15](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md)</sup>
 
 Note: Motion, and other sensor types don't behave well with responce requests, so they will not be added. 
 

package/bin/cli-find.js

@@ -200,7 +200,7 @@ proxy.listen({port: program.port, sslCaDir: ROOT}, err => {
 
     QRCode.toString(`http://${address}:${port}/cert`, {type: 'terminal'}, function(err, url) {
         console.log(url);
-        console.log('\nFollow the instructions on https://github.com/AMoo-Miki/homebridge-tuya-lan/wiki/Setup-Instructions');
+        console.log('\nFollow the instructions on https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Get-Local-Keys-for-Your-Devices.md');
         console.log(`Proxy IP: ${address}`);
         console.log(`Proxy Port: ${port}\n\n`);
     })

package/config-example.MD

@@ -6,7 +6,7 @@
 
 
 ## Configurations
-The configuration parameters to enable your devices would need to be added to `platforms` section of the Homebridge configuration file. Examples of device configs can be found on the [Supported Device Types](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types) page. Check out the [Common Problems](https://github.com/iRayanKhan/homebridge-tuya/wiki/Common-Problems) page for solutions or raise an issue if you face problems.
+The configuration parameters to enable your devices would need to be added to `platforms` section of the Homebridge configuration file. Examples of device configs can be found on the [Supported Device Types](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md) page. Check out the [Common Problems](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Common-Problems.md) page for solutions or raise an issue if you face problems.
 ```json5
 {
     ...
@@ -15,6 +15,7 @@ The configuration parameters to enable your devices would need to be added to `p
         /* The block you need to enable this plugin */
         {
             "platform": "TuyaLan",
+            "discoverTimeout": 60000,
             "devices": [
                 /* The block you need for each device */
                 {
@@ -33,11 +34,14 @@ The configuration parameters to enable your devices would need to be added to `p
     ...
 }
 ```
-#### Parameters
+#### Device parameters
 * `name` (required) is anything you'd like to use to identify this device. You can always change the name from within the Home app.
-* `type` (required) is a case-insensitive identifier that lets the plugin know how to handle your device. Find your device `type` on the [Supported Device Type List](https://github.com/iRayanKhan/homebridge-tuya/wiki/Supported-Device-Types) page.
+* `type` (required) is a case-insensitive identifier that lets the plugin know how to handle your device. Find your device `type` on the [Supported Device Type List](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md) page.
 * `manufacturer` and `model` are anything you like; the purpose of them is to help you identify the device.
 * `id` (required) and `key` (required) are parameters for your device. If you don't have them, follow the steps found on the [Setup Instructions](https://github.com/iRayanKgan/homebridge-tuya/wiki/Setup-Instructions) page.
-* `ip` needs to be added **_only_** if you face discovery issues. See [Common Problems](https://github.com/iRayanKhan/homebridge-tuya/wiki/Common-Problems) for more details.   
+* `ip` needs to be added **_only_** if you face discovery issues. See [Common Problems](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Common-Problems.md) for more details.   
 
 > To find out which `id` belongs to which device, open the Tuya Smart app and check the `Device Information` by tapping the configuration icon of your devices; it is almost always a tiny icon on the top-right.
+
+#### Other parameters
+* `discoverTimeout` (optional) is the time period (millisecond) the plugin should spend for device auto-discovery. If unspecified, the default value is 60000.

package/config.schema.json

@@ -2,11 +2,19 @@
     "pluginAlias": "TuyaLan",
     "pluginType": "platform",
     "singular": true,
-    "headerDisplay": "<p align='center'><img height='60px' src='https://user-images.githubusercontent.com/3979615/78354049-dc7ff780-75f6-11ea-8026-2f8bf81d8331.png'></p>\n\nBefore using the Tuya plugin you need to discover your devices by following [these instructions](https://github.com/AMoo-Miki/homebridge-tuya-lan/wiki/Setup-Instructions).\n\n",
+    "headerDisplay": "<p align='center'><img height='60px' src='https://user-images.githubusercontent.com/3979615/78354049-dc7ff780-75f6-11ea-8026-2f8bf81d8331.png'></p>\n\nBefore using the Tuya plugin you need to discover your devices by following [these instructions](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Get-Local-Keys-for-Your-Devices.md).\n\n",
     "footerDisplay": "",
     "schema": {
       "type": "object",
       "properties": {
+        "discoverTimeout": {
+          "title": "Device IP auto-discovery timeout",
+          "type": "integer",
+          "minimum": 0,
+          "placeholder": "Timeout (millisecond) for device IP address discovery",
+          "default": 60000,
+          "required": false
+        },
         "devices": {
           "type": "array",
           "orderable": false,
@@ -133,7 +141,7 @@
               "id": {
                 "type": "string",
                 "title": "Tuya ID",
-                "description": "If you don't have the Tuya ID or Key, follow the steps found on the <a href='https://github.com/AMoo-Miki/homebridge-tuya-lan/wiki/Setup-Instructions' target='_blank'>Setup Instructions</a> page.",
+                "description": "If you don't have the Tuya ID or Key, follow the steps found on the <a href='https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Get-Local-Keys-for-Your-Devices.md' target='_blank'>Setup Instructions</a> page.",
                 "required": true,
                 "condition": {
                   "functionBody": "return model.devices && model.devices[arrayIndices].type !== 'null';"
@@ -475,9 +483,9 @@
                   "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleHeater'].includes(model.devices[arrayIndices].type);"
                 }
               },
-              "targetTemperatureDivisor": {
+              "temperatureOffset": {
                 "type": "integer",
-                "placeholder": "1",
+                "placeholder": "0",
                 "condition": {
                   "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleHeater'].includes(model.devices[arrayIndices].type);"
                 }

package/index.js

@@ -26,6 +26,7 @@ const DoorbellAccessory = require('./lib/DoorbellAccessory');
 
 const PLUGIN_NAME = 'homebridge-tuya';
 const PLATFORM_NAME = 'TuyaLan';
+const DEFAULT_DISCOVER_TIMEOUT = 60000;
 
 const CLASS_DEF = {
     outlet: OutletAccessory,
@@ -154,7 +155,7 @@ class TuyaLan {
                     this.log.warn('Failed to discover %s (%s) in time but will keep looking.', devices[deviceId].name, deviceId);
                 }
             });
-        }, 60000);
+        }, this.config.discoverTimeout ?? DEFAULT_DISCOVER_TIMEOUT);
     }
 
     registerPlatformAccessories(platformAccessories) {

package/lib/AirConditionerAccessory.js

@@ -55,7 +55,7 @@ class AirConditionerAccessory extends BaseAccessory {
         const {Service, Characteristic} = this.hap;
         const service = this.accessory.getService(Service.HeaterCooler);
         this._checkServiceName(service, this.device.context.name);
-        
+
         this.dpActive = this._getCustomDP(this.device.context.dpActive) || '1';
         this.dpThreshold = this._getCustomDP(this.device.context.dpThreshold) || '2';
         this.dpCurrentTemperature = this._getCustomDP(this.device.context.dpCurrentTemperature) || '3';
@@ -64,7 +64,7 @@ class AirConditionerAccessory extends BaseAccessory {
         this.dpChildLock = this._getCustomDP(this.device.context.dpChildLock) || '6';
         this.dpTempUnits = this._getCustomDP(this.device.context.dpTempUnits) || '19';
         this.dpSwingMode = this._getCustomDP(this.device.context.dpSwingMode) || '104';
-        
+
         const characteristicActive = service.getCharacteristic(Characteristic.Active)
             .updateValue(this._getActive(this.dpActive))
             .on('get', this.getActive.bind(this))
@@ -89,8 +89,8 @@ class AirConditionerAccessory extends BaseAccessory {
             .on('set', this.setTargetHeaterCoolerState.bind(this));
 
         const characteristicCurrentTemperature = service.getCharacteristic(Characteristic.CurrentTemperature)
-            .updateValue(dps[this.dpSwingMode])
-            .on('get', this.getState.bind(this, this.dpSwingMode));
+            .updateValue(dps[this.dpCurrentTemperature])
+            .on('get', this.getState.bind(this, this.dpCurrentTemperature));
 
         let characteristicSwingMode;
         if (!this.device.context.noSwing) {

package/lib/BaseAccessory.js

@@ -154,18 +154,16 @@ class BaseAccessory {
         const min = this.device.context.minWhiteColor || 140;
         const max = this.device.context.maxWhiteColor || 400;
         const scale = this.device.context.scaleWhiteColor || 255;
-        const adjustedValue = (value - 71) * (max - min) / (600 - 71) + 153;
-        const convertedValue = Math.round((scale * min / (max - min)) * ((max / adjustedValue) - 1));
-        return Math.min(scale, Math.max(0, convertedValue));
+        const result = Math.round(Math.max(Math.min(scale-(scale-1)/(max-min)*(value-min),scale),1));
+        return result;
     }
 
     convertColorTemperatureFromTuyaToHomeKit(value) {
         const min = this.device.context.minWhiteColor || 140;
         const max = this.device.context.maxWhiteColor || 400;
         const scale = this.device.context.scaleWhiteColor || 255;
-        const unadjustedValue = max / ((value * (max - min) / (scale * min)) + 1);
-        const convertedValue = Math.round((unadjustedValue - 153) * (600 - 71) / (max - min) + 71);
-        return Math.min(600, Math.max(71, convertedValue));
+        const result = Math.round(Math.max(Math.min((scale-value)/((scale-1)/(max-min))+min,max),min));
+        return Math.min(600, Math.max(71, result));
     }
 
     convertColorFromHomeKitToTuya(value, dpValue) {

package/lib/RGBTWLightAccessory.js

@@ -58,10 +58,10 @@ class RGBTWLightAccessory extends BaseAccessory {
 
         const characteristicColorTemperature = service.getCharacteristic(Characteristic.ColorTemperature)
             .setProps({
-                minValue: 0,
-                maxValue: 600
+                minValue: this.device.context.minWhiteColor,
+                maxValue: this.device.context.maxWhiteColor
             })
-            .updateValue(dps[this.dpMode] === this.cmdWhite ? this.convertColorTemperatureFromTuyaToHomeKit(dps[this.dpColorTemperature]) : 0)
+            .updateValue(dps[this.dpMode] === this.cmdWhite ? this.convertColorTemperatureFromTuyaToHomeKit(dps[this.dpColorTemperature]) : this.device.context.minWhiteColor)
             .on('get', this.getColorTemperature.bind(this))
             .on('set', this.setColorTemperature.bind(this));
 
@@ -126,12 +126,12 @@ class RGBTWLightAccessory extends BaseAccessory {
                         if (oldColor.b !== newColor.b) characteristicBrightness.updateValue(newColor.b);
                         if (oldColor.h !== newColor.h) characteristicHue.updateValue(newColor.h);
 
-                        if (oldColor.s !== newColor.s) characteristicSaturation.updateValue(newColor.h);
+                        if (oldColor.s !== newColor.s) characteristicSaturation.updateValue(newColor.s);
 
-                        if (characteristicColorTemperature.value !== 0) characteristicColorTemperature.updateValue(0);
+                        if (characteristicColorTemperature.value !== this.device.context.minWhiteColor) characteristicColorTemperature.updateValue(this.device.context.minWhiteColor);
 
                     } else if (changes[this.dpMode]) {
-                        if (characteristicColorTemperature.value !== 0) characteristicColorTemperature.updateValue(0);
+                        if (characteristicColorTemperature.value !== this.device.context.minWhiteColor) characteristicColorTemperature.updateValue(this.device.context.minWhiteColor);
                     }
             }
         });
@@ -148,7 +148,7 @@ class RGBTWLightAccessory extends BaseAccessory {
     }
 
     getColorTemperature(callback) {
-        if (this.device.state[this.dpMode] !== this.cmdWhite) return callback(null, 0);
+        if (this.device.state[this.dpMode] !== this.cmdWhite) return callback(null, this.device.context.minWhiteColor);
         callback(null, this.convertColorTemperatureFromTuyaToHomeKit(this.device.state[this.dpColorTemperature]));
     }
 
@@ -160,12 +160,20 @@ class RGBTWLightAccessory extends BaseAccessory {
         this.characteristicHue.updateValue(newColor.h);
         this.characteristicSaturation.updateValue(newColor.s);
 
-        this.setMultiState({[this.dpMode]: this.cmdWhite, [this.dpColorTemperature]: this.convertColorTemperatureFromHomeKitToTuya(value)}, callback);
+        if (this.device.state[this.dpMode] !== this.cmdWhite) {
+            this.setMultiState({[this.dpMode]: this.cmdWhite, [this.dpColorTemperature]: this.convertColorTemperatureFromHomeKitToTuya(value), [this.dpBrightness]: this.convertBrightnessFromHomeKitToTuya(this.convertColorFromTuyaToHomeKit(this.device.state[this.dpColor]).b)}, callback);
+        } else {
+            this.setMultiState({[this.dpMode]: this.cmdWhite, [this.dpColorTemperature]: this.convertColorTemperatureFromHomeKitToTuya(value)}, callback);
+        }
     }
 
     getHue(callback) {
-        if (this.device.state[this.dpMode] === this.cmdWhite) return callback(null, 0);
-        callback(null, this.convertColorFromTuyaToHomeKit(this.device.state[this.dpColor]).h);
+        if (this.device.state[this.dpMode] === this.cmdWhite) {
+            const prepareHue = this.convertHomeKitColorTemperatureToHomeKitColor(this.convertColorTemperatureFromTuyaToHomeKit(this.device.state[this.dpColorTemperature]));
+            callback(null, prepareHue.h);
+        } else {
+            callback(null, this.convertColorFromTuyaToHomeKit(this.device.state[this.dpColor]).h);
+        }
     }
 
     setHue(value, callback) {
@@ -173,8 +181,12 @@ class RGBTWLightAccessory extends BaseAccessory {
     }
 
     getSaturation(callback) {
-        if (this.device.state[this.dpMode] === this.cmdWhite) return callback(null, 0);
-        callback(null, this.convertColorFromTuyaToHomeKit(this.device.state[this.dpColor]).s);
+        if (this.device.state[this.dpMode] === this.cmdWhite) {
+            const prepareSaturation = this.convertHomeKitColorTemperatureToHomeKitColor(this.convertColorTemperatureFromTuyaToHomeKit(this.device.state[this.dpColorTemperature]));
+            callback(null, prepareSaturation.s);
+        } else {
+            callback(null, this.convertColorFromTuyaToHomeKit(this.device.state[this.dpColor]).s);
+        }
     }
 
     setSaturation(value, callback) {
@@ -208,10 +220,13 @@ class RGBTWLightAccessory extends BaseAccessory {
                 } catch (ex) {}
                 next();
             }, () => {
-                this.characteristicColorTemperature.updateValue(0);
+                this.characteristicColorTemperature.updateValue(this.device.context.minWhiteColor);
             });
         };
 
+        if (this.device.state[this.dpMode] !== this.cmdColor)
+            this._pendingHueSaturation.props.b = this.convertBrightnessFromTuyaToHomeKit(this.device.state[this.dpBrightness]);
+
         const isSham = this._pendingHueSaturation.props.h === 0 && this._pendingHueSaturation.props.s === 0;
         const newValue = this.convertColorFromHomeKitToTuya(this._pendingHueSaturation.props);
         this._pendingHueSaturation = null;

package/lib/SimpleHeaterAccessory.js

@@ -7,6 +7,7 @@ class SimpleHeaterAccessory extends BaseAccessory {
 
     constructor(...props) {
         super(...props);
+        this.currentHeaterCoolerState = 0;
     }
 
     _registerPlatformAccessory() {
@@ -27,14 +28,14 @@ class SimpleHeaterAccessory extends BaseAccessory {
         this.dpCurrentTemperature = this._getCustomDP(this.device.context.dpCurrentTemperature) || '3';
         this.temperatureDivisor = parseInt(this.device.context.temperatureDivisor) || 1;
         this.thresholdTemperatureDivisor = parseInt(this.device.context.thresholdTemperatureDivisor) || 1;
-        this.targetTemperatureDivisor = parseInt(this.device.context.targetTemperatureDivisor) || 1;
+        this.temperatureOffset = parseInt(this.device.context.temperatureOffset) || 0;
 
         const characteristicActive = service.getCharacteristic(Characteristic.Active)
             .updateValue(this._getActive(dps[this.dpActive]))
             .on('get', this.getActive.bind(this))
             .on('set', this.setActive.bind(this));
 
-        service.getCharacteristic(Characteristic.CurrentHeaterCoolerState)
+        const characteristicCurrentHeaterCoolerState = service.getCharacteristic(Characteristic.CurrentHeaterCoolerState)
             .updateValue(this._getCurrentHeaterCoolerState(dps))
             .on('get', this.getCurrentHeaterCoolerState.bind(this));
 
@@ -75,11 +76,12 @@ class SimpleHeaterAccessory extends BaseAccessory {
 
             if (changes.hasOwnProperty(this.dpDesiredTemperature)) {
                 if (characteristicHeatingThresholdTemperature.value !== changes[this.dpDesiredTemperature])
-                    characteristicHeatingThresholdTemperature.updateValue(changes[this.dpDesiredTemperature * this.targetTemperatureDivisor]);
+                    characteristicHeatingThresholdTemperature.updateValue(this._getDividedState(changes[this.dpDesiredTemperature], this.thresholdTemperatureDivisor));
             }
 
             if (changes.hasOwnProperty(this.dpCurrentTemperature) && characteristicCurrentTemperature.value !== changes[this.dpCurrentTemperature]) characteristicCurrentTemperature.updateValue(this._getDividedState(changes[this.dpCurrentTemperature], this.temperatureDivisor));
 
+            characteristicCurrentHeaterCoolerState.updateValue(this._getCurrentHeaterCoolerState(state));
             this.log.info('SimpleHeater changed: ' + JSON.stringify(state));
         });
     }
@@ -113,16 +115,22 @@ class SimpleHeaterAccessory extends BaseAccessory {
     }
 
     getCurrentHeaterCoolerState(callback) {
-        this.getState([this.dpActive], (err, dps) => {
-            if (err) return callback(err);
-
-            callback(null, this._getCurrentHeaterCoolerState(dps));
-        });
+        callback(null, this.currentHeaterCoolerState);
     }
 
     _getCurrentHeaterCoolerState(dps) {
         const {Characteristic} = this.hap;
-        return dps[this.dpActive] ? Characteristic.CurrentHeaterCoolerState.HEATING : Characteristic.CurrentHeaterCoolerState.INACTIVE;
+        if (dps[this.dpActive]) {
+            if (dps[this.dpCurrentTemperature] <  dps[this.dpDesiredTemperature]) {
+                this.currentHeaterCoolerState = Characteristic.CurrentHeaterCoolerState.HEATING;
+            }
+            if (dps[this.dpCurrentTemperature] >  dps[this.dpDesiredTemperature]) {
+                this.currentHeaterCoolerState = Characteristic.CurrentHeaterCoolerState.IDLE;
+            }
+         } else {
+             this.currentHeaterCoolerState = Characteristic.CurrentHeaterCoolerState.INACTIVE;
+         };
+        return this.currentHeaterCoolerState;
     }
 
     getTargetHeaterCoolerState(callback) {
@@ -139,7 +147,7 @@ class SimpleHeaterAccessory extends BaseAccessory {
     }
 
     setTargetThresholdTemperature(value, callback) {
-        this.setState(this.dpDesiredTemperature, value * this.thresholdTemperatureDivisor, err => {
+        this.setState(this.dpDesiredTemperature, (value - this.temperatureOffset) * this.thresholdTemperatureDivisor, err => {
             if (err) return callback(err);
 
             if (this.characteristicHeatingThresholdTemperature) {
@@ -149,6 +157,10 @@ class SimpleHeaterAccessory extends BaseAccessory {
             callback();
         });
     }
+
+    _getDividedState(dp, divisor) {
+        return ((parseFloat(dp) / divisor) + this.temperatureOffset) || 0;
+    }
 }
 
 module.exports = SimpleHeaterAccessory;

package/lib/TWLightAccessory.js

@@ -1,6 +1,9 @@
 const BaseAccessory = require('./BaseAccessory');
 const async = require('async');
 
+const DEFAULT_MIN_WHITE_COLOR = 0;
+const DEFAULT_MAX_WHITE_COLOR = 600;
+
 class TWLightAccessory extends BaseAccessory {
     static getCategory(Categories) {
         return Categories.LIGHTBULB;
@@ -39,8 +42,8 @@ class TWLightAccessory extends BaseAccessory {
 
         const characteristicColorTemperature = service.getCharacteristic(Characteristic.ColorTemperature)
             .setProps({
-                minValue: 0,
-                maxValue: 600
+                minValue: this.device.context.minWhiteColor ?? DEFAULT_MIN_WHITE_COLOR,
+                maxValue: this.device.context.maxWhiteColor ?? DEFAULT_MAX_WHITE_COLOR
             })
             .updateValue(this.convertColorTemperatureFromTuyaToHomeKit(dps[this.dpColorTemperature]))
             .on('get', this.getColorTemperature.bind(this))
@@ -88,4 +91,4 @@ class TWLightAccessory extends BaseAccessory {
     }
 }
 
-module.exports = TWLightAccessory;
+module.exports = TWLightAccessory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-tuya-plus",
-  "version": "3.1.2",
+  "version": "3.2.0",
   "description": "A community-maintained Homebridge plugin for controlling Tuya devices locally over LAN. Includes new features, fixes, and updated device support.",
   "main": "index.js",
   "scripts": {

package/wiki/Common-Problems.md

@@ -0,0 +1,20 @@
+# Common Problems
+> Find answers to previously answered questions, if this guide doesn't help you, please file a new issue.
+
+
+## Error getting keys with HOOBS/Config-Ui-X
+
+HOOBS and Config-Ui-X both utilise port 8080. If you are not using port 8080, your network may have a device hosting something on that port. To fix this issue, change the discovery port. [First appeared](https://github.com/iRayanKhan/homebridge-tuya-platform/issues/4).
+
+## Device only partially works.
+
+Your device may have different data points/commands than the plugin is defaulted to handle. To fix this issue, you currently have to manually edit the device type file for your specific device. Version 2.0 (Not in Beta yet), will allow you to fix this issue via the config.json file. [First appeared](https://github.com/iRayanKhan/homebridge-tuya-platform/issues/11)
+
+## Can't get device keys.
+
+Tuya has updated their SDK to prevent the MITM method used to extract deviceID and keys. A guide is being compiled to fix this issue. Alternatively a website is being updated to add support for the old Tuya apps, to keep this method going. [First appeared](https://github.com/iRayanKhan/homebridge-tuya-platform/issues/13)
+
+## How to install the beta?
+
+Currently there is no beta release that you can use via NPM. You can visit the RC branch, and git clone it from there. If you do not know how to Git Clone, a guide is being compiled. A new beta will be published soon, and this page will be constantly updated to reflect a new beta update, with instructions. [First appeared](No-ref-yet.com/)
+

package/wiki/Device-Mapping.md

@@ -0,0 +1,3 @@
+## Device Mapping
+
+Your device may have different command to interact with this. This (W.I.P) guide will provide a detailed example for each device of all optional parameters per device, and an example of an implementation. To get your devices details, please refer to the schema of your device. 

package/wiki/Get-Local-Keys-for-Your-Devices.md

@@ -0,0 +1,77 @@
+To get the local keys for your devices, you'll need an account on Tuya's IoT site. Don't be overwhelmed, there's a lot on that site but it's pretty easy to get what you need out of it. The free trial will give you enough access to the Tuya API to get the information you need, on up to 50 devices.
+
+## 1 - Tuya Smart App
+As a prerequisite, add all of your devices to the Tuya Smart app ([iOS](https://apps.apple.com/au/app/tuya-smart/id1034649547) / [Android](https://play.google.com/store/apps/details?id=com.tuya.smart&hl=en_AU&gl=US&pli=1))
+
+## 2 - Sign up for an IoT account
+Go to https://iot.tuya.com and click Sign Up
+
+![signup](https://user-images.githubusercontent.com/82495132/120384295-d2c95100-c2da-11eb-930d-75eaad628f4f.png)
+
+* Fill in your information
+* Make up a company name if you need to
+
+![signup-info](https://user-images.githubusercontent.com/82495132/120384453-099f6700-c2db-11eb-8cbc-20f3bc5bb17f.png)
+
+* Check Agree to Terms
+* Click Agree
+* You'll be emailed a code, enter it
+
+## 3 - Sign in at iot.tuya.com
+
+## 4 - Create a cloud project
+* Click through the intro
+* On the sidebar click cloud, then projects
+* Click Free Trial under TRIAL EDITION
+
+![freetrial](https://user-images.githubusercontent.com/82495132/120384723-60a53c00-c2db-11eb-8f79-f2a2f38dbc8a.png)
+
+* Click Buy now in the new tab
+
+![buynow](https://user-images.githubusercontent.com/82495132/120384754-69960d80-c2db-11eb-802c-7067dff3274a.png)
+
+* Close the Tuya Value Added Service tab/popup
+* In the Tuya IoT Platform tab, click Subscribed to be taken back to Cloud -> Projects
+* Click create
+
+![create](https://user-images.githubusercontent.com/82495132/120384789-7a468380-c2db-11eb-9770-8bdd41d65a3a.png)
+
+* Make sure you pick smart home PAAS and the correct region, this affects whether you will be able to access your devices in the following steps. Click create
+
+![createproject](https://user-images.githubusercontent.com/82495132/120386067-04431c00-c2dd-11eb-93ff-27371397e1e2.png)
+
+* Click Authorize for the recommended APIs
+
+![authorize](https://user-images.githubusercontent.com/82495132/120384846-87637280-c2db-11eb-8a3c-b2fd256f68d5.png)
+
+## 5 - Link devices registered in Tuya app to the IoT site
+* From your project, click the link devices tab, then Link devices by App Account, then Add App Account
+
+![addappaccount](https://user-images.githubusercontent.com/82495132/120385095-d7dad000-c2db-11eb-9e4c-595af4502154.png)
+
+* In the Tuya Smart app, click me at the bottom, then the scan button, then scan your QR code
+
+![scan2](https://user-images.githubusercontent.com/82495132/120385375-2f793b80-c2dc-11eb-9343-c579fc288962.png)
+
+* Confirm the sign in
+
+## 6 - Get the keys for your devices
+* Go to the device list tab
+* Copy the device ID for your device
+
+![devices](https://user-images.githubusercontent.com/484912/204113199-a7ffd1c6-7f22-4295-a3a1-948ba15643b2.png)
+
+* In the sidebar, hover over "Cloud" and click on "API Explorer"
+
+![apiexplorer](https://user-images.githubusercontent.com/484912/204113419-3d106164-eff8-4ff3-a4f5-c7f2a025de96.png)
+
+* In the sidebar, search for "get device information" endpoint and click on the highlighted option. (It should be under "General Devices management" section. Note: there is also another endpoint called "Get _the_ device information" which will not work.)
+
+* In the "device_id" text field, paste in the device ID you copied and click "Submit Request"
+
+* In the "Response" section, there should be a property called `local_key` which is your local key.
+
+![localkey](https://user-images.githubusercontent.com/484912/204113337-81ebe3c3-5f3a-4854-a069-aa929bfb145d.png)
+
+## 7 - Video Tutorial
+* [YouTube](https://youtu.be/FpY-xsY-pZ8)

package/wiki/Setup.md

@@ -0,0 +1,6 @@
+To get your device's ID/Key, please watch [this](https://www.youtube.com/watch?v=oq0JL_wicKg
+) video. 
+
+
+
+Once you are done, add your devices info into your config. The other Wiki pages may help.