aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2024-03-02 17:53:48 -0800
committerAnton Tananaev <anton@traccar.org>2024-03-02 17:53:48 -0800
commita1c487c1a7a54382dac98f289c0d55f6fb920cce (patch)
tree43cf2edda37cdeef2e5868fb99998576d115db59
parent9c8b9ae246d45f5cc3d24fc5e3041076344b9cf6 (diff)
downloadtrackermap-server-a1c487c1a7a54382dac98f289c0d55f6fb920cce.tar.gz
trackermap-server-a1c487c1a7a54382dac98f289c0d55f6fb920cce.tar.bz2
trackermap-server-a1c487c1a7a54382dac98f289c0d55f6fb920cce.zip
Support GV355CEU GTERI messages
-rw-r--r--src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java2
-rw-r--r--src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
index eccb5c007..2e5ffa8d6 100644
--- a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
@@ -876,7 +876,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
if (!v[index++].isEmpty()) {
decodeStatus(position, Long.parseLong(v[index - 1]));
}
- index += 1; // reserved
+ index += 1; // reserved / uart device type
}
if (BitUtil.check(mask, 0)) {
diff --git a/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
index 2968161c9..d0e2ad046 100644
--- a/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
@@ -11,6 +11,9 @@ public class Gl200TextProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new Gl200TextProtocolDecoder(null));
+ verifyPositions(decoder, buffer(
+ "+RESP:GTERI,8020050605,867488060225819,GV355CEU,00000106,12390,10,1,1,0.0,37,253.0,10.240915,45.930262,20240226074452,0222,0010,2F31,0063952B,03,7,0,0.0,,,,,100,110000,0,0,1,FFFFF,VR3USHNSSNJ711765,0,H311796,109.40,0,,,,,,,46.54,29.91,16.63,12.88,,8080,,,00,0,20240226074453,2548$"));
+
verifyAttributes(decoder, buffer(
"+RESP:GTCAN,F10413,862599050467479,GV350M,0,1,C18CFDFF,3BKHHZ8X7GF723380,2,H2898058,232160.50,896,0,64,L/H1.5,P99.20,0,40532.95,,,,,,,,,,,1,0.0,234,2812.2,-78.508807,-0.218812,20240226211921,,,,,,20240226211922,DE03$"));