aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-07-24 00:17:14 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2013-07-24 00:17:14 +1200
commitbf7be45a144d26ecc213b398b0625e06b5c00bc6 (patch)
treed513ee263ffd93ba226d4782ddaecd8624883cc3 /src/org
parent81877784137ad28f07654c1cdbdb152e10371213 (diff)
downloadtraccar-server-bf7be45a144d26ecc213b398b0625e06b5c00bc6.tar.gz
traccar-server-bf7be45a144d26ecc213b398b0625e06b5c00bc6.tar.bz2
traccar-server-bf7be45a144d26ecc213b398b0625e06b5c00bc6.zip
Fix tk103 decoder (fix #335)
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/Tk103ProtocolDecoder.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java
index 92febe756..a42f8703b 100644
--- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java
@@ -33,6 +33,8 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder {
super(serverManager);
}
+ //(008600410203 BP05 000008600410203 130721 A4152.5790N01239.2770E000.0 145238 173.8 70100000A L 000000D8
+
static private Pattern pattern = Pattern.compile(
"(\\d{12})" + // Device ID
".{4}" + // Command
@@ -46,7 +48,7 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder {
"(\\d+\\.\\d)" + // Speed
"(\\d{2})(\\d{2})(\\d{2})" + // Time (HHMMSS)
"(\\d+\\.\\d+)" + // Course
- "(\\d{8})" + // State
+ "([0-9a-fA-F]{8})" + // State
"L([0-9a-fA-F]+)"); // Milage
@Override