aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjon-stumpf <jon.stumpf@gmail.com>2017-02-21 22:23:41 -0500
committerjon-stumpf <jon.stumpf@gmail.com>2017-02-21 22:23:41 -0500
commit360889705fd6db50c302c40afeeca4ca93e9d780 (patch)
tree9ac172b4e56e39b9c36e4e76ab1d6d365bd40208
parent560e01c723a6216f105ea36cafe08ec957aad700 (diff)
downloadtrackermap-server-360889705fd6db50c302c40afeeca4ca93e9d780.tar.gz
trackermap-server-360889705fd6db50c302c40afeeca4ca93e9d780.tar.bz2
trackermap-server-360889705fd6db50c302c40afeeca4ca93e9d780.zip
Updated TotemProtocol to record "pdop" and "vdop" in PATTERN1;
-rw-r--r--src/org/traccar/protocol/TotemProtocolDecoder.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/org/traccar/protocol/TotemProtocolDecoder.java
index 128c42ccd..db25a3f17 100644
--- a/src/org/traccar/protocol/TotemProtocolDecoder.java
+++ b/src/org/traccar/protocol/TotemProtocolDecoder.java
@@ -50,9 +50,9 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
.number("(dd)(dd)(dd)") // date
.expression("[^*]*").text("*")
.number("xx|") // checksum
- .number("d+.d+|") // pdop
+ .number("(d+.d+)|") // pdop
.number("(d+.d+)|") // hdop
- .number("d+.d+|") // vdop
+ .number("(d+.d+)|") // vdop
.number("(d+)|") // io status
.number("d+|") // time
.number("d") // charged
@@ -242,7 +242,9 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
}
position.setTime(dateBuilder.getDate());
+ position.set("pdop", parser.next());
position.set(Position.KEY_HDOP, parser.next());
+ position.set("vdop", parser.next());
position.set(Position.PREFIX_IO + 1, parser.next());
position.set(Position.KEY_BATTERY, parser.next());
position.set(Position.KEY_POWER, parser.nextDouble());