From 75787fa3c22bacb3e51d07cb5aceb142dddee7c1 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Sat, 6 Aug 2016 18:42:10 +0100
Subject: [PATCH] Update blinkstick neopixel modes

---
 hardware/blinkstick/76-blinkstick.html | 15 ++++++++++++++-
 hardware/blinkstick/76-blinkstick.js   |  9 ++++++++-
 hardware/blinkstick/README.md          |  2 +-
 hardware/blinkstick/package.json       |  2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/hardware/blinkstick/76-blinkstick.html b/hardware/blinkstick/76-blinkstick.html
index c70c0316..9ea14601 100644
--- a/hardware/blinkstick/76-blinkstick.html
+++ b/hardware/blinkstick/76-blinkstick.html
@@ -22,6 +22,15 @@
             <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-mode">Mode</label>
+            <select id="node-input-mode" style="width:125px !important">
+                <option value="normal">Normal</option>
+                <option value="inverted">Inverted</option>
+                <option value="neopixel">NeoPixel</option>
+            </select>
+        </div>
+
         <div class="form-row">
             <label for="node-input-task"><i class="fa fa-empire"></i> Task</label>
             <select id="node-input-task" style="width:125px !important">
@@ -41,7 +50,6 @@
             <label for="node-input-repeats"><i class="fa fa-history"></i> Repeats</label>
             <input type="text" id="node-input-repeats" placeholder="Times" style="text-align:end; width:50px !important">
         </div>
-
         <div id="duration-details" class="form-row">
             <label for="node-input-duration"><i class="fa fa-clock-o"></i> Duration</label>
             <input type="text" id="node-input-duration" placeholder="Duration" style="text-align:end; width:50px !important">
@@ -120,6 +128,7 @@
         defaults: {             // defines the default editable properties of the node
             name: {value:""},   //  along with default values.
             serial: {value:""},
+            mode: {value:"normal", validate:function(v) {return ((v === undefined)||v=="normal"||v=="inverted"||v=="neopixel"); }},
             task: {value:"set_color", validate:function(v) {return ((v === undefined)||v=="set_color"||v=="blink"||v=="morph"||v=="pulse"); }},
             delay: {value:"500", validate:function(v) {return ((v === undefined)||(/^\d+$/).test(v)); }},
             repeats: {value:"1", validate:function(v) {return ((v === undefined)||(/^\d+$/).test(v)); }},
@@ -138,6 +147,10 @@
             return this.name?"node_label_italic":"";
         },
         oneditprepare: function() {
+          if (!$("#node-input-mode").val()) {
+              $("#node-input-mode").val("normal");
+          }
+
           if (!$("#node-input-task").val()) {
               $("#node-input-task").val("set_color");
           }
diff --git a/hardware/blinkstick/76-blinkstick.js b/hardware/blinkstick/76-blinkstick.js
index 933fb8f7..3acb9804 100644
--- a/hardware/blinkstick/76-blinkstick.js
+++ b/hardware/blinkstick/76-blinkstick.js
@@ -19,6 +19,7 @@ module.exports = function(RED) {
     "use strict";
     var blinkstick = require("blinkstick");
 
+    var availableModes = ["normal", "inverted", "neopixel"];
     var availableTasks = ["set_color", "blink", "pulse", "morph"];
 
     Object.size = function(obj) {
@@ -74,6 +75,7 @@ module.exports = function(RED) {
 
         this.name = n.name;
         this.serial = n.serial;
+	    this.mode = n.mode || "normal";
         this.task = n.task || "set_color";
         this.delay = n.delay || 500;
         this.repeats = n.repeats || 1;
@@ -101,6 +103,9 @@ module.exports = function(RED) {
                         node.error("BlinkStick with serial number " + node.serial + " not found");
                     } else {
                         node.status({fill:"green",shape:"dot",text:"connected"});
+                        if(node.mode == "normal"){node.led.setMode(0);}
+                        else if(node.mode == "inverted"){node.led.setMode(1);}
+                        else if(node.mode == "neopixel"){node.led.setMode(2);}
                         if (callback) { callback(); }
                     }
                 });
@@ -112,6 +117,9 @@ module.exports = function(RED) {
                     node.error("No BlinkStick found");
                 } else {
                     node.status({fill:"green",shape:"dot",text:"connected"});
+                    if(node.mode == "normal"){node.led.setMode(0);}
+                    else if(node.mode == "inverted"){node.led.setMode(1);}
+                    else if(node.mode == "neopixel"){node.led.setMode(2);}
                     if (callback) { callback(); }
                 }
             }
@@ -196,7 +204,6 @@ module.exports = function(RED) {
                     // if it's an array then hopefully it's r,g,b,r,g,b or name,name,name
                     if (Array.isArray(msg.payload)) {
                         if (Object.size(node.led) !== 0) {
-                            node.led.setMode(2); // put it into ws2812B LED mode
                             var dat = [];
                             for (var i = 0; i < msg.payload.length; i++) {
                                 if (typeof msg.payload[i] === "string") { // if string then assume must be colour names
diff --git a/hardware/blinkstick/README.md b/hardware/blinkstick/README.md
index 4eaeecc4..3f38f1d5 100644
--- a/hardware/blinkstick/README.md
+++ b/hardware/blinkstick/README.md
@@ -16,7 +16,7 @@ For more information see <i><a href="http://www.blinkstick.com/help/tutorials" t
 
 You also currently need to create a file `/etc/udev/rules.d/80-blinkstick.rules` containing
 
-    SUBSYSTEMS=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="41e5", TAG+="uaccess"
+    SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="41e5", TAG+="uaccess"
 
 and either reload the udev rules or reboot.
 
diff --git a/hardware/blinkstick/package.json b/hardware/blinkstick/package.json
index a58b764a..276e8bca 100644
--- a/hardware/blinkstick/package.json
+++ b/hardware/blinkstick/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-blinkstick",
-    "version"       : "0.1.12",
+    "version"       : "0.1.13",
     "description"   : "A Node-RED node to control a Blinkstick",
     "dependencies"  : {
         "blinkstick"   : "1.1.3"