From 4a24779dd6e72247dde96127791ab1f5055b1b53 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sat, 23 Jul 2022 11:52:34 -0700
Subject: Improve iStartek decoding

---
 .../traccar/protocol/StartekProtocolDecoder.java   | 38 +++++++++++++---------
 .../protocol/StartekProtocolDecoderTest.java       |  6 +++-
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
index 53c02f28c..b2fcd5452 100644
--- a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
@@ -42,6 +42,7 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
             .number("d+,")                       // length
             .number("(d+),")                     // imei
             .expression("(.+)")                  // content
+            .number("xx")                        // checksum
             .compile();
 
     private static final Pattern PATTERN_POSITION = new PatternBuilder()
@@ -73,22 +74,26 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
             .groupBegin()
             .text(",")
             .number("d,")                        // extended
-            .expression("([^,]+)?,")             // fuel
+            .expression("([^,]+)?")              // fuel
+            .groupBegin()
+            .text(",")
             .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
+            .groupBegin()
+            .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+)[%L]").optional()       // fuel level
+            .groupEnd("?")
+            .groupEnd("?")
             .groupEnd("?")
             .groupEnd("?")
-            .any()
             .compile();
 
     private String decodeAlarm(int value) {
@@ -122,9 +127,6 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
         }
 
         String content = parser.next();
-        if (content.charAt(content.length() - 2 - 1) != '|') {
-            content = content.substring(0, content.length() - 2);
-        }
         if (content.length() < 100) {
 
             Position position = new Position(getProtocolName());
@@ -223,8 +225,12 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
             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);
+            if (parser.hasNext()) {
+                position.set(Position.KEY_COOLANT_TEMP, parser.nextInt() - 40);
+            }
+            if (parser.hasNext()) {
+                position.set(Position.KEY_FUEL_CONSUMPTION, parser.nextInt() * 0.1);
+            }
             position.set(Position.KEY_FUEL_LEVEL, parser.nextInt());
         }
 
diff --git a/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
index e8eecae96..072c19942 100644
--- a/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
@@ -11,9 +11,13 @@ public class StartekProtocolDecoderTest extends ProtocolTest {
 
         var decoder = inject(new StartekProtocolDecoder(null));
 
+        verifyAttribute(decoder, text(
+                "&&x164,869926040743375,000,0,,220705205955,A,33.326001,44.445318,10,1.2,0,57,8,925,418|40|038C|000083CD,31,00000015,00,00,0016|016A|0000|0000,1,,,686|33||44|99|14|124|11|8D"),
+                Position.KEY_FUEL_CONSUMPTION, 1.1);
+
         verifyAttribute(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"),
-                Position.KEY_FUEL_LEVEL, 52);
+                Position.KEY_FUEL_LEVEL, null);
 
         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"));
-- 
cgit v1.2.3