aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/UlbotechProtocolDecoder.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-08-01 12:10:17 +0500
committerAbyss777 <abyss@fox5.ru>2016-08-01 12:10:17 +0500
commitc41c8edd7e4d275885cbef72212e553a2c86c9b4 (patch)
tree08740df9c0c871e0ad3dc52d7b84c76f18cc912b /src/org/traccar/protocol/UlbotechProtocolDecoder.java
parent20c2456a9df46eaef04c787ea5471bf31a71f93c (diff)
downloadtraccar-server-c41c8edd7e4d275885cbef72212e553a2c86c9b4.tar.gz
traccar-server-c41c8edd7e4d275885cbef72212e553a2c86c9b4.tar.bz2
traccar-server-c41c8edd7e4d275885cbef72212e553a2c86c9b4.zip
- Added a few more protocols
- Removed useless alarms - Optimizations
Diffstat (limited to 'src/org/traccar/protocol/UlbotechProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/UlbotechProtocolDecoder.java11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/org/traccar/protocol/UlbotechProtocolDecoder.java b/src/org/traccar/protocol/UlbotechProtocolDecoder.java
index 7abe9fb70..0cde5c0d4 100644
--- a/src/org/traccar/protocol/UlbotechProtocolDecoder.java
+++ b/src/org/traccar/protocol/UlbotechProtocolDecoder.java
@@ -134,12 +134,6 @@ public class UlbotechProtocolDecoder extends BaseProtocolDecoder {
if (BitUtil.check(alarm, 10)) {
return Position.ALARM_SOS;
}
- if (BitUtil.check(alarm, 11)) {
- return Position.ALARM_ODB;
- }
- if (BitUtil.check(alarm, 15)) {
- return Position.ALARM_POWER_LOW;
- }
return null;
}
@@ -209,10 +203,7 @@ public class UlbotechProtocolDecoder extends BaseProtocolDecoder {
int status = buf.readUnsignedShort();
position.set(Position.KEY_IGNITION, BitUtil.check(status, 9));
position.set(Position.KEY_STATUS, status);
- String alarm = decodeAlarm(buf.readUnsignedShort());
- if (alarm != null) {
- position.set(Position.KEY_ALARM, alarm);
- }
+ position.set(Position.KEY_ALARM, decodeAlarm(buf.readUnsignedShort()));
break;
case DATA_ODOMETER: