queclink-parser 1.9.10 → 1.9.11

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+#### 1.9.11 (2024-10-09)
+
+##### New Features
+
+* **can:**  added units of measurement ([7ff59418](https://github.com/jaayesta/queclink-parser/commit/7ff594187491dcaf8c5f2aa690218363ebbba2c6))
+
+##### Bug Fixes
+
+* **can:**  fix index error for externalData in ERI ([f71b874c](https://github.com/jaayesta/queclink-parser/commit/f71b874cd0c2ead80d9cdeae5be3c5408fb6c99b))
+
 #### 1.9.10 (2024-10-08)
 
 ##### New Features

package/example.js

@@ -57,6 +57,8 @@ var cra = '+RESP:GTCRA,8020060402,867488060596284,GV57CG,06,1,1.0,0,222.0,117.12
 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 eribad = "+RESP:GTERI,6E0802,868589060669374,,00000002,28594,10,1,1,18.9,210,542.2,-70.693347,-33.537067,20241009121749,0730,0001,3341,008AF201,01,12,6.9,0000004:57:46,,,,100,220100,2,1,28FF05762863EA12,1,00B1,20241009121755,09BE$"
+
 
 var data = {
     "imei": 864696060046190,
@@ -88,7 +90,7 @@ var data = {
   }
 
 // console.log(queclink.parseCommand(data))
-const raw = new Buffer(caneri)
+const raw = new Buffer(eribad)
 console.log(queclink.parse(raw))
 queclink.parse(raw)
 

package/package.json

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

package/src/gv310lau.js

@@ -242,12 +242,6 @@ const parse = raw => {
     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
@@ -370,6 +364,12 @@ const parse = raw => {
           : null,
     })
 
+    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 })

package/src/utils.js

@@ -601,7 +601,7 @@ const parseCanData = (data, key) => {
     case 'ignitionKey':
       return (data === '0' ? 'ignition_off' : data === '1' ? 'ignition_on' : data === '2' ? 'engine_on' : null)
     case 'totalDistance':
-      if (data[0] === 'H') {
+      if (data.slice(0,1) === 'H') {
         return hToKm(data)
       } else {
         return data
@@ -666,13 +666,15 @@ const getCanData = (parsedData, ix) => {
     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,
+    totalDistanceUnit: parsedData[ix + 4] ? parsedData[ix + 4].slice(0,1) === 'H' ? 'Km' : 'I' : 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,
+    fuelLevel: parsedData[ix + 10] !== '' ? parseFloat(parsedData[ix + 10].slice(1)) : null,
+    fuelLevelUnit: parsedData[ix + 10] ? parsedData[ix + 10].slice(0,1) === 'P' ? '%' : 'L' : null,
     range: parsedData[ix + 11] !== '' ? parseCanData(parsedData[ix + 11], 'range') : null,
     acceleratorPressure:
       parsedData[ix + 12] !== '' ? parseFloat(parsedData[ix + 12]) : null,
@@ -796,6 +798,7 @@ const getCanData = (parsedData, ix) => {
       },
       adBlueLevel:
         parsedData[ix + 25] !== '' ? parseFloat(parsedData[ix + 25]) : null,
+      // adBlueLevelUnit: parsedData[ix + 25] ? parsedData[ix + 25].slice(0,1) === 'P' ? '%' : 'L' : 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,