feature: support multiple nmea2000 devices (#1553)

We need to be able to configure the outEvents
SignalK · May 16, 2023 · d7870ee · d7870ee
1 parent 599c62f
commit d7870ee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/packages/streams/canboatjs.js b/packages/streams/canboatjs.js
@@ -25,7 +25,7 @@ function CanboatJs(options) {
 
   this.fromPgn = new FromPgn(options)
   const createDebug = options.createDebug || require('debug')
-  const debug = createDebug('signalk:streams:nmea0183-signalk')
+  const debug = createDebug('signalk:streams:canboatjs')
 
   this.fromPgn.on('warning', (pgn, warning) => {
     debug(`[warning] ${pgn.pgn} ${warning}`)
@@ -36,6 +36,7 @@ function CanboatJs(options) {
   })
 
   this.app = options.app
+  this.analyzerOutEvent = options.analyzerOutEvent || 'N2KAnalyzerOut'
 }
 
 require('util').inherits(CanboatJs, Transform)
@@ -46,13 +47,13 @@ CanboatJs.prototype._transform = function (chunk, encoding, done) {
     if (pgnData) {
       pgnData.timestamp = new Date(Number(chunk.timestamp)).toISOString()
       this.push(pgnData)
-      this.app.emit('N2KAnalyzerOut', pgnData)
+      this.app.emit(this.analyzerOutEvent, pgnData)
     }
   } else {
     const pgnData = this.fromPgn.parse(chunk)
     if (pgnData) {
       this.push(pgnData)
-      this.app.emit('N2KAnalyzerOut', pgnData)
+      this.app.emit(this.analyzerOutEvent, pgnData)
     }
   }
   done()

diff --git a/packages/streams/n2kAnalyzer.js b/packages/streams/n2kAnalyzer.js
@@ -20,6 +20,9 @@ function N2KAnalyzer(options) {
   Transform.call(this, {
     objectMode: true,
   })
+
+  this.analyzerOutEvent = options.analyzerOutEvent || 'N2KAnalyzerOut'
+
   if (process.platform === 'win32') {
     this.analyzerProcess = require('child_process').spawn('cmd', [
       '/c',
@@ -47,7 +50,7 @@ function N2KAnalyzer(options) {
     try {
       parsed = JSON.parse(data)
       that.push(parsed)
-      options.app.emit('N2KAnalyzerOut', parsed)
+      options.app.emit(this.analyzerOutEvent, parsed)
     } catch (ex) {
       console.error(data)
       console.error(ex.stack)

diff --git a/packages/streams/simple.js b/packages/streams/simple.js
@@ -241,7 +241,6 @@ function nmea2000input(subOptions, logging) {
     return [
       new actisenseSerial({
         ...subOptions,
-        outEvent: 'nmea2000out',
         plainText: logging,
       }),
     ]