diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-08-12 10:13:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-12 10:13:45 +0300 |
| commit | 5d3b7cbe5924d4a4552035626a83e26b1e756255 (patch) | |
| tree | 18c1caaba30f7bb9e6c21cce492d93a85ebc1c73 /src/org/traccar/protocol | |
| parent | 1f11fa7db020f8a46e4b298dc61277460d76b678 (diff) | |
| parent | 9a55f2b000956717d5caf6fb53793264c0376ce7 (diff) | |
| download | trackermap-server-5d3b7cbe5924d4a4552035626a83e26b1e756255.tar.gz trackermap-server-5d3b7cbe5924d4a4552035626a83e26b1e756255.tar.bz2 trackermap-server-5d3b7cbe5924d4a4552035626a83e26b1e756255.zip | |
Merge pull request #2206 from Abyss777/ignition
Ignition and Motor Hours
Diffstat (limited to 'src/org/traccar/protocol')
| -rw-r--r-- | src/org/traccar/protocol/IdplProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Stl060ProtocolDecoder.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/IdplProtocolDecoder.java b/src/org/traccar/protocol/IdplProtocolDecoder.java index b0d331e3e..5b8ec7897 100644 --- a/src/org/traccar/protocol/IdplProtocolDecoder.java +++ b/src/org/traccar/protocol/IdplProtocolDecoder.java @@ -100,7 +100,7 @@ public class IdplProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_ALARM, parser.nextInt()); parser.nextInt(); // body tamper parser.nextInt(); // ac status - position.set(Position.KEY_IGNITION, parser.nextInt()); + position.set(Position.KEY_IGNITION, parser.nextInt() == 1); position.set(Position.KEY_OUTPUT, parser.nextInt()); position.set(Position.PREFIX_ADC + 1, parser.nextInt()); position.set(Position.PREFIX_ADC + 2, parser.nextInt()); diff --git a/src/org/traccar/protocol/Stl060ProtocolDecoder.java b/src/org/traccar/protocol/Stl060ProtocolDecoder.java index b8eb5ed3d..86b097f77 100644 --- a/src/org/traccar/protocol/Stl060ProtocolDecoder.java +++ b/src/org/traccar/protocol/Stl060ProtocolDecoder.java @@ -98,7 +98,7 @@ public class Stl060ProtocolDecoder extends BaseProtocolDecoder { // Old format if (parser.hasNext(5)) { position.set(Position.KEY_ODOMETER, parser.nextInt()); - position.set(Position.KEY_IGNITION, parser.nextInt()); + position.set(Position.KEY_IGNITION, parser.nextInt() == 1); position.set(Position.KEY_INPUT, parser.nextInt() + parser.nextInt() << 1); position.set(Position.KEY_FUEL, parser.nextInt()); } @@ -106,7 +106,7 @@ public class Stl060ProtocolDecoder extends BaseProtocolDecoder { // New format if (parser.hasNext(10)) { position.set(Position.KEY_CHARGE, parser.nextInt() == 1); - position.set(Position.KEY_IGNITION, parser.nextInt()); + position.set(Position.KEY_IGNITION, parser.nextInt() == 1); position.set(Position.KEY_INPUT, parser.nextInt()); position.set(Position.KEY_RFID, parser.next()); position.set(Position.KEY_ODOMETER, parser.nextInt()); |