@canboat/canboatjs 2.2.0 → 2.4.0

package/bin/analyzerjs

@@ -1,9 +1,25 @@
 #!/usr/bin/env node
 
-const argv = require('minimist')(process.argv.slice(2))
+const argv = require('minimist')(process.argv.slice(2), {
+  alias: { h: 'help' },
+  boolean: ['n']
+})
+
+if ( argv['help'] ) {
+  console.error(`Usage: ${process.argv[1]} [options]
+
+Options:
+  -c                  don't check for invalid values
+  -n                  output null values
+  -h, --help          output usage information`)
+  process.exit(1)
+}
 
 const Parser = require('../index').FromPgn
-var parser = new Parser()
+var parser = new Parser( {
+  returnNulls: argv['n'] === true,
+  checkForInvalidFields: argv['n']
+})
 
 parser.on('error', (pgn, error) => {
   console.error(`Error parsing ${pgn.pgn} ${error}`)

package/lib/fromPgn.js

@@ -60,6 +60,10 @@ class Parser extends EventEmitter {
     super()
     this.options = _.isUndefined(opts) ? {} : opts
 
+    if ( this.options.returnNulls === undefined ) {
+      this.options.returnNulls = false
+    }
+    
     this.name = pkg.name
     this.version = pkg.version
     this.author = pkg.author
@@ -235,7 +239,8 @@ class Parser extends EventEmitter {
           }
         }
 
-        if ( !_.isUndefined(value) && value != null ) {
+        if ( !_.isUndefined(value) && (value != null  ||
+                                       this.options.returnNulls) ) {
           pgn.fields[field.Name] = value
         }
       }
@@ -243,7 +248,15 @@ class Parser extends EventEmitter {
         var repeating = fields.slice(fields.length-RepeatingFields)
         pgn.fields.list = []
 
-        while ( bs.bitsLeft > 0 ) {
+        let count
+
+        if ( pgnData.RepeatingFieldSet1CountField !== undefined ) {
+          count = pgn.fields[pgnData.Fields[pgnData.RepeatingFieldSet1CountField-1].Name]
+        } else {
+          count = 2048
+        }
+
+        while ( bs.bitsLeft > 0  && --count >= 0 ) {
           var group = {}
           repeating.forEach(field => {
             if ( bs.bitsLeft > 0 ) {
@@ -570,7 +583,18 @@ function readField(options, runPostProcessor, pgn, field, bs) {
       if ( field.Offset ) {
         value += field.Offset
       }
-      if ( field.Resolution && typeof value === 'number' ) {
+      let max
+      if ( typeof field.RangeMax !== 'undefined'
+           && field.Resolution ) {
+        max = field.RangeMax / field.Resolution
+      }
+      if ( options.checkForInvalidFields !== false && max !== 'undefined' &&
+           field.FieldType !== 'LOOKUP' &&
+           field.BitLength > 1 &&
+           max - value <= 0 ) {
+        //console.log(`Bad field ${field.Name} ${max - value}`)
+        value = null
+      } if ( field.Resolution && typeof value === 'number' ) {
         var resolution = field.Resolution
 
         if ( _.isString(resolution) ) {
@@ -586,13 +610,6 @@ function readField(options, runPostProcessor, pgn, field, bs) {
         }
         
         value = Number.parseFloat(value.toFixed(precision))
-
-        if ( typeof field.RangeMin !== 'undefined' && value < field.RangeMin ) {
-          value = null
-        }
-        if ( typeof field.RangeMax !== 'undefined' && value > field.RangeMax ) {
-          value = null
-        }
       }
 
       if (field.FieldType === 'LOOKUP' &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canboat/canboatjs",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "Native javascript version of canboat",
   "main": "index.js",
   "scripts": {
@@ -79,7 +79,7 @@
     "webpack-cli": "^3.3.10"
   },
   "optionalDependencies": {
-    "serialport": "^9.0.7",
+    "serialport": "11.x.x",
     "socketcan": "^4.0.3"
   },
   "repository": {