queclink-parser 1.9.11 → 1.9.13

package/CHANGELOG.md

@@ -1,3 +1,41 @@
+#### 1.9.13 (2024-11-27)
+
+##### New Features
+
+* **dos:**  se agrega comando para salidas digitales GV58LAU y GV57CG ([d0cf801b](https://github.com/jaayesta/queclink-parser/commit/d0cf801bd0bdc90da29c94d7341b72249b0d006d))
+* **gv310lau:**  se agrega Hdop, Vdop y Ddop ([23fa674c](https://github.com/jaayesta/queclink-parser/commit/23fa674c1c6cb41a9f6bc978d69ec58a7e5b3a83))
+
+##### Bug Fixes
+
+* **options:**
+  *  se incluye llamada a nuevos verificadores de <position append mask> ([c9277a89](https://github.com/jaayesta/queclink-parser/commit/c9277a89e9bcb8aa87315d4a70310a088d1da6a1))
+  *  se modifica la lógica para <position append mask> ([2e493c2a](https://github.com/jaayesta/queclink-parser/commit/2e493c2a0b21a971027fa44a4f94dbea5e733795))
+* **canbus:**  medida de adblueLevel ([ae0e6c4b](https://github.com/jaayesta/queclink-parser/commit/ae0e6c4bbfada75f30eb87cad7b9b68335c0a6aa))
+* **mcc:**  se agrega default ([346ddbd4](https://github.com/jaayesta/queclink-parser/commit/346ddbd4a9a42e53aae7a7ee30564d4be1fd42da))
+* **input:**  cambio de indice binario. ([b10bc367](https://github.com/jaayesta/queclink-parser/commit/b10bc367987af77c5fed2e1c0b51c7832dba0901))
+
+##### Tests
+
+* **gv58lau:**  pruebas ([1ad0a8c0](https://github.com/jaayesta/queclink-parser/commit/1ad0a8c04e3c6297eae8840f58992e375310cb9b))
+
+#### 1.9.12 (2024-10-14)
+
+##### New Features
+
+* **can:**  added adBlueLevelUnit ([cfc663c8](https://github.com/jaayesta/queclink-parser/commit/cfc663c8339dadc6e36750019c7d881007942a45))
+
+##### Bug Fixes
+
+* **gv58lau:**  digital inputs ([bb78b299](https://github.com/jaayesta/queclink-parser/commit/bb78b29970fa016571d93fd9c1959c73804d294a))
+* **canbus:**  new can index consider ac100 or digitFuelSensor data ([b0e9d23e](https://github.com/jaayesta/queclink-parser/commit/b0e9d23e69e9ffacddf0b76cc3a4d04523598ebe))
+* **can:**
+  *  evaluation for parsedData ([3427d98f](https://github.com/jaayesta/queclink-parser/commit/3427d98f85d273a262dc076c4b36cb88e51c3b54))
+  *  typo ([08408de4](https://github.com/jaayesta/queclink-parser/commit/08408de4d52d38f8cd280736ff7d821303c5e756))
+
+##### Tests
+
+* **can:**  test for database when can data exists ([424e28c6](https://github.com/jaayesta/queclink-parser/commit/424e28c63c39d6d3e6a4335d9f9b79c83d574b68))
+
 #### 1.9.11 (2024-10-09)
 
 ##### New Features

package/example.js

@@ -1,16 +1,16 @@
 const queclink = require('.');
 
-var tow = '+RESP:GTTOW,8020060402,867488060596284,GV57CG,,00,1,3,0.0,0,180.6,117.129144,31.838861,20230524034505,0460,0001,DF5C,027A4F1F,01,7,0.2,20230524034505,01B8$'
-var dis = '+RESP:GTDIS,8020060402,867488060596284,GV57CG,,60,1,1,0.0,0,138.5,117.129051,31.839786,20230519083404,0460,0001,DF5C,05FE6667,01,4,0.0,20230519083405,04BD$'
+var tow = '+RESP:GTTOW,8020040703,866314060000229,GV58LAU,,00,1,1,0.0,0,136.4,117.129290,31.840318,20231207085329,0460,0000,550B,085BE2AA,01,10,0.0,20231207085330,006A$'
+var dis = '+RESP:GTDIS,8020040703,866314060000229,GV58LAU,,10,1,1,0.0,0,119.1,117.129559,31.839368,20231207085255,0460,0000,550B,085BE2AA,01,11,0.0,20231207085256,0068$'
 var iob = '+RESP:GTIOB,8020060402,867488060596284,GV57CG,,10,1,1,0.0,182,85.3,117.129200,31.839163,20230523025618,0460,0001,DF5C,05FE6667,01,6,0.4,20230522192619,0218$'
-var spd = '+RESP:GTSPD,8020060402,867488060596284,GV57CG,,00,1,1,0.4,0,220.2,117.129759,31.839433,20230523062932,0460,0001,DF5C,027A4F1F,01,4,0.0,20230523160033,0B6A$'
-var sos = '+RESP:GTSOS,8020060402,867488060596284,GV57CG,,60,1,0,0.0,351,67.3,117.129029,31.840100,20230524034859,0460,0001,DF5C,05FE6667,01,2,0.0,20230524035256,01D2$'
+var spd = '+RESP:GTSPD,8020040703,866314060000229,GV58LAU,,01,1,2,0.0,0,171.2,117.130121,31.838945,20231207085516,0460,0000,550B,085BE2AA,01,11,0.0,20231207085517,0078$'
+var sos = '+RESP:GTSOS,8020040703,866314060000229,GV58LAU,,10,1,1,0.0,0,87.8,117.129751,31.838892,20231207085541,0460,0000,550B,085BE2AA,01,11,0.0,20231207085542,007A$'
 var rtl = '+RESP:GTRTL,8020060402,867488060596284,GV57CG,,00,1,2,263.8,351,67.3,117.129029,31.840100,20230524034844,0460,0001,DF5C,05FE6667,01,6,0.0,20230524034845,01C8$'
 var dog = '+RESP:GTDOG,8020060402,867488060596284,GV57CG,,63,1,2,0.0,171,104.6,117.129097,31.839252,20230524035637,0460,0001,DF5C,05FE6667,01,10,0.3,20230524035638,01E5$'
 var igl = '+RESP:GTIGL,8020060402,867488060596284,GV57CG,,01,1,1,0.0,0,48.6,117.129292,31.839412,20230524035846,0460,0001,DF5C,05FE6667,01,10,0.4,20230524035847,0201$'
 var vgl = '+RESP:GTVGL,8020060402,867488060596284,GV57CG,,50,1,1,0.0,0,81.6,117.129297,31.839118,20230519072153,0460,0001,DF5C,05FE6667,01,1,0.7,20230519072154,03B9$'
 var hbm = '+RESP:GTHBM,8020060402,866775051515393,GV57CG,,01,1,1,20.9,266,49.8,117.104300,31.822967,20231221034050,0460,0001,DF5C,05A3F70B,01,1,19.0,20231221034051,005D$'
-var fri = '+RESP:GTFRI,8020060402,864696060004173,GV57CG,11985,10,1,1,0.0,0,118.5,117.129306,31.839197,20230808033438,0460,0001,DF5C,05FE6667,03,15,0,123.5,00123:04:44,12496,,,100,210000,,,,20230808033438,01B3$'
+var fri = '+RESP:GTFRI,8020040703,864696060004173,GV58LAU,11985,10,1,1,0.0,0,118.5,117.129306,31.839197,20230808033438,0460,0001,DF5C,05FE6667,03,15,0,123.5,00123:04:44,,,,100,210000,,,,20230808033438,01B3$'
 var eri = '+RESP:GTERI,8020060402,867488060672911,GV57CG,00008000,11975,10,1,1,0.0,0,119.9,117.129559,31.839319,20231207025940,0460,0000,550B,085BE2AA,03,6,0,11.5,,0,,,100,210300,,4,8,20231207025940,5686$'
 var esp = '+RESP:GTEPS,8020060402,135790246811220,GV57CG,13500,00,1,1,4.3,92,70.0,121.354335,31.222073,20090214013254,0460,0000,18d8,6141,01,15,2000.0,20090214093254,11F0$'
 var ais = '+RESP:GTAIS,8020060402,135790246811220,GV57CG,1980,11,1,1,4.3,92,70.0,121.354335,31.222073,20090214013254,0460,0000,18d8,6141,01,15,2000.0,20090214093254,11F0$'
@@ -30,34 +30,42 @@ var scs = '+RESP:GTSCS,8020060402,865585040006649,GV57CG,2,-0.06,0.88,-0.48,-0.9
 var pna = '+RESP:GTPNA,8020060402,135790246811220,GV57CG,20230524052727,11F0$'
 var pfa = '+RESP:GTPFA,8020060402,135790246811220,GV57CG,20230524052727,11F0$'
 var pdp = '+RESP:GTPDP,8020060402,135790246811220,GV57CG,20230524052727,11F0$'
-var mpn = '+RESP:GTMPN,8020060402,867488060596284,GV57CG,0,0.0,0,102.0,117.129386,31.839097,20230524052848,0460,0001,DF5C,05FE6667,01,15,20230524052849,02C8$'
+var mpn = '+RESP:GTMPN,8020040703,135790246811220,GV58LAU,0,4.3,92,70.0,121.354335,31.222073,20230214013254,0460,0000,18d8,6141,05,1,220100,20230214093254,11F0$'
 var mpf = '+RESP:GTMPF,8020060402,867488060596284,GV57CG,1,0.8,0,75.4,117.129447,31.839062,20230524052829,0460,0001,DF5C,05FE6667,01,15,20230524052831,02BF$'
 var btc = '+RESP:GTBTC,8020060402,867488060596284,GV57CG,1,0.0,0,48.8,117.129191,31.839340,20230524051506,0460,0001,DF5C,05FE6667,01,13,20230524051507,0277$'
 var drm = '+RESP:GTDRM,8020060402,867488060596284,GV57CG,1,0.2,0,98.3,117.129404,31.839095,20230524052844,0460,0001,DF5C,05FE6667,01,15,20230524052846,02C3$'
 var jdr = '+RESP:GTJDR,8020060402,867488060596250,GV57CG,2,0,0.0,0,29.7,117.129806,31.838006,20230412075358,0460,0000,691D,6141,01,7,20230412075457,0214$'
-var jds = '+RESP:GTJDS,8020060402,867488060596250,GV57CG,1,2,3,0.0,0,101.2,117.130039,31.838552,20230412060702,0460,0001,DF5C,05FE6667,01,1,20230412060703,016E$'
+var jds = '+RESP:GTJDS,8020040703,135790246811220,GV58LAU,1,3,0,4.3,92,70.0,121.354335,31.222073,20230214013254,0460,0000,18d8,6141,0D,1,220100,0.00,1.00,2.00,20230214093254,11F0$'
 var stc = '+RESP:GTSTC,8020060402,867488060596284,GV57CG,,3,0.0,0,112.7,117.129268,31.838801,20230524023737,0460,0001,DF5C,027A4F1F,01,9,20230523190737,0131$'
 var bpl = '+RESP:GTBPL,8020060402,867488060596722,GV57CG,3.63,4,2.3,0,54.8,117.128785,31.839313,20230522052652,0460,0001,DF5C,027A4F1F,01,1,20230522052654,413B$'
-var stt = '+RESP:GTSTT,8020060402,867488060596284,GV57CG,21,1,0.0,0,94.0,117.129389,31.839152,20230524052926,0460,0001,DF5C,05FE6667,01,15,20230524052928,02CA$'
-var ign = '+RESP:GTIGN,8020060402,867488060596284,GV57CG,0,0,0.0,0,85.4,117.129377,31.839155,20230524053546,0460,0001,DF5C,05FE6667,01,15,00012:25:35,0.2,20230524053548,02DF$'
+var stt = '+RESP:GTSTT,8020040703,135790246811220,GV58LAU,16,0,4.3,92,70.0,121.354335,31.222073,20230214013254,0460,0000,18d8,6141,05,1,220100,20230214093254,11F0$'
+var ign = '+RESP:GTIGN,8020040703,135790246811220,GV58LAU,1200,0,4.3,92,70.0,121.354335,31.222073,20230214013254,0460,0000,18d8,6141,05,1,220100,12345:12:34,2000.0,20230214093254,11F0$'
 var vgn = '+RESP:GTVGN,8020060402,867488060595385,GV57CG,00,5,14653,4,2.1,0,38.1,117.129642,31.838044,20230524051923,0460,0000,550B,B7B1,01,3,12345:12:34,0.0,20230524051924,002E$'
 var igf = '+RESP:GTIGF,8020060402,867488060596284,GV57CG,418,1,0.0,0,85.4,117.129377,31.839155,20230524053545,0460,0001,DF5C,05FE6667,01,15,00012:25:35,0.2,20230524053547,02DA$'
 var vgf = '+RESP:GTVGF,8020060402,867488060595385,GV57CG,00,5,10127,3,1.1,0,75.8,117.129668,31.838718,20230524052215,0460,0000,550B,B7B1,01,11,12345:12:34,0.0,20230524052216,0034$'
-var idf = '+RESP:GTIDF,8020060402,867488060596284,GV57CG,11,81,1,0.0,0,86.2,117.129261,31.839339,20230524054122,0460,0001,DF5C,05FE6667,01,15,0.0,20230524054123,0309$'
-var gss = '+RESP:GTGSS,8020060402,867488060596284,GV57CG,1,9,11,,3,0.0,0,89.2,117.129248,31.838906,20230524045125,0460,0001,DF5C,05FE6667,01,9,20230524045126,0240$'
+var idf = '+RESP:GTIDF,8020040703,135790246811220,GV58LAU,22,300,0,4.3,92,70.0,121.354335,31.222073,20230214013254,0460,0000,18d8,6141,05,1,220100,2000.0,20230214093254,11F0$'
+var gss = '+RESP:GTGSS,8020040703,135790246811220,GV58LAU,1,9,11,,0,4.3,92,70.0,121.354335,31.222073,20230214013254,0460,0000,18d8,6141,05,1,220100,20230214093254,11F0$'
 var str = '+RESP:GTSTR,8020060402,867488060596284,GV57CG,,,1,1.8,0,81.2,117.129328,31.839300,20230524053825,0460,0001,DF5C,05FE6667,01,15,0.0,20230524053827,02F9$'
 var stp = '+RESP:GTSTP,8020060402,867488060596284,GV57CG,,,1,0.0,0,90.4,117.129304,31.839352,20230524053856,0460,0001,DF5C,05FE6667,01,15,0.0,20230524053856,02FB$'
 var lsp = '+RESP:GTLSP,8020060402,867488060596284,GV57CG,,,1,0.0,0,86.2,117.129261,31.839339,20230524054055,0460,0001,DF5C,05FE6667,01,15,0.0,20230524054056,0306$'
-var idn = '+RESP:GTIDN,8020060402,867488060596284,GV57CG,,,1,0.0,0,86.2,117.129261,31.839339,20230524054001,0460,0001,DF5C,05FE6667,01,15,0.0,20230524054002,0300$'
-var dos = '+RESP:GTDOS,8020060402,867488060596284,GV57CG,1,0,0,3.6,0,57.6,117.129139,31.839739,20230524035840,0460,0001,DF5C,05FE6667,01,9,20230524035841,01FD$'
+var idn = '+RESP:GTIDN,8020040703,865084030960726,GV58LAU,,,0,0.0,0,66.6,117.129012,31.839195,20190411035336,0460,0000,550B,B969,05,1,220100,0.0,20190411115338,03F3$'
+var dos = '+RESP:GTDOS,8020040703,867488060673364,GV58LAU,1,2,1,0.0,0,99.8,117.129228,31.839323,20230616080921,0460,0001,DF5C,05FE6667,05,1,220100,20230616080922,40CE$'
 var rmd = '+RESP:GTRMD,8020060402,867488060596284,GV57CG,3,0,2.0,0,180.6,117.129144,31.838861,20230524032220,0460,0001,DF5C,027A4F1F,01,7,20230524032224,017D$'
 var pnr = '+RESP:GTPNR,8020060402,863835020303983,GV57CG,0,,,,,20150407094557,0633$'
 var pfr = '+RESP:GTPFR,8020060402,863835020303983,GV57CG,0,,,,,20150407094557,0633$'
 var cra = '+RESP:GTCRA,8020060402,867488060596284,GV57CG,06,1,1.0,0,222.0,117.129815,31.839434,20230523062909,0460,0001,DF5C,027A4F1F,01,3,20230523160010,0B67$'
 var asc = '+RESP:GTASC,8020060402,867488060595542,GV57CG,0.86,0.52,0.01,0.52,-0.86,0.01,0.01,0.00,-1.00,1,12.6,267,39.7,117.115453,31.827255,20230523055431,0460,0001,DF5C,05F7B315,01,10,20230523135432,03BC$'
 var hbe = '+RESP:GTHBE,8020060402,866775051515393,GV57CG,,2,0,1,42.5,0,42.6,117.101321,31.827725,20231221034214,0460,0001,DF5C,05F7B40B,01,1,002500040054,FFE2FFFF0051,10,19.8,20231221034215,006B$'
+var dat = '+RESP:GTDAT,8020040703,135790246811220,GV58LAU,3,,,1645026150,0,0.5,0,29.4,121.390923,31.164295,20111222022935,0460,0000,1806,2142,01,1,,,,,20111222022938,001A$'
+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 data = {
@@ -66,7 +74,7 @@ var data = {
     "instruction": "1_on",
     "action": "Cortar Corriente",
     "device": "queclink",
-    "password": "gv300w",
+    "password": "gv58lau",
     "device_serie": "GV",
     "previousOutput": {
       "1": false,
@@ -90,7 +98,72 @@ var data = {
   }
 
 // console.log(queclink.parseCommand(data))
-const raw = new Buffer(eribad)
-console.log(queclink.parse(raw))
+const raw = new Buffer(baaa)
+console.log(JSON.stringify(queclink.parse(raw), null, 2))
 queclink.parse(raw)
 
+
+// if (data.can) {
+//   const {
+//     comunicationOk,
+//     vin,
+//     ignitionKey,
+//     totalDistance,
+//     totalDistanceUnit,
+//     rpm,
+//     speed,
+//     engineCoolantTemp,
+//     fuelConsumption,
+//     fuelLevel,
+//     fuelLevelUnit,
+//     range,
+//     acceleratorPressure,
+//     engineHours,
+//     drivingTime,
+//     idleTime,
+//     idleFuelUsed,
+//     axleWeight,
+//     tachograph,
+//     indicators,
+//     lights,
+//     doors,
+//     overSpeedTime,
+//     overSpeedEngineTime
+//   } = data.can
+
+//   const canData = {
+//     raw: data.raw,
+//     imei: data.imei,
+//     datetime: data.datetime,
+//     point: data.point,
+//     comunicationOk,
+//     vin,
+//     ignitionKey,
+//     totalDistance,
+//     totalDistanceUnit,
+//     rpm,
+//     speed,
+//     engineCoolantTemp,
+//     fuelConsumption,
+//     fuelLevel,
+//     fuelLevelUnit,
+//     range,
+//     acceleratorPressure,
+//     engineHours,
+//     drivingTime,
+//     idleTime,
+//     idleFuelUsed,
+//     axleWeight,
+//     tachograph,
+//     indicators,
+//     lights,
+//     doors,
+//     overSpeedTime,
+//     overSpeedEngineTime,
+//     ...data.can.canExpanded
+//   }
+
+//   canData.canReportExpansionMask = canData.canReportExpansionMask.raw
+//   console.log(canData)
+//   delete data.can
+// }

package/package.json

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

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,8 +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
+    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 =
@@ -242,12 +262,6 @@ const parse = raw => {
     const bluetoothAccessory =
       utils.nHexDigit(utils.hex2bin(parsedData[4]), 11)[2] === '1'
 
-    // If get satellites is configured
-    if (utils.includeSatellites(parsedData[19])) {
-      index = 7 + 13 * number
-      satelliteInfo = true
-    }
-
     data = Object.assign(data, {
       alarm: utils.getAlarm(command[1], null),
       loc: {
@@ -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:
@@ -369,27 +395,6 @@ const parse = raw => {
       AC100 && digitFuelSensor
         ? parseInt(parsedData[index + 10], 10)
         : AC100 && !digitFuelSensor ? parseInt(parsedData[index + 9], 10) : 0
-    
-    if (canData) {
-      let canInfo = utils.getCanData(parsedData, index + 9)
-      data = Object.assign(data, { can: canInfo })
-      index = index + 49
-
-      if (canInfo?.totalDistance) {
-        data.gpsOdometer = data.odometer
-        data.odometer = canInfo.totalDistance
-      }
-
-      if (canInfo?.engineHours) {
-        data.gpsHourmeter = data.hourmeter
-        data.hourmeter = canInfo.engineHours
-      }
-
-      if (canInfo?.speed) {
-        data.gpsSpeed = data.speed
-        data.speed = canInfo.speed
-      }
-    }
 
     let externalData = {
       eriMask: {
@@ -442,6 +447,7 @@ const parse = raw => {
           })
           count += 3
         }
+
         externalData = Object.assign(externalData, {
           fuelSensorData: null,
           AC100Devices: ac100Devices
@@ -536,6 +542,28 @@ const parse = raw => {
       }
     }
 
+    if (canData) {
+      let newIndex = digitFuelSensor && !AC100 ? index + 9 + 1 : !digitFuelSensor && AC100 ? index + 9 + 4 : digitFuelSensor && AC100 ? index + 9 + 5 : index + 9
+      let canInfo = utils.getCanData(parsedData, newIndex)
+      data = Object.assign(data, { can: canInfo })
+      index = index + 49
+
+      if (canInfo?.totalDistance) {
+        data.gpsOdometer = data.odometer
+        data.odometer = canInfo.totalDistance
+      }
+
+      if (canInfo?.engineHours) {
+        data.gpsHourmeter = data.hourmeter
+        data.hourmeter = canInfo.engineHours
+      }
+
+      if (canInfo?.speed) {
+        data.gpsSpeed = data.speed
+        data.speed = canInfo.speed
+      }
+    }
+
     // Bluetooth Accessories
     if (bluetoothAccessory) {
       let btDevices = []
@@ -670,7 +698,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: {
@@ -721,6 +749,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
         })
       }
@@ -813,14 +853,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'),
@@ -850,8 +889,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,
@@ -1529,7 +1580,7 @@ const parse = raw => {
           : null,
       odometer: null,
       hourmeter: null,
-      can: utils.getCanData(parsedData, 5),
+      can: utils.getCanData(parsedData, 5)
     }
     )
   } else if (command[1] === 'GTDAT') {