queclink-parser 1.9.13 → 1.9.15

package/src/gv58lau.js

@@ -322,7 +322,6 @@ const parse = raw => {
 
     // Bluetooth Accessories
     if (bluetoothAccessory) {
-      let btDevices = []
       let btIndex
 
       if (canData) {
@@ -331,170 +330,8 @@ const parse = raw => {
         btIndex = index + 9
       }
 
-      let cnt = btIndex + 1
-      let btNum = parsedData[btIndex] !== '' ? parseInt(parsedData[btIndex]) : 1
+      let btDevices = utils.getBleData(parsedData, btIndex)
 
-      for (let c = 0; c < btNum; c++) {
-        let appendMask = utils.nHexDigit(utils.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 modeIx =
-          appendMask[8] === '1' ? ioIx + 2 + parseInt(appendMask[7]) : ioIx
-        let aEvIx = appendMask[7] === '1' ? modeIx + 1 : modeIx
-        let pressIx = 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' ? magIx + 2 + parseInt(appendMask[2]) : eTmpIx
-        let relIx = aBatpIx + parseInt(appendMask[1])
-
-        btDevices.push({
-          index: parsedData[cnt],
-          type: utils.bluetoothAccessories[parsedData[cnt + 1]],
-          model:
-            parsedData[cnt + 2] !== ''
-              ? utils.bluetoothModels[parsedData[cnt + 1]][parsedData[cnt + 2]]
-              : utils.bluetoothAccessories[parsedData[cnt + 1]],
-          appendMask: parsedData[cnt + 4],
-          rawData:
-            parsedData[cnt + 3] !== ''
-              ? {
-                raw: parsedData[cnt + 3],
-                fuelLevel:
-                  `${parsedData[cnt + 1]}${parsedData[cnt + 2]}` === '10'
-                    ? parsedData[cnt + 3]
-                    : null,
-                temperature:
-                  `${parsedData[cnt + 1]}${parsedData[cnt + 2]}` === '20'
-                    ? utils.getBtTempHumData(
-                      parsedData[cnt + 3].substring(4, 8)
-                    )
-                    : `${parsedData[cnt + 1]}${parsedData[cnt + 2]}` === '21'
-                      ? parsedData[cnt + 3] // Conversion not specified in documentation
-                      : `${parsedData[cnt + 1]}${parsedData[cnt + 2]}` ===
-                        '62'
-                        ? utils.getBtTempHumData(
-                          parsedData[cnt + 3].substring(0, 4)
-                        )
-                        : ['64', '65'].includes(
-                          `${parsedData[cnt + 1]}${parsedData[cnt + 2]}`
-                        )
-                          ? parseInt(
-                            parsedData[cnt + 3].substring(4, 8),
-                            16
-                          ) / 100
-                          : null,
-                humidity:
-                  `${parsedData[cnt + 1]}${parsedData[cnt + 2]}` === '20'
-                    ? utils.getBtTempHumData(
-                      parsedData[cnt + 3].substring(4, 8)
-                    )
-                    : `${parsedData[cnt + 1]}${parsedData[cnt + 2]}` === '62'
-                      ? utils.getBtTempHumData(
-                        parsedData[cnt + 3].substring(4, 8)
-                      )
-                      : ['64', '65'].includes(
-                        `${parsedData[cnt + 1]}${parsedData[cnt + 2]}`
-                      )
-                        ? parseInt(parsedData[cnt + 3].substring(0, 4), 16) /
-                        100
-                        : null
-              }
-              : null,
-          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,
-            mode:
-              parsedData[modeIx] !== '' && appendMask[7] === '1'
-                ? parseInt(parsedData[modeIx])
-                : 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'
-                ? utils.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 = appendMask[1] === '1' ? relIx + 1 : relIx + 2
-        cnt = parsedData[cnt + 3] !== '' ? cnt - 1 : cnt
-      }
       externalData = Object.assign(externalData, {
         btDevices: btDevices
       })
@@ -1882,26 +1719,105 @@ const parse = raw => {
     let aTmpIx = aBatIx + parseInt(appendMask[11])
     let aHumIx = aTmpIx + parseInt(appendMask[10])
     let ioIx = aHumIx + parseInt(appendMask[8])
-    let modeIx =
-      appendMask[8] === '1' ? ioIx + 2 + parseInt(appendMask[7]) : ioIx
-    let aEvIx = appendMask[7] === '1' ? modeIx + 1 : modeIx
-    let pressIx = aEvIx + parseInt(appendMask[6])
+    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' ? magIx + 2 + parseInt(appendMask[2]) : eTmpIx
+    let aBatpIx = appendMask[3] === '1' && appendMask[2] === '1'
+        ? magIx + 3 : magIx + parseInt(appendMask[2])
     let relIx = aBatpIx + parseInt(appendMask[1])
 
-    let newIndex = appendMask[1] === '1' ? relIx + 2 : relIx + 1
+    let newIndex = relIx + 1 + parseInt(appendMask[1])
 
     let satelliteInfo = utils.includeSatellites(parsedData[newIndex + 11])
     let includeStatus = utils.includeStatus(parsedData[newIndex + 11])
     let accuracyInfo = utils.includeGnnsAccuracy(parsedData[newIndex + 11]) ? 3 : 0
     let index = newIndex + 11 + (satelliteInfo + includeStatus + accuracyInfo)
 
+    let bleInfo = {
+      accesory:
+        btAccessory !== '' ? utils.bluetoothAccessories[btAccessory] : null,
+      model: parsedData[6] !== '' ? parseInt(parsedData[6]) : null,
+      name:
+        parsedData[aNameIx] !== '' && appendMask[15] === '1'
+          ? parsedData[aNameIx]
+          : null,
+      role: null,
+      type: 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
+    }
+
+    let bleData = {
+      temperature:
+        parsedData[aTmpIx] !== '' && appendMask[11] === '1'
+          ? parseInt(parsedData[aTmpIx])
+          : null,
+      humidity:
+        parsedData[aHumIx] !== '' && appendMask[10] === '1'
+          ? parseInt(parsedData[aHumIx])
+          : null,
+      event:
+        parsedData[aEvIx] !== '' && appendMask[7] === '1'
+          ? parseInt(parsedData[aEvIx])
+          : null,
+      tirePresure:
+        parsedData[pressIx] !== '' && appendMask[6] === '1'
+          ? parseInt(parsedData[pressIx]) / 6.895
+          : null,
+      timestamp:
+        parsedData[timeIx] !== '' && appendMask[5] === '1'
+          ? utils.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: {
+        configResult:
+          parsedData[relIx] !== '' && appendMask[1] === '1'
+            ? parseInt(parsedData[relIx])
+            : null,
+        state:
+          parsedData[relIx + 1] !== '' && appendMask[1] === '1'
+            ? parseInt(parsedData[relIx + 1])
+            : null
+      }
+    }
+
     data = Object.assign(data, {
-      alarm: utils.getAlarm(command[1], parsedData[7], 'gv58lau'),
+      alarm: utils.getAlarm(command[1], parsedData[7], [parsedData[4], bleInfo.mac, bleData]),
       loc: {
         type: 'Point',
         coordinates: [
@@ -2019,87 +1935,8 @@ const parse = raw => {
               ? parsedData[aMacIx]
               : null
         },
-        accessoryInfo: {
-          accesory:
-            btAccessory !== '' ? utils.bluetoothAccessories[btAccessory] : null,
-          model: parsedData[6] !== '' ? parseInt(parsedData[6]) : null,
-          name:
-            parsedData[aNameIx] !== '' && appendMask[15] === '1'
-              ? parsedData[aNameIx]
-              : null,
-          role: null,
-          type: 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: {
-          temperature:
-            parsedData[aTmpIx] !== '' && appendMask[11] === '1'
-              ? parseInt(parsedData[aTmpIx])
-              : null,
-          humidity:
-            parsedData[aHumIx] !== '' && appendMask[10] === '1'
-              ? parseInt(parsedData[aHumIx])
-              : null,
-          mode:
-            parsedData[modeIx] !== '' && appendMask[7] === '1'
-              ? parseInt(parsedData[modeIx])
-              : 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'
-              ? utils.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: {
-            configResult:
-              parsedData[relIx] !== '' && appendMask[1] === '1'
-                ? parseInt(parsedData[relIx])
-                : null,
-            state:
-              parsedData[relIx + 1] !== '' && appendMask[1] === '1'
-                ? parseInt(parsedData[relIx + 1])
-                : null
-          }
-        }
+        accessoryInfo: bleInfo,
+        accessoryData: bleData
       }
     })
   } else if (command[1] === 'GTBID') {
@@ -2562,12 +2399,12 @@ const parse = raw => {
           raw: parsedData[5] !== '' ? parsedData[5] : null,
           oilLevelLowIndicator: alarmMask1 ? alarmMask1[28] === '1' : null,
           serviceCallIndicator: alarmMask1 ? alarmMask1[27] === '1' : null,
-          aribagsIndicator: alarmMask1 ? alarmMask1[26] === '1' : null,
+          airbagsIndicator: alarmMask1 ? alarmMask1[26] === '1' : null,
           checkEngineIndicator: alarmMask1 ? alarmMask1[25] === '1' : null,
           ABSFailureIndicator: alarmMask1 ? alarmMask1[23] === '1' : null,
           engineHotIndicator: alarmMask1 ? alarmMask1[22] === '1' : null,
           oilPressureIndicator: alarmMask1 ? alarmMask1[21] === '1' : null,
-          brakeSystemaFailureIndicator: alarmMask1
+          brakeSystemFailureIndicator: alarmMask1
             ? alarmMask1[20] === '1'
             : null,
           batteryIndicator: alarmMask1 ? alarmMask1[19] === '1' : null,
@@ -2792,14 +2629,14 @@ const parse = raw => {
               ? 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,

package/src/index.js

@@ -309,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": {
@@ -300,7 +300,7 @@
     "GTVVS": "Config: ignición virtual",
     "GTAVS": "Config: ignición por acelerómetro",
     "GTVMS": "Config: modo de ignición",
-    "GTBTS": "Config: protocolo bluetooth",
+    "GTBTS": "Config: general bluetooth",
     "GTBAS": "Config: accesorio bluetooth",
     "GTBID": "Config: baliza bluetooth", 
     "GTHMC": "Config: horómetro",