Support iStartek OBD data

2 files changed, 27 insertions, 6 deletions

diff --git a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
index 042518cb2..c1869def2 100644
--- a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Anton Tananaev (anton@traccar.org)
+ * Copyright 2021 - 2022 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,14 +70,23 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
             .number("(x+),")                     // outputs
             .number("(x+)|")                     // power
             .number("(x+)")                      // battery
-            .groupBegin()
-            .text("|")
-            .expression("([^,]+)").optional()    // adc
+            .expression("([^,]+)?")              // adc
             .groupBegin()
             .text(",")
             .number("d,")                        // extended
             .expression("([^,]+)?,")             // fuel
-            .expression("([^,]+)?,?")            // temperature
+            .expression("([^,]+)?")              // temperature
+            .groupBegin()
+            .text(",")
+            .number("(d+)|")                     // rpm
+            .number("(d+)|")                     // engine load
+            .number("d+|")                       // maf flow
+            .number("d+|")                       // intake pressure
+            .number("d+|")                       // intake temperature
+            .number("(d+)|")                     // throttle
+            .number("(d+)|")                     // coolant temperature
+            .number("(d+)|")                     // instant fuel
+            .number("(d+)")                      // fuel level
             .groupEnd("?")
             .groupEnd("?")
             .any()
@@ -181,7 +190,7 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
 
         if (parser.hasNext()) {
             String[] adc = parser.next().split("\\|");
-            for (int i = 0; i < adc.length; i++) {
+            for (int i = 1; i < adc.length; i++) {
                 position.set(Position.PREFIX_ADC + (i + 1), Integer.parseInt(adc[i], 16) * 0.01);
             }
         }
@@ -208,6 +217,15 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
             }
         }
 
+        if (parser.hasNext(6)) {
+            position.set(Position.KEY_RPM, parser.nextInt());
+            position.set(Position.KEY_ENGINE_LOAD, parser.nextInt());
+            position.set(Position.KEY_THROTTLE, parser.nextInt());
+            position.set(Position.KEY_COOLANT_TEMP, parser.nextInt() - 40);
+            position.set(Position.KEY_FUEL_CONSUMPTION, parser.nextInt() * 0.1);
+            position.set(Position.KEY_FUEL_LEVEL, parser.nextInt());
+        }
+
         return position;
     }
 
diff --git a/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
index 5d22344fa..6c2d39940 100644
--- a/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
@@ -12,6 +12,9 @@ public class StartekProtocolDecoderTest extends ProtocolTest {
         var decoder = new StartekProtocolDecoder(null);
 
         verifyPosition(decoder, text(
+                "&&R187,860294046453690,000,0,,220105160656,A,22.994986,72.499711,15,0.9,2,222,55,121135784,404|98|147B|0000376A,24,0000001F,02,00,052E|01A3|0000|0000,1,010000|020000,,853|6|10|105|73|41|125|34|52"));
+
+        verifyPosition(decoder, text(
                 "&&o142,860262050066062,000,27,,211111070826,V,28.653435,-106.077455,0,0.0,0,151,1412,918,0|0|4708|01402D19,6,0000001A,02,00,04C0|016C|0000|0000,1,,,BB"));
 
         verifyPosition(decoder, text(