aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-05-02 08:35:18 -0700
committerAnton Tananaev <anton@traccar.org>2022-05-02 08:35:18 -0700
commit8853720199fb97d31d61cb442b5eac2d547aa8a0 (patch)
tree58d3fa1ae487c299a1835816bac14bb373d784d4
parent9633eccdead886ed0b580707ad76cdf06df9a603 (diff)
downloadtrackermap-server-8853720199fb97d31d61cb442b5eac2d547aa8a0.tar.gz
trackermap-server-8853720199fb97d31d61cb442b5eac2d547aa8a0.tar.bz2
trackermap-server-8853720199fb97d31d61cb442b5eac2d547aa8a0.zip
Fix Envotech status decoding
-rw-r--r--src/main/java/org/traccar/protocol/EnvotechProtocolDecoder.java2
-rw-r--r--src/test/java/org/traccar/protocol/EnvotechProtocolDecoderTest.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/EnvotechProtocolDecoder.java b/src/main/java/org/traccar/protocol/EnvotechProtocolDecoder.java
index 51391d4cc..347063547 100644
--- a/src/main/java/org/traccar/protocol/EnvotechProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/EnvotechProtocolDecoder.java
@@ -99,7 +99,7 @@ public class EnvotechProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_INPUT, parser.nextHexInt());
position.set(Position.PREFIX_OUT, parser.nextHexInt());
position.set(Position.KEY_FUEL_LEVEL, parser.nextHexInt());
- position.set(Position.KEY_STATUS, parser.nextHexInt());
+ position.set(Position.KEY_STATUS, parser.nextHexLong());
position.setFixTime(parser.nextDateTime(Parser.DateTimeFormat.DMY_HMS));
position.setValid(parser.nextInt() > 0);
diff --git a/src/test/java/org/traccar/protocol/EnvotechProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/EnvotechProtocolDecoderTest.java
index 60c592e1e..70fb5a188 100644
--- a/src/test/java/org/traccar/protocol/EnvotechProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/EnvotechProtocolDecoderTest.java
@@ -11,6 +11,9 @@ public class EnvotechProtocolDecoderTest extends ProtocolTest {
var decoder = new EnvotechProtocolDecoder(null);
verifyPosition(decoder, text(
+ "$80SLM,62,000F,F015727,020522053200,611000000,000391,C080,000,80028900,85010000'02052205320110399426S03970217E000145*E0C2#"));
+
+ verifyPosition(decoder, text(
"$80SLM,02,F,AB0010,130410155921,431750216,000040,0000,,00000000,'13041015592110476673N10111459E001281*2A"),
position("2010-04-13 15:59:21.000", true, 4.76673, 101.11459));