@canboat/canboatjs 1.26.2 → 2.0.0-beta2

package/W2K_NOTES

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

package/lib/fromPgn.js

@@ -120,7 +120,9 @@ class Parser extends EventEmitter {
       })
     }
 
-    trace(`${pgn.pgn} ${len} ${pgnData.Length} ${pgnData.RepeatingFields} ${couldBeMulti}`)
+    const RepeatingFields = pgnData.RepeatingFieldSet1Size ? pgnData.RepeatingFieldSet1Size : 0
+
+    trace(`${pgn.pgn} ${len} ${pgnData.Length} ${RepeatingFields} ${couldBeMulti}`)
     if ( coalesced || len > 0x8 || (this.format == FORMAT_COALESCED && !this.mixedFormat) ) {
       this.format = FORMAT_COALESCED
       if ( sourceString ) {
@@ -199,7 +201,7 @@ class Parser extends EventEmitter {
     try {
       var fields = pgnData.Fields
 
-      for ( var i = 0; i < fields.length-pgnData.RepeatingFields; i++ ) {
+      for ( var i = 0; i < fields.length-RepeatingFields; i++ ) {
         var field = fields[i]
         var hasMatch = !_.isUndefined(field.Match)
 
@@ -241,8 +243,8 @@ class Parser extends EventEmitter {
           pgn.fields[field.Name] = value
         }
       }
-      if ( pgnData.RepeatingFields > 0 ) {
-        var repeating = fields.slice(fields.length-pgnData.RepeatingFields)
+      if ( RepeatingFields > 0 ) {
+        var repeating = fields.slice(fields.length-RepeatingFields)
         pgn.fields.list = []
 
         while ( bs.bitsLeft > 0 ) {
@@ -478,9 +480,9 @@ class Parser extends EventEmitter {
       }
       return res
     } catch ( error ) {
-      const err = new Error(`error reading pgn ${JSON.stringify(pgn)} ${error}`)
+      const err = new Error(`error reading pgn ${JSON.stringify(pgn_data)} ${error}`)
       cb && cb(err)
-      this.emit('error', pgn, error)
+      this.emit('error', pgn_data, error)
       console.error(err)
       return
     }
@@ -498,7 +500,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 ) {
@@ -511,14 +513,15 @@ function getField(pgn, index, data) {
         }
       })
     }
-    
+
     if ( index >= 0 && index < pgn.Fields.length ) {
       return pgn.Fields[index]
     }
 
-    if ( pgn.RepeatingFields ) {
-      var startOfRepeatingFields = pgn.Fields.length - pgn.RepeatingFields
-      index = startOfRepeatingFields + ((index - startOfRepeatingFields) % pgn.RepeatingFields);
+    const RepeatingFields = pgn.RepeatingFieldSet1Size ? pgn.RepeatingFieldSet1Size : 0    
+    if ( RepeatingFields ) {
+      var startOfRepeatingFields = pgn.Fields.length - RepeatingFields
+      index = startOfRepeatingFields + ((index - startOfRepeatingFields) % RepeatingFields);
       return pgn.Fields[index]
     }
   }
@@ -579,7 +582,8 @@ function readField(options, runPostProcessor, pgn, field, bs) {
   //console.log(`${field.Name} ${value} ${field.Resolution}`)
 
   if ( value != null && !_.isUndefined(value) ) {
-    var postProcessor = fieldTypePostProcessors[field.Type]
+    let type = field.Type //hack, missing type
+    var postProcessor = fieldTypePostProcessors[type]
     if ( postProcessor ) {
       if ( runPostProcessor ) {
         value = postProcessor(field, value)
@@ -645,7 +649,7 @@ function readValue(options, pgn, field, bs, bitLength) {
   if ( _.isUndefined(bitLength) ) {
     bitLength = field.BitLength
   }
-  if ( bitLength == 0 ) {
+  if ( !field.Type && field.BitLengthVariable ) { ///hack for missing FieldType
     return readVariableLengthField(options, pgn, field, bs)
   } else if (bitLength === 8) {
     if ( field.Signed ) {
@@ -738,17 +742,21 @@ function readVariableLengthField(options, pgn, field, bs) {
    * length and thus that the field number is exactly one byte earlier.
    */
 
-  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)
+  try {
+    var refField = getField(pgn.fields.PGN, bs.view.buffer[bs.byteIndex-1]-1, pgn)
 
-    if ( bits > refField.BitLength ) {
-      bs.readBits(bits - refField.BitLength, false)
+    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)
+      
+      if ( bits > refField.BitLength ) {
+        bs.readBits(bits - refField.BitLength, false)
+      }
+      
+      return res
     }
-
-    return res
+  } catch ( error ) {
+    debug(error)
   }
 }
 
@@ -772,6 +780,10 @@ fieldTypeReaders['ASCII or UNICODE string starting with length and control byte'
       buf.writeUInt8(c, idx)
     }
 
+    if ( buf[buf.length-1] === 0 ) {
+      nameLen = nameLen - 1
+    }
+
     return buf.toString(control == 0 ? 'utf8' : 'ascii', 0, idx < nameLen ? idx : nameLen).trim()
   } else {
     return null
@@ -871,8 +883,7 @@ fieldTypePostProcessors['Time'] = (field, value) => {
   if (value >= 0xfffffffd) {
     value = undefined
   } else {
-    var seconds = (value / timeUnitsPerSecond)
-    //var units = value % timeUnitsPerSecond;
+    var seconds = (value * field.Resolution)
     var minutes = (seconds / 60);
     var seconds = seconds % 60;
     var hours = Math.floor(minutes / 60);

package/lib/toPgn.js

@@ -75,8 +75,8 @@ function toPgn(data) {
   if ( !_.isArray(fields) ) {
     fields = [ fields.Field ]
   }
-
-  for ( var index = 0; index < fields.length - pgnData.RepeatingFields; index++ ) {
+  const RepeatingFields = pgnData.RepeatingFieldSet1Size ? pgnData.RepeatingFieldSet1Size : 0
+  for ( var index = 0; index < fields.length - RepeatingFields; index++ ) {
     var field = fields[index]
     var value = data[field.Name];
 
@@ -99,8 +99,8 @@ function toPgn(data) {
 
   if ( data.list ) {
     data.list.forEach(repeat => {
-      for (var index = 0; index < pgnData.RepeatingFields; index++ ) {
-        var field = fields[pgnData.Fields.length-pgnData.RepeatingFields+index]
+      for (var index = 0; index < RepeatingFields; index++ ) {
+        var field = fields[pgnData.Fields.length-RepeatingFields+index]
         var value = repeat[field.Name];
 
         writeField(bs, pgn_number, field, data, value)
@@ -118,7 +118,7 @@ function toPgn(data) {
   if ( pgnData.Length != 0xff
        && fields[fields.length-1].Type != RES_STRINGLAU
        && fields[fields.length-1].Type != RES_STRINGLZ
-       && !pgnData.RepeatingFields ) {
+       && !RepeatingFields ) {
 
     var len = lengthsOff[pgnData.PGN] || pgnData.Length
     //console.log(`Length ${len}`)
@@ -166,16 +166,16 @@ function writeField(bs, pgn_number, field, data, value, bitLength) {
       }
       bs.writeUint8(field.Signed ? 0x7f : 0xff)
     } else {
-      bs.writeBits(0xffffff, bitLength)
+      bs.writeBits(0xffffffff, bitLength)
     }
   } else {
-
+    let type = field.Type
     if ( field.Name === 'Industry Code' ) {
       if ( _.isString(value) ) {
         value = Number(getIndustryCode(value))
       }
-    } else if ( field.Type && fieldTypeMappers[field.Type] ) {
-      value = fieldTypeMappers[field.Type](field, value)
+    } else if ( type && fieldTypeMappers[type] ) {
+      value = fieldTypeMappers[type](field, value)
     } else if (field.EnumValues && _.isString(value)) {
       if (!(field.Id === "timeStamp" && value < 60)) {
         value = lookup(field, value)
@@ -189,7 +189,7 @@ function writeField(bs, pgn_number, field, data, value, bitLength) {
     if ( field.Type && fieldTypeWriters[field.Type] ) {
       fieldTypeWriters[field.Type](pgn_number, field, value, bs)
     } else {
-      if ( _.isString(value) && bitLength !== 0 ) {
+      if ( _.isString(value) && typeof bitLength !== 'undefined' && bitLength !== 0 ) {
         value = Number(value)
       }
 
@@ -202,7 +202,7 @@ function writeField(bs, pgn_number, field, data, value, bitLength) {
         value -= field.Offset
       }
 
-      if (bitLength == 0) {
+      if ( !field.Type && field.BitLengthVariable ) { 
         writeVariableLengthField(bs, pgn_number, data, field, value)
       } else if ( _.isBuffer(value) ) {
         value.copy(bs.view.buffer, bs.byteIndex)

package/n2ka.js

@@ -0,0 +1,123 @@
+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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canboat/canboatjs",
-  "version": "1.26.2",
+  "version": "2.0.0-beta2",
   "description": "Native javascript version of canboat",
   "main": "index.js",
   "scripts": {
@@ -53,7 +53,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "@canboat/pgns": "^1.4.0",
+    "@canboat/pgns": "2.0.0-beta1",
     "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": "^4.0.3"
+    "socketcan": "^2.2.2"
   },
   "repository": {
     "type": "git",

package/wk2.out

@@ -0,0 +1,224 @@
+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