Merge branch 'master' into develop

1 files changed, 40 insertions, 9 deletions

diff --git a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
index 042518cb2..8e3624cb5 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.
@@ -17,7 +17,7 @@ package org.traccar.protocol;
 
 import io.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
-import org.traccar.DeviceSession;
+import org.traccar.session.DeviceSession;
 import org.traccar.Protocol;
 import org.traccar.helper.BitUtil;
 import org.traccar.helper.Parser;
@@ -70,17 +70,30 @@ 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("([^,]+)?")              // fuel
+            .groupBegin()
+            .text(",")
+            .expression("([^,]+)?")              // temperature
+            .groupBegin()
+            .text(",")
+            .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) {
@@ -181,7 +194,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 +221,24 @@ 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("airFlow", parser.nextInt());
+            position.set("airPressure", parser.nextInt());
+            if (parser.hasNext()) {
+                position.set("airTemp", parser.nextInt() - 40);
+            }
+            position.set(Position.KEY_THROTTLE, parser.nextInt());
+            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());
+        }
+
         return position;
     }