queclink-parser 1.9.14 → 1.9.15

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+#### 1.9.15 (2025-03-11)
+
+##### New Features
+
+* **tirepressure:**  se incorpora presión de ntco en PSI e interpretación de rawData BLE ([a263d70f](https://github.com/jaayesta/queclink-parser/commit/a263d70f1b2a358ed2cdcd414ad445e5f158f16c))
+* **rf433:**  started support for RF433 devices ([2f4f5d9b](https://github.com/jaayesta/queclink-parser/commit/2f4f5d9bf680be49e52c7f931430bae80a905d74))
+
+##### Bug Fixes
+
+* **messages:**  se actualiza mensaje en ACK BTS ([1307d12f](https://github.com/jaayesta/queclink-parser/commit/1307d12f07922d1dfc4870b348126adaf92bb2d8))
+* **tirepressure:**
+  *  se quita linea de debug ([91794b17](https://github.com/jaayesta/queclink-parser/commit/91794b17672298ec754ff22ab7d78425aaf5a801))
+  *  alarma de presión en PSI ([3f7262c1](https://github.com/jaayesta/queclink-parser/commit/3f7262c1b984b4899fb612b3d8c3498341191a95))
+
 #### 1.9.14 (2025-01-27)
 
 ##### New Features

package/example.js

@@ -79,12 +79,14 @@ var test = '+RESP:GTERI,6E0B00,868589060064048,,00000100,12109,10,1,1,0.0,83,3.1
 var test2 = '+RESP:GTERI,8020040802,866314061760094,,00000100,12217,10,1,0,0.0,114,89.4,-71.542946,-32.972462,20250117083107,0730,0003,EA6F,00070B34,01,0,12.0,0000100:49:34,,,,100,210100,,2,00,13,0,00000000,4007,,78054143F00B,1,0,01,6,4,17C608B8,283F,,78054133CB9F,1,3443,22,60,22.32,100,20250121174252,7B18$'
 var test3 = '+RESP:GTERI,8020040802,866314061760094,,00000100,12217,10,1,0,0.0,114,89.4,-71.542946,-32.972462,20250117083107,0730,0003,EA6F,00070B34,01,0,12.0,0000100:49:34,,,,100,210100,,2,01,6,4,17C608B8,283F,,78054133CB9F,1,3443,22,60,22.32,100,00,13,0,00000000,4007,,78054143F00B,1,0,20250121174252,7B18$'
 var test4 = '+RESP:GTERI,6E0B00,868589060064048,,00000100,12141,10,1,1,0.0,0,2.5,-71.543408,-32.972433,20250121211122,0730,0001,13EE,0032A502,01,12,2.6,0000014:48:01,,,,100,210100,0,3,FE,3,4,000A,780541416165,3260,00,13,0,00000000,4006,78054143F00B,1,0,02,6,4,156A0A3E,283F,,78054133CB9F,1,3449,26,54,26.22,100,20250121211125,340A$'
-
+var juego = "+RESP:GTERI,6E0802,868589060659029,,00000006,14064,10,1,1,32.4,71,471.3,-70.748220,-33.494213,20250123150132,0730,0001,3344,003D0601,01,12,9150.7,0000381:44:02,,,,100,220100,2,1,28FFB007286384D2,1,FF4C,1,203FFFFF,,2,,1190.32,1626,32,90,,,,0,371.38,193.02,178.36,128.66,,FFFF,0010,,00,0.06,0.00,FFFFFF,,,,,,,,,576370,434493,1719,371.38,,1.42,23731,,,,,,0000,56,0,,20250123150133,FAD9$"
+var tpms = '+RESP:GTERI,6E1003,864696060004173,GV310LAU,00000100,,10,1,1,0.0,0,115.8,117.129356,31.839248,20230808061540,0460,0001,DF5C,05FE6667,03,15,4.0,0000102:34:33,0,15259,10680,100,210000,7,1,1,06,12,0,001A42A2,0617,TMPS,08351B00043C,1,26,65,20231030085704,20231030085704,0017$'
+var newdtt = '+RESP:GTDTT,6E0802,868589060722215,,,,0,264,�Q4���,OzJ(��(��(��(��(��(��(��(��(��(��(��(���	N�K�4����.�]�f�v(�)sFisFisFh�����f�њ3I�3Mi���ܹ��QEQEQEQEQEQEQEQEQEQEQEQEQE(<Q��u.�7��}/�K��]��Jo���F�]�n�u��u.�i7Rn��I��Ԍ�6M%QEQEQEQEQEQEQEQEQEQEQEQEQEQEQE.h���q��h�h�)][yB,1,24.6,322,2730.3,-68.802404,-23.413967,20250210162544,0730,0002,00CA,09B38E71,01,11,,,,,20250210162545,A522$'
 
 var data = {
   "imei": 868589060039404,
-  "instruction": "temp_alarm_on",
-  "sensor_type": 'WTH300',
+  "instruction": "temp_alarm_off",
+  "sensor_type": 'WTH301',
   "sensor_index": 1,
   "action": "Configurar alarma de temperatura",
   "device": "queclink",
@@ -96,9 +98,9 @@ var data = {
 }
 
 // console.log(queclink.parseCommand(data))
-const raw = new Buffer.from(test4)
+const raw = new Buffer.from(tpms)
 console.log(JSON.stringify(queclink.parse(raw), null, 2))
-// queclink.parse(raw)
+queclink.parse(raw)
 
 // if (data.can) {
 //   const {

package/package.json

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

package/src/gv310lau.js

@@ -27,7 +27,6 @@ const parse = raw => {
     sentTime: utils.parseDate(parsedData[parsedData.length - 2]),
     serialId: parseInt(parsedData[parsedData.length - 1], 16)
   }
-
   // Gps
   if (command[1] === 'GTFRI') {
     try {
@@ -395,6 +394,8 @@ const parse = raw => {
       AC100 && digitFuelSensor
         ? parseInt(parsedData[index + 10], 10)
         : AC100 && !digitFuelSensor ? parseInt(parsedData[index + 9], 10) : 0
+    // Review when RF433 devices are implemented
+    const rf433DevicesConnected = parsedData[index + 8] === '7' ? parseInt(parsedData[index + 9]) : 0
 
     let externalData = {
       eriMask: {
@@ -540,6 +541,27 @@ const parse = raw => {
           AC100Devices: ac100Devices
         })
       }
+    // } else if (parsedData[index + 8] === '7') {
+    //   index += 1
+    //   // RF433 Devices
+    //   let rf433Devices = []
+    //     // Review when RF433 devices are implemented
+    //     let count = index + 9
+    //     for (var l = 0; l < rf433DevicesConnected; l++) {
+    //       rf433Devices.push({
+    //         // deviceNumber: parsedData[count],
+    //         // deviceType: parsedData[count + 1],
+    //         // deviceData: parsedData[count + 2]
+    //         //   ? utils.getTempInCelciousDegrees(parsedData[count + 2])
+    //         //   : null
+    //         deviceData: parsedData[count]
+    //       })
+    //       count += 1
+    //       // count += 3
+    //     }
+    //     externalData = Object.assign(externalData, {
+    //       rf433Devices: rf433Devices
+    //     })
     }
 
     if (canData) {
@@ -2043,7 +2065,7 @@ const parse = raw => {
           : null,
       tirePresure:
         parsedData[pressIx] !== '' && appendMask[6] === '1'
-          ? parseInt(parsedData[pressIx])
+          ? parseInt(parsedData[pressIx]) / 6.895
           : null,
       timestamp:
         parsedData[timeIx] !== '' && appendMask[5] === '1'

package/src/gv58lau.js

@@ -1780,7 +1780,7 @@ const parse = raw => {
           : null,
       tirePresure:
         parsedData[pressIx] !== '' && appendMask[6] === '1'
-          ? parseInt(parsedData[pressIx])
+          ? parseInt(parsedData[pressIx]) / 6.895
           : null,
       timestamp:
         parsedData[timeIx] !== '' && appendMask[5] === '1'

package/src/messages/es.json

@@ -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",

package/src/utils.js

@@ -211,7 +211,7 @@ const bluetoothModels = {
     '0': 'MAG ELA (Door Sensor)'
   },
   '12': {
-    '0': 'MLD BLE TPMS (ATP100/ATP102)'
+    '0': 'ATP100/ATP102'
   },
   '13': {
     '0': 'WRL300 (Bluetooth Relay)'
@@ -431,12 +431,46 @@ const getTempInCelciousDegrees = hexTemp => {
 }
 
 /*
-  Gets the temperature and humidity from bluetooth device
+  Gets the temperature from BLE devices in celcious degrees
 */
-const getBtTempHumData = hexTemp => {
-  var int = parseInt(hexTemp.substring(0, 2), 16)
-  var dec = parseInt(hexTemp.substring(2, 4), 16)
-  return int + dec / 256
+const getBleTempInCelciousDegrees = (device, hexData) => {
+  if (device === 'WTH300') {
+    let intTemp = parseInt(hexData.substring(0, 2), 16)
+    let decTemp = parseInt(hexData.substring(2, 4), 16)
+    return intTemp + decTemp / 256
+  } else if (['WTH301', 'WMS301'].includes(device)) {
+    let intTemp = parseInt(hexData.substring(0, 2), 16)
+    let decTemp = parseInt(hexData.substring(2, 4), 16)
+    return intTemp + decTemp / 100
+  } else if (device === 'ATP100/ATP102') {
+    let temp = parseInt(hexData.substring(4, 6), 16)
+    return temp - 40
+  } else {
+    return null
+  }
+}
+
+/*
+  Gets the humidity from BLE devices in rh
+*/
+const getBleHumidityInRH = (device, hexData) => {
+  let intHum = parseInt(hexData.substring(4, 6), 16)
+  let decHum = parseInt(hexData.substring(6, 8), 16)
+  if (device === 'WTH300') {
+    return intHum + decHum / 256
+  } else if (['WTH301', 'WMS301'].includes(device)) {
+    return intHum + decHum / 100
+  } else {
+    return null
+  }
+}
+
+/*
+  Gets the humidity from BLE devices in rh
+*/
+const getTirePressureInPSI = hexData => {
+  let tirePress = parseInt(hexData.substring(2, 4), 16) * 2.5 // In kPa
+  return tirePress / 6.895 // In PSI
 }
 
 /*
@@ -924,14 +958,17 @@ const getBleData = (parsedData, btIndex) => {
         ? magIx + 3 : magIx + parseInt(appendMask[2])
       let relIx = aBatpIx + parseInt(appendMask[1])
 
+      let bleType = bluetoothAccessories[parsedData[cnt + 1]]
+      let bleModel = parsedData[cnt + 2] !== ''
+        ? bluetoothModels[parsedData[cnt + 1]][parsedData[cnt + 2]]
+        : null
+      let rawAppendMask = parsedData[cnt + 4]
+
       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],
+        type: bleType,
+        model: bleModel,
+        appendMask: rawAppendMask,
         name:
           parsedData[aNameIx] !== '' && appendMask[15] === '1'
             ? parsedData[aNameIx]
@@ -953,7 +990,15 @@ const getBleData = (parsedData, btIndex) => {
             ? parseFloat(parsedData[aBatpIx])
             : null,
         accessoryData: {
-          rawData: parsedData[cnt + 3] !== '' ? parsedData[cnt + 3] : null,
+          data: parsedData[cnt + 3] !== '' ? {
+            raw: parsedData[cnt + 3],
+            temperature: getBleTempInCelciousDegrees(bleModel, parsedData[cnt + 3]),
+            humidity: getBleHumidityInRH(bleModel, parsedData[cnt + 3]),
+            relayState: bleModel === 'WRL300' ? parseInt(parsedData[cnt + 3]) === 1 ? 'Connected' : 'Disconnected' : null,
+            tirePresure: getTirePressureInPSI(parsedData[cnt + 3]),
+            productModel: bleModel === 'ATP100/ATP102' ? parsedData[cnt + 3].substring(6, 7) : null,
+            fwVersion: bleModel === 'ATP100/ATP102' ? parsedData[cnt + 3].substring(7, 8) : null,
+          } : null,
           temperature:
             parsedData[aTmpIx] !== '' && appendMask[11] === '1'
               ? parseInt(parsedData[aTmpIx])
@@ -980,7 +1025,7 @@ const getBleData = (parsedData, btIndex) => {
               : null,
           tirePresure:
             parsedData[pressIx] !== '' && appendMask[6] === '1'
-              ? parseInt(parsedData[pressIx])
+              ? parseInt(parsedData[pressIx]) / 6.895
               : null,
           timestamp:
             parsedData[timeIx] !== '' && appendMask[5] === '1'
@@ -1762,7 +1807,6 @@ module.exports = {
   includeGnnsAccuracy: includeGnnsAccuracy,
   getAccelerationMagnitude: getAccelerationMagnitude,
   getTempInCelciousDegrees: getTempInCelciousDegrees,
-  getBtTempHumData: getBtTempHumData,
   getFuelConsumption: getFuelConsumption,
   getHoursForHourmeter: getHoursForHourmeter,
   getSignalStrength: getSignalStrength,