diff options
| author | jon-stumpf <jon.stumpf@gmail.com> | 2017-03-17 12:21:02 -0400 |
|---|---|---|
| committer | jon-stumpf <jon.stumpf@gmail.com> | 2017-03-17 13:48:21 -0400 |
| commit | 141b92c1f93d59d72e442295f355136658c11e16 (patch) | |
| tree | 97ea34e813f97f46d4518dbc75455864bf46c3af | |
| parent | 798c599064d62f021ff4d17ecb6199acccf7406f (diff) | |
| download | trackermap-server-141b92c1f93d59d72e442295f355136658c11e16.tar.gz trackermap-server-141b92c1f93d59d72e442295f355136658c11e16.tar.bz2 trackermap-server-141b92c1f93d59d72e442295f355136658c11e16.zip | |
Fixed time comment in Tk103 and Totem protocols as requested;
| -rw-r--r-- | src/org/traccar/protocol/Tk103ProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/protocol/TotemProtocolDecoder.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java index 404e9b2cf..64314f6c8 100644 --- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java @@ -41,7 +41,7 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder { .number("(d+)(,)?") // device id .expression(".{4},?") // command .number("d*") // imei? - .number("(dd)(dd)(dd),?") // date (yymmdd or mmddyy?) + .number("(dd)(dd)(dd),?") // date (mmddyy if comma-delimited, otherwise yyddmm) .expression("([AV]),?") // validity .number("(d+)(dd.d+)") // latitude .expression("([NS]),?") diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/org/traccar/protocol/TotemProtocolDecoder.java index 434ae2521..54eb2b5a5 100644 --- a/src/org/traccar/protocol/TotemProtocolDecoder.java +++ b/src/org/traccar/protocol/TotemProtocolDecoder.java @@ -54,7 +54,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder { .number("(d+.d+)|") // hdop .number("(d+.d+)|") // vdop .number("(d+)|") // io status - .number("d+|") // battery time (units?) + .number("d+|") // battery time .number("d") // charged .number("(ddd)") // battery .number("(dddd)|") // power |