aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-07-31 20:29:21 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2013-07-31 20:29:21 +1200
commit016561b2060242e4d4cac25f352cec3dbe4c41a4 (patch)
tree4005acb8d5ac207b8c4da39cb5f5d3c678bef46c /src/org/traccar/protocol
parentb3eb72bfae2972e39fb19faba24c1a8eb88e761e (diff)
downloadtrackermap-server-016561b2060242e4d4cac25f352cec3dbe4c41a4.tar.gz
trackermap-server-016561b2060242e4d4cac25f352cec3dbe4c41a4.tar.bz2
trackermap-server-016561b2060242e4d4cac25f352cec3dbe4c41a4.zip
Fix tk103 decoder (fix #258)
Diffstat (limited to 'src/org/traccar/protocol')
-rw-r--r--src/org/traccar/protocol/Tk103ProtocolDecoder.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java
index a42f8703b..9fbf32556 100644
--- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java
@@ -33,8 +33,6 @@ 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
@@ -47,7 +45,7 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder {
"([EW])" +
"(\\d+\\.\\d)" + // Speed
"(\\d{2})(\\d{2})(\\d{2})" + // Time (HHMMSS)
- "(\\d+\\.\\d+)" + // Course
+ "(\\d+\\.?\\d+)" + // Course
"([0-9a-fA-F]{8})" + // State
"L([0-9a-fA-F]+)"); // Milage