queclink-parser 1.9.12 → 1.9.14

package/src/gv310lau.js

@@ -32,14 +32,9 @@ const parse = raw => {
   if (command[1] === 'GTFRI') {
     try {
       let number = parsedData[6] !== '' ? parseInt(parsedData[6], 10) : 1
-      let index = 6 + 12 * number
-      let satelliteInfo = false
-
-      // If get satellites is configured
-      if (utils.includeSatellites(parsedData[18])) {
-        index = 6 + 13 * number
-        satelliteInfo = true
-      }
+      let satelliteInfo = utils.includeSatellites(parsedData[18])
+      let accuracyInfo = utils.includeGnnsAccuracy(parsedData[18]) ? 3 : 0
+      let index = 6 + (12 + satelliteInfo + accuracyInfo) * number
 
       data = Object.assign(data, {
         alarm: utils.getAlarm(command[1], null),
@@ -146,8 +141,20 @@ const parse = raw => {
         lac: parsedData[16] !== '' ? parseInt(parsedData[16], 16) : null,
         cid: parsedData[17] !== '' ? parseInt(parsedData[17], 16) : null,
         satellites:
-          satelliteInfo && parsedData[index] !== ''
-            ? parseInt(parsedData[index], 10)
+          satelliteInfo && parsedData[index - (satelliteInfo + accuracyInfo) + 1] !== ''
+            ? parseInt(parsedData[index - (satelliteInfo + accuracyInfo) + 1], 10)
+            : null,
+        Hdop:
+          accuracyInfo && parsedData[index - accuracyInfo + 1] !== ''
+            ? parseFloat(parsedData[index - accuracyInfo + 1])
+            : null,
+        Vdop:
+          accuracyInfo && parsedData[index - accuracyInfo + 2] !== ''
+            ? parseFloat(parsedData[index - accuracyInfo + 2])
+            : null,
+        Ddop:
+          accuracyInfo && parsedData[index] !== ''
+            ? parseFloat(parsedData[index])
             : null,
         odometer:
           parsedData[index + 1] !== ''
@@ -163,7 +170,7 @@ const parse = raw => {
       if (number > 1) {
         let moreData = []
         for (let i = 1; i < number; i++) {
-          let gnssIx = satelliteInfo ? 7 + 13 * i : 7 + 12 * i
+          let gnssIx = 7 + (12 + satelliteInfo + accuracyInfo) * i
           moreData.push({
             index: i,
             loc: {
@@ -214,6 +221,18 @@ const parse = raw => {
             satellites:
               satelliteInfo && parsedData[gnssIx + 12] !== ''
                 ? parseInt(parsedData[gnssIx + 12], 10)
+                : null,
+            Hdop:
+              accuracyInfo && parsedData[gnssIx + 13] !== ''
+                ? parseFloat(parsedData[gnssIx + 13], 10)
+                : null,
+            Vdop:
+              accuracyInfo && parsedData[gnssIx + 14] !== ''
+                ? parseFloat(parsedData[gnssIx + 14], 10)
+                : null,
+            Ddop:
+              accuracyInfo && parsedData[gnssIx + 15] !== ''
+                ? parseFloat(parsedData[gnssIx + 15], 10)
                 : null
           })
         }
@@ -226,14 +245,9 @@ const parse = raw => {
   } else if (command[1] === 'GTERI') {
     // GPS with AC100 and/or Bluetoth Devices Connected
     let number = parsedData[7] !== '' ? parseInt(parsedData[7], 10) : 1
-    let index = 7 + 12 * number // position append mask
-    let satelliteInfo = false
-
-    // If get satellites is configured
-    if (utils.includeSatellites(parsedData[19])) {
-      index = 7 + 13 * number
-      satelliteInfo = true
-    }
+    let satelliteInfo = utils.includeSatellites(parsedData[19])
+    let accuracyInfo = utils.includeGnnsAccuracy(parsedData[19]) ? 3 : 0
+    let index = 7 + (12 + satelliteInfo + accuracyInfo) * number
 
     // External Data
     const digitFuelSensor =
@@ -353,7 +367,19 @@ const parse = raw => {
       lac: parsedData[17] !== '' ? parseInt(parsedData[17], 16) : null,
       cid: parsedData[18] !== '' ? parseInt(parsedData[18], 16) : null,
       satellites:
-        satelliteInfo && parsedData[index] !== ''
+        satelliteInfo && parsedData[index - (satelliteInfo + accuracyInfo) + 1] !== ''
+          ? parseInt(parsedData[index - (satelliteInfo + accuracyInfo) + 1])
+          : null,
+      Hdop:
+        accuracyInfo && parsedData[index - accuracyInfo + 1] !== ''
+          ? parseFloat(parsedData[index - accuracyInfo + 1])
+          : null,
+      Vdop:
+        accuracyInfo && parsedData[index - accuracyInfo + 2] !== ''
+          ? parseFloat(parsedData[index - accuracyInfo + 2])
+          : null,
+      Ddop:
+        accuracyInfo && parsedData[index] !== ''
           ? parseFloat(parsedData[index])
           : null,
       odometer:
@@ -540,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
       })
@@ -672,7 +581,7 @@ const parse = raw => {
     if (number > 1) {
       let moreData = []
       for (let i = 1; i < number; i++) {
-        let gnssIx = satelliteInfo ? 8 + 13 * i : 8 + 12 * i
+        let gnssIx = 8 + (12 + satelliteInfo + accuracyInfo) * i
         moreData.push({
           index: i,
           loc: {
@@ -723,6 +632,18 @@ const parse = raw => {
           satellites:
             satelliteInfo && parsedData[gnssIx + 12] !== ''
               ? parseInt(parsedData[gnssIx + 12], 10)
+              : null,
+          Hdop:
+            accuracyInfo && parsedData[gnssIx + 13] !== ''
+              ? parseFloat(parsedData[gnssIx + 13], 10)
+              : null,
+          Vdop:
+            accuracyInfo && parsedData[gnssIx + 14] !== ''
+              ? parseFloat(parsedData[gnssIx + 14], 10)
+              : null,
+          Ddop:
+            accuracyInfo && parsedData[gnssIx + 15] !== ''
+              ? parseFloat(parsedData[gnssIx + 15], 10)
               : null
         })
       }
@@ -815,14 +736,13 @@ const parse = raw => {
   ) {
     // Common Alarms
     let number = parsedData[6] !== '' ? parseInt(parsedData[6], 10) : 1
-    let index = 6 + 12 * number // position append mask
-    let satelliteInfo = false
+    let posAppendMask = parsedData[18] ? utils
+      .nHexDigit(utils.hex2bin(parsedData[18]), 8) : null
 
     // If get satellites is configured
-    if (utils.includeSatellites(parsedData[18])) {
-      index += 1
-      satelliteInfo = true
-    }
+    let satelliteInfo = posAppendMask && posAppendMask[7] === '1' ? 1 : 0
+    let accuracyInfo = posAppendMask && posAppendMask[4] === '1' ? 3 : 0
+    let index = 6 + (12 + satelliteInfo + accuracyInfo) * number
 
     data = Object.assign(data, {
       alarm: utils.getAlarm(command[1], parsedData[5], 'gv310lau'),
@@ -852,8 +772,20 @@ const parse = raw => {
       lac: parsedData[16] !== '' ? parseInt(parsedData[16], 16) : null,
       cid: parsedData[17] !== '' ? parseInt(parsedData[17], 16) : null,
       satellites:
-        satelliteInfo && parsedData[index] !== ''
-          ? parseInt(parsedData[index])
+        satelliteInfo && parsedData[index - (satelliteInfo + accuracyInfo) + 1] !== ''
+          ? parseInt(parsedData[index - (satelliteInfo + accuracyInfo) + 1])
+          : null,
+      Hdop:
+        accuracyInfo && parsedData[index - accuracyInfo + 1] !== ''
+          ? parseFloat(parsedData[index - accuracyInfo + 1], 10)
+          : null,
+      Vdop:
+        accuracyInfo && parsedData[index - accuracyInfo + 2] !== ''
+          ? parseFloat(parsedData[index - accuracyInfo + 2], 10)
+          : null,
+      Ddop:
+        accuracyInfo && parsedData[index] !== ''
+          ? parseFloat(parsedData[index], 10)
           : null,
       odometer:
         parsedData[index + 1] !== '' ? parseFloat(parsedData[index + 1]) : null,
@@ -1531,7 +1463,7 @@ const parse = raw => {
           : null,
       odometer: null,
       hourmeter: null,
-      can: utils.getCanData(parsedData, 5),
+      can: utils.getCanData(parsedData, 5)
     }
     )
   } else if (command[1] === 'GTDAT') {
@@ -2048,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
@@ -2068,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: [
@@ -2142,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') {
@@ -2606,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,
@@ -2836,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,