queclink-parser 1.9.8 → 1.9.10

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+#### 1.9.10 (2024-10-08)
+
+##### New Features
+
+* **canbus:**  can data from ERI report and others ([8f590b6b](https://github.com/jaayesta/queclink-parser/commit/8f590b6bf35588a01c703c93a71f78b37b4cb1ac))
+
+#### 1.9.9 (2024-10-04)
+
+##### Bug Fixes
+
+* **input:**  fix gv57cg input bits ([35d4199e](https://github.com/jaayesta/queclink-parser/commit/35d4199e1ff7236cdf48ccf8ad965c08df6599a7))
+
 #### 1.9.8 (2024-10-04)
 
 ##### New Features

package/example.js

@@ -56,6 +56,7 @@ var pfr = '+RESP:GTPFR,8020060402,863835020303983,GV57CG,0,,,,,20150407094557,06
 var cra = '+RESP:GTCRA,8020060402,867488060596284,GV57CG,06,1,1.0,0,222.0,117.129815,31.839434,20230523062909,0460,0001,DF5C,027A4F1F,01,3,20230523160010,0B67$'
 var asc = '+RESP:GTASC,8020060402,867488060595542,GV57CG,0.86,0.52,0.01,0.52,-0.86,0.01,0.01,0.00,-1.00,1,12.6,267,39.7,117.115453,31.827255,20230523055431,0460,0001,DF5C,05F7B315,01,10,20230523135432,03BC$'
 var hbe = '+RESP:GTHBE,8020060402,866775051515393,GV57CG,,2,0,1,42.5,0,42.6,117.101321,31.827725,20231221034214,0460,0001,DF5C,05F7B40B,01,1,002500040054,FFE2FFFF0051,10,19.8,20231221034215,006B$'
+var caneri = '+RESP:GTERI,6E0802,868589060350066,,00000104,28696,10,1,1,0.0,344,17.6,-71.604231,-33.043113,20241001170305,0730,0001,13F0,004E2212,01,6 ,10496.6,0000273:06:37,,,,98,210500,0,1,203FFFFF,,2,H4168131,5859.88,513,0,71,H2.4,P92.00,,,386.89,308.11,78.78,173.25,,FFFF,0000,,00,0.00,0.00,FFFFFF,62,,,,,,,,226631,181383,,386.89,79.35,,10178,,,,,,0000,0,0,,1,00,13,0,00000000,4007,,78054133C69C,1,0,20241001170312,26B5$'
 
 var data = {
     "imei": 864696060046190,
@@ -86,7 +87,8 @@ var data = {
     }
   }
 
-console.log(queclink.parseCommand(data))
-// const raw = new Buffer(hbe)
-// console.log(queclink.parse(raw))
-// queclink.parse(raw)
+// console.log(queclink.parseCommand(data))
+const raw = new Buffer(caneri)
+console.log(queclink.parse(raw))
+queclink.parse(raw)
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "queclink-parser",
-  "version": "1.9.8",
+  "version": "1.9.10",
   "description": "Parse raw data from Queclink devices",
   "main": "src",
   "scripts": {

package/src/gv310lau.js

@@ -113,7 +113,7 @@ const parse = raw => {
           state:
             utils.nHexDigit(parsedData[index + 7], 10).substring(4, 6) !== ''
               ? utils.states[ // eslint-disable-line
-                utils.nHexDigit(parsedData[index + 7], 10).substring(4, 6)
+              utils.nHexDigit(parsedData[index + 7], 10).substring(4, 6)
               ]
               : null
         },
@@ -229,6 +229,25 @@ const parse = raw => {
     let index = 7 + 12 * number // position append mask
     let satelliteInfo = false
 
+    // External Data
+    const digitFuelSensor =
+      utils.nHexDigit(utils.hex2bin(parsedData[4]), 11)[10] === '1'
+    const AC100 = utils.nHexDigit(utils.hex2bin(parsedData[4]), 11)[9] === '1'
+    const canData =
+      utils.nHexDigit(utils.hex2bin(parsedData[4]), 11)[8] === '1'
+    const fuelLevelPercentage =
+      utils.nHexDigit(utils.hex2bin(parsedData[4]), 11)[7] === '1'
+    const fuelVolume =
+      utils.nHexDigit(utils.hex2bin(parsedData[4]), 11)[6] === '1'
+    const bluetoothAccessory =
+      utils.nHexDigit(utils.hex2bin(parsedData[4]), 11)[2] === '1'
+
+    const fuelSensorData = digitFuelSensor ? parsedData[index + 9] : null
+    const ac100DevicesConnected =
+      AC100 && digitFuelSensor
+        ? parseInt(parsedData[index + 10], 10)
+        : AC100 && !digitFuelSensor ? parseInt(parsedData[index + 9], 10) : 0
+
     // If get satellites is configured
     if (utils.includeSatellites(parsedData[19])) {
       index = 7 + 13 * number
@@ -308,7 +327,7 @@ const parse = raw => {
         state:
           utils.nHexDigit(parsedData[index + 7], 10).substring(4, 6) !== ''
             ? utils.states[ // eslint-disable-line
-              utils.nHexDigit(parsedData[index + 7], 10).substring(4, 6)
+            utils.nHexDigit(parsedData[index + 7], 10).substring(4, 6)
             ]
             : null
       },
@@ -348,33 +367,36 @@ const parse = raw => {
       hourmeter:
         parsedData[index + 2] !== ''
           ? utils.getHoursForHourmeter(parsedData[index + 2])
-          : null
+          : null,
     })
-    // External Data
-    const digitFuelSensor =
-      utils.nHexDigit(utils.hex2bin(parsedData[4]), 11)[10] === '1'
-    const AC100 = utils.nHexDigit(utils.hex2bin(parsedData[4]), 11)[9] === '1'
-    const reserved =
-      utils.nHexDigit(utils.hex2bin(parsedData[4]), 11)[8] === '1'
-    const fuelLevelPercentage =
-      utils.nHexDigit(utils.hex2bin(parsedData[4]), 11)[7] === '1'
-    const fuelVolume =
-      utils.nHexDigit(utils.hex2bin(parsedData[4]), 11)[6] === '1'
-    const bluetoothAccessory =
-      utils.nHexDigit(utils.hex2bin(parsedData[4]), 11)[2] === '1'
 
-    const fuelSensorData = digitFuelSensor ? parsedData[index + 9] : null
-    const ac100DevicesConnected =
-      AC100 && digitFuelSensor
-        ? parseInt(parsedData[index + 10], 10)
-        : AC100 && !digitFuelSensor ? parseInt(parsedData[index + 9], 10) : 0
+    if (canData) {
+      let canInfo = utils.getCanData(parsedData, index + 9)
+      data = Object.assign(data, { can: canInfo })
+      index = index + 49
+
+      if (canInfo?.totalDistance) {
+        data.gpsOdometer = data.odometer
+        data.odometer = canInfo.totalDistance
+      }
+
+      if (canInfo?.engineHours) {
+        data.gpsHourmeter = data.hourmeter
+        data.hourmeter = canInfo.engineHours
+      }
+
+      if (canInfo?.speed) {
+        data.gpsSpeed = data.speed
+        data.speed = canInfo.speed
+      }
+    }
 
     let externalData = {
       eriMask: {
         raw: parsedData[4],
         digitFuelSensor: digitFuelSensor,
         AC100: AC100,
-        reserved: reserved,
+        canData: canData,
         fuelLevelPercentage: fuelLevelPercentage,
         fuelVolume: fuelVolume,
         bluetoothAccessory: bluetoothAccessory
@@ -1474,43 +1496,6 @@ const parse = raw => {
       satelliteInfo = true
     }
 
-    let inicatorsBin =
-      parsedData[24] !== ''
-        ? utils.nHexDigit(utils.hex2bin(parsedData[24]), 16)
-        : null
-    let lights =
-      parsedData[25] !== ''
-        ? utils.nHexDigit(utils.hex2bin(parsedData[25]), 8)
-        : null
-    let doors =
-      parsedData[26] !== ''
-        ? utils.nHexDigit(utils.hex2bin(parsedData[26]), 8)
-        : null
-    let canExpansionMask =
-      parsedData[29] !== ''
-        ? utils
-          .nHexDigit(utils.hex2bin(parsedData[29]), 32)
-          .split('')
-          .reverse()
-          .join('')
-        : null
-    let expansionBin =
-      parsedData[50] !== ''
-        ? utils
-          .nHexDigit(utils.hex2bin(parsedData[50]), 16)
-          .split('')
-          .reverse()
-          .join('')
-        : null
-    let tachographBin =
-      parsedData[23] !== ''
-        ? utils
-          .nHexDigit(utils.hex2bin(parsedData[23]), 8)
-          .split('')
-          .reverse()
-          .join('')
-        : null
-
     data = Object.assign(data, {
       alarm: utils.getAlarm(command[1], parsedData[4]),
       loc: {
@@ -1544,201 +1529,9 @@ const parse = raw => {
           : null,
       odometer: null,
       hourmeter: null,
-      can: {
-        comunicationOk: parsedData[5] === '1',
-        vin: parsedData[7] !== '' ? parsedData[7] : null,
-        ignitionKey: parsedData[8] !== '' ? parseInt(parsedData[8], 10) : null,
-        distance: parsedData[9] !== '' ? parsedData[9] : null,
-        fuelUsed: parsedData[10] !== '' ? parseFloat(parsedData[10]) : null, // float
-        rpm: parsedData[11] !== '' ? parseInt(parsedData[11], 10) : null, // int
-        speed: parsedData[12] !== '' ? parseFloat(parsedData[12]) : null,
-        coolantTemp:
-          parsedData[13] !== '' ? parseInt(parsedData[13], 10) : null,
-        fuelConsumption: parsedData[14] !== '' ? parsedData[14] : null,
-        fuelLevel: parsedData[15] !== '' ? parsedData[15] : null,
-        range: parsedData[16] !== '' ? parsedData[16] : null,
-        acceleratorPressure:
-          parsedData[17] !== '' ? parseFloat(parsedData[17]) : null, // %
-        engineHours: parsedData[18] !== '' ? parseFloat(parsedData[18]) : null,
-        drivingTime: parsedData[19] !== '' ? parseFloat(parsedData[19]) : null,
-        idleTime: parsedData[20] !== '' ? parseFloat(parsedData[20]) : null,
-        idleFuelUsed: parsedData[21] !== '' ? parseFloat(parsedData[21]) : null,
-        axleWight: parsedData[22] !== '' ? parsedData[22] : null,
-        tachograph: {
-          raw: parsedData[23] !== '' ? parsedData[23] : null,
-          validDriverData: tachographBin ? tachographBin[7] === '1' : null,
-          insertedDriverCard: tachographBin ? tachographBin[5] === '1' : null,
-          driverWorkingState: tachographBin
-            ? utils.dWorkingStates[parseInt(tachographBin.substring(3, 5), 2)]
-            : null,
-          drivingTimeState: tachographBin
-            ? utils.dTimeStates[parseInt(tachographBin.substring(5, 8), 2)]
-            : null
-        },
-        indicators: {
-          raw: parsedData[24] !== '' ? parsedData[24] : null,
-          lowFuel: inicatorsBin ? inicatorsBin[0] === '1' : null,
-          driverSeatbelt: inicatorsBin ? inicatorsBin[1] === '1' : null,
-          airConditioning: inicatorsBin ? inicatorsBin[2] === '1' : null,
-          cruiseControl: inicatorsBin ? inicatorsBin[3] === '1' : null,
-          brakePedal: inicatorsBin ? inicatorsBin[4] === '1' : null,
-          clutchPedal: inicatorsBin ? inicatorsBin[5] === '1' : null,
-          handbrake: inicatorsBin ? inicatorsBin[6] === '1' : null,
-          centralLock: inicatorsBin ? inicatorsBin[7] === '1' : null,
-          reverseGear: inicatorsBin ? inicatorsBin[8] === '1' : null,
-          runningLights: inicatorsBin ? inicatorsBin[9] === '1' : null,
-          lowBeams: inicatorsBin ? inicatorsBin[10] === '1' : null,
-          highBeams: inicatorsBin ? inicatorsBin[11] === '1' : null,
-          rearFogLights: inicatorsBin ? inicatorsBin[12] === '1' : null,
-          frontFogLights: inicatorsBin ? inicatorsBin[13] === '1' : null,
-          doors: inicatorsBin ? inicatorsBin[14] === '1' : null,
-          trunk: inicatorsBin ? inicatorsBin[15] === '1' : null
-        },
-        lights: {
-          raw: parsedData[25] !== '' ? parsedData[25] : null,
-          running: lights ? lights[0] === '1' : null,
-          lowBeams: lights ? lights[1] === '1' : null,
-          frontFog: lights ? lights[2] === '1' : null,
-          rearFog: lights ? lights[3] === '1' : null,
-          hazard: lights ? lights[4] === '1' : null
-        },
-        doors: {
-          raw: parsedData[26] !== '' ? parsedData[26] : null,
-          driver: doors ? doors[0] === '1' : null,
-          passenger: doors ? doors[1] === '1' : null,
-          rearLeft: doors ? doors[2] === '1' : null,
-          rearRight: doors ? doors[3] === '1' : null,
-          trunk: doors ? doors[4] === '1' : null,
-          hood: doors ? doors[5] === '1' : null
-        },
-        overSpeedTime: parsedData[27] !== '' ? parsedData[27] : null,
-        overSpeedEngineTime: parsedData[28] !== '' ? parsedData[28] : null,
-        canReportExpansionMask: {
-          raw: parsedData[29] !== '' ? parsedData[29] : null,
-          engineTorque: canExpansionMask ? canExpansionMask[23] === '1' : null,
-          rapidAccelerations: canExpansionMask
-            ? canExpansionMask[22] === '1'
-            : null,
-          rapidBrakings: canExpansionMask ? canExpansionMask[21] === '1' : null,
-          expansionInformation: canExpansionMask
-            ? canExpansionMask[20] === '1'
-            : null,
-          registrationNumber: canExpansionMask
-            ? canExpansionMask[19] === '1'
-            : null,
-          tachographDriver2Name: canExpansionMask
-            ? canExpansionMask[18] === '1'
-            : null,
-          tachographDriver1Name: canExpansionMask
-            ? canExpansionMask[17] === '1'
-            : null,
-          tachographDriver2Card: canExpansionMask
-            ? canExpansionMask[16] === '1'
-            : null,
-          tachographDriver1Card: canExpansionMask
-            ? canExpansionMask[15] === '1'
-            : null,
-          totalBrakeApplications: canExpansionMask
-            ? canExpansionMask[14] === '1'
-            : null,
-          totalAcceleratorKickDownTime: canExpansionMask
-            ? canExpansionMask[13] === '1'
-            : null,
-          totalCruiseControlTime: canExpansionMask
-            ? canExpansionMask[12] === '1'
-            : null,
-          totalEffectiveEngineSpeedTime: canExpansionMask
-            ? canExpansionMask[11] === '1'
-            : null,
-          totalAcceleratorKickDown: canExpansionMask
-            ? canExpansionMask[10] === '1'
-            : null,
-          pedalBrakingFactor: canExpansionMask
-            ? canExpansionMask[9] === '1'
-            : null,
-          engineBrakingFactor: canExpansionMask
-            ? canExpansionMask[8] === '1'
-            : null,
-          analogInputValue: canExpansionMask
-            ? canExpansionMask[7] === '1'
-            : null,
-          tachographDrivingDirection: canExpansionMask
-            ? canExpansionMask[6] === '1'
-            : null,
-          tachographVehicleMotionSignal: canExpansionMask
-            ? canExpansionMask[5] === '1'
-            : null,
-          tachographOverspeedSignal: canExpansionMask
-            ? canExpansionMask[4] === '1'
-            : null,
-          AxleWeight4: canExpansionMask ? canExpansionMask[3] === '1' : null,
-          AxleWeight3: canExpansionMask ? canExpansionMask[2] === '1' : null,
-          AxleWeight1: canExpansionMask ? canExpansionMask[1] === '1' : null,
-          adBlueLevel: canExpansionMask ? canExpansionMask[0] === '1' : null
-        },
-        canExpanded: {
-          adBlueLevel:
-            parsedData[30] !== '' ? parseFloat(parsedData[30]) : null,
-          axleWeight1: parsedData[31] !== '' ? parseInt(parsedData[31]) : null,
-          axleWeight3: parsedData[32] !== '' ? parseInt(parsedData[32]) : null,
-          axleWeight4: parsedData[33] !== '' ? parseInt(parsedData[33]) : null,
-          tachographOverspeedSignal:
-            parsedData[34] !== '' ? parseInt(parsedData[34]) : null,
-          tachographVehicleMotionSignal:
-            parsedData[35] !== '' ? parseInt(parsedData[35]) : null,
-          tachographDrivingDirection:
-            parsedData[36] !== '' ? parseInt(parsedData[36]) : null,
-          analogInputValue:
-            parsedData[37] !== '' ? parseInt(parsedData[37]) : null,
-          engineBrakingFactor:
-            parsedData[38] !== '' ? parseInt(parsedData[38]) : null,
-          pedalBrakingFactor:
-            parsedData[39] !== '' ? parseInt(parsedData[39]) : null,
-          totalAcceleratorKickDown:
-            parsedData[40] !== '' ? parseInt(parsedData[40]) : null,
-          totalEffectiveEngineSpeedTime:
-            parsedData[41] !== '' ? parseFloat(parsedData[41]) : null,
-          totalCruiseControlTime:
-            parsedData[42] !== '' ? parseFloat(parsedData[42]) : null,
-          totalAcceleratorKickDownTime:
-            parsedData[43] !== '' ? parseFloat(parsedData[43]) : null,
-          totalBrakeApplications:
-            parsedData[44] !== '' ? parseInt(parsedData[44]) : null,
-          tachographDriver1Card:
-            parsedData[45] !== '' ? parseInt(parsedData[45]) : null,
-          tachographDriver2Card:
-            parsedData[46] !== '' ? parseInt(parsedData[46]) : null,
-          tachographDriver1Name: parsedData[47] !== '' ? parsedData[47] : null,
-          tachographDriver2Name: parsedData[48] !== '' ? parsedData[48] : null,
-          registrationNumber:
-            parsedData[49] !== '' ? parseInt(parsedData[49]) : null,
-          expansionInformation: {
-            raw: parsedData[50] !== '' ? parsedData[50] : null,
-            webasto: expansionBin ? expansionBin[0] === '1' : null,
-            brakeFluidLowIndicator: expansionBin
-              ? expansionBin[1] === '1'
-              : null,
-            coolantLevelLowIndicator: expansionBin
-              ? expansionBin[2] === '1'
-              : null,
-            batteryIndicator: expansionBin ? expansionBin[3] === '1' : null,
-            brakeSystemaFailureIndicator: expansionBin
-              ? expansionBin[4] === '1'
-              : null,
-            oilPressureIndicator: expansionBin ? expansionBin[5] === '1' : null,
-            engineHotIndicator: expansionBin ? expansionBin[6] === '1' : null,
-            ABSFailureIndicator: expansionBin ? expansionBin[7] === '1' : null,
-            checkEngineIndicator: expansionBin ? expansionBin[9] === '1' : null,
-            aribagsIndicator: expansionBin ? expansionBin[10] === '1' : null,
-            serviceCallIndicator: expansionBin
-              ? expansionBin[11] === '1'
-              : null,
-            oilLevelLowIndicator: expansionBin ? expansionBin[12] === '1' : null
-          },
-          adblueLevel: parsedData[30] !== '' ? parsedData[30] : null
-        }
-      }
-    })
+      can: utils.getCanData(parsedData, 5),
+    }
+    )
   } else if (command[1] === 'GTDAT') {
     let dataIndex = 4
     // Short format
@@ -2185,13 +1978,13 @@ const parse = raw => {
         bluetoothInfo: {
           name:
             parsedData[index + 2] !== '' &&
-            utils.nHexDigit(utils.hex2bin(parsedData[index + 1]), 16)[15] ===
+              utils.nHexDigit(utils.hex2bin(parsedData[index + 1]), 16)[15] ===
               '1'
               ? parsedData[index + 2]
               : null,
           mac:
             parsedData[index + 3] !== '' &&
-            utils.nHexDigit(utils.hex2bin(parsedData[index + 1]), 16)[14] ===
+              utils.nHexDigit(utils.hex2bin(parsedData[index + 1]), 16)[14] ===
               '1'
               ? parsedData[index + 3]
               : null
@@ -2202,17 +1995,17 @@ const parse = raw => {
           name: null,
           role:
             parsedData[index + 4] !== '' &&
-            utils.nHexDigit(utils.hex2bin(parsedData[index + 1]), 16)[7] === '1'
+              utils.nHexDigit(utils.hex2bin(parsedData[index + 1]), 16)[7] === '1'
               ? utils.peerRoles[parsedData[index + 4]]
               : null,
           type:
             parsedData[index + 5] !== '' &&
-            utils.nHexDigit(utils.hex2bin(parsedData[index + 1]), 16)[5] === '1'
+              utils.nHexDigit(utils.hex2bin(parsedData[index + 1]), 16)[5] === '1'
               ? utils.peerAddressesTypes[parsedData[index + 5]]
               : null,
           mac:
             parsedData[index + 6] !== '' &&
-            utils.nHexDigit(utils.hex2bin(parsedData[index + 1]), 16)[4] === '1'
+              utils.nHexDigit(utils.hex2bin(parsedData[index + 1]), 16)[4] === '1'
               ? parsedData[index + 6]
               : null
         },
@@ -2549,29 +2342,29 @@ const parse = raw => {
           appendMask[0] === '1' && parsedData[typeIx + 1] !== ''
             ? {
               idMfrData:
-                  parsedData[typeIx] === '0' && parsedData[typeIx + 1] !== ''
-                    ? parsedData[typeIx + 1]
-                    : null,
+                parsedData[typeIx] === '0' && parsedData[typeIx + 1] !== ''
+                  ? parsedData[typeIx + 1]
+                  : null,
               uuid:
-                  parsedData[typeIx] === '1' && parsedData[typeIx + 1] !== ''
-                    ? parsedData[typeIx + 1]
-                    : null,
+                parsedData[typeIx] === '1' && parsedData[typeIx + 1] !== ''
+                  ? parsedData[typeIx + 1]
+                  : null,
               major:
-                  parsedData[typeIx] === '1' && parsedData[typeIx + 2] !== ''
-                    ? parsedData[typeIx + 2]
-                    : null,
+                parsedData[typeIx] === '1' && parsedData[typeIx + 2] !== ''
+                  ? parsedData[typeIx + 2]
+                  : null,
               minor:
-                  parsedData[typeIx] === '1' && parsedData[typeIx + 3] !== ''
-                    ? parsedData[typeIx + 3]
-                    : null,
+                parsedData[typeIx] === '1' && parsedData[typeIx + 3] !== ''
+                  ? parsedData[typeIx + 3]
+                  : null,
               nid:
-                  parsedData[typeIx] === '2' && parsedData[typeIx + 1] !== ''
-                    ? parsedData[typeIx + 1]
-                    : null,
+                parsedData[typeIx] === '2' && parsedData[typeIx + 1] !== ''
+                  ? parsedData[typeIx + 1]
+                  : null,
               bid:
-                  parsedData[typeIx] === '2' && parsedData[typeIx + 2] !== ''
-                    ? parsedData[typeIx + 2]
-                    : null
+                parsedData[typeIx] === '2' && parsedData[typeIx + 2] !== ''
+                  ? parsedData[typeIx + 2]
+                  : null
             }
             : null
       })
@@ -2652,12 +2445,12 @@ const parse = raw => {
             : null,
         lac:
           parsedData[index + 2] !== '' ||
-          parsedData[index + 2].toUpperCase() === 'FFFF'
+            parsedData[index + 2].toUpperCase() === 'FFFF'
             ? parseInt(parsedData[index + 2], 16)
             : null,
         cid:
           parsedData[index + 3] !== '' ||
-          parsedData[index + 3].toUpperCase() === 'FFFF'
+            parsedData[index + 3].toUpperCase() === 'FFFF'
             ? parseInt(parsedData[index + 3], 16)
             : null,
         rxLevel:
@@ -2686,12 +2479,12 @@ const parse = raw => {
           : null,
       lac:
         parsedData[index + 2] !== '' ||
-        parsedData[index + 2].toUpperCase() === 'FFFF'
+          parsedData[index + 2].toUpperCase() === 'FFFF'
           ? parseInt(parsedData[index + 2], 16)
           : null,
       cid:
         parsedData[index + 3] !== '' ||
-        parsedData[index + 3].toUpperCase() === 'FFFF'
+          parsedData[index + 3].toUpperCase() === 'FFFF'
           ? parseInt(parsedData[index + 3], 16)
           : null,
       rxLevel:

package/src/gv57cg.js

@@ -221,12 +221,12 @@ const parse = raw => {
             utils.nHexDigit(
               utils.hex2bin(parsedData[index + 6].substring(2, 4)),
               8
-            )[7] === '1',
+            )[6] === '1',
           '1':
             utils.nHexDigit(
               utils.hex2bin(parsedData[index + 6].substring(2, 4)),
               8
-            )[6] === '1'
+            )[7] === '1'
         },
         output: {
           '3':
@@ -594,8 +594,8 @@ const parse = raw => {
         raw: `${parsedData[21]}${parsedData[22]}`,
         sos: false,
         input: {
-          '2': utils.nHexDigit(utils.hex2bin(parsedData[21]), 8)[7] === '1',
-          '1': utils.nHexDigit(utils.hex2bin(parsedData[21]), 8)[6] === '1'
+          '2': utils.nHexDigit(utils.hex2bin(parsedData[21]), 8)[6] === '1',
+          '1': utils.nHexDigit(utils.hex2bin(parsedData[21]), 8)[7] === '1'
         },
         output: {
           '3': utils.nHexDigit(utils.hex2bin(parsedData[22]), 8)[5] === '1',
@@ -1117,12 +1117,12 @@ const parse = raw => {
                 utils.nHexDigit(
                   utils.hex2bin(parsedData[index + 1].substring(2, 4)),
                   8
-                )[7] === '1',
+                )[6] === '1',
             '1':
                 utils.nHexDigit(
                   utils.hex2bin(parsedData[index + 1].substring(2, 4)),
                   8
-                )[6] === '1'
+                )[7] === '1'
           },
           output: {
             '3':
@@ -1764,12 +1764,12 @@ const parse = raw => {
                 utils.nHexDigit(
                   utils.hex2bin(parsedData[index + 1].substring(2, 4)),
                   8
-                )[7] === '1',
+                )[6] === '1',
             '1':
                 utils.nHexDigit(
                   utils.hex2bin(parsedData[index + 1].substring(2, 4)),
                   8
-                )[6] === '1'
+                )[7] === '1'
           },
           output: {
             '3':
@@ -1990,12 +1990,12 @@ const parse = raw => {
                 utils.nHexDigit(
                   utils.hex2bin(parsedData[index + 1].substring(2, 4)),
                   8
-                )[7] === '1',
+                )[6] === '1',
             '1':
                 utils.nHexDigit(
                   utils.hex2bin(parsedData[index + 1].substring(2, 4)),
                   8
-                )[6] === '1'
+                )[7] === '1'
           },
           output: {
             '3':

package/src/utils.js

@@ -241,24 +241,24 @@ const beaconTypes = {
   Possible Driving Time Related States
 */
 const dTimeStates = {
-  0: 'Sin límites alcanzados',
-  1: 'Conducción sobre 4 horas y 15 minutos',
-  2: 'Conducción sobre 4 horas y 30 minutos',
-  3: 'Conducción sobre 8 horas y 45 minutos',
-  4: 'Conducción sobre 9 horas',
-  5: 'Conducción sobre 15 horas y 45 minutos (con descanso menor a 8 horas en las últimas 24 horas)',
-  6: 'Conducción sobre 16 horas',
-  7: 'Otro límite'
+  0: 'normal',
+  1: '04h_15min',
+  2: '04h_30min',
+  3: '08h_45min',
+  4: '09h_00min',
+  5: '15h_45min',
+  6: '16h_00min',
+  7: 'other'
 }
 
 /*
   Possible Driving Working States
 */
 const dWorkingStates = {
-  0: 'Normal',
-  1: 'En descanso - Durmiendo',
-  2: 'Conductor disponible - Descanso corto',
-  3: 'Conduciendo - En el volante'
+  0: 'normal',
+  1: 'rest',
+  2: 'work',
+  3: 'driving'
 }
 
 /*
@@ -518,69 +518,341 @@ const getMNC = (countryData, opData) => {
   let mnc = parseInt(opData, 10)
   let operator
   if (mcc === 716) {
-     operator = (mnc === 6) ? 'Movistar' :
-                (mnc === 7) ? 'Nextel' :
-                (mnc === 10) ? 'Claro' :
-                (mnc === 15) ? 'Viettel' :
-                (mnc === 17) ? 'Entel' :
-                (mnc === 20) ? 'Cuy Mobile (Claro)' :
+    operator = (mnc === 6) ? 'Movistar' :
+      (mnc === 7) ? 'Nextel' :
+        (mnc === 10) ? 'Claro' :
+          (mnc === 15) ? 'Viettel' :
+            (mnc === 17) ? 'Entel' :
+              (mnc === 20) ? 'Cuy Mobile (Claro)' :
                 'Desconocido'
   } else if (mcc === 722) {
     operator = (mnc === 1) ? 'Tuenti' :
-               (mnc === 10) ? 'Movicom' :
-               (mnc === 20) ? 'Nextel' :
-               (mnc === 34) ? 'Telecom Personal' :
-               ([310, 320, 330].includes(mnc)) ? 'Claro' :
-               'Desconocido'
+      (mnc === 10) ? 'Movicom' :
+        (mnc === 20) ? 'Nextel' :
+          (mnc === 34) ? 'Telecom Personal' :
+            ([310, 320, 330].includes(mnc)) ? 'Claro' :
+              'Desconocido'
   } else if (mcc === 724) {
     // Incomplete
     operator = ([2, 3, 4].includes(mnc)) ? 'TIM' :
-               ([5, 6, 12].includes(mnc)) ? 'Claro' :
-               'Otra'
+      ([5, 6, 12].includes(mnc)) ? 'Claro' :
+        'Otra'
   } else if (mcc === 730) {
     operator = ([1, 10].includes(mnc)) ? 'Entel' :
-               ([2, 7].includes(mnc)) ? 'Movistar' :
-               ([3, 23].includes(mnc)) ? 'Claro' :
-               (mnc === 8) ? 'VTR (Claro)' :
-               (mnc === 9) ? 'WOM' :
-               ([14, 20, 21, 28].includes(mnc)) ? 'Otro' : 
-               'Desconocido'
+      ([2, 7].includes(mnc)) ? 'Movistar' :
+        ([3, 23].includes(mnc)) ? 'Claro' :
+          (mnc === 8) ? 'VTR (Claro)' :
+            (mnc === 9) ? 'WOM' :
+              ([14, 20, 21, 28].includes(mnc)) ? 'Otro' :
+                'Desconocido'
   } else if (mcc === 732) {
     operator = (mnc === 1) ? 'Telecom' :
-               (mnc === 2) ? 'Edatel' :
-               (mnc === 101) ? 'Claro' :
-               (mnc === 103) ? 'Colombia Móvil' :
-               ([102, 123].includes(mnc)) ? 'Movistar' :
-               (mnc === 360) ? 'WOM' : 
-               'Desconocido'
+      (mnc === 2) ? 'Edatel' :
+        (mnc === 101) ? 'Claro' :
+          (mnc === 103) ? 'Colombia Móvil' :
+            ([102, 123].includes(mnc)) ? 'Movistar' :
+              (mnc === 360) ? 'WOM' :
+                'Desconocido'
   } else if (mcc === 736) {
     operator = (mnc === 1) ? 'Viva Bolivia' :
-               (mnc === 2) ? 'Entel' :
-               (mnc === 3) ? 'Telecel' :
-               (mnc === 4) ? 'Cotas' :
-               (mnc === 5) ? 'Comteco' :
-               'Desconocido'
+      (mnc === 2) ? 'Entel' :
+        (mnc === 3) ? 'Telecel' :
+          (mnc === 4) ? 'Cotas' :
+            (mnc === 5) ? 'Comteco' :
+              'Desconocido'
   } else if (mcc === 740) {
     operator = (mnc === 1) ? 'Otecel (Movistar)' :
-               (mnc === 2) ? 'Conecel (Claro)' :
-               (mnc === 0) ? 'Telecsa (CNT' :
-               'Desconocido'
+      (mnc === 2) ? 'Conecel (Claro)' :
+        (mnc === 0) ? 'Telecsa (CNT' :
+          'Desconocido'
   } else if (mcc === 744) {
     operator = (mnc === 1) ? 'Hola Paraguay' :
-               (mnc === 2) ? 'AMX Paraguay' :
-               (mnc === 3) ? 'Comunicaciones Privadas' :
-               (mnc === 4) ? 'Telefónica Celular del Paraguay' :
-               (mnc === 5) ? 'Núcleo' :
-               'Desconocido'
+      (mnc === 2) ? 'AMX Paraguay' :
+        (mnc === 3) ? 'Comunicaciones Privadas' :
+          (mnc === 4) ? 'Telefónica Celular del Paraguay' :
+            (mnc === 5) ? 'Núcleo' :
+              'Desconocido'
   } else if (mcc === 748) {
     operator = ([0, 1].includes(mnc)) ? 'Ancel' :
-               (mnc === 7) ? 'Movistar' :
-               (mnc === 0) ? 'AMX Wireless' :
-               'Desconocido'
+      (mnc === 7) ? 'Movistar' :
+        (mnc === 0) ? 'AMX Wireless' :
+          'Desconocido'
   } else {
     operator = 'Desconocido'
   }
-  return {country: latamMcc[mcc], mnc: mnc, operator: operator
+  return {
+    country: latamMcc[mcc], mnc: mnc, operator: operator
+  }
+}
+
+/*
+  Hectometer to Kilometer
+*/
+const hToKm = (data) => {
+  let h = parseFloat(data.slice(1))
+  return parseFloat((h * 0.1).toFixed(2))
+}
+
+/*
+  Parse CAN100 data
+*/
+const parseCanData = (data, key) => {
+  switch (key) {
+    case 'ignitionKey':
+      return (data === '0' ? 'ignition_off' : data === '1' ? 'ignition_on' : data === '2' ? 'engine_on' : null)
+    case 'totalDistance':
+      if (data[0] === 'H') {
+        return hToKm(data)
+      } else {
+        return data
+      }
+    case 'range':
+      return hToKm(data)
+    case 'fuelConsumption':
+      if (data[0] === 'H') {
+        return hToKm(data) * 1000
+      } else if (data[0] === 'L') {
+        return parseFloat(parseFloat(data.slice(1)).toFixed(2))
+      } else {
+        return data
+      }
+    case 'tachographDrivingDirection':
+      return data === '0' ? 'forward' : 'backward'
+    default:
+      return data
+  }
+}
+
+/*
+  Get CANbus data
+*/
+const getCanData = (parsedData, ix) => {
+  let inicatorsBin =
+    parsedData[ix + 19] !== ''
+      ? nHexDigit(hex2bin(parsedData[ix + 19]), 16)
+      : null
+  let lights =
+    parsedData[ix + 20] !== ''
+      ? nHexDigit(hex2bin(parsedData[ix + 20]), 8)
+      : null
+  let doors =
+    parsedData[ix + 21] !== ''
+      ? nHexDigit(hex2bin(parsedData[ix + 21]), 8)
+      : null
+  let canExpansionMask =
+    parsedData[ix + 24] !== ''
+      ? nHexDigit(hex2bin(parsedData[ix + 24]), 32)
+        .split('')
+        .reverse()
+        .join('')
+      : null
+  let expansionBin =
+    parsedData[ix + 45] !== ''
+      ? nHexDigit(hex2bin(parsedData[ix + 45]), 16)
+        .split('')
+        .reverse()
+        .join('')
+      : null
+  let tachographBin =
+    parsedData[ix + 18] !== ''
+      ? nHexDigit(hex2bin(parsedData[ix + 18]), 8)
+        .split('')
+        .reverse()
+        .join('')
+      : null
+
+  return {
+    comunicationOk: parsedData[ix] ? parsedData[ix] === '1' : null,
+    vin: parsedData[ix + 2] !== '' ? parsedData[ix + 2] : null,
+    ignitionKey: parsedData[ix + 3] !== '' ? parseCanData(parsedData[ix + 3], 'ignitionKey') : null,
+    totalDistance: parsedData[ix + 4] !== '' ? parseCanData(parsedData[ix + 4], 'totalDistance') : null,
+    fuelUsed: parsedData[ix + 5] !== '' ? parseFloat(parsedData[ix + 5]) : null, // float
+    rpm: parsedData[ix + 6] !== '' ? parseInt(parsedData[ix + 6], 10) : null, // int
+    speed: parsedData[ix + 7] !== '' ? parseFloat(parsedData[ix + 7]) : null,
+    engineCoolantTemp:
+      parsedData[ix + 8] !== '' ? parseInt(parsedData[ix + 8], 10) : null,
+    fuelConsumption: parsedData[ix + 9] !== '' ? parseCanData(parsedData[ix + 9], 'fuelConsumption') : null,
+    fuelLevel: parsedData[ix + 10] !== '' ? parsedData[ix + 10] : null,
+    range: parsedData[ix + 11] !== '' ? parseCanData(parsedData[ix + 11], 'range') : null,
+    acceleratorPressure:
+      parsedData[ix + 12] !== '' ? parseFloat(parsedData[ix + 12]) : null,
+    engineHours: parsedData[ix + 13] !== '' ? parseFloat(parsedData[ix + 13]) : null,
+    drivingTime: parsedData[ix + 14] !== '' ? parseFloat(parsedData[ix + 14]) : null,
+    idleTime: parsedData[ix + 15] !== '' ? parseFloat(parsedData[ix + 15]) : null,
+    idleFuelUsed: parsedData[ix + 16] !== '' ? parseFloat(parsedData[ix + 16]) : null,
+    axleWight: parsedData[ix + 17] !== '' ? parseFloat(parsedData[ix + 17]) : null,
+    tachograph: {
+      raw: parsedData[ix + 18] !== '' ? parsedData[ix + 18] : null,
+      validDriverData: tachographBin ? tachographBin[7] === '1' : null,
+      insertedDriverCard: tachographBin ? tachographBin[5] === '1' : null,
+      driverWorkingState: tachographBin
+        ? dWorkingStates[parseInt(tachographBin.substring(3, 5), 2)]
+        : null,
+      drivingTimeState: tachographBin
+        ? dTimeStates[parseInt(tachographBin.substring(5, 8), 2)]
+        : null
+    },
+    indicators: inicatorsBin ? {
+      raw: inicatorsBin !== '' ? parsedData[ix + 19] : null,
+      lowFuel: inicatorsBin ? inicatorsBin[0] === '1' : null,
+      driverSeatbelt: inicatorsBin ? inicatorsBin[1] === '1' : null,
+      airConditioning: inicatorsBin ? inicatorsBin[2] === '1' : null,
+      cruiseControl: inicatorsBin ? inicatorsBin[3] === '1' : null,
+      brakePedal: inicatorsBin ? inicatorsBin[4] === '1' : null,
+      clutchPedal: inicatorsBin ? inicatorsBin[5] === '1' : null,
+      handbrake: inicatorsBin ? inicatorsBin[6] === '1' : null,
+      centralLock: inicatorsBin ? inicatorsBin[7] === '1' : null,
+      reverseGear: inicatorsBin ? inicatorsBin[8] === '1' : null,
+      runningLights: inicatorsBin ? inicatorsBin[9] === '1' : null,
+      lowBeams: inicatorsBin ? inicatorsBin[10] === '1' : null,
+      highBeams: inicatorsBin ? inicatorsBin[11] === '1' : null,
+      rearFogLights: inicatorsBin ? inicatorsBin[12] === '1' : null,
+      frontFogLights: inicatorsBin ? inicatorsBin[13] === '1' : null,
+      doors: inicatorsBin ? inicatorsBin[14] === '1' : null,
+      trunk: inicatorsBin ? inicatorsBin[15] === '1' : null
+    } : null,
+    lights: lights ? {
+      raw: lights !== '' ? parsedData[ix + 20] : null,
+      running: lights ? lights[0] === '1' : null,
+      lowBeams: lights ? lights[1] === '1' : null,
+      frontFog: lights ? lights[2] === '1' : null,
+      rearFog: lights ? lights[3] === '1' : null,
+      hazard: lights ? lights[4] === '1' : null
+    } : null,
+    doors: doors ? {
+      raw: doors !== '' ? parsedData[ix + 21] : null,
+      driver: doors ? doors[0] === '1' : null,
+      passenger: doors ? doors[1] === '1' : null,
+      rearLeft: doors ? doors[2] === '1' : null,
+      rearRight: doors ? doors[3] === '1' : null,
+      trunk: doors ? doors[4] === '1' : null,
+      hood: doors ? doors[5] === '1' : null
+    } : null,
+    overSpeedTime: parsedData[ix + 22] !== '' ? parseFloat(parsedData[ix + 22]) : null,
+    overSpeedEngineTime: parsedData[ix + 23] !== '' ? parseFloat(parsedData[ix + 23]) : null,
+    canExpanded: {
+      canReportExpansionMask: {
+        raw: parsedData[ix + 24] !== '' ? parsedData[ix + 24] : null,
+        engineTorque: canExpansionMask ? canExpansionMask[23] === '1' : null,
+        rapidAccelerations: canExpansionMask
+          ? canExpansionMask[22] === '1'
+          : null,
+        rapidBrakings: canExpansionMask ? canExpansionMask[21] === '1' : null,
+        expansionInformation: canExpansionMask
+          ? canExpansionMask[20] === '1'
+          : null,
+        registrationNumber: canExpansionMask
+          ? canExpansionMask[19] === '1'
+          : null,
+        tachographDriver2Name: canExpansionMask
+          ? canExpansionMask[18] === '1'
+          : null,
+        tachographDriver1Name: canExpansionMask
+          ? canExpansionMask[17] === '1'
+          : null,
+        tachographDriver2Card: canExpansionMask
+          ? canExpansionMask[16] === '1'
+          : null,
+        tachographDriver1Card: canExpansionMask
+          ? canExpansionMask[15] === '1'
+          : null,
+        totalBrakeApplications: canExpansionMask
+          ? canExpansionMask[14] === '1'
+          : null,
+        totalAcceleratorKickDownTime: canExpansionMask
+          ? canExpansionMask[13] === '1'
+          : null,
+        totalCruiseControlTime: canExpansionMask
+          ? canExpansionMask[12] === '1'
+          : null,
+        totalEffectiveEngineSpeedTime: canExpansionMask
+          ? canExpansionMask[11] === '1'
+          : null,
+        totalAcceleratorKickDown: canExpansionMask
+          ? canExpansionMask[10] === '1'
+          : null,
+        pedalBrakingFactor: canExpansionMask
+          ? canExpansionMask[9] === '1'
+          : null,
+        engineBrakingFactor: canExpansionMask
+          ? canExpansionMask[8] === '1'
+          : null,
+        analogInputValue: canExpansionMask
+          ? canExpansionMask[7] === '1'
+          : null,
+        tachographDrivingDirection: canExpansionMask
+          ? canExpansionMask[6] === '1'
+          : null,
+        tachographVehicleMotionSignal: canExpansionMask
+          ? canExpansionMask[5] === '1'
+          : null,
+        tachographOverspeedSignal: canExpansionMask
+          ? canExpansionMask[4] === '1'
+          : null,
+        AxleWeight4: canExpansionMask ? canExpansionMask[3] === '1' : null,
+        AxleWeight3: canExpansionMask ? canExpansionMask[2] === '1' : null,
+        AxleWeight1: canExpansionMask ? canExpansionMask[1] === '1' : null,
+        adBlueLevel: canExpansionMask ? canExpansionMask[0] === '1' : null
+      },
+      adBlueLevel:
+        parsedData[ix + 25] !== '' ? parseFloat(parsedData[ix + 25]) : null,
+      axleWeight1: parsedData[ix + 26] !== '' ? parseInt(parsedData[ix + 26]) : null,
+      axleWeight3: parsedData[ix + 27] !== '' ? parseInt(parsedData[ix + 27]) : null,
+      axleWeight4: parsedData[ix + 28] !== '' ? parseInt(parsedData[ix + 28]) : null,
+      tachographOverspeedSignal:
+        parsedData[ix + 29] !== '' ? (parsedData[ix + 29] === '1') : null,
+      tachographVehicleMotionSignal:
+        parsedData[ix + 30] !== '' ? (parsedData[ix + 30] === '1') : null,
+      tachographDrivingDirection:
+        parsedData[ix + 31] !== '' ? parseCanData(parsedData[ix + 31], 'tachographDrivingDirection') : null,
+      analogInputValue:
+        parsedData[ix + 32] !== '' ? parseFloat(parsedData[ix + 32]) * 1000 : null,
+      engineBrakingFactor:
+        parsedData[ix + 33] !== '' ? parseInt(parsedData[ix + 33]) : null,
+      pedalBrakingFactor:
+        parsedData[ix + 34] !== '' ? parseInt(parsedData[ix + 34]) : null,
+      totalAcceleratorKickDown:
+        parsedData[ix + 35] !== '' ? parseInt(parsedData[ix + 35]) : null,
+      totalEffectiveEngineSpeedTime:
+        parsedData[ix + 36] !== '' ? parseFloat(parsedData[ix + 36]) : null,
+      totalCruiseControlTime:
+        parsedData[ix + 37] !== '' ? parseFloat(parsedData[ix + 37]) : null,
+      totalAcceleratorKickDownTime:
+        parsedData[ix + 38] !== '' ? parseFloat(parsedData[ix + 38]) : null,
+      totalBrakeApplications:
+        parsedData[ix + 39] !== '' ? parseInt(parsedData[ix + 39]) : null,
+      tachographDriver1Card: parsedData[ix + 40] !== '' ? parsedData[ix + 40] : null,
+      tachographDriver2Card: parsedData[ix + 41] !== '' ? parsedData[ix + 41] : null,
+      tachographDriver1Name: parsedData[ix + 42] !== '' ? parsedData[ix + 42] : null,
+      tachographDriver2Name: parsedData[ix + 43] !== '' ? parsedData[ix + 43] : null,
+      registrationNumber: parsedData[ix + 44] !== '' ? parsedData[ix + 44] : null,
+      expansionInformation: {
+        raw: parsedData[ix + 45] !== '' ? parsedData[ix + 45] : null,
+        webasto: expansionBin ? expansionBin[0] === '1' : null,
+        brakeFluidLowIndicator: expansionBin
+          ? expansionBin[1] === '1'
+          : null,
+        coolantLevelLowIndicator: expansionBin
+          ? expansionBin[2] === '1'
+          : null,
+        batteryIndicator: expansionBin ? expansionBin[3] === '1' : null,
+        brakeSystemaFailureIndicator: expansionBin
+          ? expansionBin[4] === '1'
+          : null,
+        oilPressureIndicator: expansionBin ? expansionBin[5] === '1' : null,
+        engineHotIndicator: expansionBin ? expansionBin[6] === '1' : null,
+        ABSFailureIndicator: expansionBin ? expansionBin[7] === '1' : null,
+        checkEngineIndicator: expansionBin ? expansionBin[9] === '1' : null,
+        aribagsIndicator: expansionBin ? expansionBin[10] === '1' : null,
+        serviceCallIndicator: expansionBin
+          ? expansionBin[11] === '1'
+          : null,
+        oilLevelLowIndicator: expansionBin ? expansionBin[12] === '1' : null
+      },
+      rapidBrakings: parsedData[ix + 46] !== '' ? parseInt(parsedData[ix + 46]) : null,
+      rapidAccelerations: parsedData[ix + 47] !== '' ? parseInt(parsedData[ix + 47]) : null,
+      engineTorque: parsedData[ix + 48] !== '' ? parseFloat(parsedData[ix + 48]) : null,
+    }
   }
 }
 
@@ -1237,6 +1509,7 @@ module.exports = {
   getHoursForHourmeter: getHoursForHourmeter,
   getSignalStrength: getSignalStrength,
   getSignalPercentage: getSignalPercentage,
+  getCanData: getCanData,
   getAlarm: getAlarm,
   bin2dec: bin2dec,
   bin2hex: bin2hex,