From 829a9456482797109d359bd5d65bc7bf747a35fc Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 9 May 2016 15:00:50 +1200 Subject: Fix GL200 FRI message decoding --- src/org/traccar/protocol/Gl200ProtocolDecoder.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/org/traccar/protocol') diff --git a/src/org/traccar/protocol/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/Gl200ProtocolDecoder.java index 617f0f541..f1211f279 100644 --- a/src/org/traccar/protocol/Gl200ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gl200ProtocolDecoder.java @@ -396,8 +396,6 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder { position.set(Event.PREFIX_ADC + 1, parser.next()); position.set(Event.PREFIX_ADC + 2, parser.next()); position.set(Event.KEY_BATTERY, parser.next()); - position.set(Event.KEY_RPM, parser.next()); - position.set(Event.KEY_FUEL, parser.next()); if (parser.hasNext(3)) { int ignition = parser.nextInt(16); @@ -410,6 +408,9 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder { position.set(Event.KEY_OUTPUT, parser.nextInt(16)); } + position.set(Event.KEY_RPM, parser.next()); + position.set(Event.KEY_FUEL, parser.next()); + // workaround for wrong location time if (parser.hasNext(6)) { DateBuilder dateBuilder = new DateBuilder() -- cgit v1.2.3