From e845f799dd54bab6f580d405c51ef774a4491ab4 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 30 Oct 2020 22:00:33 -0700 Subject: Additional Meitrack parameters --- .../org/traccar/protocol/MeitrackProtocolDecoder.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java index c43f1ea83..9b12f1c15 100644 --- a/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 - 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2012 - 2020 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -396,6 +396,12 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder { case 0x07: position.set(Position.KEY_RSSI, buf.readUnsignedByte()); break; + case 0x97: + position.set(Position.KEY_THROTTLE, buf.readUnsignedByte()); + break; + case 0x9D: + position.set(Position.KEY_FUEL_LEVEL, buf.readUnsignedByte()); + break; default: buf.readUnsignedByte(); break; @@ -412,6 +418,9 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder { case 0x09: position.setCourse(buf.readUnsignedShortLE()); break; + case 0x0A: + position.set(Position.KEY_HDOP, buf.readUnsignedShortLE()); + break; case 0x0B: position.setAltitude(buf.readShortLE()); break; @@ -421,6 +430,9 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder { case 0x1A: position.set(Position.KEY_POWER, buf.readUnsignedShortLE() * 0.01); break; + case 0x40: + position.set(Position.KEY_EVENT, buf.readUnsignedShortLE()); + break; case 0x91: case 0x92: position.set(Position.KEY_OBD_SPEED, buf.readUnsignedShortLE()); @@ -434,6 +446,9 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder { case 0x9C: position.set(Position.KEY_COOLANT_TEMP, buf.readUnsignedShortLE()); break; + case 0x9F: + position.set(Position.PREFIX_TEMP + 1, buf.readUnsignedShortLE()); + break; case 0xC9: position.set(Position.KEY_FUEL_CONSUMPTION, buf.readUnsignedShortLE()); break; @@ -457,6 +472,7 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder { position.setTime(new Date((946684800 + buf.readUnsignedIntLE()) * 1000)); // 2000-01-01 break; case 0x0C: + case 0x9B: position.set(Position.KEY_ODOMETER, buf.readUnsignedIntLE()); break; case 0x0D: -- cgit v1.2.3