queclink-parser 1.9.13 → 1.9.14

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+#### 1.9.14 (2025-01-27)
+
+##### New Features
+
+* **WID310:**  se agrega soporte para WID310 en reporte ERI ([1631319c](https://github.com/jaayesta/queclink-parser/commit/1631319c827f633cbb1ef61298f5f83ac19098b8))
+* **temp:**  se agrega alarma de temperatura para dispositivos BLE ([d45f73b9](https://github.com/jaayesta/queclink-parser/commit/d45f73b996e8e861be9e8f10a36b886a03e38d66))
+* **bleData:**  se cambia la forma de obtener datos de bluetooth por ERI ([f6ef1f22](https://github.com/jaayesta/queclink-parser/commit/f6ef1f2258b2562dde79974e306b35d1728a9b8c))
+* **bleAlarms:**  se agregan alarmas BLE ([abfc04a4](https://github.com/jaayesta/queclink-parser/commit/abfc04a464980a5580b982af252f338b4dde2625))
+
+##### Bug Fixes
+
+* **eri:**
+  *  se corrigen problemas de indexación pendientes BLE para reporte ERI ([460a53bd](https://github.com/jaayesta/queclink-parser/commit/460a53bd6b2fd3f4439534f5d1620fbeccff9ce7))
+  *  se corrigen problemas de indexación BLE para reporte ERI ([a2b978f8](https://github.com/jaayesta/queclink-parser/commit/a2b978f8e0de62fbfe5076bf5a2a675e1f2b0412))
+* **BAA:**
+  *  se corrige error en el indexado de reporte GTBAA para GV310LAU ([344fb52f](https://github.com/jaayesta/queclink-parser/commit/344fb52f90317f2e3f73ecdb59564a2a30d6dc80))
+  *  se corrige error en el indexado de reporte GTBAA para GV58LAU ([8aac88c1](https://github.com/jaayesta/queclink-parser/commit/8aac88c11e676e6a9c6c3fe7c97f7fc4860f9463))
+* **log:**  se elimina console log del código ([3ee79e0a](https://github.com/jaayesta/queclink-parser/commit/3ee79e0a915c59aef42e486c2eff61eba876b608))
+
 #### 1.9.13 (2024-11-27)
 
 ##### New Features

package/example.js

@@ -60,48 +60,45 @@ var dat = '+RESP:GTDAT,8020040703,135790246811220,GV58LAU,3,,,1645026150,0,0.5,0
 var bcs = '+RESP:GTBCS,8020040703,867995030096625,GV58LAU,,0,0.0,0,58.4,117.129522,31.839343,20190426054910,0460,0000,550B,B969,05,1,220100,0D03,BT-1,78054100CE22,0,1,6654B1767842,,,,,20190426054911,0B44$'
 var can = '+RESP:GTCAN,8020040703,866314061482707,,10,0,E03FFFFF,,,H0,,,,,,,,,,,,,,,,,,,,FFFFFF,,,,,,,,,,,,,,,,,,,,,,,,,,,1,0.0,0,1501.0,-99.192304,18.932028,20241122171647,0334,0020,0232,029C3E18,01,12,20241122171648,06CD$'
 var ida = '+RESP:GTIDA,8020040703,862170013895931,GV58LAU,,D2C4FBC5,1,1,1,0.8,0,22.2,117.198630,31.845229,20120802121626,0460,0000,5663,2BB9,01,15,0.0,,,,,20120802121627,008E$'
-var baa = '+RESP:GTBAA,8020040703,867995030131778,GV58LAU,00,6,0,00,001F,TD_100109,FD6D3DE6D704,1,350,17,0,0,0,0,20151210084039,0.00,00,0,0,0,2,0,FFFE0005FF04,5A5A00,00,000A,000B,000A,000A,000B,0,105.6,0,54.8,117.129384,31.839299,20191119013822,0460,0000,550B,B1E2,05,1,220100,20191119013823,03F8$'
 var baaa = '+RESP:GTBAA,8020040703,866314061808901,,00,13,0,15,4007,,FFFFFFFFFFFF,0,1,0,0,,,,,,,0730,0003,EA6F,00070B20,0D,0,220100,0.00,0.00,0.00,20241124061933,4BAF$'
 var caneri = '+RESP:GTERI,6E0802,868589060350066,,00000104,28696,10,1,1,0.0,344,17.6,-71.604231,-33.043113,20241001170305,0730,0001,13F0,004E2212,01,6 ,10496.6,0000273:06:37,,,,98,210500,0,1,203FFFFF,,2,H4168131,5859.88,513,0,71,H2.4,P92.00,,,386.89,308.11,78.78,173.25,,FFFF,0000,,00,0.00,0.00,FFFFFF,62,,,,,,,,226631,181383,,386.89,79.35,,10178,,,,,,0000,0,0,,1,00,13,0,00000000,4007,,78054133C69C,1,0,20241001170312,26B5$'
 var eribad = "+RESP:GTERI,6E0802,868589060669374,,00000002,28594,10,1,1,18.9,210,542.2,-70.693347,-33.537067,20241009121749,0730,0001,3341,008AF201,01,12,6.9,0000004:57:46,,,,100,220100,2,1,28FF05762863EA12,1,00B1,20241009121755,09BE$"
-var test = "+RESP:GTSOS,8020040703,866314061808901,,,10,1,0,,,,,,,0730,0003,EA6F,00070B0C,09,6,0.00,2.00,0.00,4.9,20241121064349,080F$"
+var high_temp = "+RESP:GTBAA,6E0801,868589060039404,,01,6,2,02,083F,WTH300,7805412AFE28,1,3525,25,49,25.00,0,0.0,35,153.1,-72.668510,-38.256640,20241227153248,0730,0001,23F1,00342902,01,12,20241227153635,A915$"
+var in_range = "+RESP:GTBAA,6E0801,868589060039404,,01,6,2,03,083F,WTH300,7805412AFE28,1,3519,24,47,24.95,0,0.0,35,153.1,-72.668510,-38.256640,20241227151247,0730,0001,23F1,00339F10,01,12,20241227151525,A912$"
+var relay_off = '+RESP:GTBAA,6E0801,868589060039404,,00,13,0,15,4000,0,0,1,0.0,35,153.1,-72.668510,-38.256640,20241227145055,0730,0001,23F1,00342911,01,12,20241227145055,A8F9$'
+var relay_on = '+RESP:GTBAA,6E0801,868589060039404,,00,13,0,15,4000,0,1,1,0.0,35,153.1,-72.668510,-38.256640,20241227144952,0730,0001,23F1,00342911,01,12,20241227144951,A8F5$'
+var eri58 = '+RESP:GTERI,8020040802,864696060004173,GV58LAU,00000100,,10,1,1,0.0,0,115.8,117.129356,31.839248,20230808061540,0460,0001,DF5C,05FE6667,03,15,0,4.0,0000102:34:33,,,,100,210000,,1,0,06,12,0,001A42A2,0617,TMPS,08351B00043C,1,26,65,20231030085704,20231030085704,0017$'
+var eri310 = '+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,0,06,12,0,001A42A2,0617,TMPS,08351B00043C,1,26,65,20231030085704,20231030085704,ABCD$'
+var eri = '+RESP:GTERI,8020040802,866314061645121,,00000100,12944,10,1,1,0.0,247,611.9,-70.577108,-33.523989,20250114225655,0730,0001,3330,00A4FC01,01,9,41375.5,0002383:14:12,,,,100,110001,,2,00,13,0,00000000,4007,,78054143F187,1,0,03,6,5,0DE10E6A,083F,,7805413E6A41,1,3543,36,35,36.90,20250114225923,2ACB$'
+var eri2 = '+RESP:GTERI,8020040802,866314061760094,,00000100,12186,10,1,0,0.0,17,-7.0,-71.543345,-32.972461,20250111040734,0730,0003,EA6F,00070B0C,01,0,0.2,0000063:26:41,,,,100,210100,,2,00,13,0,00000001,4007,,78054143F00B,1,1,01,6,4,17BB0821,283F,,78054133CB9F,1,3482,20,60,20.81,100,20250115130224,41C4$'
+var eri3 = '+RESP:GTERI,8020040802,866314061760094,,00000100,12208,10,1,0,0.0,17,-7.0,-71.543345,-32.972461,20250111040734,0730,0003,EA6F,00070B0C,01,0,0.2,0000063:28:25,,,,100,210100,,3,00,13,0,00000001,4007,,78054143F00B,1,1,01,6,4,16B60839,283F,,78054133CB9F,1,3485,21,58,21.05,100,FE,3,4,000A,78054141615E,3030,20250115130409,41CC$'
 
+var baa = '+RESP:GTBAA,8020040802,866314061760094,,01,6,4,13,283F,,78054133CB9F,1,3481,21,57,21.05,100,0,0.0,17,-7.0,-71.543345,-32.972461,20250111040734,0730,0003,EA6F,00070B0C,01,0,20250115130318,41C8$'
+var ack = '+ACK:GTBAS,6E0A03,868589060039404,,1,0000,20250120151212,22CC$'
+var test = '+RESP:GTERI,6E0B00,868589060064048,,00000100,12109,10,1,1,0.0,83,3.1,-71.543397,-32.972429,20250121142808,0730,0001,13EE,0032A502,01,12,2.6,0000008:04:49,,,,88,210100,0,2,02,6,4,164808ED,283F,,78054133CB9F,1,3447,22,57,22.85,100,FE,3,4,000A,780541416165,3270,20250121142810,2C1A$'
+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 data = {
-    "imei": 864696060046190,
-    "datetime": "2024-09-23T22:02:36.639Z",
-    "instruction": "1_on",
-    "action": "Cortar Corriente",
-    "device": "queclink",
-    "password": "gv58lau",
-    "device_serie": "GV",
-    "previousOutput": {
-      "1": false,
-      "2": false,
-      "3": false
-    },
-    "previousToggle": {
-      "1": 0,
-      "2": 0,
-      "3": 0,
-      "4": 0,
-      "5": 0
-    },
-    "previousDuration": {
-      "1": 0,
-      "2": 0,
-      "3": 0,
-      "4": 0,
-      "5": 0
-    }
-  }
+  "imei": 868589060039404,
+  "instruction": "temp_alarm_on",
+  "sensor_type": 'WTH300',
+  "sensor_index": 1,
+  "action": "Configurar alarma de temperatura",
+  "device": "queclink",
+  "password": "gv310lau",
+  "alarmId": 0,
+  "sensorId": "7805412AFE28",
+  "minTemp": 25 || null,
+  "maxTemp": 29 || null
+}
 
 // console.log(queclink.parseCommand(data))
-const raw = new Buffer(baaa)
+const raw = new Buffer.from(test4)
 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.13",
+  "version": "1.9.14",
   "description": "Parse raw data from Queclink devices",
   "main": "src",
   "scripts": {

package/src/gv310lau.js

@@ -566,125 +566,8 @@ const parse = raw => {
 
     // Bluetooth Accessories
     if (bluetoothAccessory) {
-      let btDevices = []
       let btIndex = digitFuelSensor ? index + 10 : index + 9
-      let cnt = btIndex + 1
-      let btNum = parsedData[btIndex] !== '' ? parseInt(parsedData[btIndex]) : 1
-      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],
-          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
-      }
+      let btDevices = utils.getBleData(parsedData, btIndex)
       externalData = Object.assign(externalData, {
         btDevices: btDevices
       })
@@ -2097,18 +1980,18 @@ 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 satIndex = newIndex + 11
 
     // If get satellites is configured
@@ -2117,8 +2000,87 @@ const parse = raw => {
       satelliteInfo = true
     }
 
+    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])
+          : 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'
+            ? utils.relayBLEResults[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], 'gv310lau'),
+      alarm: utils.getAlarm(command[1], parsedData[7], [parsedData[4], bleInfo.mac, bleData]),
       loc: {
         type: 'Point',
         coordinates: [
@@ -2191,87 +2153,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') {
@@ -2655,12 +2538,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,
@@ -2885,14 +2768,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/gv57cg.js

@@ -2025,12 +2025,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,
@@ -2255,14 +2255,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/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])
+          : 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": {

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'
 }
 
 /*
@@ -851,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,
@@ -871,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
 */
@@ -1375,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,
@@ -1505,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,
@@ -1526,6 +1768,7 @@ module.exports = {
   getSignalStrength: getSignalStrength,
   getSignalPercentage: getSignalPercentage,
   getCanData: getCanData,
+  getBleData: getBleData,
   getAlarm: getAlarm,
   bin2dec: bin2dec,
   bin2hex: bin2hex,