queclink-parser 1.9.12 → 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
@@ -619,7 +625,7 @@ const parseCanData = (data, key) => {
     case 'tachographDrivingDirection':
       return data === '0' ? 'forward' : 'backward'
     case 'adBlueLevel':
-      if(['P','L'].includes(data.slice(0,1))) {
+      if (['P', 'L'].includes(data.slice(0, 1))) {
         return parseFloat(parseFloat(data.slice(1)).toFixed(2))
       } else {
         return parseFloat(parseFloat(data).toFixed(2))
@@ -672,7 +678,7 @@ 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,
+    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,
@@ -680,7 +686,7 @@ const getCanData = (parsedData, ix) => {
       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,
+    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,
@@ -804,7 +810,7 @@ const getCanData = (parsedData, ix) => {
       },
       adBlueLevel:
         parsedData[ix + 25] ? parseCanData(parsedData[ix + 25], 'adBlueLevel') : null,
-      adBlueLevelUnit: parsedData[ix + 25] ? parsedData[ix + 25].slice(0,1) === 'P' ? '%' : 'L' ? 'L': 'L' : 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,
@@ -1264,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') {
@@ -1510,7 +1516,8 @@ module.exports = {
   checkGps: checkGps,
   includeSatellites: includeSatellites,
   includeGnssTrigger: includeGnssTrigger,
-  appendMaskData: appendMaskData,
+  includeStatus: includeStatus,
+  includeGnnsAccuracy: includeGnnsAccuracy,
   getAccelerationMagnitude: getAccelerationMagnitude,
   getTempInCelciousDegrees: getTempInCelciousDegrees,
   getBtTempHumData: getBtTempHumData,