Update blink1 node to allow multiple blink1s

hardware/blink1/77-blink1.html

@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013 IBM Corp.
+  Copyright 2013,2016 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,9 +15,14 @@
 -->
 
 <script type="text/x-red" data-template-name="blink1">
+    <div class="form-row">
+        <label for="node-input-serial"><i class="fa fa-random"></i> Device ID</label>
+        <input type="text" id="node-input-serial" placeholder="defaults to first found" style="width:60%">
+        <a id="node-lookup-serial" class="btn"><i id="node-lookup-serial-icon" class="fa fa-search"></i></a>
+    </div>
     <div class="form-row">
         <label for="node-input-fade"><i class="fa fa-signal"></i> Fade (mS)</label>
-        <input type="text" id="node-input-fade" placeholder="0">
+        <input type="text" id="node-input-fade" placeholder="500">
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
@@ -27,8 +32,11 @@
 
 <script type="text/x-red" data-help-name="blink1">
     <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>
+    <p>Expects a <b>msg.payload</b> with either a three part csv string of 
-    <p>Also accepts <a hred="http://www.cheerlights.com/control-cheerlights" target="_new"></a>cheerlight</a> colour names.</p>
+    <i>r,g,b</i> or a hex colour <i>#rrggbb</i></p>
+    <p>You can also use the <a href="http://www.cheerlights.com/control-cheerlights" target="_new">@cheerlights</a>
+    colour names - red, green, blue, cyan, magenta, yellow, orange, pink,
+    purple, white, oldlace (warmwhite), and also amber and black (off).</p>
 </script>
 
 <script type="text/javascript">
@@ -36,7 +44,8 @@
         category: 'output',
         color:"GoldenRod",
         defaults: {
-            fade: {value:"0",required:true,validate:RED.validators.number()},
+            serial: {value:""},
+            fade: {value:"500",required:true,validate:RED.validators.number()},
             name: {value:""}
         },
         inputs:1,
@@ -48,6 +57,19 @@
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            $("#node-lookup-serial").click(function() {
+                $.getJSON('blink1list',function(data) {
+                      $("#node-input-serial").autocomplete({
+                          source:data,
+                          minLength:0,
+                          close: function( event, ui ) {
+                              $("#node-input-serial").autocomplete( "destroy" );
+                          }
+                      }).autocomplete("search","");
+                  });
+              });
           }
       });
 </script>

