queclink-parser 1.8.3 → 1.8.5

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+#### 1.8.5 (2024-01-11)
+
+#### 1.8.4 (2024-01-11)
+
+##### Bug Fixes
+
+* **replace:**  new 'replace' deleted in utils. ([37598dfc](https://github.com/jaayesta/queclink-parser/commit/37598dfc8017fbbf8d0ea2ed40228c3f31408f7e))
+
 #### 1.8.3 (2024-01-08)
 
 #### 1.8.2 (2024-01-08)

package/example.js

@@ -50,6 +50,10 @@ var crg = '+RESP:GTCRG,6E0200,866775050906544,,1,10,1,1,0.0,18,113.5,117.129345,
 var crd = '+RESP:GTCRD,6E0200,866775050906544,,01,06,1,1,000B0001FFAB000B0001FFAB000B0001FFAB000B0001FFAB000B0001FFAB000B0001FFAB000B0001FFAB000B0001FFAB000B0001FFAB000B0001FFAB000B0001FFAB000B0001FFAB000B0001FFAB000B0001FFAB000C0001FFAB000B0001FFAB000B0003FFAB000C0001FFAB000B0001FFAB000B0001FFAB000C0001FFAB000B0001FFAB000B0001FFAB000B0002FFAB000B0001FFAB000B0001FFAB000B0001FFAB000B0001FFAB000B0001FFAB000B0001FFAB000C0001FFAB000B0001FFAB000C0001FFAB000B0001FFAB000C0001FFAB000B0001FFAB000B0001FFAB000B0002FFAC000B0001FFAB000B0001FFAB000B0001FFAB000B0001FFAB000B0002FFAB000B0001FFAB000B0001FFAB000B0001FFAB000B0003FFAB000C0001FFAB000B0001FFAB000B0002FFAB000B0002FFAB000C0001FFAB000F0003FFAB000C0002FFAB00070000FFAB000B0002FFAB000B0001FFAB000C0001FFAB000B0002FFAB000F0004FFB0000D0004FFAF00190001FFAB001CFFFDFFAB00110004FFAB0010FFFFFFAA00060002FFAB000E0001FFAB00140004FFAB00100006FFAB000E0006FFAB000F0006FFAB00100004FFAC00150001FFAA00140003FFAA0006000AFFAB00060003FFABFFFD0000FFABFFF4FFFDFFABFFE8FFFCFFABFFE9000BFFABFFB3FFFAFFAA,20220826103154,1C3F$';
 var acc = '+RESP:GTACC,6E0200,866775050906544,,000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0001FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000A0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000A0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000A0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB000B0002FFAB,,,,20220826104109,1C9E$';
 var can = '+RESP:GTCAN,6E0100,866775050906767,,0,1,E03FFFFF,LSVNY41Z0B2521894,2,H1230,2.46,865,10,77,M167.0,P97.60,,0,0.92,0.61,0.31,11.20,,,0442,,20,0.08,0.00,00FFFFFF,100,326,253,306,1,1,1,999,617,996,307,0.03,0.19,0.22,947,1111111111,2222222222,123456789012345678901234567890abcdefghij,98765abcdefghij36254iuelopiedj5duebdkvde,5647893214,0000,0,0,89,,,1,0.0,173,86.8,117.129379,31.838965,20220712054346,0460,0000,550B,0E9E30A5,00,20220712054348,00D4$';
-const raw = new Buffer(can)
+var vgl = '+RESP:GTVGL,270804,867162025516246,,,40,1,1,0.0,0,113.6,117.201344,31.832924,20171013053055,0460,0001,D5D6,8062B71,00,0.1,20171013053055,0573$';
+var dis = '+RESP:GTDIS,270804,863835020303983,,,11,1,1,0.0,165,59.5,117.201427,31.833061,20150407012708,0460,0001,D5D6,5281,00,3.6,20150407092709,05F3$';
+var hbm1 = '+RESP:GTHBM,270804,863835020307067,,,10,1,1,0.1,49,64.5,117.201427,31.833100,20150327012643,0460,0000,5665,47A1,00,34.0,20150327092644,031A$';
+var hbm2 = '+RESP:GTHBM,270804,863835020307067,,,11,1,1,12.0,330,72.8,117.201388,31.833175,20150327012737,0460,0000,5665,47A1,00,34.0,20150327092738,031D$';
+const raw = new Buffer(ver)
 console.log(queclink.parse(raw))
 // queclink.parse(raw)

package/package.json

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

package/src/gv310lau.js

@@ -1947,35 +1947,35 @@ const parse = raw => {
       odometer: null,
       hourmeter: null
     })
-  } else if (command[1] === 'GTCSQ') {
-    data = Object.assign(data, {
-      alarm: utils.getAlarm(command[1], parsedData[5], 'gv310lau'),
-      loc: {
-        type: 'Point',
-        coordinates: [null, null]
-      },
-      speed: null,
-      gpsStatus: null,
-      hdop: null,
-      status: null,
-      azimuth: null,
-      altitude: null,
-      datetime: parsedData[6] !== '' ? utils.parseDate(parsedData[6]) : null,
-      voltage: {
-        battery: null,
-        inputCharge: null,
-        ada: null,
-        adb: null,
-        adc: null
-      },
-      mcc: null,
-      mnc: null,
-      lac: null,
-      cid: null,
-      satellites: null,
-      odometer: null,
-      hourmeter: null
-    })
+  // } else if (command[1] === 'GTCSQ') {
+  //   data = Object.assign(data, {
+  //     alarm: utils.getAlarm(command[1], parsedData[5]),
+  //     loc: {
+  //       type: 'Point',
+  //       coordinates: [null, null]
+  //     },
+  //     speed: null,
+  //     gpsStatus: null,
+  //     hdop: null,
+  //     status: null,
+  //     azimuth: null,
+  //     altitude: null,
+  //     datetime: parsedData[6] !== '' ? utils.parseDate(parsedData[6]) : null,
+  //     voltage: {
+  //       battery: null,
+  //       inputCharge: null,
+  //       ada: null,
+  //       adb: null,
+  //       adc: null
+  //     },
+  //     mcc: null,
+  //     mnc: null,
+  //     lac: null,
+  //     cid: null,
+  //     satellites: null,
+  //     odometer: null,
+  //     hourmeter: null
+  //   })
   } else if (command[1] === 'GTVER') {
     data = Object.assign(data, {
       alarm: utils.getAlarm(

package/src/messages/es.json

@@ -170,15 +170,15 @@
   "GTWPB": "Botón SOS presionado",
   "GTTOW": "Vehículo remolcado",
   "GTDIS": {
-    "1": "Entrada digital port activada",
-    "0": "Entrada digital port desactivada"
+    "1": "Entrada digital id activada",
+    "0": "Entrada digital id desactivada"
   },
   "GTIOB": "Salida digital modificada por IOB",
   "GTDOS": {
-    "1": "Salida digital port activada",
-    "0": "Salida digital port desactivada"
+    "1": "Salida digital activada",
+    "0": "Salida digital desactivada"
   },
-  "GTDOM": "Salida digital port activada con forma de onda wave",
+  "GTDOM": "Salida digital activada",
   "GTNMD": {
     "0": "Vehículo en movimiento",
     "1": "Vehículo detenido"
@@ -186,12 +186,12 @@
   "GTDAT": "Datos del puerto serial recibidos",
   "GTSOA": "Compartimento tarjeta SIM abierto",
   "GTHBM": {
-    "0": "Frenada Brusca at_vel",
-    "1": "Aceleración Brusca at_vel",
-    "2": "Giro Brusco at_vel",
-    "3": "Frenada Brusca Girando at_vel",
-    "4": "Aceleración Brusca Girando at_vel",
-    "5": "Comportamiento Brusco Desconocido at_vel"
+    "0": "Frenada Brusca",
+    "1": "Aceleración Brusca",
+    "2": "Giro Brusco",
+    "3": "Frenada Brusca Girando",
+    "4": "Aceleración Brusca Girando",
+    "5": "Comportamiento Brusco Desconocido"
   },
   "GTHBE": {
     "0": "Fin de Frenada Brusca",
@@ -247,9 +247,9 @@
   },
   "GTBID": "Se ha detectado baliza bluetooth",
   "GTLBA": {
-    "1": "Batería baja en el WTS100 con serie serial",
-    "2": "Batería baja en el WTH100 con serie serial",
-    "3": "Batería baja en el botón SOS con seria serial"
+    "1": "Batería baja en el WTS100",
+    "2": "Batería baja en el WTH100",
+    "3": "Batería baja en el botón SOS bluetooth"
   },
   "+ACK": {
     "GTBSI": "Config: APN",

package/src/utils.js

@@ -266,6 +266,9 @@ const getProtocolVersion = protocol => {
   Gets the software/hardware version
 */
 const getVersion = hexVersion => {
+  if (hexVersion === '') {
+    return 'no disponible'
+  }
   const X = parseInt(hexVersion.substring(0, 2), 16)
   const Y = parseInt(hexVersion.substring(2, 4), 16)
   return `${X}.${Y}`
@@ -478,7 +481,7 @@ const getAlarm = (command, report, extra = false) => {
       type: 'DI',
       number: reportID,
       status: reportType === 1,
-      message: messages[command][reportType].replace('port', reportID)
+      message: messages[command][reportType].replace('id',reportID)
     }
   } else if (command === 'GTNMR') {
     const reportType = report[1]
@@ -508,18 +511,16 @@ const getAlarm = (command, report, extra = false) => {
       message: messages[command][reportType === 0 ? '1' : '0']
     }
   } else if (command === 'GTVGL') {
-    let reportID = parseInt(report[0], 10)
-    const reportType = parseInt(report[1], 10)
-    if (reportID === 0) {
-      reportID = ''
-    } else if (reportID === 1) {
-      reportID = ' por sensor de movimiento'
+    let reportID = parseInt(report[0], 16)
+    const reportType = parseInt(report[1], 16)
+    if (reportID === 1) {
+      reportID = 'por seYansor de movimiento'
     } else if (reportID === 2) {
-      reportID = ' por voltaje de batería'
+      reportID = 'por voltaje de batería'
     } else if (reportID === 4) {
-      reportID = ' por acelerómetro'
+      reportID = 'por acelerómetro'
     } else if (reportID === 7) {
-      reportID = ' por metodología combinada'
+      reportID = 'por metodología combinada'
     } else {
       reportID = ''
     }
@@ -527,10 +528,8 @@ const getAlarm = (command, report, extra = false) => {
       type: 'DI',
       number: 1,
       status: reportType === 0,
-      message: messages[command][reportType === 0 ? '1' : '0'].replace(
-        ' mode',
-        reportID
-      )
+      reason: reportID,
+      message: messages[command][reportType === 0 ? '1' : '0']
     }
   } else if (command === 'GTIGN') {
     const duration = report !== '' ? parseInt(report, 10) : null
@@ -725,7 +724,7 @@ const getAlarm = (command, report, extra = false) => {
       type: 'DO',
       number: outputId,
       status: outputStatus === '1',
-      message: messages[command][outputStatus].replace('port', outputId)
+      message: messages[command][outputStatus]
     }
   } else if (command === 'GTDOM') {
     const waveShape = report[0] !== '' ? parseInt(report[0]) : null
@@ -735,8 +734,6 @@ const getAlarm = (command, report, extra = false) => {
       number: outputId,
       wave: waveShape,
       message: messages[command]
-        .replace('port', outputId)
-        .replace('wave', waveShape)
     }
   } else if (command === 'GTDAT') {
     return {
@@ -772,21 +769,23 @@ const getAlarm = (command, report, extra = false) => {
         4: acceleration turning
         5: unknown harsh behavior
       */
-    let reportID = parseInt(report[0], 10)
+    let reportID = parseInt(report[0], 16)
+    let vel
     if (reportID === 1) {
-      reportID = ' con velocidad baja'
+      vel = 'baja'
     } else if (reportID === 2) {
-      reportID = ' con velocidad media'
+      vel = 'media'
     } else if (reportID === 3) {
-      reportID = ' con velocidad alta'
+      vel = 'alta'
     } else {
-      reportID = ''
+      vel = ''
     }
     const reportType = report[1]
     return {
       type: 'Harsh_Behavior',
       status: parseInt(reportType, 10),
-      message: messages[command][reportType].replace(' at_vel', reportID)
+      velocity: vel !== '' ? vel : null,
+      message: messages[command][reportType]
     }
   } else if (command === 'GTHBE') {
     /*
@@ -870,21 +869,24 @@ const getAlarm = (command, report, extra = false) => {
     return {
       type: command,
       status: 'BT_Low_Battery',
-      message: messages[command][type].replace('serial', parseInt(serial, 16))
+      serialNumber: serial !== '' ? parseInt(serial, 16) : null,
+      message: messages[command][type]
     }
   } else if (command === 'GTCSQ') {
     return {
       type: command,
       status: 'CONFIG',
-      message: messages[command].replace(
-        'data',
-        report !== '' ? 100 * parseInt(parseFloat(report) / 7, 10) : '--'
-      )
+      // message: messages[command].replace(
+      //   'data',
+      //   report !== '' ? 100 * parseInt(parseFloat(report) / 7, 10) : '--'
+      // )
     }
   } else if (command === 'GTVER') {
     return {
       type: command,
       status: 'CONFIG',
+      firmware: {raw: report[0], value: parseFloat(getVersion(report[0]))},
+      hardware: {raw: report[1], value: parseFloat(getVersion(report[1]))},
       message: messages[command]
         .replace('data0', getVersion(report[0]))
         .replace('data1', getVersion(report[1]))