@canboat/canboatjs 2.11.1 → 3.0.0-beta.2

package/lib/candevice.js

@@ -20,9 +20,8 @@ const _ = require('lodash')
 const Uint64LE = require('int64-buffer').Uint64LE
 const { defaultTransmitPGNs, getIndustryCode, getManufacturerCode, getDeviceClassCode } = require('./codes')
 const { toPgn } = require('./toPgn')
-const N2kDevice = require('./n2kDevice')
-
 let packageJson
+
 try
 {
   packageJson = require('../' + 'package.json')
@@ -31,21 +30,344 @@ try
 
 const deviceTransmitPGNs = [ 60928, 59904, 126996, 126464 ]
 
-class CanDevice extends N2kDevice {
+class CanDevice extends EventEmitter {
   constructor (canbus, options) {
-    super(options)
+    super()
+
+    if ( options.addressClaim ) {
+      this.addressClaim = options.addressClaim
+      this.addressClaim.pgn = 60928
+      this.addressClaim.dst = 255
+      this.addressClaim.prio = 6
+    } else {
+      this.addressClaim = {
+        pgn: 60928,
+        dst: 255,
+        prio:6,        
+        "Unique Number": 1263,
+        "Manufacturer Code": 999,
+        "Device Function": 130,      // PC gateway
+        "Device Class": 25,          // Inter/Intranetwork Device
+        "Device Instance Lower": 0,
+        "Device Instance Upper": 0,
+        "System Instance": 0,
+        "Industry Group": 4,          // Marine
+        "Reserved1": 1,
+        "Reserved2": 2
+      }
+      this.addressClaim["Unique Number"] = options.uniqueNumber || Math.floor(Math.random() * Math.floor(2097151))
+    }
+
+    let version = packageJson ? packageJson.version : "1.0"
+
+    if ( options.productInfo ) {
+      this.productInfo = options.productInfo
+      this.productInfo.pgn = 126996
+      this.productInfo.dst = 255
+    } else {
+      this.productInfo = {
+        pgn: 126996,
+        dst: 255,
+        "NMEA 2000 Version": 1300,
+        "Product Code": 667,   // Just made up..
+        "Model ID": "Signal K",
+        "Model Version": "canboatjs",
+        "Model Serial Code": options.uniqueNumber ? options.uniqueNumber.toString() : "000001",
+        "Certification Level": 0,
+        "Load Equivalency": 1
+      }
+    }
+
+    this.productInfo["Software Version Code"] = version
+
+    if ( options.serverVersion && options.serverUrl ) {
+      this.configurationInfo = {
+        pgn: 126998,
+        dst: 255,
+        "Installation Description #1": options.serverUrl,
+        "Installation Description #2": options.serverDescription,
+        "Manufacturer Information": options.serverVersion
+      }
+    } 
+
     this.canbus = canbus
+    this.options = _.isUndefined(options) ? {} : options
+
+    this.address = _.isUndefined(options.preferredAddress) ? 100 : options.preferredAddress
+    this.cansend = false
+    this.foundConflict = false
+    this.heartbeatCounter = 0
+    this.devices = {}
+
+    if ( !options.disableDefaultTransmitPGNs ) {
+      this.transmitPGNs = _.union(deviceTransmitPGNs, defaultTransmitPGNs)
+    } else {
+      this.transmitPGNs = [...deviceTransmitPGNs]
+    }
+    
+    if ( this.options.transmitPGNs ) {
+      this.transmitPGNs = _.union(this.transmitPGNs,
+                                  this.options.transmitPGNs)
+    }
 
     if ( options.app ) {
       options.app.on(options.analyzerOutEvent || 'N2KAnalyzerOut', this.n2kMessage.bind(this))
     }
   }
 
-  sendPGN(pgn, src) {
-    pgn.src = src || this.address
-    debug('Sending PGN %j', pgn)
-    this.canbus.sendPGN(pgn)
+  start() {
+    sendISORequest(this, 60928, 254)
+    setTimeout(() => {
+      sendAddressClaim(this)
+    }, 1000)
+  }
+
+  n2kMessage(pgn) {
+    if ( pgn.dst == 255 || pgn.dst == this.address ) {
+      try {
+        if ( pgn.pgn == 59904 ) {
+          handleISORequest(this, pgn)
+        } else if ( pgn.pgn == 126208 ) {
+          handleGroupFunction(this, pgn)
+        } else if ( pgn.pgn == 60928 ) {
+          handleISOAddressClaim(this, pgn)
+        } else if ( pgn.pgn == 126996 ) {
+          handleProductInformation(this, pgn)
+        }
+      } catch ( err ) {
+        console.error(err)
+        console.error(err.stack)
+      }
+
+      /*
+      var handler = this.handlers[pgn.pgn.toString()]
+      if ( pgn.dst == this.address )
+        debug(`handler ${handler}`)
+      if ( _.isFunction(handler) ) {
+        debug(`got handled PGN %j  ${handled}`, pgn)
+        handler(pgn)
+      }
+      */
+    }
+  }
+}
+
+function sendPGN(device, pgn, src, dest) {
+  pgn.src = src || device.address
+  debug('Sending PGN %j', pgn)
+  device.canbus.sendPGN(pgn)
+}
+
+function handleISORequest(device, n2kMsg) {
+  debug('handleISORequest %j', n2kMsg)
+
+  switch (n2kMsg.fields.PGN) {
+  case 126996:  // Product Information request
+    sendProductInformation(device)
+    break;
+  case 126998:  // Config Information request
+    sendConfigInformation(device)
+    break;
+  case 60928:   // ISO address claim request
+    sendPGN(device, device.addressClaim)
+    break;
+  case 126464:
+    sendPGNList(device)
+    break;
+  default:
+    if ( !device.options.disableNAKs ) {
+      debug(`Got unsupported ISO request for PGN ${n2kMsg.fields.PGN}. Sending NAK.`)
+      sendNAKAcknowledgement(device, n2kMsg.src, n2kMsg.fields.PGN)
+    }
+  }
+}
+
+function handleGroupFunction(device, n2kMsg) {
+  debug('handleGroupFunction %j', n2kMsg)
+  if(n2kMsg.fields.functionCodeRequest) {
+    handleRequestGroupFunction(device, n2kMsg)
+  } else if(n2kMsg.fields.functionCodeCommand) {
+    handleCommandGroupFunction(device, n2kMsg)
+  } else {
+    debug('Got unsupported Group Function PGN: %j', n2kMsg)
+  }
+
+  function handleRequestGroupFunction(device, n2kMsg) {
+    if ( !device.options.disableNAKs ) {
+      // We really don't support group function requests for any PGNs yet -> always respond with pgnErrorCode 1 = "PGN not supported"
+      debug("Sending 'PGN Not Supported' Group Function response for requested PGN", n2kMsg.fields.PGN)
+      
+      const acknowledgement = {
+        pgn: 126208,
+        dst: n2kMsg.src,
+        "Function Code": 2,
+        "PGN": n2kMsg.fields.PGN,
+        "PGN error code": 4,
+        "Transmission interval/Priority error code": 0,
+      "# of Parameters": 0
+      }
+      sendPGN(device, acknowledgement)
+    }
+  }
+
+  function handleCommandGroupFunction(device, n2kMsg) {
+    if ( !device.options.disableNAKs ) {
+      // We really don't support group function commands for any PGNs yet -> always respond with pgnErrorCode 1 = "PGN not supported"
+      debug("Sending 'PGN Not Supported' Group Function response for commanded PGN", n2kMsg.fields.PGN)
+      
+      const acknowledgement = {
+        pgn: 126208,
+        dst: n2kMsg.src,
+        "Function Code": 2,
+        "PGN": n2kMsg.fields.PGN,
+        "PGN error code": 4,
+      "Transmission interval/Priority error code": 0,
+        "# of Parameters": 0
+      }
+      sendPGN(device, acknowledgement)
+    }
+  }
+}
+
+function handleISOAddressClaim(device, n2kMsg) {
+  if ( n2kMsg.src != device.address ) {
+    if ( !device.devices[n2kMsg.src] ) {
+      debug(`registering device ${n2kMsg.src}`)
+      device.devices[n2kMsg.src] = { addressClaim: n2kMsg }
+      if ( device.cansend ) {
+        //sendISORequest(device, 126996, undefined, n2kMsg.src)
+      }
+    }
+    return
+  }
+
+  debug('Checking ISO address claim. %j', n2kMsg)
+
+  const uint64ValueFromReceivedClaim = getISOAddressClaimAsUint64(n2kMsg)
+  const uint64ValueFromOurOwnClaim = getISOAddressClaimAsUint64(device.addressClaim)
+
+  if(uint64ValueFromOurOwnClaim < uint64ValueFromReceivedClaim) {
+    debug(`Address conflict detected! Kept our address as ${device.address}.`)
+    sendAddressClaim(device)      // We have smaller address claim data -> we can keep our address -> re-claim it
+  } else if(uint64ValueFromOurOwnClaim > uint64ValueFromReceivedClaim) {
+    this.foundConflict = true
+    increaseOwnAddress(device)    // We have bigger address claim data -> we have to change our address
+    sendAddressClaim(device)
+    debug(`Address conflict detected! Changed our address to ${device.address}.`)
+  }
+}
+
+function increaseOwnAddress(device) {
+  var start = device.address
+  do {
+    device.address = (device.address + 1) % 253
+  } while ( device.address != start && device.devices[device.address] )
+}
+
+function handleProductInformation(device, n2kMsg) {
+  if ( !device.devices[n2kMsg.src] ) {
+    device.devices[n2kMsg.src] = {}
+  }
+  debug('got production information %j', n2kMsg)
+  device.devices[n2kMsg.src].productInformation = n2kMsg
+}
+
+function sendHeartbeat(device)
+{
+  device.heartbeatCounter = device.heartbeatCounter + 1
+  if ( device.heartbeatCounter > 252 )
+  {
+    device.heartbeatCounter = 0
+  }
+  sendPGN(device,{
+    pgn: 126993,
+    dst: 255,
+    prio:7,
+    "Data transmit offset": "00:01:00",
+    "Sequence Counter": device.heartbeatCounter,
+    "Controller 1 State":"Error Active"
+  })
+}
+
+
+function sendAddressClaim(device) {
+  if ( device.devices[device.address] ) {
+    //someone already has this address, so find a free one
+    increaseOwnAddress(device)
+  }
+  debug(`Sending address claim ${device.address}`)
+  sendPGN(device, device.addressClaim)
+  setTimeout(() => {
+    if ( !device.foundConflict ) {
+      debug('no address conflics, enabling send')
+      device.cansend = true
+      if ( device.options.app ) {
+        device.options.app.emit('nmea2000OutAvailable')
+      }
+      sendISORequest(device, 126996)
+      device.heartbeatInterval = setInterval(() => {
+        sendHeartbeat(device)
+      }, 60*1000)
+      /*
+      _.keys(device.devices).forEach((address) => {
+        sendISORequest(device, 126996, undefined, address)
+      })
+      */
+
+    }
+  }, 250)
+}
+
+function sendISORequest(device, pgn, src, dst=255) {
+  debug(`Sending iso request for ${pgn} to ${dst}`)
+
+  const isoRequest = {
+    pgn: 59904,
+    dst: dst,
+    "PGN": pgn
+  }
+  sendPGN(device, isoRequest, src)
+}
+
+
+function sendProductInformation(device) {
+  debug("Sending product info..")
+
+  sendPGN(device, device.productInfo)
+}
+
+function sendConfigInformation(device) {
+  if ( device.configurationInfo ) {
+    debug("Sending config info..")
+    sendPGN(device, device.configurationInfo)
   }
 }
 
+function sendNAKAcknowledgement(device, src, requestedPGN) {
+  const acknowledgement = {
+    pgn: 59392,
+    dst: src,
+    Control: 1,
+    "Group Function": 255,
+    PGN: requestedPGN
+  }
+  sendPGN(device, acknowledgement)
+}
+
+function sendPGNList(device, src) {
+  //FIXME: for now, adding everything that signalk-to-nmea2000 supports
+  //need a way for plugins, etc. to register the pgns they provide
+  const pgnList = {
+    pgn: 126464,
+    dst: src,
+    "Function Code": 0,
+    list: device.transmitPGNs
+  }
+  sendPGN(device, pgnList)
+}
+
+function getISOAddressClaimAsUint64(pgn) {
+  return new Uint64LE(toPgn(pgn))
+}
+
 module.exports = CanDevice

package/lib/fromPgn.js

@@ -62,6 +62,14 @@ class Parser extends EventEmitter {
     if ( this.options.returnNulls === undefined ) {
       this.options.returnNulls = false
     }
+
+    if ( this.options.useCamel === undefined ) {
+      this.options.useCamel = false
+    }
+
+    if ( this.options.useCamelCompat === undefined ) {
+      this.options.useCamelCompat = false
+    }
     
     this.name = pkg.name
     this.version = pkg.version
@@ -204,6 +212,7 @@ class Parser extends EventEmitter {
     let RepeatingFields = pgnData.RepeatingFieldSet1Size ? pgnData.RepeatingFieldSet1Size : 0
 
     pgn.fields = {}
+    
     try {
       var fields = pgnData.Fields
 
@@ -234,8 +243,8 @@ class Parser extends EventEmitter {
               const ts = _.get(pgn, 'timestamp', new Date())
               pgn.timestamp = _.isDate(ts) ? ts.toISOString() : ts
               if ( !_.isUndefined(value) && (value != null  ||
-                                       this.options.returnNulls) ) {
-                pgn.fields[field.Name] = value
+                                             this.options.returnNulls) ) {
+                this.setField(pgn.fields, field, value)
               }
               this.emit('pgn', pgn)
               cb && cb(undefined, pgn)
@@ -255,7 +264,7 @@ class Parser extends EventEmitter {
 
         if ( !_.isUndefined(value) && (value != null  ||
                                        this.options.returnNulls) ) {
-          pgn.fields[field.Name] = value
+          this.setField(pgn.fields, field, value)
         }
       }
       if ( RepeatingFields > 0 ) {
@@ -265,7 +274,7 @@ class Parser extends EventEmitter {
         let count
 
         if ( pgnData.RepeatingFieldSet1CountField !== undefined ) {
-          count = pgn.fields[pgnData.Fields[pgnData.RepeatingFieldSet1CountField-1].Name]
+          count = pgn.fields[pgnData.Fields[pgnData.RepeatingFieldSet1CountField-1][this.options.useCamel ? 'Id' :  'Name']]
         } else {
           count = 2048
         }
@@ -276,7 +285,7 @@ class Parser extends EventEmitter {
             if ( bs.bitsLeft > 0 ) {
               var value = readField(this.options, true, pgn, field, bs, fields)
               if ( !_.isUndefined(value) && value != null ) {
-                group[field.Name] = value
+                this.setField(group, field, value)
               }
             }
           })
@@ -306,6 +315,17 @@ class Parser extends EventEmitter {
     }
   }
 
+  setField(res, field, value) {
+    if ( this.options.useCamelCompat ) {
+      res[field.Id] = value
+      res[field.Name] = value
+    } else if ( this.options.useCamel ) {
+      res[field.Id] = value
+    } else {
+      res[field.Name] = value
+    }
+  }
+
   findNonMatchPgn(pgnList) {
     return pgnList.find(f => {
       return !f.Fields.find(f => !_.isUndefined(f.Match))
@@ -616,8 +636,9 @@ function readField(options, runPostProcessor, pgn, field, bs, fields) {
       if ( options.checkForInvalidFields !== false && max !== 'undefined' &&
            field.FieldType !== 'LOOKUP' &&
            field.FieldType !== 'FIELDTYPE_LOOKUP' &&
+           field.FieldType !== 'PGN' &&
            field.BitLength > 1 &&
-           max - value <= 0 ) {
+           max - value < 0 ) {
         //console.log(`Bad field ${field.Name} ${max - value}`)
         value = null
       } if ( field.Resolution && typeof value === 'number' ) {
@@ -724,9 +745,9 @@ function readValue(options, pgn, field, bs, fields, bitLength) {
     var y = bs.readUint32()
 
     if ( field.Signed ) {
-      value = x === 0xffffffff && y == 0x7fffffff ? null : new Int64LE(y,x)
+      value = (x === 0xffffffff || x === 0xfffffffe) && y == 0x7fffffff  ? null : new Int64LE(y,x)
     } else {
-      value = x === 0xffffffff && y == 0xffffffff ? null : new Uint64LE(y,x)
+      value = (x === 0xffffffff || x === 0xfffffffe) && y == 0xffffffff ? null : new Uint64LE(y,x)
     }
   } else if ( bitLength <= 64 ) {
     value = bs.readBits(bitLength, field.Signed)
@@ -930,7 +951,7 @@ function lookupKeyBitLength(data, fields)
 {
   let field = fields.find(field => (field.Name === 'Key'))
 
-  let val = data['Key']
+  let val = data['Key'] || data['key']
   if ( typeof val === 'string' ) {
     val = lookupFieldTypeEnumerationValue(field.LookupFieldTypeEnumeration, val)
   }
@@ -967,6 +988,8 @@ fieldTypePostProcessors['TIME'] = (field, value) => {
   return value
 }
 
+fieldTypePostProcessors['DURATION'] = fieldTypePostProcessors['TIME']
+
 fieldTypePostProcessors['Pressure'] = (field, value) => {
   if (field.Unit)
   {

package/lib/pgns.js

@@ -1,5 +1,6 @@
 const { flow, first, isArray, isEmpty, propertyOf } = require('lodash/fp')
-const pgns = require('@canboat/pgns')
+const canboat = require('@canboat/pgns')
+const pgns = canboat.pgns
 const pgnsIK = { PGNs: [] } //require('@canboat/pgns/pgns-ik')
 const pgnsNGT = { PGNs: [] } //require('@canboat/pgns/pgns-ngt')
 const _ = require('lodash')
@@ -7,7 +8,7 @@ const debug = require('debug')('canboatjs:pgns')
 
 function organizePGNs() {
   const res = {}
-  const all = [...pgns.PGNs, ...pgnsIK.PGNs, ...pgnsNGT.PGNs]
+  const all = [...canboat.getPGNs(), ...pgnsIK.PGNs, ...pgnsNGT.PGNs]
   all.forEach(pgn => {
     if ( !res[pgn.PGN] ) {
       res[pgn.PGN] = []

package/lib/simpleCan.js

@@ -39,7 +39,7 @@ SimpleCan.prototype.start = function () {
                                   disableDefaultTransmitPGNs: true,
                                   disableNAKs: true
                                  },
-                                )
+)
   this.candevice.start()
 }
 
@@ -98,10 +98,6 @@ SimpleCan.prototype.sendPGN = function (msg) {
   }
 }
 
-SimpleCan.prototype.sendActisenseFormat = function (msg) {
-  this.sendPGN(msg)
-}
-
 function binToActisense(pgn, data, length) {
   return (
     pgn.timestamp +

package/lib/stringMsg.js

@@ -8,7 +8,6 @@ const {
 const {
   buildCanId, encodeCanIdString, parseCanId, parseCanIdStr,
 } = require('./canId')
-const moment = require('moment')
 
 /**
  * Helper function that helps merge canId fields with format, data, and others.
@@ -118,17 +117,6 @@ exports.encodeYDRAW = ({ data, ...canIdInfo }) => {
   return pgns.map(buffer => canId + ' ' + byteString(buffer, ' '))
 }
 
-//16:29:27.082 R 19F51323 01 02<CR><LF>
-exports.encodeYDRAWFull = ({ data, ...canIdInfo }) => {
-  const canId = encodeCanIdString(canIdInfo)
-  const pgns = data.length > 8 || canIdInfo.pgn == 126720 ? getPlainPGNs(data) : [ data ]
-  return pgns.map(buffer =>
-    moment().utc().format('hh:mm:ss.SSS')
-      + ' R '
-      + canId + ' '
-      + byteString(buffer, ' '))
-}
-
 const get0183Sentence = (msg) => {
   let sentence = msg
   if (sentence.charAt(0) === '\\') {

package/lib/toPgn.js

@@ -21,7 +21,7 @@ const BitStream = require('bit-buffer').BitStream
 const Int64LE = require('int64-buffer').Int64LE
 const Uint64LE = require('int64-buffer').Uint64LE
 const { getPlainPGNs } = require('./utilities')
-const { encodeActisense, encodeActisenseN2KACSII, encodeYDRAW, encodeYDRAWFull, parseActisense, encodePCDIN, encodeMXPGN, encodePDGY } = require('./stringMsg')
+const { encodeActisense, encodeActisenseN2KACSII, encodeYDRAW, parseActisense, encodePCDIN, encodeMXPGN, encodePDGY } = require('./stringMsg')
 const { encodeN2KActisense } = require('./n2k-actisense')
 const { encodeCanId } = require('./canId')
 const { getIndustryCode, getManufacturerCode } = require('./codes')
@@ -74,7 +74,7 @@ function toPgn(data) {
   let RepeatingFields = pgnData.RepeatingFieldSet1Size ? pgnData.RepeatingFieldSet1Size : 0
   for ( var index = 0; index < fields.length - RepeatingFields; index++ ) {
     var field = fields[index]
-    var value = data[field.Name];
+    var value = data[field.Name] !== undefined ? data[field.Name] : data[field.Id]
 
     if ( !_.isUndefined(field.Match) ) {
       //console.log(`matching ${field.Name} ${field.Match} ${value} ${_.isString(value)}`)
@@ -98,7 +98,7 @@ function toPgn(data) {
     data.list.forEach(repeat => {
       for (var index = 0; index < RepeatingFields; index++ ) {
         var field = fields[pgnData.Fields.length-RepeatingFields+index]
-        var value = repeat[field.Name];
+        var value = repeat[field.Name] !== undefined ? repeat[field.Name] : repeat[field.Id]
 
         writeField(bs, pgn_number, field, data, value, fields)
       }
@@ -171,7 +171,7 @@ function writeField(bs, pgn_number, field, data, value, fields, bitLength) {
     }
   } else {
     let type = field.FieldType
-    if ( field.Name === 'Industry Code' ) {
+    if ( field.Id === 'industryCode' ) {
       if ( _.isString(value) ) {
         value = Number(getIndustryCode(value))
       }
@@ -184,6 +184,10 @@ function writeField(bs, pgn_number, field, data, value, fields, bitLength) {
       }
     }
 
+    if ( field.FieldType == "NUMBER" && _.isString(value) ) {
+      value = Number(value)
+    }
+
     if (field.Resolution && typeof value === 'number' ) {
       value = Number((value / field.Resolution).toFixed(0))
     }
@@ -191,9 +195,11 @@ function writeField(bs, pgn_number, field, data, value, fields, bitLength) {
     if ( field.FieldType && fieldTypeWriters[field.FieldType] ) {
       fieldTypeWriters[field.FieldType](pgn_number, field, value, bs)
     } else {
+      /*
       if ( _.isString(value) && typeof bitLength !== 'undefined' && bitLength !== 0 ) {
         value = Number(value)
-      }
+        }
+        */
 
       if ( field.Unit === "kWh" ) {
         value /= 3.6e6; // 1 kWh = 3.6 MJ.
@@ -284,7 +290,7 @@ function lookupKeyBitLength(data, fields)
 {
   let field = fields.find(field => (field.Name === 'Key'))
 
-  let val = data['Key']
+  let val = data['Key'] || data['key']
   if ( typeof val === 'string' ) {
     val = lookupFieldTypeEnumerationValue(field.LookupFieldTypeEnumeration, val)
   }
@@ -327,10 +333,6 @@ function pgnToYdgwRawFormat(info) {
   return encodeYDRAW({ ...info, data: toPgn(info) })
 }
 
-function pgnToYdgwFullRawFormat(info) {
-  return encodeYDRAWFull({ ...info, data: toPgn(info) })
-}
-
 function pgnToPCDIN(info) {
   return encodePCDIN({ ...info, data: toPgn(info) })
 }
@@ -340,7 +342,6 @@ function pgnToMXPGN(info) {
 }
 
 const actisenseToYdgwRawFormat = _.flow(parseActisense, encodeYDRAW)
-const actisenseToYdgwFullRawFormat = _.flow(parseActisense, encodeYDRAWFull)
 const actisenseToPCDIN = _.flow(parseActisense, encodePCDIN)
 const actisenseToMXPGN = _.flow(parseActisense, encodeMXPGN)
 const actisenseToiKonvert = _.flow(parseActisense, encodePDGY)
@@ -460,6 +461,8 @@ fieldTypeMappers['TIME'] = (field, value) => {
   return value
 }
 
+fieldTypeMappers['DURATION'] = fieldTypeMappers['TIME']
+
 /*
 fieldTypeMappers['Manufacturer code'] = (field, value) => {
   if ( _.isString(value) ) {
@@ -495,9 +498,7 @@ module.exports.toPgn = toPgn
 module.exports.toiKonvertSerialFormat = toiKonvertSerialFormat
 module.exports.pgnToiKonvertSerialFormat = pgnToiKonvertSerialFormat
 module.exports.pgnToYdgwRawFormat = pgnToYdgwRawFormat
-module.exports.pgnToYdgwFullRawFormat = pgnToYdgwFullRawFormat
 module.exports.actisenseToYdgwRawFormat = actisenseToYdgwRawFormat
-module.exports.actisenseToYdgwFullRawFormat = actisenseToYdgwFullRawFormat
 module.exports.pgnToActisenseSerialFormat = pgnToActisenseSerialFormat
 module.exports.pgnToActisenseN2KAsciiFormat = pgnToActisenseN2KAsciiFormat
 module.exports.pgnToN2KActisenseFormat = pgnToN2KActisenseFormat

package/lib/ydgw02.js

@@ -20,7 +20,7 @@ const FromPgn = require('./fromPgn').Parser
 const Parser = require('./fromPgn').Parser
 const _ = require('lodash')
 const { defaultTransmitPGNs } = require('./codes')
-const { pgnToYdgwRawFormat, pgnToYdgwFullRawFormat, actisenseToYdgwRawFormat } = require('./toPgn')
+const { pgnToYdgwRawFormat, actisenseToYdgwRawFormat } = require('./toPgn')
 
 const pgnsSent = {}
 
@@ -63,11 +63,6 @@ function Ydgw02Stream (options, type) {
       options.app.emit('connectionwrite', { providerId: options.providerId })
     })
 
-    options.app.on('ydFullRawOut', (msgs) => {
-      this.sendYdgwFullPGN(msgs)
-      options.app.emit('connectionwrite', { providerId: options.providerId })
-    })
-
     //this.sendString('$PDGY,N2NET_OFFLINE')
 
     if ( type === 'usb' ) {
@@ -87,24 +82,12 @@ Ydgw02Stream.prototype.sendString = function (msg) {
 Ydgw02Stream.prototype.sendPGN = function (pgn) {
   let now = Date.now()
   let lastSent = pgnsSent[pgn.pgn]
-  let msgs
-  if ( pgn.ydFullFormat === true ) {
-    msgs = pgnToYdgwFullRawFormat(pgn)
-  } else {
-    msgs = pgnToYdgwRawFormat(pgn)
-  }
-  msgs.forEach(raw => {
+  pgnToYdgwRawFormat(pgn).forEach(raw => {
     this.sendString(raw + '\r\n')
   })
   pgnsSent[pgn.pgn] = now
 }
 
-Ydgw02Stream.prototype.sendYdgwFullPGN = function (msgs) {
-  msgs.forEach(raw => {
-    this.sendString(raw + '\r\n')
-  })
-}
-
 Ydgw02Stream.prototype.sendYdgwPGN = function (msg) {
 
   actisenseToYdgwRawFormat(msg).forEach(raw => {