@canboat/canboatjs 1.24.2 → 1.24.4

package/lib/toPgn.js

@@ -28,6 +28,8 @@ const { getIndustryCode, getManufacturerCode } = require('./codes')
 const debug = require('debug')('canboatjs:toPgn')
 
 const RES_STRINGLAU = 'ASCII or UNICODE string starting with length and control byte'
+const RES_STRINGLZ = 'ASCII string starting with length byte'
+
 
 var fieldTypeWriters = {}
 var fieldTypeMappers = {}
@@ -115,6 +117,7 @@ function toPgn(data) {
 
   if ( pgnData.Length != 0xff
        && fields[fields.length-1].Type != RES_STRINGLAU
+       && fields[fields.length-1].Type != RES_STRINGLZ
        && !pgnData.RepeatingFields ) {
 
     var len = lengthsOff[pgnData.PGN] || pgnData.Length
@@ -327,6 +330,36 @@ const actisenseToiKonvert = _.flow(parseActisense, encodePDGY)
 const actisenseToN2KAsciiFormat = _.flow(parseActisense, encodeActisenseN2KACSII)
 const actisenseToN2KActisenseFormat = _.flow(parseActisense, encodeN2KActisense)
 
+function bitIsSet(field, index, value) {
+  if (!field.value2name) {
+    field.value2name = {};
+    field.EnumBitValues.forEach(function(enumPair) {
+      var key = _.keys(enumPair)[0]
+      field.value2name[Number(key)] = enumPair[key]
+    })
+  }
+  return value.indexOf(field.value2name[index]) != -1
+}
+
+fieldTypeWriters['Bitfield'] = (pgn, field, value, bs) => {
+  if ( _.isUndefined(value) || value.length === 0 ) {
+    if ( field.BitLength % 8  == 0 ) {
+      var bytes = field.BitLength/8
+      var lastByte = field.Signed ? 0x7f : 0xff
+      for ( var i = 0; i < bytes-1; i++ ) {
+        bs.writeUint8(0x0)
+      }
+      bs.writeUint8(0x0)
+    } else {
+      bs.writeBits(0xffffffff, field.BitLength)
+    }
+  } else {
+    for ( var i = 0; i < field.BitLength; i++ ) {
+      bs.writeBits(bitIsSet(field, i, value) ? 1 : 0, 1)
+    }
+  }
+}
+
 fieldTypeWriters['ASCII text'] = (pgn, field, value, bs) => {
 
   let fill = 0xff
@@ -353,6 +386,17 @@ fieldTypeWriters['ASCII text'] = (pgn, field, value, bs) => {
   }
 }
 
+fieldTypeWriters[RES_STRINGLZ] = (pgn, field, value, bs) => {
+  if ( _.isUndefined(value) ) {
+    value = ""
+  }
+  bs.writeUint8(value.length)
+  for ( var i = 0; i < value.length; i++ ) {
+    bs.writeUint8(value.charCodeAt(i))
+  }  
+  bs.writeUint8(0)
+}
+
 fieldTypeWriters["String with start/stop byte"] = (pgn, field, value, bs) => {
   if ( _.isUndefined(value) ) {
     value = ""

package/package.json

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