@canboat/canboatjs 2.12.3 → 3.0.0-beta.10

package/bin/analyzerjs

@@ -2,8 +2,7 @@
 
 const argv = require('minimist')(process.argv.slice(2), {
   alias: { h: 'help' },
-  boolean: ['n'],
-  boolean: ['r']
+  boolean: ['n', 'r', 'camel', 'camel-compat']
 })
 
 if ( argv['help'] ) {
@@ -13,6 +12,8 @@ Options:
   -c                  don't check for invalid values
   -n                  output null values
   -r                  parse $MXPGN as little endian
+  --camel             output field names in camelCase
+  --camel-compat      output field names in camelCase and regular
   -h, --help          output usage information`)
   process.exit(1)
 }
@@ -21,7 +22,9 @@ const Parser = require('../index').FromPgn
 var parser = new Parser( {
   returnNulls: argv['n'] === true,
   littleEndianMXPGN: argv['r'] === true,
-  checkForInvalidFields: argv['c'] !== true
+  checkForInvalidFields: argv['c'] !== true,
+  useCamel: argv['camel'],
+  useCamelCompat: argv['camel-compat']
 })
 
 parser.on('error', (pgn, error) => {

package/bin/candumpjs

@@ -4,7 +4,7 @@ const canboatjs = require('../index')
 const Parser = require('../index').FromPgn
 const { parseCanId } = require('../lib/canId')
 const socketcan = require('socketcan')
-
+const { binToActisense } = require('../lib/utilities')
 var parser = new canboatjs.FromPgn()
 
 
@@ -83,16 +83,3 @@ channel.addListener('onMessage', (msg) => {
 channel.start()
 
 
-function binToActisense(pgn, data, length) {
-  return (
-    pgn.timestamp +
-      `,${pgn.prio},${pgn.pgn},${pgn.src},${pgn.dst},${length},` +
-      new Uint32Array(data)
-      .reduce(function(acc, i) {
-        acc.push(i.toString(16));
-        return acc;
-      }, [])
-      .map(x => (x.length === 1 ? "0" + x : x))
-      .join(",")
-  );
-}

package/bin/cansend

@@ -0,0 +1,130 @@
+#!/usr/bin/env node
+
+const canboatjs = require('../index')
+const Parser = require('../index').FromPgn
+const { parseCanId } = require('../lib/canId')
+const { parseActisense } = require('../lib/stringMsg')
+
+const { toPgn } = require('../lib/toPgn')
+const { getPlainPGNs, binToActisense } = require('../lib/utilities')
+const { encodeCanId } = require('../lib/canId')
+
+const argv = require('minimist')(process.argv.slice(2), {
+  boolean: ['test', 'log-output'],
+  string: ['src'],
+  alias: { h: 'help' }
+})
+
+if ( argv['help'] ) {
+  console.error(`Usage: ${process.argv[0]} [options] candevice
+
+Options:
+  --src <src>    use src for all messages
+  --log-output   log messages sent
+  --test         don't connect or send any data
+  -h, --help     output usage information`)
+  process.exit(1)
+}
+
+if ( argv['_'].length === 0 ) {
+  console.error('Please specify a device')
+  process.exit(1)
+}
+
+const canDevice = argv['_'][0]
+const srcArg = argv.src
+const logOut = argv['log-output']
+const test = argv.test
+
+let channel
+
+if ( !test ) {
+  const socketcan = require('socketcan')
+  channel = socketcan.createRawChannel(canDevice);
+  
+  channel.addListener('onStopped', (msg) => {
+    console.error('socketcan stopped')
+  })
+  
+  channel.start()
+}
+
+var readline = require('readline')
+var rl = readline.createInterface({
+  input: process.stdin,
+  output: process.stdout,
+  terminal: false
+})
+
+var input = []
+
+rl.on('line', function (line) {
+  if ( line.length === 0 ) {
+    return
+  }
+  
+  let msg =  line[0] === '{'  ? JSON.parse(line) : line
+
+  if ( typeof msg === 'string' ) {
+    var split = msg.split(',')
+    if ( srcArg !== undefined ) {
+      split[3] = srcArg
+    }
+    msg = split.join(',')
+  } else {
+    if ( msg.prio === undefined ) {
+      msg.prio = 3
+    }
+    if ( msg.dst === undefined ) {
+      msg.dst = 255
+    }
+    if ( srcArg !== undefined ) {
+      msg.src = srcArg
+    }
+    if ( msg.src === undefined ) {
+      msg.src = 100
+    }
+  }
+
+  var pgn, canid, buffer
+  if ( typeof msg === 'object' ) {
+    canid = encodeCanId(msg)
+    buffer = toPgn(msg)
+    if ( buffer === undefined ) {
+      console.error('invalid input: %s', line)
+      return
+    }
+    pgn = msg
+  } else {
+    pgn = parseActisense(msg)
+
+    if ( isNaN(pgn.prio) || isNaN(pgn.pgn) || isNaN(pgn.dst) || isNaN(pgn.src) ) {
+      console.error('invalid input: ' + line)
+      return
+    }
+    
+    canid = encodeCanId(pgn)
+    buffer = pgn.data
+  }
+  
+  pgn.timestamp = new Date().toISOString()
+  
+  if ( buffer.length > 8 || pgn.pgn == 126720 ) {
+    var pgns = getPlainPGNs(buffer)
+    pgns.forEach(pbuffer => {
+      if ( !test ) {
+        channel.send({id: canid, ext:true, data: pbuffer})
+      }
+      if ( logOut ) {
+        console.log(binToActisense(pgn, pbuffer, pbuffer.length))
+      }
+    })                    
+  } else {
+    if ( !test ) {
+      channel.send({id: canid, ext:true, data: buffer})
+    }
+    if ( logOut ) {
+      console.log(binToActisense(pgn, buffer, buffer.length))
+    }
+  }
+})