aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorjon-stumpf <jon.stumpf@gmail.com>2017-03-04 22:59:00 -0500
committerjon-stumpf <jon.stumpf@gmail.com>2017-03-04 22:59:00 -0500
commit43e94cb2c59fb57a1eef5e9cbc63cd702a8dfab3 (patch)
tree3c67d08ad7b376be1295c45ea7b8b134d4a13847 /src/org
parentf7da653ee14f471cf3d482690e7c659297514ab9 (diff)
downloadtrackermap-server-43e94cb2c59fb57a1eef5e9cbc63cd702a8dfab3.tar.gz
trackermap-server-43e94cb2c59fb57a1eef5e9cbc63cd702a8dfab3.tar.bz2
trackermap-server-43e94cb2c59fb57a1eef5e9cbc63cd702a8dfab3.zip
Reverted processing of panic button status in CarcellProtocol;
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/CarcellProtocolDecoder.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/CarcellProtocolDecoder.java b/src/org/traccar/protocol/CarcellProtocolDecoder.java
index 70e99558e..3d1ceff2c 100644
--- a/src/org/traccar/protocol/CarcellProtocolDecoder.java
+++ b/src/org/traccar/protocol/CarcellProtocolDecoder.java
@@ -140,7 +140,7 @@ public class CarcellProtocolDecoder extends BaseProtocolDecoder {
if (parser.hasNext(4)) {
position.set("cloned", parser.next().equals("1"));
- position.set(Position.KEY_ALARM, parser.next());
+ parser.next(); // panic button status
String painelStatus = parser.next();
if (painelStatus.equals("1")) {
@@ -154,7 +154,7 @@ public class CarcellProtocolDecoder extends BaseProtocolDecoder {
if (parser.hasNext(5)) {
position.set("timeUntilDelivery", parser.nextInt());
- position.set(Position.KEY_ALARM, parser.next());
+ parser.next(); // panic button status
position.set(Position.KEY_INPUT, parser.next()); // aux
Double mainVoltage = parser.nextDouble() / 100d;