aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-03-17 22:28:02 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2017-03-17 22:28:02 +1300
commitb2a61d29b0c4304613d5618e9953ec3721aee842 (patch)
tree7734588ce8bf8db07694a8456692fa8d58a769e2 /src
parent73667548d1d83cdfbd6b4a76e0321698cad0fd4b (diff)
downloadtraccar-server-b2a61d29b0c4304613d5618e9953ec3721aee842.tar.gz
traccar-server-b2a61d29b0c4304613d5618e9953ec3721aee842.tar.bz2
traccar-server-b2a61d29b0c4304613d5618e9953ec3721aee842.zip
Decode additional H02 parameters
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/protocol/H02ProtocolDecoder.java24
1 files changed, 23 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java
index 6ab997b86..5291107ee 100644
--- a/src/org/traccar/protocol/H02ProtocolDecoder.java
+++ b/src/org/traccar/protocol/H02ProtocolDecoder.java
@@ -142,6 +142,7 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
position.setCourse((buf.readUnsignedByte() & 0x0f) * 100.0 + BcdUtil.readInteger(buf, 2));
processStatus(position, buf.readUnsignedInt());
+
return position;
}
@@ -170,7 +171,18 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
.number("(?:(dd)(dd)(dd))?") // date (ddmmyy)
.any()
.number(",(x{8})") // status
- .expression("(?:#|,.*)")
+ .groupBegin()
+ .number(",(d+),") // odometer
+ .number("(-?d+),") // temperature
+ .number("(d+.d+),") // fuel
+ .number("(-?d+),") // altitude
+ .number("(x+),") // lac
+ .number("(x+)#") // cid
+ .or()
+ .expression(",.*")
+ .or()
+ .text("#")
+ .groupEnd()
.compile();
private static final Pattern PATTERN_NBR = new PatternBuilder()
@@ -240,6 +252,16 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
processStatus(position, parser.nextLong(16));
+ if (parser.hasNext(6)) {
+ position.set(Position.KEY_ODOMETER, parser.nextInt());
+ position.set(Position.PREFIX_TEMP + 1, parser.nextInt());
+ position.set(Position.KEY_FUEL_LEVEL, parser.nextDouble());
+
+ position.setAltitude(parser.nextInt());
+
+ position.setNetwork(new Network(CellTower.fromLacCid(parser.nextInt(16), parser.nextInt(16))));
+ }
+
return position;
}