frodovdr/node-red-nodes
1
0
Fork 0
mirror of https://github.com/node-red/node-red-nodes.git synced 2025-03-01 10:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

update "core" extra nodes to use newer Buffer syntax

Browse Source
This commit is contained in:
Dave Conway-Jones
2017-06-24 13:53:22 +01:00
parent a64d758e18
commit 6c3c16f210
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
io/serialport/25-serial.js
View File

@@ -52,7 +52,7 @@ module.exports = function(RED) {
payload += node.addCh;
}
else if (node.addCh !== "") {
payload = Buffer.concat([payload,new Buffer(node.addCh)]);
payload = Buffer.concat([payload,new Buffer.from(node.addCh)]);
}
node.port.write(payload,function(err,res) {
if (err) {
@@ -94,8 +94,8 @@ module.exports = function(RED) {
var node = this;
node.tout = null;
var buf;
if (node.serialConfig.out != "count") { buf = new Buffer(bufMaxSize); }
else { buf = new Buffer(Number(node.serialConfig.newline)); }
if (node.serialConfig.out != "count") { buf = new Buffer.alloc(bufMaxSize); }
else { buf = new Buffer.alloc(Number(node.serialConfig.newline)); }
var i = 0;
node.status({fill:"grey",shape:"dot",text:"node-red:common.status.not-connected"});
node.port = serialPool.get(this.serialConfig.serialport,
@@ -108,17 +108,17 @@ module.exports = function(RED) {
var splitc;
if (node.serialConfig.newline.substr(0,2) == "0x") {
splitc = new Buffer([parseInt(node.serialConfig.newline)]);
splitc = new Buffer.from([parseInt(node.serialConfig.newline)]);
}
else {
splitc = new Buffer(node.serialConfig.newline.replace("\\n","\n").replace("\\r","\r").replace("\\t","\t").replace("\\e","\e").replace("\\f","\f").replace("\\0","\0")); // jshint ignore:line
splitc = new Buffer.from(node.serialConfig.newline.replace("\\n","\n").replace("\\r","\r").replace("\\t","\t").replace("\\e","\e").replace("\\f","\f").replace("\\0","\0")); // jshint ignore:line
}
this.port.on('data', function(msg) {
// single char buffer
if ((node.serialConfig.newline === 0)||(node.serialConfig.newline === "")) {
if (node.serialConfig.bin !== "bin") { node.send({"payload": String.fromCharCode(msg)}); }
else { node.send({"payload": new Buffer([msg])}); }
else { node.send({"payload": new Buffer.from([msg])}); }
}
else {
// do the timer thing
@@ -130,7 +130,7 @@ module.exports = function(RED) {
else {
node.tout = setTimeout(function () {
node.tout = null;
var m = new Buffer(i+1);
var m = new Buffer.alloc(i+1);
buf.copy(m,0,0,i+1);
if (node.serialConfig.bin !== "bin") { m = m.toString(); }
node.send({"payload": m});
@@ -145,7 +145,7 @@ module.exports = function(RED) {
buf[i] = msg;
i += 1;
if ( i >= parseInt(node.serialConfig.newline)) {
var m = new Buffer(i);
var m = new Buffer.alloc(i);
buf.copy(m,0,0,i);
if (node.serialConfig.bin !== "bin") { m = m.toString(); }
node.send({"payload":m});
@@ -158,7 +158,7 @@ module.exports = function(RED) {
buf[i] = msg;
i += 1;
if ((msg === splitc[0]) || (i === bufMaxSize)) {
var n = new Buffer(i);
var n = new Buffer.alloc(i);
buf.copy(n,0,0,i);
if (node.serialConfig.bin !== "bin") { n = n.toString(); }
node.send({"payload":n});

2
io/serialport/package.json
View File

@@ -1,6 +1,6 @@
{
"name" : "node-red-node-serialport",
"version" : "0.4.2",
"version" : "0.4.3",
"description" : "Node-RED nodes to talk to serial ports",
"dependencies" : {
"serialport" : "~4.0.7"