aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/AstraProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-03-08 19:14:23 +1300
committerGitHub <noreply@github.com>2017-03-08 19:14:23 +1300
commite3a3f06cc07bc5d75d3d670e045abb5d6c91fcad (patch)
treeee424dc1b6b86abb54abcc5fe4f2068ac0cbf286 /src/org/traccar/protocol/AstraProtocolDecoder.java
parentb7e53f57689e1f8a1c0705aeea32dc6e69f3fcb3 (diff)
parentf94613b97cf80af64154ae571920a273771fa1d3 (diff)
downloadtraccar-server-e3a3f06cc07bc5d75d3d670e045abb5d6c91fcad.tar.gz
traccar-server-e3a3f06cc07bc5d75d3d670e045abb5d6c91fcad.tar.bz2
traccar-server-e3a3f06cc07bc5d75d3d670e045abb5d6c91fcad.zip
Merge pull request #2979 from jon-stumpf/jss-add-info
Additional Protocol Information
Diffstat (limited to 'src/org/traccar/protocol/AstraProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/AstraProtocolDecoder.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/AstraProtocolDecoder.java b/src/org/traccar/protocol/AstraProtocolDecoder.java
index 71f2080bb..ea6aa7b30 100644
--- a/src/org/traccar/protocol/AstraProtocolDecoder.java
+++ b/src/org/traccar/protocol/AstraProtocolDecoder.java
@@ -93,7 +93,7 @@ public class AstraProtocolDecoder extends BaseProtocolDecoder {
buf.readUnsignedByte(); // max journey speed
buf.skipBytes(6); // accelerometer
- buf.readUnsignedShort(); // journey distance
+ position.set(Position.KEY_ODOMETER_TRIP, buf.readUnsignedShort());
buf.readUnsignedShort(); // journey idle time
position.setAltitude(buf.readUnsignedByte() * 20);
@@ -105,12 +105,9 @@ public class AstraProtocolDecoder extends BaseProtocolDecoder {
buf.readUnsignedByte(); // geofence events
if (BitUtil.check(status, 8)) {
-
position.set(Position.KEY_RFID, buf.readBytes(7).toString(StandardCharsets.US_ASCII));
position.set(Position.KEY_ODOMETER, buf.readUnsignedMedium() * 1000);
-
- buf.readUnsignedShort(); // engine time
-
+ position.set(Position.KEY_HOURS, buf.readUnsignedShort());
}
if (BitUtil.check(status, 6)) {