Updated protocols to record additional information as reported in comments and confirmed in available documentation;

1 files changed, 6 insertions, 4 deletions

diff --git a/src/org/traccar/protocol/CastelProtocolDecoder.java b/src/org/traccar/protocol/CastelProtocolDecoder.java
index 07d26f2b1..f61c76f9f 100644
--- a/src/org/traccar/protocol/CastelProtocolDecoder.java
+++ b/src/org/traccar/protocol/CastelProtocolDecoder.java
@@ -178,8 +178,8 @@ public class CastelProtocolDecoder extends BaseProtocolDecoder {
         buf.readUnsignedInt(); // ACC ON time
         buf.readUnsignedInt(); // UTC time
         position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
-        buf.readUnsignedInt(); // trip odometer
-        buf.readUnsignedInt(); // total fuel consumption
+        position.set(Position.KEY_TRIP_ODOMETER, buf.readUnsignedInt()); // trip odometer
+        position.set(Position.KEY_FUEL_CONSUMPTION, buf.readUnsignedInt()); // total fuel consumption
         buf.readUnsignedShort(); // current fuel consumption
         position.set(Position.KEY_STATUS, buf.readUnsignedInt());
         buf.skipBytes(8);
@@ -263,8 +263,8 @@ public class CastelProtocolDecoder extends BaseProtocolDecoder {
             buf.readUnsignedInt(); // ACC ON time
             buf.readUnsignedInt(); // UTC time
             long odometer = buf.readUnsignedInt();
-            buf.readUnsignedInt(); // trip odometer
-            buf.readUnsignedInt(); // total fuel consumption
+            long tripOdometer = buf.readUnsignedInt(); // trip odometer
+            long fuelConsumption = buf.readUnsignedInt(); // total fuel consumption
             buf.readUnsignedShort(); // current fuel consumption
             long status = buf.readUnsignedInt();
             buf.skipBytes(8);
@@ -276,6 +276,8 @@ public class CastelProtocolDecoder extends BaseProtocolDecoder {
             for (int i = 0; i < count; i++) {
                 Position position = readPosition(deviceSession, buf);
                 position.set(Position.KEY_ODOMETER, odometer);
+                position.set(Position.KEY_TRIP_ODOMETER, tripOdometer);
+                position.set(Position.KEY_FUEL_CONSUMPTION, fuelConsumption);
                 position.set(Position.KEY_STATUS, status);
                 positions.add(position);
             }