Fix Totem alarm decoding

traccar · Apr 26, 2018 · 2738665 · 2738665
1 parent be6226d
commit 2738665
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/org/traccar/protocol/TotemProtocolDecoder.java
@@ -367,7 +367,7 @@ protected Object decode(
 
         String sentence = (String) msg;
         Pattern pattern = PATTERN3;
-        if (sentence.indexOf("A") == 6) {
+        if (sentence.charAt(2) == '0') {
             pattern = PATTERN4;
         } else if (sentence.contains("$GPRMC")) {
             pattern = PATTERN1;

diff --git a/test/org/traccar/protocol/TotemProtocolDecoderTest.java b/test/org/traccar/protocol/TotemProtocolDecoderTest.java
@@ -10,6 +10,9 @@ public void testDecode() throws Exception {
 
         TotemProtocolDecoder decoder = new TotemProtocolDecoder(new TotemProtocol());
 
+        verifyPosition(decoder, text(
+                "$$011602867119025755430|50099800180420045019401400000000000000B8797D110816811201.500002132615.7037S02801.8099E056149"));
+
         verifyPosition(decoder, text(
                 "$$0108AB863835028447675|5004C0001710250234064214059828A058AE121010604000.600000320304.7772N10134.8238E11625B"));