diff options
| author | Abyss777 <abyss@fox5.ru> | 2016-08-11 08:27:11 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2016-08-11 08:27:11 +0500 |
| commit | 76420fb31d41a62bc0fe19e8fea63be374c67b61 (patch) | |
| tree | fa0eafe357ea4fb7961c3b81a531cd315d137086 /src | |
| parent | 40e26cbf38a236f3c92e50dff619b1a29bd413de (diff) | |
| download | trackermap-server-76420fb31d41a62bc0fe19e8fea63be374c67b61.tar.gz trackermap-server-76420fb31d41a62bc0fe19e8fea63be374c67b61.tar.bz2 trackermap-server-76420fb31d41a62bc0fe19e8fea63be374c67b61.zip | |
Changed KEY_IGNITION to boolean in 3 protocols
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/traccar/protocol/IdplProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Stl060ProtocolDecoder.java | 4 | ||||
| -rw-r--r-- | src/org/traccar/protocol/VisiontekProtocolDecoder.java | 2 |
3 files changed, 4 insertions, 4 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()); diff --git a/src/org/traccar/protocol/VisiontekProtocolDecoder.java b/src/org/traccar/protocol/VisiontekProtocolDecoder.java index bfd4a78fa..47a8b20cf 100644 --- a/src/org/traccar/protocol/VisiontekProtocolDecoder.java +++ b/src/org/traccar/protocol/VisiontekProtocolDecoder.java @@ -109,7 +109,7 @@ public class VisiontekProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_SATELLITES, parser.next()); position.set(Position.KEY_ODOMETER, parser.next()); - position.set(Position.KEY_IGNITION, parser.next()); + position.set(Position.KEY_IGNITION, parser.next().equals("1")); position.set(Position.PREFIX_IO + 1, parser.next()); position.set(Position.PREFIX_IO + 2, parser.next()); position.set("immobilizer", parser.next()); |