iStartek serial interface support

3 files changed, 145 insertions, 21 deletions

diff --git a/src/main/java/org/traccar/protocol/StartekFrameDecoder.java b/src/main/java/org/traccar/protocol/StartekFrameDecoder.java
new file mode 100644
index 000000000..608b128cd
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/StartekFrameDecoder.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2024 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import org.traccar.BaseFrameDecoder;
+
+import java.nio.charset.StandardCharsets;
+
+public class StartekFrameDecoder extends BaseFrameDecoder {
+
+    @Override
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception {
+
+        if (buf.readableBytes() < 10) {
+            return null;
+        }
+
+        int lengthIndex = buf.readerIndex() + 3;
+        int dividerIndex = buf.indexOf(lengthIndex, buf.writerIndex(), (byte) ',');
+        if (dividerIndex > 0) {
+            int lengthOffset = dividerIndex - buf.readerIndex() + 4;
+            int length = lengthOffset + Integer.parseInt(buf.getCharSequence(
+                    lengthIndex, dividerIndex - lengthIndex, StandardCharsets.US_ASCII).toString());
+            if (buf.readableBytes() >= length) {
+                return buf.readRetainedSlice(length);
+            }
+        }
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/org/traccar/protocol/StartekProtocol.java b/src/main/java/org/traccar/protocol/StartekProtocol.java
index 550545345..9c01d24e2 100644
--- a/src/main/java/org/traccar/protocol/StartekProtocol.java
+++ b/src/main/java/org/traccar/protocol/StartekProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 Anton Tananaev (anton@traccar.org)
+ * Copyright 2021 - 2024 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.
@@ -15,7 +15,6 @@
  */
 package org.traccar.protocol;
 
-import io.netty.handler.codec.LineBasedFrameDecoder;
 import io.netty.handler.codec.string.StringDecoder;
 import io.netty.handler.codec.string.StringEncoder;
 import org.traccar.BaseProtocol;
@@ -38,7 +37,7 @@ public class StartekProtocol extends BaseProtocol {
         addServer(new TrackerServer(config, getName(), false) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline, Config config) {
-                pipeline.addLast(new LineBasedFrameDecoder(1100));
+                pipeline.addLast(new StartekFrameDecoder());
                 pipeline.addLast(new StringEncoder());
                 pipeline.addLast(new StringDecoder());
                 pipeline.addLast(new StartekProtocolEncoder(StartekProtocol.this));
diff --git a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
index 71afb6ad6..0eeb5b2aa 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 - 2022 Anton Tananaev (anton@traccar.org)
+ * Copyright 2021 - 2024 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.
@@ -41,12 +41,13 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
             .expression(".")                     // index
             .number("d+,")                       // length
             .number("(d+),")                     // imei
+            .number("(xxx),")                    // type
             .expression("(.+)")                  // content
             .number("xx")                        // checksum
+            .text("\r\n")
             .compile();
 
     private static final Pattern PATTERN_POSITION = new PatternBuilder()
-            .number("xxx,")                      // command
             .number("(d+),")                     // event
             .expression("([^,]+)?,")             // event data
             .number("(dd)(dd)(dd)")              // date (yyymmdd)
@@ -134,26 +135,24 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
             return null;
         }
 
+        String type = parser.next();
         String content = parser.next();
-        if (content.length() < 100) {
-
-            Position position = new Position(getProtocolName());
-            position.setDeviceId(deviceSession.getDeviceId());
-
-            getLastLocation(position, null);
-
-            position.set(Position.KEY_RESULT, content);
-
-            return position;
-
-        } else {
-
-            return decodePosition(deviceSession, content);
-
+        switch (type) {
+            case "000":
+                return decodePosition(deviceSession, content);
+            case "710":
+                return decodeSerial(deviceSession, content);
+            default:
+                Position position = new Position(getProtocolName());
+                position.setDeviceId(deviceSession.getDeviceId());
+                getLastLocation(position, null);
+                position.set(Position.KEY_TYPE, type);
+                position.set(Position.KEY_RESULT, content);
+                return position;
         }
     }
 
-    protected Object decodePosition(DeviceSession deviceSession, String content) throws Exception {
+    private Object decodePosition(DeviceSession deviceSession, String content) {
 
         Parser parser = new Parser(PATTERN_POSITION, content);
         if (!parser.matches()) {
@@ -255,4 +254,81 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
         return position;
     }
 
+    private Object decodeSerial(DeviceSession deviceSession, String content) {
+
+        Position position = new Position(getProtocolName());
+        position.setDeviceId(deviceSession.getDeviceId());
+
+        getLastLocation(position, null);
+
+        String[] frames = content.split("\r\n");
+
+        for (String frame : frames) {
+            String[] values = frame.split(",");
+            int index = 0;
+            String type = values[index++];
+            switch (type) {
+                case "T1":
+                    index += 1; // speed
+                    position.set(Position.KEY_RPM, Double.parseDouble(values[index++]));
+                    index += 1; // fuel consumption
+                    position.set(Position.KEY_FUEL_LEVEL, Double.parseDouble(values[index++]));
+                    index += 4; // axel weights
+                    index += 1; // turbo pressure
+                    position.set(Position.KEY_COOLANT_TEMP, Integer.parseInt(values[index++]));
+                    index += 1; // accelerator pedal
+                    position.set("torque", Integer.parseInt(values[index++]));
+                    index += 1; // firmware version
+                    position.set(Position.KEY_POWER, Double.parseDouble(values[index++]));
+                    index += 1; // coolant level
+                    position.set("oilTemp", Double.parseDouble(values[index++]));
+                    index += 1; // oil level
+                    position.set(Position.KEY_THROTTLE, Double.parseDouble(values[index++]));
+                    index += 1; // air inlet pressure
+                    index += 1; // fuel tank secondary
+                    index += 1; // current gear
+                    index += 1; // seatbelt
+                    position.set("oilPressure", Integer.parseInt(values[index++]));
+                    index += 1; // wet tank air pressure
+                    index += 1; // pto state
+                    int ignition = Integer.parseInt(values[index++]);
+                    if (ignition < 2) {
+                        position.set(Position.KEY_IGNITION, ignition > 0);
+                    }
+                    index += 1; // brake pedal
+                    position.set("catalystLevel", Double.parseDouble(values[index++]));
+                    index += 1; // fuel type
+                    break;
+                case "T2":
+                    position.set(Position.KEY_ODOMETER, Double.parseDouble(values[index++]) * 1000);
+                    index += 1; // total fuel
+                    index += 1; // fuel used cruise
+                    index += 1; // fuel used drive
+                    index += 1;
+                    index += 1;
+                    index += 1; // total idle time
+                    index += 1; // total time pto
+                    index += 1; // time cruise
+                    index += 1;
+                    index += 1;
+                    index += 1;
+                    index += 1;
+                    index += 1;
+                    index += 1; // brake apps
+                    index += 1; // clutch apps
+                    position.set(Position.KEY_HOURS, Integer.parseInt(values[index++]));
+                    index += 1; // time torque
+                    position.set(Position.KEY_FUEL_CONSUMPTION, Double.parseDouble(values[index++]));
+                    index += 1; // total cruise control distance
+                    position.set(Position.KEY_FUEL_USED, Double.parseDouble(values[index++]));
+                    index += 1; // total drive time
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        return position;
+    }
+
 }