aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2012-12-26 10:33:44 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2012-12-26 10:33:44 +1300
commitba9f54789326436879a85effff2131de9d7023f5 (patch)
tree1d328c40011cbac6b41e91c5f931c6e2ab397d68 /src/org/traccar/protocol
parentfe9f9b034713cb98531d73698a65bd03d18a771c (diff)
downloadtrackermap-server-ba9f54789326436879a85effff2131de9d7023f5.tar.gz
trackermap-server-ba9f54789326436879a85effff2131de9d7023f5.tar.bz2
trackermap-server-ba9f54789326436879a85effff2131de9d7023f5.zip
Fix meiligao regex pattern
Diffstat (limited to 'src/org/traccar/protocol')
-rw-r--r--src/org/traccar/protocol/MeiligaoProtocolDecoder.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
index 3d8fbef75..0ba9568ba 100644
--- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
@@ -46,6 +46,7 @@ public class MeiligaoProtocolDecoder extends GenericProtocolDecoder {
/**
* Regular expressions pattern
*/
+ //"020600.930,A,2309.2051,N,11318.8449,E,0.00,0.00,090710,,,A*6A|2.6|96.7|0000|0000,3FFF|000000000"
//"155422.000,V,2230.7623,N,11403.4218,E,0.00,0,060211,,*1A|0.0|26|0000|0000,0000|0000000000000000|63|00000000"
static private Pattern pattern = Pattern.compile(
"(\\d{2})(\\d{2})(\\d{2})\\.(\\d{3})," + // Time (HHMMSS.SSS)
@@ -58,7 +59,7 @@ public class MeiligaoProtocolDecoder extends GenericProtocolDecoder {
"(\\d+\\.?\\d*)?," + // Course
"(\\d{2})(\\d{2})(\\d{2})," + // Date (DDMMYY)
"[^\\|]+\\|(\\d+\\.\\d)\\|" + // Dilution of precision
- "(\\d+)\\|" + // Altitude
+ "(\\d+\\.?\\d*)\\|" + // Altitude
"([0-9a-fA-F]+)" + // State
".*"); // TODO: parse ADC
@@ -88,6 +89,7 @@ public class MeiligaoProtocolDecoder extends GenericProtocolDecoder {
/**
* Decode message
*/
+ @Override
protected Object decode(
ChannelHandlerContext ctx, Channel channel, Object msg)
throws Exception {