aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/AquilaProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-05-22 17:59:22 +1200
committerGitHub <noreply@github.com>2017-05-22 17:59:22 +1200
commit5af130db6edcc25d89a8f84e55350644ba4797b3 (patch)
treed828de08c9c2f7cabf671f6d75ddda459af77507 /src/org/traccar/protocol/AquilaProtocolDecoder.java
parent0bafa34ebceba731aae2b45ae9e05c8f55b66b0e (diff)
parent152e8f2e494275b1259601560abc22bcb39502c3 (diff)
downloadtrackermap-server-5af130db6edcc25d89a8f84e55350644ba4797b3.tar.gz
trackermap-server-5af130db6edcc25d89a8f84e55350644ba4797b3.tar.bz2
trackermap-server-5af130db6edcc25d89a8f84e55350644ba4797b3.zip
Merge pull request #3178 from Abyss777/power_and_charge
Organize KEY_POWER and KEY_CHARGE
Diffstat (limited to 'src/org/traccar/protocol/AquilaProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/AquilaProtocolDecoder.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/AquilaProtocolDecoder.java b/src/org/traccar/protocol/AquilaProtocolDecoder.java
index 30f5667af..5ff974a7d 100644
--- a/src/org/traccar/protocol/AquilaProtocolDecoder.java
+++ b/src/org/traccar/protocol/AquilaProtocolDecoder.java
@@ -161,7 +161,7 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_FUEL_LEVEL, parser.nextInt());
position.set(Position.PREFIX_IN + 1, parser.next());
- position.set(Position.KEY_CHARGE, parser.next());
+ position.set(Position.KEY_CHARGE, parser.next().equals("1"));
position.set(Position.PREFIX_IN + 2, parser.next());
position.set(Position.KEY_IGNITION, parser.nextInt(0) == 1);
@@ -176,7 +176,7 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
position.setCourse(parser.nextInt(0));
- position.set(Position.KEY_CHARGE, parser.next());
+ position.set(Position.KEY_CHARGE, parser.next().equals("1"));
position.set(Position.KEY_IGNITION, parser.nextInt(0) == 1);
position.set(Position.KEY_POWER, parser.nextInt(0));
position.set(Position.KEY_BATTERY, parser.nextInt(0));
@@ -195,7 +195,7 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_HDOP, parser.nextDouble(0));
position.set(Position.PREFIX_ADC + 1, parser.nextInt(0));
position.set(Position.PREFIX_IN + 1, parser.nextInt(0));
- position.set(Position.KEY_CHARGE, parser.next());
+ position.set(Position.KEY_CHARGE, parser.next().equals("1"));
position.set(Position.PREFIX_IN + 2, parser.nextInt(0));
position.set(Position.KEY_IGNITION, parser.nextInt(0) == 1);
position.set(Position.KEY_POWER, parser.nextInt(0));