aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/protocol')
-rw-r--r--src/org/traccar/protocol/V680ProtocolDecoder.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/V680ProtocolDecoder.java b/src/org/traccar/protocol/V680ProtocolDecoder.java
index e8c3d3426..40549857a 100644
--- a/src/org/traccar/protocol/V680ProtocolDecoder.java
+++ b/src/org/traccar/protocol/V680ProtocolDecoder.java
@@ -40,16 +40,17 @@ public class V680ProtocolDecoder extends BaseProtocolDecoder {
"([^#]+)#" + // Password
"[^#]+#" +
"(\\d+)#" + // Packet number
- "(\\d+)." + // GSM base station
- "[^#]+#" +
- "(\\d{3})(\\d{2}\\.\\d+)," + // Longitude (DDDMM.MMMM)
+ "([^#]+)#" + // GSM base station
+ "(?:[^#]+#)?" +
+ "(\\d+)(\\d{2}\\.\\d+)," + // Longitude (DDDMM.MMMM)
"([EW])," +
"(\\d{2})(\\d{2}\\.\\d+)," + // Latitude (DDMM.MMMM)
"([NS])," +
"(\\d+\\.\\d+)," + // Speed
- "(\\d+)#" + // Course
+ "(\\d+\\.?\\d*)#" + // Course
"(\\d{2})(\\d{2})(\\d{2})#" + // Date (DDMMYY)
- "(\\d{2})(\\d{2})(\\d{2})"); // Time (HHMMSS)
+ "(\\d{2})(\\d{2})(\\d{2})" + // Time (HHMMSS)
+ ".*");
@Override
protected Object decode(