From 6c68a7531289c4166b7e8ea58fc1ffdbe4893ed4 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 1 Jun 2018 05:14:08 +1200 Subject: Fix GPS103 course decoding --- src/org/traccar/protocol/Gps103ProtocolDecoder.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java index 9883079d1..9a27dd9d2 100644 --- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java @@ -66,13 +66,13 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder { .expression("([EW]),").optional() .number("(d+)(dd.d+),") // longitude (dddmm.mmmm) .expression("([EW])?,").optional() - .number("(d+.?d*)?,").optional() // speed - .number("(d+.?d*)?,").optional() // course - .number("(d+.?d*)?,").optional() // altitude - .number("([01])?,").optional() // ignition - .number("([01])?,").optional() // door - .number("(?:(d+.d+)%)?,").optional() // fuel 1 - .number("(?:(d+.d+)%)?,").optional() // fuel 2 + .number("(d+.?d*)?").optional() // speed + .number(",(d+.?d*)?").optional() // course + .number(",(d+.?d*)?").optional() // altitude + .number(",([01])?").optional() // ignition + .number(",([01])?").optional() // door + .number(",(?:(d+.d+)%)?").optional() // fuel 1 + .number(",(?:(d+.d+)%)?").optional() // fuel 2 .number("(-?d+)?") // temperature .groupEnd() .any() -- cgit v1.2.3