diff --git a/nodes/core/core/75-exec.js b/nodes/core/core/75-exec.js index 9f5b7a9b1..dd806df6a 100644 --- a/nodes/core/core/75-exec.js +++ b/nodes/core/core/75-exec.js @@ -34,7 +34,7 @@ function ExecNode(n) { // then prepend with the msg.payload var arg = node.append.split(","); if (msg.payload != " ") { arg.unshift(msg.payload); } - //console.log(arg); + node.log(node.cmd+" "+arg); var ex = spawn(node.cmd,arg); ex.stdout.on('data', function (data) { //console.log('[exec] stdout: ' + data); @@ -55,6 +55,7 @@ function ExecNode(n) { else { var cl = node.cmd+" "+msg.payload+" "+node.append; + node.log(cl); var child = exec(cl, function (error, stdout, stderr) { msg.payload = stdout; var msg2 = {payload:stderr}; diff --git a/nodes/core/logic/16-range.html b/nodes/core/logic/16-range.html new file mode 100644 index 000000000..79e94f688 --- /dev/null +++ b/nodes/core/logic/16-range.html @@ -0,0 +1,78 @@ + + + + + + + diff --git a/nodes/core/logic/16-range.js b/nodes/core/logic/16-range.js new file mode 100644 index 000000000..6c68fccfb --- /dev/null +++ b/nodes/core/logic/16-range.js @@ -0,0 +1,47 @@ +/** + * Copyright 2013 IBM Corp. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + **/ + +var RED = require(process.env.NODE_RED_HOME + "/red/red"); + +function RangeNode(n) { + RED.nodes.createNode(this, n); + this.action = n.action; + this.round = n.round || false; + this.minin = Number(n.minin); + this.maxin = Number(n.maxin); + this.minout = Number(n.minout); + this.maxout = Number(n.maxout); + var node = this; + + this.on('input', function (msg) { + var n = Number(msg.payload); + if (!isNaN(n)) { + if (node.action == "clamp") { + if (n < node.minin) { n = node.minin; } + if (n > node.maxin) { n = node.maxin; } + } + if (node.action == "roll") { + if (n >= node.maxin) { n = (n - node.minin) % (node.maxin - node.minin) + node.minin; } + if (n < node.minin) { n = (n - node.minin) % (node.maxin - node.minin) + node.maxin; } + } + msg.payload = ((n - node.minin) / (node.maxin - node.minin) * (node.maxout - node.minout)) + node.minout; + if (node.round) { msg.payload = Math.round(msg.payload); } + node.send(msg); + } + else { node.log("Not a number: "+msg.payload); } + }); +} +RED.nodes.registerType("range", RangeNode); diff --git a/public/icons/range.png b/public/icons/range.png new file mode 100644 index 000000000..f4a71485d Binary files /dev/null and b/public/icons/range.png differ