@canboat/canboatjs 1.27.2 → 1.28.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/candumpjs +18 -1
- package/lib/canbus.js +1 -1
- package/lib/fromPgn.js +3 -3
- package/package.json +1 -1
package/bin/candumpjs
CHANGED
|
@@ -67,8 +67,25 @@ channel.addListener('onMessage', (msg) => {
|
|
|
67
67
|
var pgn = parseCanId(msg.id)
|
|
68
68
|
|
|
69
69
|
pgn.timestamp = new Date().toISOString()
|
|
70
|
+
|
|
71
|
+
let sourceString = binToActisense(pgn, msg.data, msg.data.length)
|
|
70
72
|
|
|
71
|
-
parser.parse({ pgn, length: msg.data.length, data: msg.data })
|
|
73
|
+
parser.parse({ pgn, length: msg.data.length, data: msg.data, sourceString })
|
|
72
74
|
})
|
|
73
75
|
|
|
74
76
|
channel.start()
|
|
77
|
+
|
|
78
|
+
|
|
79
|
+
function binToActisense(pgn, data, length) {
|
|
80
|
+
return (
|
|
81
|
+
pgn.timestamp +
|
|
82
|
+
`,${pgn.prio},${pgn.pgn},${pgn.src},${pgn.dst},${length},` +
|
|
83
|
+
new Uint32Array(data)
|
|
84
|
+
.reduce(function(acc, i) {
|
|
85
|
+
acc.push(i.toString(16));
|
|
86
|
+
return acc;
|
|
87
|
+
}, [])
|
|
88
|
+
.map(x => (x.length === 1 ? "0" + x : x))
|
|
89
|
+
.join(",")
|
|
90
|
+
);
|
|
91
|
+
}
|
package/lib/canbus.js
CHANGED
|
@@ -318,7 +318,7 @@ function readLine(that, line) {
|
|
|
318
318
|
|
|
319
319
|
pgn.timestamp = new Date().toISOString()
|
|
320
320
|
|
|
321
|
-
that.push({ pgn: pgn, length: len, data })
|
|
321
|
+
that.push({ pgn: pgn, length: len, data, sourceString: line })
|
|
322
322
|
}
|
|
323
323
|
|
|
324
324
|
CanbusStream.prototype._transform = function (chunk, encoding, done) {
|
package/lib/fromPgn.js
CHANGED
|
@@ -299,11 +299,11 @@ class Parser extends EventEmitter {
|
|
|
299
299
|
} else if ( _.isBuffer(data) ) {
|
|
300
300
|
return this.parseBuffer(data, cb)
|
|
301
301
|
} else {
|
|
302
|
-
return this.parsePgnData(data.pgn, data.length, data.data, data.coalesced === true)
|
|
302
|
+
return this.parsePgnData(data.pgn, data.length, data.data, data.coalesced === true, cb, data.sourceString)
|
|
303
303
|
}
|
|
304
304
|
}
|
|
305
305
|
|
|
306
|
-
parsePgnData(pgn, length, data, coalesced, cb) {
|
|
306
|
+
parsePgnData(pgn, length, data, coalesced, cb, sourceString) {
|
|
307
307
|
try
|
|
308
308
|
{
|
|
309
309
|
var buffer = data
|
|
@@ -317,7 +317,7 @@ class Parser extends EventEmitter {
|
|
|
317
317
|
|
|
318
318
|
var bv = new BitView(buffer);
|
|
319
319
|
var bs = new BitStream(bv)
|
|
320
|
-
const res = this._parse(pgn, bs, length, coalesced, cb);
|
|
320
|
+
const res = this._parse(pgn, bs, length, coalesced, cb, sourceString);
|
|
321
321
|
if ( res ) {
|
|
322
322
|
debug('parsed pgn %j', pgn)
|
|
323
323
|
}
|