queclink-parser 1.9.12 → 1.9.14

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') {
@@ -307,9 +309,16 @@ const parseCommand = data => {
     mode = /on(E)?/.test(state) ? 3 : 0
     const alarmId = data.alarmId || 0
     const sensorId = data.sensorId || '0000000000000000'
+    const index = data.sensor_index || 2
+    const sensorType = utils.bleTempHumSensors[data.sensor_type]
     const minTemp = data.minTemp || 0
     const maxTemp = data.maxTemp || 0
-    command = `AT+GTTMP=${password},${alarmId},${mode},${sensorId},,,${minTemp},${maxTemp},,,2,10,,,0,0,0,0,,,,,${serialId}$`
+    if (sensorType === '0') {
+      command = `AT+GTTMP=${password},${alarmId},${mode},${sensorId},,,${minTemp},${maxTemp},,,2,10,,,0,0,0,0,,,,,${serialId}$`
+    } else {
+      command = `AT+GTBAS=${password},${index},6,${sensorType},,${sensorId},83F,,2400,,${mode},${minTemp},${maxTemp},2,,,,,,,,0,0,0,0,,,${serialId}$`
+    }
+    
   } else if (/^copiloto_temp_alarm_(on|off)(E)?$/.test(data.instruction)) {
     // AT+GTDAT=gv300w,2,,>CMD3005,60,18,0,5,-3<,0,,,,FFFF$
     // Temperature Alarm

package/src/messages/es.json

@@ -230,23 +230,23 @@
   "GTBDS": "Accesorio bluetooth desconectado",
   "GTBAA": {
     "00": "Accesorio con batería baja",
-    "01": "Temperatura baja",
-    "02": "Temperatura alta",
-    "03": "Temperatura dentro del rango configurado",
+    "01": "Temperatura bajo el rango definido ()",
+    "02": "Temperatura sobre el rango definido ()",
+    "03": "Regreso a temperatura dentro de rango ()",
     "04": "Botón presionado",
-    "07": "Bajo nivel de humedad",
-    "08": "Alto nivel de humedad",
-    "09": "Humedad dentro del rango congigurado",
+    "07": "Bajo nivel de humedad ()",
+    "08": "Alto nivel de humedad ()",
+    "09": "Regreso a humedad dentro de rango ()",
     "0A": "Evento de ángulo",
     "0C": "Evento de magneto",
-    "0E": "Presión baja en neumático",
-    "0F": "Presión alta en neumático",
-    "10": "Presión de neumático en el rango configurado",
+    "0E": "Neumático con presión baja ()",
+    "0F": "Neumático con presión alta ()",
+    "10": "Regreso a presión de neumáticos dentro de rango ()",
     "11": "No se ha detectado accesorio bluetooth",
     "12": "Se ha detectado un accesorio bluetooth",
     "13": "Puerta abierta",
     "14": "Puerta cerrada",
-    "15": "Cambio de estado en Relé BT"
+    "15": "Relay bluetooth __"
   },
   "GTBID": "Se ha detectado baliza bluetooth",
   "GTLBA": {
@@ -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

@@ -218,6 +218,17 @@ const bluetoothModels = {
   }
 }
 
+/*
+  BLE Temp & Hum sensors
+*/
+const bleTempHumSensors = {
+  'AC100': '0',
+  'WTH300': '2',
+  'RHT ELA': '3',
+  'WMS301': '4',
+  'WTH301': '5'
+}
+
 /*
   Possible Beacon ID Models
 */
@@ -234,7 +245,19 @@ const beaconModels = {
 const beaconTypes = {
   '0': 'ID',
   '1': 'iBeacon',
-  '2': 'Eddystone'
+  '2': 'Eddystone',
+  '3': 'Queclink'
+}
+
+/*
+  Possible Relay BLE config results
+*/
+const relayBLEResults = {
+  0: 'Success',
+  1: 'Error connecting',
+  2: 'Incorrect BLE password',
+  3: 'Error updating BLE password',
+  4: 'Error'
 }
 
 /*
@@ -293,9 +316,11 @@ const latamMcc = {
   736: 'Bolivia',
   740: 'Ecuador',
   744: 'Paraguay',
-  748: 'Uruguay'
+  748: 'Uruguay',
+  default: 'Desconocido'
 }
 
+
 /*
   Gets the Queclink Device Type
 */
@@ -363,7 +388,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 +396,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 +610,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 +630,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 +648,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 +701,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 +709,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 +833,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,
@@ -845,14 +874,14 @@ const getCanData = (parsedData, ix) => {
           ? expansionBin[2] === '1'
           : null,
         batteryIndicator: expansionBin ? expansionBin[3] === '1' : null,
-        brakeSystemaFailureIndicator: expansionBin
+        brakeSystemFailureIndicator: expansionBin
           ? expansionBin[4] === '1'
           : null,
         oilPressureIndicator: expansionBin ? expansionBin[5] === '1' : null,
         engineHotIndicator: expansionBin ? expansionBin[6] === '1' : null,
         ABSFailureIndicator: expansionBin ? expansionBin[7] === '1' : null,
         checkEngineIndicator: expansionBin ? expansionBin[9] === '1' : null,
-        aribagsIndicator: expansionBin ? expansionBin[10] === '1' : null,
+        airbagsIndicator: expansionBin ? expansionBin[10] === '1' : null,
         serviceCallIndicator: expansionBin
           ? expansionBin[11] === '1'
           : null,
@@ -865,6 +894,166 @@ const getCanData = (parsedData, ix) => {
   }
 }
 
+
+/*
+  Get Bluetooth data
+*/
+const getBleData = (parsedData, btIndex) => {
+  let btDevices = []
+  let cnt = btIndex + 1
+  let btNum = parsedData[btIndex] !== '' ? parseInt(parsedData[btIndex]) : 1
+
+  for (let c = 0; c < btNum; c++) {
+    if (!['FE', 'FF'].includes(parsedData[cnt])) {
+      let appendMask = nHexDigit(hex2bin(parsedData[cnt + 4]), 16)
+      let aNameIx = cnt + 4 + parseInt(appendMask[15])
+      let aMacIx = aNameIx + parseInt(appendMask[14])
+      let aStatIx = aMacIx + parseInt(appendMask[13])
+      let aBatIx = aStatIx + parseInt(appendMask[12])
+      let aTmpIx = aBatIx + parseInt(appendMask[11])
+      let aHumIx = aTmpIx + parseInt(appendMask[10])
+      let ioIx = aHumIx + parseInt(appendMask[8])
+      let aEvIx = appendMask[8] === '1' && appendMask[7] === '1'
+        ? ioIx + 3 : ioIx + parseInt(appendMask[7])
+      let pressIx = appendMask[7] === '1' && appendMask[6] === '1'
+        ? aEvIx + 2 : aEvIx + parseInt(appendMask[6])
+      let timeIx = pressIx + parseInt(appendMask[5])
+      let eTmpIx = timeIx + parseInt(appendMask[4])
+      let magIx = eTmpIx + parseInt(appendMask[3])
+      let aBatpIx = appendMask[3] === '1' && appendMask[2] === '1'
+        ? magIx + 3 : magIx + parseInt(appendMask[2])
+      let relIx = aBatpIx + parseInt(appendMask[1])
+
+      btDevices.push({
+        index: parsedData[cnt],
+        type: bluetoothAccessories[parsedData[cnt + 1]],
+        model:
+          parsedData[cnt + 2] !== ''
+            ? bluetoothModels[parsedData[cnt + 1]][parsedData[cnt + 2]]
+            : null,
+        appendMask: parsedData[cnt + 4],
+        name:
+          parsedData[aNameIx] !== '' && appendMask[15] === '1'
+            ? parsedData[aNameIx]
+            : null,
+        mac:
+          parsedData[aMacIx] !== '' && appendMask[14] === '1'
+            ? parsedData[aMacIx]
+            : null,
+        status:
+          parsedData[aStatIx] !== '' && appendMask[13] === '1'
+            ? parseInt(parsedData[aStatIx])
+            : null,
+        batteryLevel:
+          parsedData[aBatIx] !== '' && appendMask[12] === '1'
+            ? parseInt(parsedData[aBatIx])
+            : null,
+        batteryPercentage:
+          parsedData[aBatpIx] !== '' && appendMask[2] === '1'
+            ? parseFloat(parsedData[aBatpIx])
+            : null,
+        accessoryData: {
+          rawData: parsedData[cnt + 3] !== '' ? parsedData[cnt + 3] : null,
+          temperature:
+            parsedData[aTmpIx] !== '' && appendMask[11] === '1'
+              ? parseInt(parsedData[aTmpIx])
+              : null,
+          humidity:
+            parsedData[aHumIx] !== '' && appendMask[10] === '1'
+              ? parseInt(parsedData[aHumIx])
+              : null,
+          outputStatus:
+            parsedData[ioIx] !== '' && appendMask[8] === '1'
+              ? parsedData[ioIx]
+              : null,
+          inputStatus:
+            parsedData[ioIx + 1] !== '' && appendMask[8] === '1'
+              ? parsedData[ioIx + 1]
+              : null,
+          analogInputStatus:
+            parsedData[ioIx + 2] !== '' && appendMask[8] === '1'
+              ? parsedData[ioIx + 2]
+              : null,
+          event:
+            parsedData[aEvIx] !== '' && appendMask[7] === '1'
+              ? parseInt(parsedData[aEvIx])
+              : null,
+          tirePresure:
+            parsedData[pressIx] !== '' && appendMask[6] === '1'
+              ? parseInt(parsedData[pressIx])
+              : null,
+          timestamp:
+            parsedData[timeIx] !== '' && appendMask[5] === '1'
+              ? parseDate(parsedData[timeIx])
+              : null,
+          enhancedTemperature:
+            parsedData[eTmpIx] !== '' && appendMask[4] === '1'
+              ? parseFloat(parsedData[eTmpIx])
+              : null,
+          magDevice: {
+            id:
+              parsedData[magIx] !== '' && appendMask[3] === '1'
+                ? parsedData[magIx]
+                : null,
+            eventCounter:
+              parsedData[magIx + 1] !== '' && appendMask[3] === '1'
+                ? parseInt(parsedData[magIx + 1])
+                : null,
+            magnetState:
+              parsedData[magIx + 2] !== '' && appendMask[3] === '1'
+                ? parseInt(parsedData[magIx + 2])
+                : null
+          },
+          relay: {
+            state:
+              parsedData[relIx] !== '' && appendMask[1] === '1'
+                ? parseInt(parsedData[relIx])
+                : null
+          }
+        }
+      })
+      cnt = relIx + 1
+    } else {
+      let appendMask = nHexDigit(hex2bin(parsedData[cnt + 3]), 8)
+      let aMacIx = cnt + 3 + parseInt(appendMask[6])
+      let aBatIx = aMacIx + parseInt(appendMask[4])
+      let aSigIx = aBatIx + parseInt(appendMask[1])
+      let bTypeIx = aSigIx + parseInt(appendMask[0])
+
+      btDevices.push({
+        index: parsedData[cnt],
+        type: beaconTypes[parsedData[cnt + 1]],
+        model: parsedData[cnt + 2] !== ''
+          ? beaconModels[parsedData[cnt + 2]]
+          : null,
+        appendMask: parsedData[cnt + 3],
+        mac:
+          parsedData[aMacIx] !== '' && appendMask[6] === '1'
+            ? parsedData[aMacIx]
+            : null,
+        batteryLevel:
+          parsedData[aBatIx] !== '' && appendMask[4] === '1'
+            ? parseInt(parsedData[aBatIx])
+            : null,
+        SignalStrength:
+          parsedData[aSigIx] !== '' && appendMask[1] === '1'
+            ? parseInt(parsedData[aSigIx])
+            : null,
+        beaconType:
+          parsedData[bTypeIx] !== '' && appendMask[0] === '1'
+            ? parseInt(parsedData[bTypeIx])
+            : null,
+        beaconData:
+          parsedData[bTypeIx + 1] !== '' && appendMask[0] === '1'
+            ? parseInt(parsedData[bTypeIx + 1])
+            : null,
+      })
+      cnt = bTypeIx + 1 + parseInt(appendMask[1])
+    }
+  }
+  return btDevices
+}
+
 /*
   Gets the alarm type
 */
@@ -1264,7 +1453,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') {
@@ -1369,10 +1558,67 @@ const getAlarm = (command, report, extra = false) => {
   } else if (command === 'GTBDS') {
     return { type: 'Bluetooth_Disonnected', message: messages[command] }
   } else if (command === 'GTBAA') {
-    return {
-      type: 'Bluetooth_Alarm',
-      message: messages[command][report]
+    if (['01', '02', '03'].includes(report)) {
+      const number = parseInt(extra[0])
+      const mac = extra[1]
+      const temperature = extra[2].enhancedTemperature ? extra[2].enhancedTemperature : extra[2].temperature
+      const status = report !== '03' // 01 & 02 means outside range, 03 means inside range
+      return {
+        type: 'Outside_Temperature',
+        number: number,
+        deviceID: mac,
+        status: status,
+        temperature: temperature,
+        message: messages[command][report].replace('()', `(${temperature}°C)`)
+      }
+    } else if (['07', '08', '09'].includes(report)) {
+      const number = parseInt(extra[0])
+      const mac = extra[1]
+      const humidity = extra[2].humidity ? extra[2].humidity : null
+      const status = report !== '09' // 07 & 08 means outside range, 09 means inside range
+      return {
+        type: 'Outside_Humidity',
+        number: number,
+        deviceID: mac,
+        status: status,
+        humidity: humidity,
+        message: messages[command][report].replace('()', `(${humidity}%)`)
+      }
+    } else if (['0E', '0F', '10'].includes(report)) {
+      const number = parseInt(extra[0])
+      const mac = extra[1]
+      const pressure = extra[2].tirePresure ? extra[2].tirePresure : null
+      const status = report !== '10' // 0E & 0F means outside range, 10 means inside range
+      return {
+        type: 'Outside_Tire_Pressure',
+        number: number,
+        deviceID: mac,
+        status: status,
+        pressure: pressure,
+        message: messages[command][report].replace('()', `(${pressure}kPa)`)
+      }
+    } else if (report === '15') {
+      const number = parseInt(extra[0])
+      const mac = extra[1]
+      const status = extra[2].relay.state === 1
+      const humanStatus = status ? 'activado' : 'desactivado'
+      const configResult = extra[2].relay.configResult ? extra[2].relay.configResult : null
+      return {
+        type: 'Relay_BLE',
+        number: number,
+        deviceID: mac,
+        status: status,
+        configResult: configResult,
+        message: messages[command][report].replace('__', `${humanStatus}`)
+      }
+    } else {
+      return {
+        type: 'Bluetooth_Alarm',
+        message: messages[command][report]
+      }
     }
+
+
   } else {
     return {
       type: command,
@@ -1499,8 +1745,10 @@ module.exports = {
   disconnectionReasons: disconnectionReasons,
   bluetoothAccessories: bluetoothAccessories,
   bluetoothModels: bluetoothModels,
+  bleTempHumSensors: bleTempHumSensors,
   beaconModels: beaconModels,
   beaconTypes: beaconTypes,
+  relayBLEResults: relayBLEResults,
   dTimeStates: dTimeStates,
   dWorkingStates: dWorkingStates,
   gnssTriggerTypes: gnssTriggerTypes,
@@ -1510,7 +1758,8 @@ module.exports = {
   checkGps: checkGps,
   includeSatellites: includeSatellites,
   includeGnssTrigger: includeGnssTrigger,
-  appendMaskData: appendMaskData,
+  includeStatus: includeStatus,
+  includeGnnsAccuracy: includeGnnsAccuracy,
   getAccelerationMagnitude: getAccelerationMagnitude,
   getTempInCelciousDegrees: getTempInCelciousDegrees,
   getBtTempHumData: getBtTempHumData,
@@ -1519,6 +1768,7 @@ module.exports = {
   getSignalStrength: getSignalStrength,
   getSignalPercentage: getSignalPercentage,
   getCanData: getCanData,
+  getBleData: getBleData,
   getAlarm: getAlarm,
   bin2dec: bin2dec,
   bin2hex: bin2hex,