From 83965a91af6494e8d877b383913db144828f760d Mon Sep 17 00:00:00 2001
From: Dave C-J <dave@conway-jones.co.uk>
Date: Thu, 19 Dec 2013 14:38:26 +0000
Subject: [PATCH] Make fade work properly for Blink1, And add some colour name
 support for @cheerlights

---
 hardware/blink/77-blink1.html |  4 ++--
 hardware/blink/77-blink1.js   | 21 +++++++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/hardware/blink/77-blink1.html b/hardware/blink/77-blink1.html
index 25ebf6b9..14efa87a 100644
--- a/hardware/blink/77-blink1.html
+++ b/hardware/blink/77-blink1.html
@@ -23,11 +23,11 @@
         <label for="node-input-name"><i class="icon-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
-    <div class="form-tips">Expects a msg.payload with three part csv string of r,g,b.</div>
 </script>
 
 <script type="text/x-red" data-help-name="blink1">
-    <p>ThingM Blink1 output node. Expects a msg.payload with a three part csv string of r,g,b.</p>
+    <p>ThingM Blink1 output node.</p>
+    <p>Expects a msg.payload with either a three part csv string of r,g,b or a hex colour #rrggbb</p>
 </script>
 
 <script type="text/javascript">
diff --git a/hardware/blink/77-blink1.js b/hardware/blink/77-blink1.js
index f82478f4..e1788802 100644
--- a/hardware/blink/77-blink1.js
+++ b/hardware/blink/77-blink1.js
@@ -19,7 +19,7 @@ var Blink1 = require("node-blink1");
 
 function Blink1Node(n) {
     RED.nodes.createNode(this,n);
-    this.fade = n.fade||0;
+    this.fade = Number(n.fade) || 0;
     var node = this;
 
     try {
@@ -43,7 +43,23 @@ function Blink1Node(n) {
                 }
                 else {
                     // you can add fancy colours by name here if you want...
-                    node.warn("Blink1 : invalid msg : "+msg.payload);
+                    // these are the @cheerlight ones.
+                    var result = msg.payload.toLowerCase().match(/red|green|blue|cyan|white|warmwhite|purple|magenta|yellow|orange|black/g);
+                    var colors = {"red":"#FF0000","green":"#008000","blue":"#0000FF","cyan":"#00FFFF","white":"#FFFFFF",
+                        "warmwhite":"#FDF5E6","purple":"#800080","magenta":"#FF00FF","yellow":"#FFFF00","orange":"#FFA500","black":"#000000"}
+                    if (result != null) {
+                        for (var colour in result) {
+                            var c = colors[result[colour]];
+                            var r = parseInt(c.slice(1,3),16);
+                            var g = parseInt(c.slice(3,5),16);
+                            var b = parseInt(c.slice(5),16);
+                            if (node.fade == 0) { blink1.setRGB( r, g, b ); }
+                            else { blink1.fadeToRGB(node.fade, r, g, b ); }
+                        }
+                    }
+                    else {
+                        node.warn("Blink1 : invalid msg : "+msg.payload);
+                    }
                 }
             }
             else {
@@ -51,6 +67,7 @@ function Blink1Node(n) {
             }
         });
         this.on("close", function() {
+            console.log(typeof blink1.close);
             if (blink1 && typeof blink1.close == "function") {
                 blink1.close();
             }