frodovdr/node-red-nodes
1
0
Fork 0
mirror of https://github.com/node-red/node-red-nodes.git synced 2023-10-10 13:36:58 +02:00
Code Issues Releases Wiki Activity

fix broken neopixel merge

Browse Source
This commit is contained in:
Dave Conway-Jones 2018-04-15 17:59:30 +01:00
parent acc2dc1a14
commit 5358b29255
No known key found for this signature in database
GPG Key ID: 9E7F9C73F5168CD4
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hardware/neopixel/neopixel.js
View File

@ -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);

2
hardware/neopixel/package.json
View File

@ -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" : {
},