queclink-parser 1.9.11 → 1.9.12

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+#### 1.9.12 (2024-10-14)
+
+##### New Features
+
+* **can:**  added adBlueLevelUnit ([cfc663c8](https://github.com/jaayesta/queclink-parser/commit/cfc663c8339dadc6e36750019c7d881007942a45))
+
+##### Bug Fixes
+
+* **gv58lau:**  digital inputs ([bb78b299](https://github.com/jaayesta/queclink-parser/commit/bb78b29970fa016571d93fd9c1959c73804d294a))
+* **canbus:**  new can index consider ac100 or digitFuelSensor data ([b0e9d23e](https://github.com/jaayesta/queclink-parser/commit/b0e9d23e69e9ffacddf0b76cc3a4d04523598ebe))
+* **can:**
+  *  evaluation for parsedData ([3427d98f](https://github.com/jaayesta/queclink-parser/commit/3427d98f85d273a262dc076c4b36cb88e51c3b54))
+  *  typo ([08408de4](https://github.com/jaayesta/queclink-parser/commit/08408de4d52d38f8cd280736ff7d821303c5e756))
+
+##### Tests
+
+* **can:**  test for database when can data exists ([424e28c6](https://github.com/jaayesta/queclink-parser/commit/424e28c63c39d6d3e6a4335d9f9b79c83d574b68))
+
 #### 1.9.11 (2024-10-09)
 
 ##### New Features

package/example.js

@@ -90,7 +90,73 @@ var data = {
   }
 
 // console.log(queclink.parseCommand(data))
-const raw = new Buffer(eribad)
-console.log(queclink.parse(raw))
-queclink.parse(raw)
+const raw = new Buffer(caneri)
+// console.log(queclink.parse(raw))
+// queclink.parse(raw)
 
+data = queclink.parse(raw)
+// console.log(data)
+if (data.can) {
+  const {
+    comunicationOk,
+    vin,
+    ignitionKey,
+    totalDistance,
+    totalDistanceUnit,
+    rpm,
+    speed,
+    engineCoolantTemp,
+    fuelConsumption,
+    fuelLevel,
+    fuelLevelUnit,
+    range,
+    acceleratorPressure,
+    engineHours,
+    drivingTime,
+    idleTime,
+    idleFuelUsed,
+    axleWeight,
+    tachograph,
+    indicators,
+    lights,
+    doors,
+    overSpeedTime,
+    overSpeedEngineTime
+  } = data.can
+
+  const canData = {
+    raw: data.raw,
+    imei: data.imei,
+    datetime: data.datetime,
+    point: data.point,
+    comunicationOk,
+    vin,
+    ignitionKey,
+    totalDistance,
+    totalDistanceUnit,
+    rpm,
+    speed,
+    engineCoolantTemp,
+    fuelConsumption,
+    fuelLevel,
+    fuelLevelUnit,
+    range,
+    acceleratorPressure,
+    engineHours,
+    drivingTime,
+    idleTime,
+    idleFuelUsed,
+    axleWeight,
+    tachograph,
+    indicators,
+    lights,
+    doors,
+    overSpeedTime,
+    overSpeedEngineTime,
+    ...data.can.canExpanded
+  }
+
+  canData.canReportExpansionMask = canData.canReportExpansionMask.raw
+  console.log(canData)
+  delete data.can
+}

package/package.json

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

package/src/gv310lau.js

@@ -229,6 +229,12 @@ const parse = raw => {
     let index = 7 + 12 * number // position append mask
     let satelliteInfo = false
 
+    // If get satellites is configured
+    if (utils.includeSatellites(parsedData[19])) {
+      index = 7 + 13 * number
+      satelliteInfo = true
+    }
+
     // External Data
     const digitFuelSensor =
       utils.nHexDigit(utils.hex2bin(parsedData[4]), 11)[10] === '1'
@@ -242,12 +248,6 @@ const parse = raw => {
     const bluetoothAccessory =
       utils.nHexDigit(utils.hex2bin(parsedData[4]), 11)[2] === '1'
 
-    // If get satellites is configured
-    if (utils.includeSatellites(parsedData[19])) {
-      index = 7 + 13 * number
-      satelliteInfo = true
-    }
-
     data = Object.assign(data, {
       alarm: utils.getAlarm(command[1], null),
       loc: {
@@ -369,27 +369,6 @@ const parse = raw => {
       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: {
@@ -442,6 +421,7 @@ const parse = raw => {
           })
           count += 3
         }
+
         externalData = Object.assign(externalData, {
           fuelSensorData: null,
           AC100Devices: ac100Devices
@@ -536,6 +516,28 @@ const parse = raw => {
       }
     }
 
+    if (canData) {
+      let newIndex = digitFuelSensor && !AC100 ? index + 9 + 1 : !digitFuelSensor && AC100 ? index + 9 + 4 : digitFuelSensor && AC100 ? index + 9 + 5 : index + 9
+      let canInfo = utils.getCanData(parsedData, newIndex)
+      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
+      }
+    }
+
     // Bluetooth Accessories
     if (bluetoothAccessory) {
       let btDevices = []

package/src/gv58lau.js

@@ -56,12 +56,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':

package/src/utils.js

@@ -618,6 +618,12 @@ const parseCanData = (data, key) => {
       }
     case 'tachographDrivingDirection':
       return data === '0' ? 'forward' : 'backward'
+    case 'adBlueLevel':
+      if(['P','L'].includes(data.slice(0,1))) {
+        return parseFloat(parseFloat(data.slice(1)).toFixed(2))
+      } else {
+        return parseFloat(parseFloat(data).toFixed(2))
+      }
     default:
       return data
   }
@@ -663,28 +669,28 @@ const getCanData = (parsedData, ix) => {
 
   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,
-    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,
+    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] !== '' ? parseFloat(parsedData[ix + 10].slice(1)) : null,
+      parsedData[ix + 8] ? parseInt(parsedData[ix + 8], 10) : null,
+    fuelConsumption: parsedData[ix + 9] ? parseCanData(parsedData[ix + 9], 'fuelConsumption') : 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,
+    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,
+      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,
+    axleWeight: parsedData[ix + 17] ? parseFloat(parsedData[ix + 17]) : null,
+    tachograph: parsedData[ix + 18] ? {
+      raw: parsedData[ix + 18] ? parsedData[ix + 18] : null,
       validDriverData: tachographBin ? tachographBin[7] === '1' : null,
       insertedDriverCard: tachographBin ? tachographBin[5] === '1' : null,
       driverWorkingState: tachographBin
@@ -693,9 +699,9 @@ const getCanData = (parsedData, ix) => {
       drivingTimeState: tachographBin
         ? dTimeStates[parseInt(tachographBin.substring(5, 8), 2)]
         : null
-    },
+    } : null,
     indicators: inicatorsBin ? {
-      raw: inicatorsBin !== '' ? parsedData[ix + 19] : null,
+      raw: inicatorsBin ? parsedData[ix + 19] : null,
       lowFuel: inicatorsBin ? inicatorsBin[0] === '1' : null,
       driverSeatbelt: inicatorsBin ? inicatorsBin[1] === '1' : null,
       airConditioning: inicatorsBin ? inicatorsBin[2] === '1' : null,
@@ -714,7 +720,7 @@ const getCanData = (parsedData, ix) => {
       trunk: inicatorsBin ? inicatorsBin[15] === '1' : null
     } : null,
     lights: lights ? {
-      raw: lights !== '' ? parsedData[ix + 20] : null,
+      raw: lights ? parsedData[ix + 20] : null,
       running: lights ? lights[0] === '1' : null,
       lowBeams: lights ? lights[1] === '1' : null,
       frontFog: lights ? lights[2] === '1' : null,
@@ -722,7 +728,7 @@ const getCanData = (parsedData, ix) => {
       hazard: lights ? lights[4] === '1' : null
     } : null,
     doors: doors ? {
-      raw: doors !== '' ? parsedData[ix + 21] : null,
+      raw: doors ? parsedData[ix + 21] : null,
       driver: doors ? doors[0] === '1' : null,
       passenger: doors ? doors[1] === '1' : null,
       rearLeft: doors ? doors[2] === '1' : null,
@@ -730,11 +736,11 @@ const getCanData = (parsedData, ix) => {
       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,
+    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,
+        raw: parsedData[ix + 24] ? parsedData[ix + 24] : null,
         engineTorque: canExpansionMask ? canExpansionMask[23] === '1' : null,
         rapidAccelerations: canExpansionMask
           ? canExpansionMask[22] === '1'
@@ -797,40 +803,40 @@ const getCanData = (parsedData, ix) => {
         adBlueLevel: canExpansionMask ? canExpansionMask[0] === '1' : null
       },
       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,
+        parsedData[ix + 25] ? parseCanData(parsedData[ix + 25], 'adBlueLevel') : null,
+      adBlueLevelUnit: parsedData[ix + 25] ? parsedData[ix + 25].slice(0,1) === 'P' ? '%' : 'L' ? 'L': '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,
       tachographOverspeedSignal:
-        parsedData[ix + 29] !== '' ? (parsedData[ix + 29] === '1') : null,
+        parsedData[ix + 29] ? (parsedData[ix + 29] === '1') : null,
       tachographVehicleMotionSignal:
-        parsedData[ix + 30] !== '' ? (parsedData[ix + 30] === '1') : null,
+        parsedData[ix + 30] ? (parsedData[ix + 30] === '1') : null,
       tachographDrivingDirection:
-        parsedData[ix + 31] !== '' ? parseCanData(parsedData[ix + 31], 'tachographDrivingDirection') : null,
+        parsedData[ix + 31] ? parseCanData(parsedData[ix + 31], 'tachographDrivingDirection') : null,
       analogInputValue:
-        parsedData[ix + 32] !== '' ? parseFloat(parsedData[ix + 32]) * 1000 : null,
+        parsedData[ix + 32] ? parseFloat(parsedData[ix + 32]) * 1000 : null,
       engineBrakingFactor:
-        parsedData[ix + 33] !== '' ? parseInt(parsedData[ix + 33]) : null,
+        parsedData[ix + 33] ? parseInt(parsedData[ix + 33]) : null,
       pedalBrakingFactor:
-        parsedData[ix + 34] !== '' ? parseInt(parsedData[ix + 34]) : null,
+        parsedData[ix + 34] ? parseInt(parsedData[ix + 34]) : null,
       totalAcceleratorKickDown:
-        parsedData[ix + 35] !== '' ? parseInt(parsedData[ix + 35]) : null,
+        parsedData[ix + 35] ? parseInt(parsedData[ix + 35]) : null,
       totalEffectiveEngineSpeedTime:
-        parsedData[ix + 36] !== '' ? parseFloat(parsedData[ix + 36]) : null,
+        parsedData[ix + 36] ? parseFloat(parsedData[ix + 36]) : null,
       totalCruiseControlTime:
-        parsedData[ix + 37] !== '' ? parseFloat(parsedData[ix + 37]) : null,
+        parsedData[ix + 37] ? parseFloat(parsedData[ix + 37]) : null,
       totalAcceleratorKickDownTime:
-        parsedData[ix + 38] !== '' ? parseFloat(parsedData[ix + 38]) : null,
+        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,
+        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,
+        raw: parsedData[ix + 45] ? parsedData[ix + 45] : null,
         webasto: expansionBin ? expansionBin[0] === '1' : null,
         brakeFluidLowIndicator: expansionBin
           ? expansionBin[1] === '1'
@@ -852,9 +858,9 @@ const getCanData = (parsedData, ix) => {
           : 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,
+      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,
     }
   }
 }