diff options
| -rw-r--r-- | src/org/traccar/protocol/GpsGateProtocolDecoder.java | 16 | ||||
| -rw-r--r-- | src/org/traccar/protocol/HaicomProtocolDecoder.java | 32 |
2 files changed, 24 insertions, 24 deletions
diff --git a/src/org/traccar/protocol/GpsGateProtocolDecoder.java b/src/org/traccar/protocol/GpsGateProtocolDecoder.java index c4b1316d5..d4991b221 100644 --- a/src/org/traccar/protocol/GpsGateProtocolDecoder.java +++ b/src/org/traccar/protocol/GpsGateProtocolDecoder.java @@ -33,16 +33,16 @@ public class GpsGateProtocolDecoder extends BaseProtocolDecoder { private static final Pattern PATTERN = new PatternBuilder() .text("$GPRMC,") - .number("(dd)(dd)(dd).?(d+)?,") // Time (HHMMSS.SSS) - .expression("([AV]),") // Validity - .number("(dd)(dd.d+),") // Latitude (DDMM.MMMM) + .number("(dd)(dd)(dd).?(d+)?,") // time + .expression("([AV]),") // validity + .number("(dd)(dd.d+),") // latitude .expression("([NS]),") - .number("(ddd)(dd.d+),") // Longitude (DDDMM.MMMM) + .number("(ddd)(dd.d+),") // longitude .expression("([EW]),") - .number("(d+.d+)?,") // Speed - .number("(d+.d+)?,") // Course - .number("(dd)(dd)(dd)") // Date (DDMMYY) - .any() // Other (Checksumm) + .number("(d+.d+)?,") // speed + .number("(d+.d+)?,") // course + .number("(dd)(dd)(dd)") // date (ddmmyy) + .any() .compile(); private void send(Channel channel, String message) { diff --git a/src/org/traccar/protocol/HaicomProtocolDecoder.java b/src/org/traccar/protocol/HaicomProtocolDecoder.java index d187a4a63..db6090650 100644 --- a/src/org/traccar/protocol/HaicomProtocolDecoder.java +++ b/src/org/traccar/protocol/HaicomProtocolDecoder.java @@ -34,22 +34,22 @@ public class HaicomProtocolDecoder extends BaseProtocolDecoder { private static final Pattern PATTERN = new PatternBuilder() .text("$GPRS") - .number("(d+),") // IMEI - .expression("([^,]+),") // Version - .number("(dd)(dd)(dd),") // Date - .number("(dd)(dd)(dd),") // Time - .number("(d)") // Flags - .number("(dd)(d{5})") // Latitude (DDMMMMM) - .number("(ddd)(d{5}),") // Longitude (DDDMMMMM) - .number("(d+),") // Speed - .number("(d+),") // Course - .number("(d+),") // Status - .number("(d+)?,") // GPRS counting value - .number("(d+)?,") // GPS power saving counting value - .number("(d+),") // Switch status - .number("(d+)") // Relay status - .expression("(?:[LH]{2})?") // Power status - .number("#V(d+)") // Battery + .number("(d+),") // imei + .expression("([^,]+),") // version + .number("(dd)(dd)(dd),") // date + .number("(dd)(dd)(dd),") // time + .number("(d)") // flags + .number("(dd)(d{5})") // latitude + .number("(ddd)(d{5}),") // longitude + .number("(d+),") // speed + .number("(d+),") // course + .number("(d+),") // status + .number("(d+)?,") // gprs counting value + .number("(d+)?,") // gps power saving counting value + .number("(d+),") // switch status + .number("(d+)") // relay status + .expression("(?:[LH]{2})?") // power status + .number("#V(d+)") // battery .any() .compile(); |