Merge pull request #3 from mattmattmatt/set-color-temperature

Set color temperature

Author: Matt

CHANGELOG.md

@@ -10,6 +10,7 @@
 
 [Node-RED](http://nodered.org) nodes to control [MiHome/Xiaomi Yeelights](https://www.yeelight.com/) from your smart home, somewhat [API compatible with node-red-contrib-node-hue nodes](https://github.com/jdomeij/node-red-contrib-node-hue#input-node).
 
+
 ## Install
 
 Run the following command in your Node-RED user directory – typically `~/.node-red`:
@@ -24,6 +25,7 @@ Provides two palette nodes – one to send control commands to a Yeelight, and o
 
 ![](https://github.com/mattmattmatt/node-red-contrib-yeelight-compat-hue/blob/master/tooling/nodes.png?raw=true)
 
+
 ### Output node
 
 Sets the state of the selected Yeelight device.
@@ -34,6 +36,7 @@ Sets the state of the selected Yeelight device.
 | :---| :---|
 | `on`   | Sets the `on` state where the value is `true` or `false`|
 | `bri`   | Sets the brightness value from `0` to `255` |
+| `ct`   | Sets the color temperature value in Kelvin from `1700` to `6500` |
 | `hue` | Sets the hue value from `0` to `65535` |
 | `sat`  | Sets the saturation value from `0` to `255`  |
 | `hex`  | Sets the rgb value from `#00000` to `#FFFFFF`   |
@@ -57,13 +60,18 @@ Sets the state of the selected Yeelight device.
     "hex": "#AA00CC",
 }
 ```
-The node supports sending [hex values](http://htmlcolorcodes.com/) and [HSV values](https://alloyui.com/examples/color-picker/hsv).  
+```JSON
+{
+    "ct": 2200,
+}
+```
+The node supports sending [color temperature values](http://www.erco.com/service/rgbw/), [hex values](http://htmlcolorcodes.com/) and [HSV values](https://alloyui.com/examples/color-picker/hsv).  
 The brightness value will always have to be provided separately and will not be deducted from e.g. a hex value's brightness component.
 
-
 ##### References
 This node's input payload structure is based on [node-red-contrib-node-hue](https://github.com/jdomeij/node-red-contrib-node-hue#input-node), which is based on [Node Hue API](https://github.com/peter-murray/node-hue-api#lightstate-options).
 
+
 ### Input node
 
 Returns the current state of the selected Yeelight device.
@@ -106,6 +114,7 @@ Additionally, a fresh state can be requested from the connected Yeelight by send
 The `raw` property of `msg.payload` contains the raw state information retrieved from the Yeelight for advanced usage.  
 Note that value scales are not compatible with _node-red-contrib-node-hue_, and that `hue` value and `rgb` value will not match since only the correct color per `color_mode` is returned by the lamp.
 
+
 ### Configuration node
 
 Configures a Yeelight connection to one light in the local network.

README.md

@@ -4,7 +4,7 @@
 import Yeelight from 'yeelight2';
 import convert from 'color-convert';
 
-import { sanitizeState, hexToRgbInt, normalize } from './utils';
+import { sanitizeState, hexToRgbInt, normalize, colorTemperatureToRgbInt } from './utils';
 
 export default function YeeLightNodeOut(RED) {
     return function(config) {
@@ -25,7 +25,7 @@ export default function YeeLightNodeOut(RED) {
                 return;
             }
 
-            const { on, hex, bri, hue, sat, duration } = msg.payload;
+            const { on, hex, bri, hue, sat, duration, ct } = msg.payload;
 
             if (on === false) {
                 node.serverConfig.yeelight.set_power(on, null, duration);
@@ -37,7 +37,10 @@ export default function YeeLightNodeOut(RED) {
                 let rgbIntToTurnTo;
                 let briToTurnTo;
 
-                if (typeof hex !== 'undefined') {
+                if (typeof ct !== 'undefined') {
+                    rgbIntToTurnTo = colorTemperatureToRgbInt(ct);
+                    briToTurnTo = normalize(bri || currentState.bri, 255, 100);
+                } else if (typeof hex !== 'undefined') {
                     rgbIntToTurnTo = hexToRgbInt(hex);
                     briToTurnTo = (bri && normalize(bri, 255, 100)) || convert.hex.hsv(hex)[2];
                 } else if (

src/YeeLightNodeOut.js

@@ -2,7 +2,7 @@
 
 import Yeelight from 'yeelight2';
 
-import { rgbIntToHex, colorTemperatureToRGB, sanitizeState } from './utils';
+import { rgbIntToHex, sanitizeState } from './utils';
 
 export default function YeeLightNodeState(RED) {
     return function(config) {

src/YeeLightNodeState.js

@@ -26,7 +26,7 @@ export function rgbIntToHex(number) {
     );
 }
 
-export function colorTemperatureToRGB(kelvin) {
+export function colorTemperatureToRgb(kelvin) {
     var temp = kelvin / 100;
     var red, green, blue;
 
@@ -52,9 +52,9 @@ export function colorTemperatureToRGB(kelvin) {
     }
 
     return {
-        r: clamp(red, 0, 255),
-        g: clamp(green, 0, 255),
-        b: clamp(blue, 0, 255),
+        red: clamp(red, 0, 255),
+        green: clamp(green, 0, 255),
+        blue: clamp(blue, 0, 255),
     };
 }
 
@@ -73,6 +73,11 @@ export function hexToRgbInt(hex) {
     return parseInt('0x' + hex.replace('#', ''), 16);
 }
 
+export function colorTemperatureToRgbInt(ct) {
+    const { red, green, blue } = colorTemperatureToRgb(ct);
+    return hexToRgbInt('#' + convert.rgb.hex(red, green, blue));
+}
+
 export function normalize(value, currentMax = 100, newMax = 255) {
     return Math.round(parseInt(value, 10) / currentMax * newMax);
 }
@@ -102,7 +107,7 @@ export function sanitizeState(state) {
             sat: normalize(convert.hex.hsv(hex)[1]),
         };
     } else if (state.color_mode === '2') {
-        const { r: red, g: green, b: blue } = colorTemperatureToRGB(state.ct);
+        const { red, green, blue } = colorTemperatureToRgb(state.ct);
         result.state = {
             ...result.state,
             ct: parseInt(state.ct, 10),

src/utils.js

@@ -63,7 +63,11 @@ <h4>Example inputs</h4>
     <pre><code>{
     "on": true,
     "bri": 120,
-    "hex": "#AA00CC",
+    "hex": "#AA00CC"
+}</code></pre>
+    <pre><code>{
+"on": true,
+"ct": 2200
 }</code></pre>
      </p>