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

bump serialport dependency, add ja translation for baudrate message, fix linting, bump package

Browse Source
This commit is contained in:
Dave Conway-Jones 2020-08-27 13:00:10 +01:00
parent 53f32ec521
commit 53ad00f165
No known key found for this signature in database
GPG Key ID: 302A6725C594817F
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,19 +41,19 @@ module.exports = function(RED) {
node.port = serialPool.get(this.serialConfig); node.port = serialPool.get(this.serialConfig);
node.on("input",function(msg) { node.on("input",function(msg) {
if (msg.hasOwnProperty("baudrate")) { if (msg.hasOwnProperty("baudrate")) {
var baud = parseInt(msg.baudrate); var baud = parseInt(msg.baudrate);
if (isNaN(baud)) { if (isNaN(baud)) {
node.error(RED._("serial.errors.badbaudrate"),msg); node.error(RED._("serial.errors.badbaudrate"),msg);
} else { } else {
node.port.update({baudRate: baud},function(err,res) { node.port.update({baudRate: baud},function(err,res) {
if (err) { if (err) {
var errmsg = err.toString().replace("Serialport","Serialport "+node.port.serial.path); var errmsg = err.toString().replace("Serialport","Serialport "+node.port.serial.path);
node.error(errmsg,msg); node.error(errmsg,msg);
} }
}); });
} }
} }
if (!msg.hasOwnProperty("payload")) { return; } // do nothing unless we have a payload if (!msg.hasOwnProperty("payload")) { return; } // do nothing unless we have a payload
var payload = node.port.encodePayload(msg.payload); var payload = node.port.encodePayload(msg.payload);
node.port.write(payload,function(err,res) { node.port.write(payload,function(err,res) {
@ -135,18 +135,18 @@ module.exports = function(RED) {
// Serial Out // Serial Out
node.on("input",function(msg) { node.on("input",function(msg) {
if (msg.hasOwnProperty("baudrate")) { if (msg.hasOwnProperty("baudrate")) {
var baud = parseInt(msg.baudrate); var baud = parseInt(msg.baudrate);
if (isNaN(baud)) { if (isNaN(baud)) {
node.error(RED._("serial.errors.badbaudrate"),msg); node.error(RED._("serial.errors.badbaudrate"),msg);
} else { } else {
node.port.update({baudRate: baud},function(err,res) { node.port.update({baudRate: baud},function(err,res) {
if (err) { if (err) {
var errmsg = err.toString().replace("Serialport","Serialport "+node.port.serial.path); var errmsg = err.toString().replace("Serialport","Serialport "+node.port.serial.path);
node.error(errmsg,msg); node.error(errmsg,msg);
} }
}); });
} }
} }
if (!msg.hasOwnProperty("payload")) { return; } // do nothing unless we have a payload if (!msg.hasOwnProperty("payload")) { return; } // do nothing unless we have a payload
if (msg.hasOwnProperty("count") && (typeof msg.count === "number") && (node.serialConfig.out === "count")) { if (msg.hasOwnProperty("count") && (typeof msg.count === "number") && (node.serialConfig.out === "count")) {
node.serialConfig.newline = msg.count; node.serialConfig.newline = msg.count;
@ -275,7 +275,7 @@ module.exports = function(RED) {
return payload; return payload;
}, },
write: function(m,cb) { this.serial.write(m,cb); }, write: function(m,cb) { this.serial.write(m,cb); },
update: function(m,cb) { this.serial.update(m,cb); }, update: function(m,cb) { this.serial.update(m,cb); },
enqueue: function(msg,sender,cb) { enqueue: function(msg,sender,cb) {
var payload = this.encodePayload(msg.payload); var payload = this.encodePayload(msg.payload);
var qobj = { var qobj = {

2
io/serialport/locales/en-US/25-serial.json
View File

@ -67,7 +67,7 @@
"disconnected": "serial port __port__ disconnected", "disconnected": "serial port __port__ disconnected",
"closed": "serial port __port__ closed", "closed": "serial port __port__ closed",
"list": "Failed to list ports. Please enter manually.", "list": "Failed to list ports. Please enter manually.",
"badbaudrate": "Baudrate is not valid" "badbaudrate": "Baudrate is invalid"
} }
} }
} }

2
io/serialport/locales/ja/25-serial.json
View File

@ -52,7 +52,7 @@
"disconnected": "serial port __port__ disconnected", "disconnected": "serial port __port__ disconnected",
"closed": "serial port __port__ closed", "closed": "serial port __port__ closed",
"list": "ポートのリスト化に失敗しました。手動で入力してください。", "list": "ポートのリスト化に失敗しました。手動で入力してください。",
"badbaudrate": "Baudrate is not valid" "badbaudrate": "ボーレートが不正です"
} }
} }
} }

4
io/serialport/package.json
View File

@ -1,9 +1,9 @@
{ {
"name" : "node-red-node-serialport", "name" : "node-red-node-serialport",
"version" : "0.10.3", "version" : "0.11.0",
"description" : "Node-RED nodes to talk to serial ports", "description" : "Node-RED nodes to talk to serial ports",
"dependencies" : { "dependencies" : {
"serialport" : "^8.0.8" "serialport" : "^9.0.1"
}, },
"repository" : { "repository" : {
"type":"git", "type":"git",