Update blink1 node to allow multiple blink1s

This commit is contained in:
Dave Conway-Jones
2016-01-02 12:27:57 +00:00
parent 681bdae576
commit 0662354ec3
4 changed files with 85 additions and 46 deletions

View File

@@ -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
// all blink1 nodes affect the same (single) led
var blink1 = null;
var blink1 = {};
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();
if (blink1) {
blink1[node.serial||"one"] = blink1[node.serial||"one"] || new Blink1.Blink1(node.serial);
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 ); }
else { blink1.fadeToRGB(node.fade, r, g, b ); }
if (node.fade === 0) { blink1[node.serial||"one"].setRGB( 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); }
else { blink1.fadeToRGB(node.fade, 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[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",
"yellow":"#FFFF00","amber":"#FFD200","orange":"#FFA500","black":"#000000","pink":"#FF69B4"}
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 ); }
else { blink1.fadeToRGB(node.fade, r, g, b ); }
}
else {
node.warn("Blink1 : invalid msg : "+msg.payload);
"white":"#FFFFFF","warmwhite":"#FDF5E6","oldlace":"#FDF5E6",
"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[node.serial||"one"].setRGB( r, g, b ); }
else { blink1[node.serial||"one"].fadeToRGB(node.fade, r, g, b ); }
}
else { node.warn("Blink1 : invalid colour name : " + 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 {
node.warn("Blink1 : not found");
}
} catch (e) { node.error("Blink1 : device not found"); blink1 = null; }
else { node.warn("Blink1 : not found"); }
}
catch (e) { node.error("Blink1 : device not found"); blink1[node.serial||"one"] = null; }
});
this.on("close", function(done) {
if (blink1 && typeof blink1.close === "function") {
//This ought to work but seems to cause more hangs on closing than not...
blink1.close(function() { done() });
if (blink1[node.serial||"one"] && typeof blink1[node.serial||"one"].close === "function") {
blink1[node.serial||"one"].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());
});
}