queclink-parser 1.9.11 → 1.9.13

package/src/index.js

@@ -250,8 +250,10 @@ const parseCommand = data => {
     const do5 = `${outputs[4]},${prevDurations['5']},${prevToggles['5']}`
     const longOperation = data.longOperation || false ? '1' : '0'
     const dosReport = data.dosReport || false ? '1' : '0'
-    if (data.device_serie === 'GV' && data.password === 'gv57cg') {
+    if (data.device_serie === 'GV' && password === 'gv57cg') {
       command = `AT+GTDOS=${password},,,1,${do1},,,${dosReport},0,5,,,,${serialId}$`
+    } else if (data.device_serie === 'GV' && password === 'gv58lau') {
+      command = `AT+GTDOS=${password},0,3,1,${do1},0,,2,${do2},0,,3,${do3},0,,0,,,0${dosReport},,,FFFF$`
     } else if (data.device_serie === 'GV') {
       command = `AT+GTOUT=${password},${do1},${do2},${do3},${do4},${longOperation},${dosReport},,,${serialId}$`
     } else if (data.device_serie === 'GMT') {

package/src/messages/es.json

@@ -283,6 +283,7 @@
     "GTJDC": "Config: detección de jamming",
     "GTASC": "Config: autocalibración de acelerómetro",
     "GTOUT": "Config: salidas digitales",
+    "GTDOS": "Config: salidas digitales",
     "GTDIS": "Config: entradas digitales",
     "GTGDO": "Config: salidas digitales graduales",
     "GTROS": "Config: restricción de salidas",

package/src/utils.js

@@ -293,9 +293,11 @@ const latamMcc = {
   736: 'Bolivia',
   740: 'Ecuador',
   744: 'Paraguay',
-  748: 'Uruguay'
+  748: 'Uruguay',
+  default: 'Desconocido'
 }
 
+
 /*
   Gets the Queclink Device Type
 */
@@ -363,7 +365,7 @@ const checkGps = (lng, lat) => {
   included in the report
 */
 const includeSatellites = positionAppendMask => {
-  return ['01', '03', '05', '07'].includes(positionAppendMask)
+  return nHexDigit(hex2bin(positionAppendMask), 4)[3] == '1'
 }
 
 /*
@@ -371,19 +373,23 @@ const includeSatellites = positionAppendMask => {
   included in the report
 */
 const includeGnssTrigger = positionAppendMask => {
-  return ['02', '03', '06', '07'].includes(positionAppendMask)
+  return nHexDigit(hex2bin(positionAppendMask), 4)[2] == '1'
 }
 
 /*
-  Returns if Possition Append Mask includes
-  more information in the report
+  Returns if the Status is
+  included in the report
 */
-const appendMaskData = positionAppendMask => {
-  let satelliteInfo = ['01', '03', '05', '07'].includes(positionAppendMask)
-  let gnssTrigger = ['02', '03', '06', '07'].includes(positionAppendMask)
-  let statusInfo = parseInt(positionAppendMask) > 3
+const includeStatus = positionAppendMask => {
+  return nHexDigit(hex2bin(positionAppendMask), 4)[1] == '1'
+}
 
-  return satelliteInfo + gnssTrigger + statusInfo
+/*
+  Returns if the GNNS Accuracy is
+  included in the report
+*/
+const includeGnnsAccuracy = positionAppendMask => {
+  return nHexDigit(hex2bin(positionAppendMask), 4)[0] == '1'
 }
 
 /*
@@ -581,7 +587,7 @@ const getMNC = (countryData, opData) => {
     operator = 'Desconocido'
   }
   return {
-    country: latamMcc[mcc], mnc: mnc, operator: operator
+    country: latamMcc[mcc] || latamMcc.default, mnc: mnc, operator: operator
   }
 }
 
@@ -601,7 +607,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.slice(0,1) === 'H') {
+      if (data.slice(0, 1) === 'H') {
         return hToKm(data)
       } else {
         return data
@@ -618,6 +624,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 +675,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,
-    fuelLevelUnit: parsedData[ix + 10] ? parsedData[ix + 10].slice(0,1) === 'P' ? '%' : 'L' : null,
-    range: parsedData[ix + 11] !== '' ? parseCanData(parsedData[ix + 11], 'range') : 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,
     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 +705,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 +726,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 +734,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 +742,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 +809,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' : '%' : 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 +864,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,
     }
   }
 }
@@ -1258,7 +1270,7 @@ const getAlarm = (command, report, extra = false) => {
       magnitude: Number(
         Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2) + Math.pow(z, 2)).toFixed(2)
       ).toString(),
-      xyz: {x: x, y: y, z: z},
+      xyz: { x: x, y: y, z: z },
       message: messages[command][report[1]]
     }
   } else if (command === 'GTCRA') {
@@ -1504,7 +1516,8 @@ module.exports = {
   checkGps: checkGps,
   includeSatellites: includeSatellites,
   includeGnssTrigger: includeGnssTrigger,
-  appendMaskData: appendMaskData,
+  includeStatus: includeStatus,
+  includeGnnsAccuracy: includeGnnsAccuracy,
   getAccelerationMagnitude: getAccelerationMagnitude,
   getTempInCelciousDegrees: getTempInCelciousDegrees,
   getBtTempHumData: getBtTempHumData,