@canboat/canboatjs 2.0.0-beta2 → 2.0.0

package/bin/candumpjs

@@ -67,8 +67,25 @@ channel.addListener('onMessage', (msg) => {
   var pgn = parseCanId(msg.id)
   
   pgn.timestamp = new Date().toISOString()
+
+  let sourceString = binToActisense(pgn, msg.data, msg.data.length)
   
-  parser.parse({ pgn, length: msg.data.length, data: msg.data })
+  parser.parse({ pgn, length: msg.data.length, data: msg.data, sourceString })
 })
 
 channel.start()
+
+
+function binToActisense(pgn, data, length) {
+  return (
+    pgn.timestamp +
+      `,${pgn.prio},${pgn.pgn},${pgn.src},${pgn.dst},${length},` +
+      new Uint32Array(data)
+      .reduce(function(acc, i) {
+        acc.push(i.toString(16));
+        return acc;
+      }, [])
+      .map(x => (x.length === 1 ? "0" + x : x))
+      .join(",")
+  );
+}

package/lib/canbus.js

@@ -84,7 +84,7 @@ function CanbusStream (options) {
     options.app.on(options.outEvent || 'nmea2000out', (msg) => {
       that.sendPGN(msg)
     })
-    options.app.on('nmea2000JsonOut', (msg) => {
+    options.app.on(options.jsonOutEvent || 'nmea2000JsonOut', (msg) => {
       that.sendPGN(msg)
     })
   }
@@ -94,6 +94,9 @@ function CanbusStream (options) {
     this.socketCanWriter = null
     var hasWriter = spawn('sh', ['-c', 'which socketcan-writer'])
 
+    const setProviderError = this.setProviderError.bind(this)
+    const setProviderStatus = this.setProviderStatus.bind(this)
+
     hasWriter.on('close', code => {
       if ( code == 0 ) {
         debug('found socketcan-writer, starting...')
@@ -318,7 +321,7 @@ function readLine(that, line) {
 
   pgn.timestamp = new Date().toISOString()
 
-  that.push({ pgn: pgn, length: len, data })
+  that.push({ pgn: pgn, length: len, data, sourceString: line })
 }
 
 CanbusStream.prototype._transform = function (chunk, encoding, done) {

package/lib/candevice.js

@@ -88,7 +88,7 @@ class CanDevice extends EventEmitter {
     }
 
     if ( options.app ) {
-      options.app.on('N2KAnalyzerOut', this.n2kMessage.bind(this))
+      options.app.on(options.analyzerOutEvent || 'N2KAnalyzerOut', this.n2kMessage.bind(this))
     }
   }
 

package/lib/fromPgn.js

@@ -40,6 +40,7 @@ const maxInt64 = new Int64LE(0x7fffffff, 0xffffffff)
 
 const FORMAT_PLAIN = 0
 const FORMAT_COALESCED  = 1
+const RES_BINARY = 'Binary data'
 
 const FASTPACKET_INDEX = 0
 const FASTPACKET_SIZE = 1
@@ -301,11 +302,11 @@ class Parser extends EventEmitter {
     } else if ( _.isBuffer(data) ) {
       return this.parseBuffer(data, cb)
     } else {
-      return this.parsePgnData(data.pgn, data.length, data.data, data.coalesced === true)
+      return this.parsePgnData(data.pgn, data.length, data.data, data.coalesced === true, cb, data.sourceString)
     }
   }
 
-  parsePgnData(pgn, length, data, coalesced, cb) {
+  parsePgnData(pgn, length, data, coalesced, cb, sourceString) {
     try
     {
       var buffer = data
@@ -319,7 +320,7 @@ class Parser extends EventEmitter {
 
       var bv = new BitView(buffer);
       var bs = new BitStream(bv)
-      const res = this._parse(pgn, bs, length, coalesced, cb);
+      const res = this._parse(pgn, bs, length, coalesced, cb, sourceString);
       if ( res ) {
         debug('parsed pgn %j', pgn)
       }
@@ -500,7 +501,7 @@ function getField(pgn, index, data) {
         var hasMatch = !_.isUndefined(field.Match)
         if ( hasMatch && data.fields.list.length > 0 ) {
           let param = data.fields.list.find(f => f.Parameter === idx+1)
-
+          
           if ( param ) {
             pgnList = pgnList.filter(f => f.Fields[idx].Match == param.Value)
             if ( pgnList.length == 0 ) {
@@ -513,7 +514,7 @@ function getField(pgn, index, data) {
         }
       })
     }
-
+    
     if ( index >= 0 && index < pgn.Fields.length ) {
       return pgn.Fields[index]
     }
@@ -571,7 +572,7 @@ function readField(options, runPostProcessor, pgn, field, bs) {
   if ( reader ) {
     value = reader(pgn, field, bs)
   } else {
-    if ( bs.bitsLeft < field.BitLength ) {
+    if ( field.Type !== RES_BINARY  && bs.bitsLeft < field.BitLength ) {
       //no more data
       bs.readBits(bs.bitsLeft, false)
       return
@@ -701,12 +702,25 @@ function readValue(options, pgn, field, bs, bitLength) {
     } else {
       value = x === 0xffffffff && y == 0xffffffff ? null : new Uint64LE(y,x)
     }
-  } else {
+  } else if ( bitLength <= 64 ) {
     value = bs.readBits(bitLength, field.Signed)
     if ( bitLength > 1 && isMax(bitLength, value, field.Signed) ) {
       value = null
     }
-    //console.log(`${field.Name} ${bitLength} ${value} ${bs.view.buffer[bs.byteIndex]} ${bs.index}`)
+  } else {
+    if ( bs.bitsLeft < field.BitLength ) {
+      bitLength = bs.bitsLeft
+    }
+    
+    value = bs.readArrayBuffer(bitLength/8, field.Signed)
+    value = new Uint32Array(value)
+      .reduce(function(acc, i) {
+        acc.push(i.toString(16));
+        return acc;
+      }, [])
+      .map(x => (x.length === 1 ? "0" + x : x))
+      .join(" ")
+    return value
   }
   
   if ( value != null && typeof value !== 'undefined' && typeof value !== 'number' ) {
@@ -744,7 +758,7 @@ function readVariableLengthField(options, pgn, field, bs) {
 
   try {
     var refField = getField(pgn.fields.PGN, bs.view.buffer[bs.byteIndex-1]-1, pgn)
-
+    
     if ( refField ) {
       var bits = (refField.BitLength + 7) & ~7; // Round # of bits in field refField up to complete bytes: 1->8, 7->8, 8->8 etc.
       let res =  readField(options, false, pgn, refField, bs)
@@ -918,7 +932,7 @@ fieldTypePostProcessors['Pressure'] = (field, value) => {
   return value
 }
 
-fieldTypePostProcessors['Binary data'] = (field, value) => {
+fieldTypePostProcessors[RES_BINARY] = (field, value) => {
   return value.toString()
 }
 

package/lib/ikonvert.js

@@ -77,7 +77,7 @@ function iKonvertStream (options) {
         that.sendPGN(msg)
       }
     })
-    options.app.on('nmea2000JsonOut', (msg) => {
+    options.app.on(options.jsonOutEvent || 'nmea2000JsonOut', (msg) => {
       that.sendPGN(msg)
     })
 

package/lib/serial.js

@@ -108,6 +108,10 @@ SerialStream.prototype.start = function () {
   this.isFile = false
   this.state = MSG_START
 
+  if ( typeof this.reconnectDelay === 'undefined' ) {
+    this.reconnectDelay = 1000
+  }
+
   if ( !this.options.fromFile ) {
     this.serial = new SerialPort(this.options.device, {
       baudRate: this.options.baudrate || 115200
@@ -122,7 +126,9 @@ SerialStream.prototype.start = function () {
         ? (msg) => {
           this.options.app.setProviderError(this.options.providerId, msg)
         }
-        : () => {}
+          : () => {}
+    this.setProviderStatus = setProviderStatus
+    
     var that = this
     
     this.serial.on('data', (data) => {
@@ -163,7 +169,7 @@ SerialStream.prototype.start = function () {
         }
       })
       
-      this.options.app.on('nmea2000JsonOut', msg => {
+      this.options.app.on(this.options.jsonOutEvent || 'nmea2000JsonOut', msg => {
         if ( this.outAvailable ) {
           writeObject(msg)
         }
@@ -175,15 +181,18 @@ SerialStream.prototype.start = function () {
     this.serial.on('error', function (x) {
       setProviderError(x.message)
       console.log(x)
+      that.scheduleReconnect()
     })
     this.serial.on('close', () => {
       setProviderError('Closed, reconnecting...')
-      this.start.bind(this)
+      //this.start.bind(this)
+      that.scheduleReconnect()
     })
     this.serial.on(
       'open',
       function () {
         try {
+          this.reconnectDelay = 1000
           setProviderStatus(`Connected to ${that.options.device}`)
           var buf = composeMessage(NGT_MSG_SEND, Buffer.from(NGT_STARTUP_MSG), NGT_STARTUP_MSG.length)
           debugOut(buf)
@@ -211,6 +220,16 @@ SerialStream.prototype.start = function () {
   }
 }
 
+SerialStream.prototype.scheduleReconnect = function () {
+  this.reconnectDelay *= this.reconnectDelay < 60 * 1000 ? 1.5 : 1
+  const msg = `Not connected (retry delay ${(
+    this.reconnectDelay / 1000
+  ).toFixed(0)} s)`
+  debug(msg)
+  this.setProviderStatus(msg)
+  setTimeout(this.start.bind(this), this.reconnectDelay)
+}
+
 function readData(that, data) {
   for ( var i = 0; i < data.length; i++ ) {
     //console.log(data[i])

package/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
 })
 

package/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;

package/lib/venus.js

@@ -75,7 +75,7 @@ VenusStream.prototype._transform = function (pgn, encoding, done) {
   this.fromPgn.parseVenusMQTT(pgn, (error, pgn) => {
     if ( !error ) {
       this.push(pgn)
-      this.options.app.emit('N2KAnalyzerOut', pgn)
+      this.options.app.emit(this.options.analyzerOutEvent || 'N2KAnalyzerOut', pgn)
     }
 
     done()

package/lib/w2k01.js

@@ -51,7 +51,7 @@ function W2K01Stream (options, type, outEvent) {
         }
       })
       
-      options.app.on('nmea2000JsonOut', (msg) => {
+      options.app.on(options.jsonOutEvent || 'nmea2000JsonOut', (msg) => {
         this.sendPGN(msg)
       })
     }

package/lib/ydgw02.js

@@ -57,7 +57,7 @@ function Ydgw02Stream (options, type) {
       }
     })
 
-    options.app.on('nmea2000JsonOut', (msg) => {
+    options.app.on(options.jsonOutEvent || 'nmea2000JsonOut', (msg) => {
       this.sendPGN(msg)
     })
 
@@ -133,7 +133,7 @@ Ydgw02Stream.prototype._transform = function (chunk, encoding, done) {
   const pgn = this.fromPgn.parseYDGW02(line)
   if ( !_.isUndefined(pgn) ) {
     this.push(pgn)
-    this.options.app.emit('N2KAnalyzerOut', pgn)
+    this.options.app.emit(this.options.analyzerOutEvent || 'N2KAnalyzerOut', pgn)
   }
 
   done()

package/lib/ydvr.js

@@ -108,6 +108,10 @@ function YdvrStream() {
 
   this.parser = new FromPgn();
 
+  this.messageCount = 0;
+  this.errorCount = 0;
+  this.timerResetCount = 0;
+
   this.parser.on('error', (pgn, error) => {
     console.error(`Error parsing ${pgn.pgn} ${error}`);
     console.error(error.stack);
@@ -141,7 +145,8 @@ YdvrStream.prototype.parseNextRecord = function () {
   let timeAbsolute;
   if (this.lastTime != null && time < this.lastTime) {
     this.timeOffset = (this.timeOffset || 0) + 60000;
-    timeAbsolute = time + timeOffset;
+    timeAbsolute = time + this.timeOffset;
+    this.timerResetCount += 1;
   } else {
     timeAbsolute = time;
   }
@@ -150,6 +155,9 @@ YdvrStream.prototype.parseNextRecord = function () {
   var identifier = this.bs.readUint32();
   if (identifier === 0xffffffff) {
     // service record
+    if (this.bs.bitsLeft < 8 * 8) {
+      return false;
+    }
     var srData = this.bs.readArrayBuffer(8);
   } else {
     const pgn = parseCanId(identifier);
@@ -163,6 +171,9 @@ YdvrStream.prototype.parseNextRecord = function () {
     } else {
       bodyLen = 8;
     }
+    if (this.bs.bitsLeft < bodyLen * 8) {
+      return false;
+    }
     var body = this.bs.readArrayBuffer(bodyLen);
 
     const parsed = this.parser.parsePgnData(
@@ -177,6 +188,7 @@ YdvrStream.prototype.parseNextRecord = function () {
     }
   }
 
+  this.messageCount += 1;
   return true;
 }
 
@@ -192,7 +204,10 @@ YdvrStream.prototype._transform = function (chunk, encoding, done) {
     let parsed = false;
     try {
       parsed = this.parseNextRecord();
-    } catch (ex) { }
+    } catch (ex) {
+      console.error(ex);
+      this.errorCount += 1;
+    }
     if (!parsed) {
       this.bs.byteIndex = startIndex;
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canboat/canboatjs",
-  "version": "2.0.0-beta2",
+  "version": "2.0.0",
   "description": "Native javascript version of canboat",
   "main": "index.js",
   "scripts": {
@@ -53,7 +53,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "@canboat/pgns": "2.0.0-beta1",
+    "@canboat/pgns": "2.x.x",
     "bit-buffer": "0.2.3",
     "date-fns": "2.0.0-alpha.27",
     "debug": "^4.3.4",
@@ -80,7 +80,7 @@
   },
   "optionalDependencies": {
     "serialport": "^9.0.7",
-    "socketcan": "^2.2.2"
+    "socketcan": "^4.0.3"
   },
   "repository": {
     "type": "git",

package/W2K_NOTES

@@ -1,5 +0,0 @@
-N2K Actisense corruption?
-  Docs don't match
-  What is that last byte?
-
-Not seeing 126996

package/n2ka.js

@@ -1,123 +0,0 @@
-var net = require('net');
-const BitStream = require('bit-buffer').BitStream
-const BitView = require('bit-buffer').BitView
-const cid = require('./lib/canId')
-const FromPgn = require('./lib/fromPgn').Parser
-const debug = require('debug')('canboatjs:w2k01')
-
-var client = new net.Socket();
-client.connect(60003, '192.168.1.145', function() {
-  console.log('Connected');
-});
-
-client.on('data', function(data) {
-  const parser = new FromPgn()
-  
-  /*
-  var obuf = Buffer.from(data)
-  let len = obuf.readUInt16LE(3)
-
-  let buf = Buffer.alloc(len)
-  obuf.copy(buf, 0, 5, len+5)
-  console.log('New Buf: ' + buf.toString('hex'))
-  let offset = 0
-  let dst = buf.readUInt8(offset)
-  offset += 1
-  let canid = buf.readUInt32LE(offset)
-  offset += 4
-  let timestamp = buf.readUInt32LE(offset)
-  offset += 4
-  let mhs = buf.readUInt8(offset)
-  offset += 1
-  
-  let info = cid.parseCanId(canid)
-
-  console.log(`(${len}, ${data.length}) (${info.src}, ${info.dst}) ${info.pgn} ${timestamp}`)
-  
-
-  try {
-    let pgnData = Buffer.alloc(len-offset-2)
-    buf.copy(pgnData, 0, offset, len-2)
-    console.log('pgnData: ' + pgnData.toString('hex'))
-    let pgn = parser.parsePgnData(info, pgnData.length, pgnData, true)
-    console.log(pgn)
-  } catch (error) {
-
-    console.log(error)
-  }
-  */
-
-  debug('Received: (' + data.length + ') ' + Buffer.from(data).toString('hex'))
-  
-  var inBuf = Buffer.from(data)
-  var inOffset = 0
-
-  while ( true ) {
-    let len = inBuf.readUInt16LE(inOffset+3)
-
-    if ( inBuf.length < inOffset + 5 + len ) {
-      console.log('PARTIAL PGN')
-      this.lastChunk = Buffer.alloc(inBuf.length - inOffset)
-      inBuf.copy(this.lastChunk, 0, inOffset, inBuf.length-1)
-      return
-    } else if ( inBuf[inOffset + 5 + len -1] != 0x03 ||
-                inBuf[inOffset + 5 + len -2] != 0x10 ) {
-      //console.log('Received: (' + data.length + ') ' + Buffer.from(data).toString('hex'))
-      //console.log('LENGTH MISMATCH ' + inBuf[inOffset + 5 + len -1])
-      return
-    }
-    
-    let buf = Buffer.alloc(len)
-    inBuf.copy(buf, 0, inOffset+5, inOffset+len+5)
-
-   
-    let offset = 0
-    let dst = buf.readUInt8(offset)
-    offset += 1
-    let canid = buf.readUInt32LE(offset)
-    offset += 4
-    let timestamp = buf.readUInt32LE(offset)
-    offset += 4
-    let mhs = buf.readUInt8(offset)
-    offset += 1
-    
-    let info = cid.parseCanId(canid)
-
-    if ( info.pgn != 129025)
-      return
-
-    let pgnData = Buffer.alloc(len-offset-3)
-    buf.copy(pgnData, 0, offset, len-3)
-
-    /*
-    console.log('inputLen: ' + inBuf.length)
-    console.log('NextBuf: (' + buf.length + ') ' + buf.toString('hex'))
-    console.log('pgnData: (' + pgnData.length + ') ' + pgnData.toString('hex'))
-
-    console.log(`${len} ${mhs} ${dst} (${info.src}, ${info.dst}) ${info.pgn} ${timestamp}`)
-    */
-    
-    let pgn = parser.parsePgnData(info, pgnData.length, pgnData, true)
-    if ( pgn ) {
-      //console.log(JSON.stringify(pgn))
-      
-    }
-    
-    inOffset += len + 5
-    //console.log(`inOffset ${inOffset} `)
-    if ( inOffset >= inBuf.length  ) {
-      return
-    }
-    break
-  }
-});
-
-client.on('close', function() {
-  console.log('Connection closed');
-})
-
-process.on('SIGINT', () => {
-  console.info('SIGINT signal received.');
-  client.destroy()
-});
-  

package/wk2.out

@@ -1,224 +0,0 @@
-A000021.144 05FF2 1F801 F04E4717B2E569D2
-A000021.244 05FF2 1F801 EF4E4717B3E569D2
-A000021.293 05FF2 1F802 FFFC289A1600FFFF
-A000021.344 05FF2 1F801 EF4E4717B3E569D2
-A000021.355 05FF7 1EF00 E59861060202FFFFFFFF03030000FFFFFFFFFFFFFFFFFFFF0000FFFFFF7FFFFFFF7FFFFFFF7F0000FF7F
-A000021.360 05FF7 1EF00 E59812070202FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7F
-A000021.363 05FF3 1F904 FFFFFFFFFF0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7FFF7F
-A000021.367 05FF3 1F903 FFF0FFFFFF7FFFFF
-A000021.444 05FF2 1F801 EE4E4717B4E569D2
-A000021.544 05FF2 1F802 FFFC289A1700FFFF
-A000021.544 05FF2 1F801 F04E4717AFE569D2
-A000021.644 05FF2 1F801 F14E4717ABE569D2
-A000021.700 05FF7 1EF00 E598E708000A0301030DDDB7C684051101
-A000021.744 05FF2 1F801 F24E4717A8E569D2
-A000021.794 05FF2 1F802 FFFC289A1900FFFF
-A000021.844 05FF2 1F801 F34E4717A4E569D2
-A000021.944 05FF2 1F801 F34E4717A1E569D2
-A000022.041 05FF7 1EF00 E5984819020203030101030F08FF0F00303CA31C0113C6A90F
-A000022.044 05FF3 1F805 FFDB4BA48A7822C068149B75826B05808477E7A7D762F5998A99000000000014FC06CD002A03AAF2FFFF00
-A000022.046 05FF6 1F11A FFF2DB4B69F8FFFF
-A000022.068 05FF6 1FA03 FFDACD0010036F02
-A000022.068 05FF7 1EF00 E5981700040453487B42F4D0E942AFB70443000000000000000000000000000000000000000000000000F29C0340CE06FB4022C10141BA7EC74000000000
-A000022.073 05FF2 1F802 FFFC289A1D00FFFF
-A000022.073 05FF2 1F801 F44E47179EE569D2
-A000022.144 05FF2 1F801 F14E471797E569D2
-A000022.244 05FF2 1F801 EC4E471799E569D2
-A000022.294 05FF2 1F802 FFFC289A2800FFFF
-A000022.344 05FF2 1F801 E74E47179BE569D2
-A000022.355 05FF7 1EF00 E59861060202FFFFFFFF03030000FFFFFFFFFFFFFFFFFFFF0000FFFFFF7FFFFFFF7FFFFFFF7F0000FF7F
-A000022.360 05FF7 1EF00 E59812070202FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7F
-A000022.362 05FF3 1F904 FFFFFFFFFF0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7FFF7F
-A000022.366 05FF3 1F903 FFF0FFFFFF7FFFFF
-A000022.387 05FF7 1EF00 E598E008020203090012E8071900
-A000022.389 05FF7 1EF00 E598E008020203090112E8071900
-A000022.391 05FF7 1EF00 E598E008020203090B11011900
-A000022.392 05FF7 1EF00 E598E008020203090C12E8071900
-A000022.444 05FF2 1F801 E04E47179CE569D2
-A000022.544 05FF2 1F802 FFFC289A3200FFFF
-A000022.544 05FF2 1F801 F54E471771E569D2
-A000022.644 05FF2 1F801 ED4E471772E569D2
-A000022.700 05FF7 1EF00 E598E708000A0301030DDDB7C684051101
-A000022.744 05FF2 1F801 E54E471772E569D2
-A000022.794 05FF2 1F802 FFFC289A4600FFFF
-A000022.844 05FF2 1F801 DB4E471772E569D2
-A000022.944 05FF2 1F801 D24E471771E569D2
-A000023.044 05FF3 1F805 FFDB4BDBB17822804FA0566B826B0580C203F09CD762F53F9891000000000014FC06CD002A03AAF2FFFF00
-A000023.049 05FF6 1F11A FFF2DB4B69F8FFFF
-A000023.068 05FF6 1FA03 FFDACD0010036F02
-A000023.068 05FF7 1EF00 E598170004043EAD77420D9DE84217C303430000000000000000000000000000000000000000000000007193034085F4FA40B0B701418E6FC74000000000
-A000023.072 05FF2 1F802 FFFC289A5300FFFF
-A000023.072 05FF2 1F801 C84E47176FE569D2
-A000023.144 05FF2 1F801 C24E47176DE569D2
-A000023.244 05FF2 1F801 B84E47176BE569D2
-A000023.294 05FF2 1F802 FFFC289A5900FFFF
-A000023.344 05FF2 1F801 AE4E471769E569D2
-A000023.355 05FF7 1EF00 E59861060202FFFFFFFF03030000FFFFFFFFFFFFFFFFFFFF0000FFFFFF7FFFFFFF7FFFFFFF7F0000FF7F
-A000023.360 05FF7 1EF00 E59812070202FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7F
-A000023.362 05FF3 1F904 FFFFFFFFFF0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7FFF7F
-A000023.366 05FF3 1F903 FFF0FFFFFF7FFFFF
-A000023.443 05FF2 1F801 9E4E471764E569D2
-A000023.541 05FF7 1EF00 E5984719020206030101030F08FF0F00303CA31C011100190022904E2B9EA10C
-A000023.544 05FF2 1F802 FFFC8B956500FFFF
-A000023.545 05FF2 1F801 914E471761E569D2
-A000023.644 05FF2 1F801 984E471762E569D2
-A000023.700 05FF7 1EF00 E598E708000A0301030DDDB7C684051101
-A000023.744 05FF2 1F801 3A4E471754E569D2
-A000023.794 05FF2 1F802 FFFC488E6900FFFF
-A000023.844 05FF2 1F801 314E471752E569D2
-A000023.944 05FF2 1F801 2A4E471752E569D2
-A000024.041 05FF7 1EF00 E5984819020203030101030F08FF0F00303CA31C0113C7A90F
-A000024.044 05FF3 1F805 FFDB4BC4D87822C0589B0945826B0500F03E8196D762F52BF085000000000014FC06CD002A03AAF2FFFF00
-A000024.048 05FF6 1F11A FFF2DB4B69F8FFFF
-A000024.068 05FF6 1FA03 FFDACD0010036F02
-A000024.068 05FF7 1EF00 E59817000404AF8B764259E0E742CB4D0343000000000000000000000000000000000000000000000000EB8903401DE2FA402EAE01414C60C74000000000
-A000024.071 05FF2 1F802 FFFCDE896200FFFF
-A000024.075 05FF2 1F801 234E471753E569D2
-A000024.144 05FF2 1F801 204E471754E569D2
-A000024.244 05FF2 1F801 1D4E471754E569D2
-A000024.294 05FF2 1F802 FFFC78865600FFFF
-A000024.344 05FF2 1F801 1A4E471754E569D2
-A000024.354 05FF7 1EF00 E59861060202FFFFFFFF03030000FFFFFFFFFFFFFFFFFFFF0000FFFFFF7FFFFFFF7FFFFFFF7F0000FF7F
-A000024.360 05FF7 1EF00 E59812070202FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7F
-A000024.362 05FF3 1F904 FFFFFFFFFF0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7FFF7F
-A000024.364 05FF3 1F903 FFF0FFFFFF7FFFFF
-A000024.387 05FF7 1EF00 E598E008020203090012E8071900
-A000024.389 05FF7 1EF00 E598E008020203090112E8071900
-A000024.391 05FF7 1EF00 E598E008020203090B11011900
-A000024.392 05FF7 1EF00 E598E008020203090C12E8071900
-A000024.444 05FF2 1F801 174E471755E569D2
-A000024.544 05FF2 1F802 FFFC78865000FFFF
-A000024.545 05FF2 1F801 144E471755E569D2
-A000024.644 05FF2 1F801 114E471756E569D2
-A000024.700 05FF7 1EF00 E598E708000A0301030DDDB7C684051101
-A000024.744 05FF2 1F801 074E471756E569D2
-A000024.794 05FF2 1F802 FFFC78864900FFFF
-A000024.844 05FF2 1F801 FF4D471755E569D2
-A000024.944 05FF2 1F801 F84D471755E569D2
-A000025.044 05FF3 1F805 FFDB4BD4FF7822C025B34D38826B0500CB59C196D762F5753F7F000000000014FC06CD002A03AAF2FFFF00
-A000025.049 05FF6 1F11A FFF2DB4B69F8FFFF
-A000025.066 05FF6 1FA03 FFDACD000F036E02
-A000025.068 05FF7 1EF00 E59817000404677C7742E7F1E742D47103430000000000000000000000000000000000000000000000005F800340A2CFFA40A3A40141F950C74000000000
-A000025.072 05FF2 1F802 FFFC78864500FFFF
-A000025.072 05FF2 1F801 EC4D471754E569D2
-A000025.144 05FF2 1F801 E14D471754E569D2
-A000025.244 05FF2 1F801 D64D471754E569D2
-A000025.294 05FF2 1F802 FFFC78864300FFFF
-A000025.344 05FF2 1F801 CB4D471754E569D2
-A000025.355 05FF7 1EF00 E59861060202FFFFFFFF03030000FFFFFFFFFFFFFFFFFFFF0000FFFFFF7FFFFFFF7FFFFFFF7F0000FF7F
-A000025.360 05FF7 1EF00 E59812070202FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7F
-A000025.362 05FF3 1F904 FFFFFFFFFF0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7FFF7F
-A000025.365 05FF3 1F903 FFF0FFFFFF7FFFFF
-A000025.444 05FF2 1F801 C04D471754E569D2
-A000025.544 05FF2 1F802 FFFC78864000FFFF
-A000025.544 05FF2 1F801 B54D471754E569D2
-A000025.644 05FF2 1F801 AA4D471754E569D2
-A000025.700 05FF7 1EF00 E598E708000A0301030DDDB7C684051101
-A000025.744 05FF2 1F801 A44D471755E569D2
-A000025.794 05FF2 1F802 FFFC78863E00FFFF
-A000025.844 05FF2 1F801 9E4D471755E569D2
-A000025.944 05FF2 1F801 7A4D471756E569D2
-A000026.044 05FF3 1F805 FFDB4B0B277922005557F01B826B05004210BF97D762F528937E000000000014FC06CD002A03AAF2FFFF00
-A000026.049 05FF6 1F11A FFF2DB4B69F8FFFF
-A000026.063 05FF6 1FA03 FFDACD000F036E02
-A000026.068 05FF7 1EF00 E59817000404E2F8784290E3E84238090443000000000000000000000000000000000000000000000000CB76034014BDFA400E9B01419741C74000000000
-A000026.073 05FF2 1F802 FFFC78864200FFFF
-A000026.073 05FF2 1F801 734D471759E569D2
-A000026.073 05FF7 1EF00 E5984719020206030101030F08FF0F00303CA31C011100190022904E2B9FA10C
-A000026.078 05FF7 1EF00 E5984819020203030101030F08FF0F00303CA31C0113C8A90F
-A000026.144 05FF2 1F801 6A4D47175BE569D2
-A000026.244 05FF2 1F801 614D47175EE569D2
-A000026.294 05FF2 1F802 FFFC78865300FFFF
-A000026.344 05FF2 1F801 574D471760E569D2
-A000026.355 05FF7 1EF00 E59861060202FFFFFFFF03030000FFFFFFFFFFFFFFFFFFFF0000FFFFFF7FFFFFFF7FFFFFFF7F0000FF7F
-A000026.360 05FF7 1EF00 E59812070202FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7F
-A000026.362 05FF3 1F904 FFFFFFFFFF0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7FFF7F
-A000026.365 05FF3 1F903 FFF0FFFFFF7FFFFF
-A000026.387 05FF7 1EF00 E598E008020203090012E8071900
-A000026.389 05FF7 1EF00 E598E008020203090112E8071900
-A000026.391 05FF7 1EF00 E598E008020203090B11011900
-A000026.392 05FF7 1EF00 E598E008020203090C12E8071900
-A000026.444 05FF2 1F801 4C4D471763E569D2
-A000026.544 05FF2 1F802 FFFCE6846100FFFF
-A000026.544 05FF2 1F801 464D471763E569D2
-A000026.644 05FF2 1F801 404D471762E569D2
-A000026.700 05FF7 1EF00 E598E708000A0301030DDDB7C684051101
-A000026.744 05FF2 1F801 394D471761E569D2
-A000026.794 05FF2 1F802 FFFC38826B00FFFF
-A000026.844 05FF2 1F801 324D471760E569D2
-A000026.944 05FF2 1F801 2B4D471760E569D2
-A000027.044 05FF3 1F805 FFDB4BF44D7922402890A309826B0580C6D36299D762F5B41E7E000000000014FC06CD002903AAF2FFFF00
-A000027.048 05FF6 1F11A FFF2DB4B69F8FFFF
-A000027.065 05FF6 1FA03 FFDACD000F036E02
-A000027.065 05FF7 1EF00 E5981700040469777B42F0FAE942BFCF04430000000000000000000000000000000000000000000000002F6D034068AAFA406B9101411E32C74000000000
-A000027.072 05FF2 1F802 FFFCC07E7800FFFF
-A000027.072 05FF2 1F801 244D471760E569D2
-A000027.144 05FF2 1F801 184D47175FE569D2
-A000027.244 05FF2 1F801 0B4D47175FE569D2
-A000027.294 05FF2 1F802 FFFC6F7C7D00FFFF
-A000027.344 05FF2 1F801 FE4C47175EE569D2
-A000027.355 05FF7 1EF00 E59861060202FFFFFFFF03030000FFFFFFFFFFFFFFFFFFFF0000FFFFFF7FFFFFFF7FFFFFFF7F0000FF7F
-A000027.360 05FF7 1EF00 E59812070202FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7F
-A000027.362 05FF3 1F904 FFFFFFFFFF0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7FFF7F
-A000027.366 05FF3 1F903 FFF0FFFFFF7FFFFF
-A000027.444 05FF2 1F801 F34C47175FE569D2
-A000027.544 05FF2 1F802 FFFC5E7A8000FFFF
-A000027.544 05FF2 1F801 C34C47175FE569D2
-A000027.642 05FF2 1F801 B64C471760E569D2
-A000027.707 05FF7 1EF00 E598E708000A0301030DDDB7C684051101
-A000027.744 05FF2 1F801 AA4C47175FE569D2
-A000027.794 05FF2 1F802 FFFC177A8700FFFF
-A000027.844 05FF2 1F801 A24C47175EE569D2
-A000027.944 05FF2 1F801 874C47175FE569D2
-A000028.041 05FF7 1EF00 E5984819020203030101030F08FF0F00303CA31C0113C9A90F
-A000028.044 05FF3 1F805 FFDB4B0475792200D0CA4FE2816B0580641E6B99D762F5ACF17D000000000014FC06CD002903AAF2FFFF00
-A000028.048 05FF6 1F11A FFF2DB4B69F8FFFF
-A000028.068 05FF6 1FA03 FFDACD000F036E02
-A000028.068 05FF7 1EF00 E598170004049E9A7E42D81AEB42C6AD05430000000000000000000000000000000000000000000000008A630340A097FA40B88701418E22C74000000000
-A000028.074 05FF2 1F802 FFFC92798600FFFF
-A000028.074 05FF2 1F801 7B4C471760E569D2
-A000028.144 05FF2 1F801 764C471762E569D2
-A000028.244 05FF2 1F801 714C471764E569D2
-A000028.294 05FF2 1F802 FFFCFA768000FFFF
-A000028.344 05FF2 1F801 5C4C47176BE569D2
-A000028.355 05FF7 1EF00 E59861060202FFFFFFFF03030000FFFFFFFFFFFFFFFFFFFF0000FFFFFF7FFFFFFF7FFFFFFF7F0000FF7F
-A000028.359 05FF7 1EF00 E59812070202FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7F
-A000028.362 05FF3 1F904 FFFFFFFFFF0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7FFF7F
-A000028.367 05FF3 1F903 FFF0FFFFFF7FFFFF
-A000028.386 05FF7 1EF00 E598E008020203090012E8071900
-A000028.389 05FF7 1EF00 E598E008020203090112E8071900
-A000028.391 05FF7 1EF00 E598E008020203090B11011900
-A000028.392 05FF7 1EF00 E598E008020203090C12E8071900
-A000028.444 05FF2 1F801 584C47176EE569D2
-A000028.541 05FF7 1EF00 E5984719020206030101030F08FF0F00303CA31C011100190022904E2BA0A10C
-A000028.544 05FF2 1F802 FFFC82737900FFFF
-A000028.545 05FF2 1F801 4C4C471778E569D2
-A000028.644 05FF2 1F801 464C471780E569D2
-A000028.707 05FF7 1EF00 E598E708000A0301030DDDB7C684051101
-A000028.744 05FF2 1F801 404C47177EE569D2
-A000028.794 05FF2 1F802 FFFC146C6C00FFFF
-A000028.844 05FF2 1F801 3C4C471780E569D2
-A000028.944 05FF2 1F801 354C471787E569D2
-A000029.044 05FF3 1F805 FFDB4B149C7922801525F6D0816B050017A601A3D762F5F8567D000000000014FC06CD002903AAF2FFFF00
-A000029.048 05FF6 1F11A FFF2DB4B69F8FFFF
-A000029.067 05FF6 1FA03 FFDACD000E036E02
-A000029.068 05FF7 1EF00 E598170004045FD480425FF3EB424A6A0643000000000000000000000000000000000000000000000000D75A0340A886FA40F67E01417F14C74000000000
-A000029.074 05FF2 1F802 FFFCCE696A00FFFF
-A000029.074 05FF2 1F801 314C471789E569D2
-A000029.144 05FF2 1F801 2C4C47178BE569D2
-A000029.244 05FF2 1F801 254C471792E569D2
-A000029.293 05FF2 1F802 FFFCE0646700FFFF
-A000029.344 05FF2 1F801 294C47178CE569D2
-A000029.355 05FF7 1EF00 E59861060202FFFFFFFF03030000FFFFFFFFFFFFFFFFFFFF0000FFFFFF7FFFFFFF7FFFFFFF7F0000FF7F
-A000029.359 05FF7 1EF00 E59812070202FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7F
-A000029.362 05FF3 1F904 FFFFFFFFFF0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF7FFF7F
-A000029.362 05FF3 1F903 FFF0FFFFFF7FFFFF
-A000029.444 05FF2 1F801 244C471790E569D2
-A000029.544 05FF2 1F802 FFFCB0636800FFFF
-A000029.544 05FF2 1F801 1B4C471796E569D2
-A000029.644 05FF2 1F801 134C47179CE569D2
-A000029.708 05FF7 1EF00 E598E708000A0301030DDDB7C684051101
-A000029.744 05FF2 1F801 0A4C4717A3E569D2
-A000029.792 05FF2 1F802 FFFC74656800FFFF
-A000029.844 05FF2 1F801 004C4717A9E569D2
-A000029.944 05FF2 1F801 F64B4717AEE569D2