@canboat/canboatjs 2.5.4 → 2.5.6

package/README.md

@@ -8,8 +8,7 @@ Canboatjs is a port of the canboat project (https://github.com/canboat/canboat)
 
 # Contributors
 
-Canboajs js is built on the backs of a few people whithout whom it would not be possible.
-
+- Scott Bender <scott@scottbender.net>
 - Kees Verruijt <kees@verruijt.net>
 - Jouni Hartikainen <jouni.hartikainen@iki.fi>
 - Teppo Kurki <teppo.kurki@iki.fi>
@@ -55,7 +54,7 @@ Example: `candump can0 | candumpanalyzerjs`
 
 Read directly from a socketcan device without the need to install can-utils
 
-Example: candumpjs can0
+Example: `candumpjs can0`
 
 ## ydvr-file
 

package/lib/canbus.js

@@ -54,14 +54,16 @@ function CanbusStream (options) {
   this.options = options
   this.start()
 
+   console.trace()
+   console.log(options.app.ssetProviderStatus)
   this.setProviderStatus = options.app && options.app.setProviderStatus
     ? (msg) => {
-      options.app.setPluginStatus(options.providerId, msg)
+      options.app.setProviderStatus(options.providerId, msg)
     }
   : () => {}
   this.setProviderError = options.app && options.app.setProviderError
     ? (msg) => {
-      options.app.setPluginError(options.providerId, msg)
+      options.app.setProviderError(options.providerId, msg)
     }
   : () => {}
   

package/lib/fromPgn.js

@@ -611,6 +611,7 @@ function readField(options, runPostProcessor, pgn, field, bs, fields) {
       }
       if ( options.checkForInvalidFields !== false && max !== 'undefined' &&
            field.FieldType !== 'LOOKUP' &&
+           field.FieldType !== 'FIELDTYPE_LOOKUP' &&
            field.BitLength > 1 &&
            max - value <= 0 ) {
         //console.log(`Bad field ${field.Name} ${max - value}`)
@@ -633,7 +634,8 @@ function readField(options, runPostProcessor, pgn, field, bs, fields) {
         value = Number.parseFloat(value.toFixed(precision))
       }
 
-      if (field.FieldType === 'LOOKUP' &&
+      if ((field.FieldType === 'LOOKUP' ||
+           field.FieldType === 'FIELDTYPE_LOOKUP') &&
           runPostProcessor &&
           (_.isUndefined(options.resolveEnums) ||
            options.resolveEnums)) {

package/lib/stringMsg.js

@@ -112,10 +112,26 @@ exports.encodeYDRAW = ({ data, ...canIdInfo }) => {
   return pgns.map(buffer => canId + ' ' + byteString(buffer, ' '))
 }
 
+const get0183Sentence = (msg) => {
+  let sentence = msg
+  if (sentence.charAt(0) === '\\') {
+    split = sentence.split('\\')
+    if ( split.length < 3 ) {
+      return false
+    }
+    sentence = split[2]
+  }
+  return sentence
+}
+
 // $PCDIN,01F119,00000000,0F,2AAF00D1067414FF*59
-exports.isPCDIN = startsWith('$PCDIN,')
+exports.isPCDIN = (msg) => {
+  const sentence = get0183Sentence(msg)
+  return sentence.startsWith('$PCDIN,')
+}
 exports.parsePCDIN = (input) => {
-  const [ prefix, pgn, timeHex, src, data ] = input.split(',')
+  const sentence = get0183Sentence(input)
+  const [ prefix, pgn, timeHex, src, data ] = sentence.split(',')
   let timer = parseInt(timeHex, 32)
   
   timer = timer / 1024
@@ -136,9 +152,13 @@ exports.encodePCDIN = ({ prefix = '$PCDIN', pgn, data, dst = 255}) => {
 }
 
 // $MXPGN,01F801,2801,C1308AC40C5DE343*19
-exports.isMXPGN = startsWith('$MXPGN,')
+exports.isMXPGN = (msg) => {
+  const sentence = get0183Sentence(msg)
+  return sentence.startsWith('$MXPGN,')
+}
 exports.parseMXPGN = (input) => {
-  const [ prefix, pgn, attr_word, data ] = input.split(',')
+  const sentence = get0183Sentence(input)
+  const [ prefix, pgn, attr_word, data ] = sentence.split(',')
 
   const send_prio_len = (parseInt(attr_word.substr(0,2), 16).toString(2)).padStart(8, '0');
   const addr = (parseInt(attr_word.substr(2,2), 16));

package/lib/toPgn.js

@@ -190,7 +190,8 @@ function writeField(bs, pgn_number, field, data, value, fields, bitLength) {
       }
     } else if ( type && fieldTypeMappers[type] ) {
       value = fieldTypeMappers[type](field, value)
-    } else if (field.FieldType === 'LOOKUP' && _.isString(value)) {
+    } else if ((field.FieldType === 'LOOKUP' ||
+                field.FieldType === 'FIELDTYPE_LOOKUP') && _.isString(value)) {
       if (!(field.Id === "timeStamp" && value < 60)) {
         value = lookup(field, value)
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canboat/canboatjs",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "description": "Native javascript version of canboat",
   "main": "index.js",
   "scripts": {