@canboat/canboatjs 3.10.0 → 3.10.2
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/dist/canbus.js +0 -1
- package/dist/canbus.js.map +1 -1
- package/dist/fromPgn.d.ts.map +1 -1
- package/dist/fromPgn.js +2 -8
- package/dist/fromPgn.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/n2kDevice.d.ts.map +1 -1
- package/dist/n2kDevice.js +22 -19
- package/dist/n2kDevice.js.map +1 -1
- package/dist/persist.js +1 -1
- package/dist/persist.js.map +1 -1
- package/dist/yddevice.d.ts.map +1 -1
- package/dist/yddevice.js +1 -0
- package/dist/yddevice.js.map +1 -1
- package/dist/ydgw02.d.ts.map +1 -1
- package/dist/ydgw02.js +33 -32
- package/dist/ydgw02.js.map +1 -1
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
package/dist/ydgw02.js
CHANGED
|
@@ -24,6 +24,7 @@ const stream_1 = require("stream");
|
|
|
24
24
|
const fromPgn_1 = require("./fromPgn");
|
|
25
25
|
const yddevice_1 = require("./yddevice");
|
|
26
26
|
const toPgn_1 = require("./toPgn");
|
|
27
|
+
const canId_1 = require("./canId");
|
|
27
28
|
const util_1 = __importDefault(require("util"));
|
|
28
29
|
//const pgnsSent = {}
|
|
29
30
|
function Ydgw02Stream(options, type) {
|
|
@@ -88,7 +89,9 @@ Ydgw02Stream.prototype.sendPGN = function (pgn) {
|
|
|
88
89
|
//let lastSent = pgnsSent[pgn.pgn]
|
|
89
90
|
let msgs;
|
|
90
91
|
if (pgn.ydFullFormat === true || this.device !== undefined) {
|
|
91
|
-
pgn.src
|
|
92
|
+
if (pgn.src !== 254) {
|
|
93
|
+
pgn.src = this.device.address;
|
|
94
|
+
}
|
|
92
95
|
msgs = (0, toPgn_1.pgnToYdgwFullRawFormat)(pgn);
|
|
93
96
|
}
|
|
94
97
|
else {
|
|
@@ -116,46 +119,44 @@ Ydgw02Stream.prototype.sendYdgwPGN = function (msg) {
|
|
|
116
119
|
msgs.forEach((raw) => {
|
|
117
120
|
this.sendString(raw + '\r\n');
|
|
118
121
|
});
|
|
119
|
-
/*
|
|
120
|
-
if ( !this.parser ) {
|
|
121
|
-
this.parser = new Parser()
|
|
122
|
-
|
|
123
|
-
let that = this
|
|
124
|
-
this.parser.on('error', (pgn, error) => {
|
|
125
|
-
console.error(`Error parsing ${pgn.pgn} ${error}`)
|
|
126
|
-
console.error(error.stack)
|
|
127
|
-
})
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
this.parser.on('pgn', (pgn) => {
|
|
131
|
-
let now = Date.now()
|
|
132
|
-
let lastSent = pgnsSent[pgn.pgn]
|
|
133
|
-
if ( !lastSent || now - lastSent > rateLimit ) {
|
|
134
|
-
pgnToYdwgRawFormat(pgn).forEach(raw => {
|
|
135
|
-
this.sendString(raw)
|
|
136
|
-
})
|
|
137
|
-
pgnsSent[pgn.pgn] = now
|
|
138
|
-
}
|
|
139
|
-
})
|
|
140
|
-
}
|
|
141
|
-
this.parser.parseString(msg)
|
|
142
|
-
*/
|
|
143
122
|
};
|
|
144
123
|
util_1.default.inherits(Ydgw02Stream, stream_1.Transform);
|
|
145
124
|
Ydgw02Stream.prototype._transform = function (chunk, encoding, done) {
|
|
146
125
|
const line = chunk.toString().trim();
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
126
|
+
if (line.length < 23) {
|
|
127
|
+
//bad data
|
|
128
|
+
done();
|
|
129
|
+
return;
|
|
130
|
+
}
|
|
131
|
+
if (this.options.createDevice === true) {
|
|
132
|
+
if (this.device === undefined) {
|
|
153
133
|
this.device = new yddevice_1.YdDevice(this.options);
|
|
154
134
|
this.device.start();
|
|
155
135
|
}
|
|
136
|
+
if (this.cansend() && line.charAt(13) === 'T') {
|
|
137
|
+
//11:54:07.833 R 18eafffe 00 ee 00
|
|
138
|
+
const canId = (0, canId_1.parseCanIdStr)(line.slice(15, 23));
|
|
139
|
+
if (canId.src === this.device.address) {
|
|
140
|
+
//ignore pgn we're transmitting
|
|
141
|
+
done();
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
if (this.sentAvailable === false) {
|
|
148
|
+
this.sentAvailable = true;
|
|
149
|
+
this.debug('emit nmea2000OutAvailable');
|
|
150
|
+
this.options.app.emit('nmea2000OutAvailable');
|
|
151
|
+
}
|
|
152
|
+
if (line.charAt(13) === 'T') {
|
|
153
|
+
//ignore pgns we're transmitting
|
|
154
|
+
done();
|
|
155
|
+
return;
|
|
156
|
+
}
|
|
156
157
|
}
|
|
157
|
-
this.options.app.emit('canboatjs:rawoutput', line);
|
|
158
158
|
const pgn = this.fromPgn.parseYDGW02(line);
|
|
159
|
+
this.options.app.emit('canboatjs:rawoutput', line);
|
|
159
160
|
if (pgn !== undefined) {
|
|
160
161
|
this.push(pgn);
|
|
161
162
|
this.options.app.emit(this.options.analyzerOutEvent || 'N2KAnalyzerOut', pgn);
|
package/dist/ydgw02.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ydgw02.js","sourceRoot":"","sources":["../lib/ydgw02.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;
|
|
1
|
+
{"version":3,"file":"ydgw02.js","sourceRoot":"","sources":["../lib/ydgw02.ts"],"names":[],"mappings":"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"}
|