diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-08-05 08:50:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 08:50:20 +0300 |
| commit | e15f80a0eb5c57a90a98773e8d21ae20e98a8910 (patch) | |
| tree | 3d81f8c60ef3fe8adcd0064c01ab0695122baa8f /src/org/traccar/protocol/CarcellProtocolDecoder.java | |
| parent | 132fbb9bd658490ea77aae50e20257b680c3cceb (diff) | |
| parent | 791a010e5a449a27e8243b9bc98c918ffa054eac (diff) | |
| download | traccar-server-e15f80a0eb5c57a90a98773e8d21ae20e98a8910.tar.gz traccar-server-e15f80a0eb5c57a90a98773e8d21ae20e98a8910.tar.bz2 traccar-server-e15f80a0eb5c57a90a98773e8d21ae20e98a8910.zip | |
Merge pull request #2166 from Abyss777/alarms
Organized alarms in the first part of protocols
Diffstat (limited to 'src/org/traccar/protocol/CarcellProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/CarcellProtocolDecoder.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/CarcellProtocolDecoder.java b/src/org/traccar/protocol/CarcellProtocolDecoder.java index 7aacfa4d0..e9b6cdf28 100644 --- a/src/org/traccar/protocol/CarcellProtocolDecoder.java +++ b/src/org/traccar/protocol/CarcellProtocolDecoder.java @@ -143,7 +143,9 @@ public class CarcellProtocolDecoder extends BaseProtocolDecoder { parser.next(); // panic button status String painelStatus = parser.next(); - position.set(Position.KEY_ALARM, painelStatus.equals("1")); + if (painelStatus.equals("1")) { + position.set(Position.KEY_ALARM, Position.ALARM_GENERAL); + } position.set("painel", painelStatus.equals("2")); Double mainVoltage = parser.nextDouble() / 100d; |