aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-05-15 16:58:10 -0700
committerAnton Tananaev <anton@traccar.org>2022-05-15 16:58:10 -0700
commitbac331ebf2a67d0bdc4f96c78f0dfbeb0c4b6da6 (patch)
treea5eb54aa7164e74e953c6d89fcc5e457ddab67e4 /src
parent7a0e14eda651314d7bd076c882dd872964b16832 (diff)
downloadtrackermap-server-bac331ebf2a67d0bdc4f96c78f0dfbeb0c4b6da6.tar.gz
trackermap-server-bac331ebf2a67d0bdc4f96c78f0dfbeb0c4b6da6.tar.bz2
trackermap-server-bac331ebf2a67d0bdc4f96c78f0dfbeb0c4b6da6.zip
Handle Startek OBD issue
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/traccar/protocol/StartekProtocolDecoder.java4
-rw-r--r--src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java5
2 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
index c1869def2..8a7b5cec7 100644
--- a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
@@ -42,7 +42,6 @@ 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()
@@ -123,6 +122,9 @@ 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());
diff --git a/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
index 6c2d39940..cea079156 100644
--- a/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
@@ -11,8 +11,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"));
+ 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);
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"));