fix: toPgn sends 00 for null values instead of ff (#222)

* fix: toActisenseSerialFormat to handle prio * fix: toPgn to handle null values to send FF rather than 00
canboat · May 26, 2023 · 78d0a0e · 78d0a0e
1 parent ed28e9e
commit 78d0a0e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/stringMsg.js b/lib/stringMsg.js
@@ -59,7 +59,7 @@ exports.encodeActisense = ({
     byteString(data)
   ].join(','))
 
-exports.toActisenseSerialFormat = (pgn, data, dst=255, src=0) => exports.encodeActisense({
+exports.toActisenseSerialFormat = (pgn, data, dst=255, src=0, prio=2) => exports.encodeActisense({
   pgn, data, dst, src, prio
 })
 

diff --git a/lib/toPgn.js b/lib/toPgn.js
@@ -154,7 +154,7 @@ function writeField(bs, pgn_number, field, data, value, bitLength) {
   }
 
   // console.log(`${field.Name}:${value}(${bitLength}-${field.Resolution})`)
-  if ( _.isUndefined(value) ) {
+  if ( _.isUndefined(value) || value === null) {
     if ( field.Type && fieldTypeWriters[field.Type] ) {
       fieldTypeWriters[field.Type](pgn_number, field, value, bs)
     } else if ( bitLength % 8  == 0 ) {
@@ -223,7 +223,7 @@ function writeField(bs, pgn_number, field, data, value, bitLength) {
         if (field.Signed) {
           bs.writeInt32(value)
         } else {
-          bs.writeUint32(value)
+          bs.writeUint32(value) 
         }
       } else if (bitLength === 48 || bitLength == 24) {
         var count = bitLength/8;