From ef30c922ab89a2b3b24011e66ee9ac6671e3507c Mon Sep 17 00:00:00 2001 From: jfunston83 Date: Fri, 25 Oct 2019 18:16:29 -0600 Subject: Update DmtProtocolDecoder.java --- .../java/org/traccar/protocol/DmtProtocolDecoder.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/main/java/org') diff --git a/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java b/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java index c04e90f1d..43af422db 100644 --- a/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java @@ -187,6 +187,21 @@ public class DmtProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_INPUT, input); position.set(Position.KEY_OUTPUT, output); position.set(Position.KEY_STATUS, status); + + } else if (fieldId == 27) { + int odometer = buf.readIntLE(); + int runhours = buf.readIntLE(); + + position.set("DeviceOdo", odometer); + position.set("DeviceRunHours", runhours); + + + } else if (fieldId == 26) { + int tripodometer = buf.readIntLE(); + int triprunhours = buf.readIntLE(); + + position.set("TripOdo", tripodometer); + position.set("TripRunTime", triprunhours); } else if (fieldId == 6) { -- cgit v1.2.3 From 9726f97fe3d1f83351bf98b0a61361aa371c43be Mon Sep 17 00:00:00 2001 From: jfunston83 Date: Fri, 25 Oct 2019 18:19:14 -0600 Subject: Support for Odometer and Run Hours Support for a number of DMT devices that track odometer and run hours. --- src/main/java/org/traccar/protocol/DmtProtocolDecoder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java b/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java index 43af422db..79a80c0c8 100644 --- a/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java @@ -187,7 +187,7 @@ public class DmtProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_INPUT, input); position.set(Position.KEY_OUTPUT, output); position.set(Position.KEY_STATUS, status); - + } else if (fieldId == 27) { int odometer = buf.readIntLE(); int runhours = buf.readIntLE(); -- cgit v1.2.3 From 4ccd054983ecf633b5832738ee64199c6b6696ee Mon Sep 17 00:00:00 2001 From: jfunston83 Date: Sat, 26 Oct 2019 06:07:18 -0600 Subject: Update DmtProtocolDecoder.java --- src/main/java/org/traccar/protocol/DmtProtocolDecoder.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java b/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java index 79a80c0c8..56d242612 100644 --- a/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java @@ -189,19 +189,15 @@ public class DmtProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_STATUS, status); } else if (fieldId == 27) { - int odometer = buf.readIntLE(); - int runhours = buf.readIntLE(); - position.set("DeviceOdo", odometer); - position.set("DeviceRunHours", runhours); + position.set(Position.KEY_ODOMETER, buf.readUnsignedIntLE()); + position.set("DeviceRunTime", buf.readUnsignedIntLE()); } else if (fieldId == 26) { - int tripodometer = buf.readIntLE(); - int triprunhours = buf.readIntLE(); - position.set("TripOdo", tripodometer); - position.set("TripRunTime", triprunhours); + position.set(Position.KEY_ODOMETER_TRIP, buf.readUnsignedIntLE()); + position.set("TripRunTime", buf.readUnsignedIntLE()); } else if (fieldId == 6) { -- cgit v1.2.3 From ff65e0c1b1fa8da85e61d8d66f3cdd416b68088c Mon Sep 17 00:00:00 2001 From: jfunston83 Date: Sat, 26 Oct 2019 07:32:35 -0600 Subject: Update DmtProtocolDecoder.java --- src/main/java/org/traccar/protocol/DmtProtocolDecoder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java b/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java index 56d242612..1dfa6bcd7 100644 --- a/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java @@ -187,7 +187,7 @@ public class DmtProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_INPUT, input); position.set(Position.KEY_OUTPUT, output); position.set(Position.KEY_STATUS, status); - + } else if (fieldId == 27) { position.set(Position.KEY_ODOMETER, buf.readUnsignedIntLE()); @@ -197,7 +197,7 @@ public class DmtProtocolDecoder extends BaseProtocolDecoder { } else if (fieldId == 26) { position.set(Position.KEY_ODOMETER_TRIP, buf.readUnsignedIntLE()); - position.set("TripRunTime", buf.readUnsignedIntLE()); + position.set("TripRunTime", buf.readUnsignedIntLE()); } else if (fieldId == 6) { -- cgit v1.2.3 From b5814bb9a2bd9f29bda1ece1bd51ae0ad07c076d Mon Sep 17 00:00:00 2001 From: jfunston83 Date: Sat, 26 Oct 2019 16:09:40 -0600 Subject: Update DmtProtocolDecoder.java Fixed to use engine hours attribute. DMT devices send these values in seconds, converted to ms for the Hours values. --- src/main/java/org/traccar/protocol/DmtProtocolDecoder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java b/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java index 1dfa6bcd7..63c120eed 100644 --- a/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java @@ -191,13 +191,13 @@ public class DmtProtocolDecoder extends BaseProtocolDecoder { } else if (fieldId == 27) { position.set(Position.KEY_ODOMETER, buf.readUnsignedIntLE()); - position.set("DeviceRunTime", buf.readUnsignedIntLE()); + position.set(Position.KEY_HOURS, buf.readUnsignedIntLE() * 1000); } else if (fieldId == 26) { position.set(Position.KEY_ODOMETER_TRIP, buf.readUnsignedIntLE()); - position.set("TripRunTime", buf.readUnsignedIntLE()); + position.set("TripHours", buf.readUnsignedIntLE() * 1000); } else if (fieldId == 6) { -- cgit v1.2.3 From 1a2c46e6f3d95babd6c4f41f6e1a6f8700390352 Mon Sep 17 00:00:00 2001 From: jfunston83 Date: Sat, 26 Oct 2019 16:25:15 -0600 Subject: Update DmtProtocolDecoder.java --- .../org/traccar/protocol/DmtProtocolDecoder.java | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java b/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java index 63c120eed..c49f06d65 100644 --- a/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java @@ -188,17 +188,6 @@ public class DmtProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_OUTPUT, output); position.set(Position.KEY_STATUS, status); - } else if (fieldId == 27) { - - position.set(Position.KEY_ODOMETER, buf.readUnsignedIntLE()); - position.set(Position.KEY_HOURS, buf.readUnsignedIntLE() * 1000); - - - } else if (fieldId == 26) { - - position.set(Position.KEY_ODOMETER_TRIP, buf.readUnsignedIntLE()); - position.set("TripHours", buf.readUnsignedIntLE() * 1000); - } else if (fieldId == 6) { while (buf.readerIndex() < fieldEnd) { @@ -223,6 +212,16 @@ public class DmtProtocolDecoder extends BaseProtocolDecoder { } } + } else if (fieldId == 26) { + + position.set(Position.KEY_ODOMETER_TRIP, buf.readUnsignedIntLE()); + position.set("tripHours", buf.readUnsignedIntLE() * 1000); + + } else if (fieldId == 27) { + + position.set(Position.KEY_ODOMETER, buf.readUnsignedIntLE()); + position.set(Position.KEY_HOURS, buf.readUnsignedIntLE() * 1000); + } buf.readerIndex(fieldEnd); -- cgit v1.2.3