aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjon-stumpf <jon.stumpf@gmail.com>2017-03-12 12:00:54 -0400
committerjon-stumpf <jon.stumpf@gmail.com>2017-03-17 11:18:57 -0400
commitc0e2b2b0cbe103a0ae554d2e792d21af196c06d4 (patch)
tree6a522a635ad390cfd4b8f66baafee57fc8f33b95
parent2ba06b327a08432ebfc9e8a41a36bf124e087af6 (diff)
downloadtraccar-server-c0e2b2b0cbe103a0ae554d2e792d21af196c06d4.tar.gz
traccar-server-c0e2b2b0cbe103a0ae554d2e792d21af196c06d4.tar.bz2
traccar-server-c0e2b2b0cbe103a0ae554d2e792d21af196c06d4.zip
Fixed comment for date format to match code in Meitrack and Totem protocols;
-rw-r--r--src/org/traccar/protocol/MeitrackProtocolDecoder.java2
-rw-r--r--src/org/traccar/protocol/TotemProtocolDecoder.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/org/traccar/protocol/MeitrackProtocolDecoder.java
index e97e44dac..ea08c0545 100644
--- a/src/org/traccar/protocol/MeitrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeitrackProtocolDecoder.java
@@ -49,7 +49,7 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder {
.number("(d+),") // event
.number("(-?d+.d+),") // latitude
.number("(-?d+.d+),") // longitude
- .number("(dd)(dd)(dd)") // date (ddmmyy)
+ .number("(dd)(dd)(dd)") // date (yymmdd)
.number("(dd)(dd)(dd),") // time (hhmmss)
.number("([AV]),") // validity
.number("(d+),") // satellites
diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/org/traccar/protocol/TotemProtocolDecoder.java
index 8c99df611..d1f459c3b 100644
--- a/src/org/traccar/protocol/TotemProtocolDecoder.java
+++ b/src/org/traccar/protocol/TotemProtocolDecoder.java
@@ -103,7 +103,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
.number("xx") // length
.number("(d+)|") // imei
.expression("(..)") // alarm type
- .number("(dd)(dd)(dd)") // date (yymmdd)
+ .number("(dd)(dd)(dd)") // date (ddmmyy)
.number("(dd)(dd)(dd)") // time (hhmmss)
.number("(xxxx)") // io status
.expression("[01]") // charging