hardware/blink1/77-blink1.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 IBM Corp.
+ * Copyright 2013,2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,22 +17,24 @@
 module.exports = function(RED) {
     "use strict";
     var Blink1 = require("node-blink1");
-    // create a single global blink1 object
+    var blink1 = {};
-    // all blink1 nodes affect the same (single) led
-    var blink1 = null;
 
     function Blink1Node(n) {
         RED.nodes.createNode(this,n);
-        this.fade = Number(n.fade) || 0;
+        this.serial = n.serial;
+        if (!this.serial) { delete this.serial; }
+        this.fade = Number(n.fade) || 500;
         var node = this;
 
         try {
             var p1 = /^\#[A-Fa-f0-9]{6}$/
-            var p2 = /[0-9]+,[0-9]+,[0-9]+/
+            var p2 = /^[0-9]+,[0-9]+,[0-9]+$/
+            var p3 = /^[0-9]+,[0-9]+,[0-9]+,[0-2]$/
             this.on("input", function(msg) {
                 try {
-                    blink1 = blink1 || new Blink1.Blink1();
+                    blink1[node.serial||"one"] = blink1[node.serial||"one"] || new Blink1.Blink1(node.serial);
-                    if (blink1) {
+                    node.status({text:node.serial});
+                    if (blink1[node.serial||"one"]) {
                         var r,g,b;
                         try {
                             if (p1.test(msg.payload)) {
@@ -40,47 +42,54 @@ module.exports = function(RED) {
                                 r = parseInt(msg.payload.slice(1,3),16);
                                 g = parseInt(msg.payload.slice(3,5),16);
                                 b = parseInt(msg.payload.slice(5),16);
-                                if (node.fade === 0) { blink1.setRGB( r, g, b ); }
+                                if (node.fade === 0) { blink1[node.serial||"one"].setRGB( r, g, b ); }
-                                else { blink1.fadeToRGB(node.fade, r, g, b ); }
+                                else { blink1[node.serial||"one"].fadeToRGB(node.fade, r, g, b ); }
                             }
                             else if (p2.test(msg.payload)) {
                                 // if it is a r,g,b triple
                                 var rgb = msg.payload.split(',');
-                                if (node.fade === 0) { blink1.setRGB(parseInt(rgb[0])&255, parseInt(rgb[1])&255, parseInt(rgb[2])&255); }
+                                if (node.fade === 0) { blink1[node.serial||"one"].setRGB(parseInt(rgb[0])&255, parseInt(rgb[1])&255, parseInt(rgb[2])&255); }
-                                else { blink1.fadeToRGB(node.fade, parseInt(rgb[0])&255, parseInt(rgb[1])&255, parseInt(rgb[2])&255); }
+                                else { blink1[node.serial||"one"].fadeToRGB(node.fade, parseInt(rgb[0])&255, parseInt(rgb[1])&255, parseInt(rgb[2])&255); }
+                            }
+                            else if (p3.test(msg.payload)) {
+                                // if it is a r,g,b,index quad for a two led device
+                                var rgb = msg.payload.split(',');
+                                blink1[node.serial||"one"].fadeToRGB(node.fade, parseInt(rgb[0])&255, parseInt(rgb[1])&255, parseInt(rgb[2])&255, parseInt(rgb[3])&3);
                             }
                             else {
                                 // you can add fancy colours by name here if you want...
                                 // these are the @cheerlight ones.
                                 var colors = {"red":"#FF0000","green":"#00FF00","blue":"#0000FF","cyan":"#00FFFF",
-                                    "white":"#FFFFFF","warmwhite":"#FDF5E6","oldlace":"#FDF5E6","purple":"#800080","magenta":"#FF00FF",
+                                    "white":"#FFFFFF","warmwhite":"#FDF5E6","oldlace":"#FDF5E6",
-                                    "yellow":"#FFFF00","amber":"#FFD200","orange":"#FFA500","black":"#000000","pink":"#FF69B4"}
+                                    "purple":"#800080","magenta":"#FF00FF","pink":"#FF69B4",
+                                    "yellow":"#FFFF00","amber":"#FFD200","orange":"#FFA500",
+                                    "black":"#000000","off":"#000000"}
+                                if (typeof(msg.payload) === "string") {
                                     if (msg.payload.toLowerCase() in colors) {
                                         var c = colors[msg.payload.toLowerCase()];
                                         r = parseInt(c.slice(1,3),16);
                                         g = parseInt(c.slice(3,5),16);
                                         b = parseInt(c.slice(5),16);
-                                    if (node.fade === 0) { blink1.setRGB( r, g, b ); }
+                                        if (node.fade === 0) { blink1[node.serial||"one"].setRGB( r, g, b ); }
-                                    else { blink1.fadeToRGB(node.fade, r, g, b ); }
+                                        else { blink1[node.serial||"one"].fadeToRGB(node.fade, r, g, b ); }
                                     }
-                                else {
+                                    else { node.warn("Blink1 : invalid colour name : " + msg.payload); }
-                                    node.warn("Blink1 : invalid msg : "+msg.payload);
+                                }
+                                else { node.warn("Blink1 : invalid msg : "+msg.payload); }
                             }
                         }
-                        } catch (e) { node.error("Blink1 : error"); blink1 = null; }
+                        catch (e) { node.error("Blink1 : error"); blink1[node.serial||"one"] = null; }
                     }
-                    else {
+                    else { node.warn("Blink1 : not found"); }
-                        node.warn("Blink1 : not found");
                 }
-                } catch (e) { node.error("Blink1 : device not found"); blink1 = null; }
+                catch (e) { node.error("Blink1 : device not found"); blink1[node.serial||"one"] = null; }
             });
             this.on("close", function(done) {
-                if (blink1 && typeof blink1.close === "function") {
+                if (blink1[node.serial||"one"] && typeof blink1[node.serial||"one"].close === "function") {
-                    //This ought to work but seems to cause more hangs on closing than not...
+                    blink1[node.serial||"one"].close(function() { done() });
-                    blink1.close(function() { done() });
                 }
                 else { done(); }
-                blink1 = null;
+                blink1[node.serial||"one"] = null;
             });
         }
         catch(e) {
@@ -88,4 +97,8 @@ module.exports = function(RED) {
         }
     }
     RED.nodes.registerType("blink1",Blink1Node);
+
+    RED.httpAdmin.get("/blink1list", RED.auth.needsPermission('blink1.read'), function(req,res) {
+        res.json(Blink1.devices());
+    });
 }

hardware/blink1/README.md

@@ -10,9 +10,14 @@ As the blink1 is a USB HID device you may need some extra hardware libraries as
 documented <a href="https://www.npmjs.com/package/node-blink1" target="_new">here</a>
 and <a href="https://github.com/todbot/blink1/blob/master/linux/51-blink1.rules" target="_new">here</a>.
 
-Specifically Ubuntu/Debian/Raspbian user may need to
+Specifically Ubuntu/Debian/Raspbian users may need to
 
-    sudo apt-get install libusb-1.0-0.dev.
+    sudo apt-get install libusb-1.0-0-dev
+
+and also setup these udev rules in `/etc/udev/rules.d/51-blink1.rules`
+
+    SUBSYSTEM=="input", GROUP="input", MODE="0666"
+    SUBSYSTEM=="usb", ATTRS{idVendor}=="27b8", ATTRS{idProduct}=="01ed", MODE:="666", GROUP="plugdev"
 
 Install
 -------
@@ -20,8 +25,7 @@ Install
 Run the following command in the user directory of your Node-RED install.
 This is usually `~/.node-red`
 
-    npm install node-red-node-blink1
+    npm i node-red-node-blink1
-
 
 Usage
 -----
@@ -32,4 +36,4 @@ Sends the <b>msg.payload</b> to a Thingm Blink(1) LED device. The payload can be
  - a hex colour #rrggbb - e.g. green is  #00FF00
  - a <a href="http://www.cheerlights.com/control-cheerlights">@cheerlights</a> colour name - e.g. blue
 
- The @cheerlights colours are - red, amber, green, blue, cyan, magenta, yellow, orange, pink, purple, white, warmwhite, black
+ The colours it accepts are - red, amber, green, blue, cyan, magenta, yellow, orange, pink, purple, white, warmwhite (or oldlace), black, (or off)

hardware/blink1/package.json

@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-blink1",
-    "version"       : "0.0.11",
+    "version"       : "0.0.12",
     "description"   : "A Node-RED node to control a Thingm Blink(1)",
     "dependencies"  : {
         "node-blink1"   : "0.2.2"