diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-05-09 15:00:50 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-05-09 15:00:50 +1200 |
| commit | 829a9456482797109d359bd5d65bc7bf747a35fc (patch) | |
| tree | dda4c96a2b25820a58396a596933366d5acfd328 /src/org | |
| parent | 4e44bf1fa20bf6ce41cc7e0eed9b79d079454f82 (diff) | |
| download | traccar-server-829a9456482797109d359bd5d65bc7bf747a35fc.tar.gz traccar-server-829a9456482797109d359bd5d65bc7bf747a35fc.tar.bz2 traccar-server-829a9456482797109d359bd5d65bc7bf747a35fc.zip | |
Fix GL200 FRI message decoding
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/traccar/protocol/Gl200ProtocolDecoder.java | 5 |
1 files changed, 3 insertions, 2 deletions
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() |