From 5358b29255ed84f957452496b17381e28363ebca Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Sun, 15 Apr 2018 17:59:30 +0100 Subject: [PATCH] fix broken neopixel merge --- hardware/neopixel/neopixel.js | 12 ++---------- hardware/neopixel/package.json | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/hardware/neopixel/neopixel.js b/hardware/neopixel/neopixel.js index bb973b85..c8781367 100755 --- a/hardware/neopixel/neopixel.js +++ b/hardware/neopixel/neopixel.js @@ -54,7 +54,7 @@ module.exports = function(RED) { function inputlistener(msg) { if (msg.hasOwnProperty("brightness")) { - node.child.stdin.write("brightness,"+msg.brightness.toString()+"\n"); + node.child.stdin.write("brightness,"+msg.brightness.toString()+"\n"); } if (msg.hasOwnProperty("payload")) { var pay = msg.payload.toString().toUpperCase(); @@ -113,17 +113,9 @@ module.exports = function(RED) { } } -<<<<<<< Updated upstream - node.child = spawn(piCommand, [node.pixels, node.wipe, node.mode, node.brightness, node.gamma]); - node.status({fill:"green",shape:"dot",text:"ok"}); -||||||| merged common ancestors - node.child = spawn(piCommand, [node.pixels, node.wipe, node.mode]); - node.status({fill:"green",shape:"dot",text:"ok"}); -======= if (allOK === true) { - node.child = spawn(piCommand, [node.pixels, node.wipe, node.mode]); + node.child = spawn(piCommand, [node.pixels, node.wipe, node.mode, node.brightness, node.gamma]); node.status({fill:"green",shape:"dot",text:"ok"}); ->>>>>>> Stashed changes node.on("input", inputlistener); diff --git a/hardware/neopixel/package.json b/hardware/neopixel/package.json index c61d4d92..9077022d 100755 --- a/hardware/neopixel/package.json +++ b/hardware/neopixel/package.json @@ -1,6 +1,6 @@ { "name" : "node-red-node-pi-neopixel", - "version" : "0.0.17", + "version" : "0.0.18", "description" : "A Node-RED node to output to a neopixel (ws2812) string of LEDS from a Raspberry Pi.", "dependencies" : { },