From 9d9778d13be1cef31c7891fc9519edfa54efdc2a Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 2 Feb 2019 00:31:18 -0800 Subject: Fix code issues --- src/org/traccar/protocol/CellocatorProtocolDecoder.java | 7 +------ src/org/traccar/protocol/FreematicsProtocolDecoder.java | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'src/org/traccar/protocol') diff --git a/src/org/traccar/protocol/CellocatorProtocolDecoder.java b/src/org/traccar/protocol/CellocatorProtocolDecoder.java index 453d8d7e7..d23f76a93 100644 --- a/src/org/traccar/protocol/CellocatorProtocolDecoder.java +++ b/src/org/traccar/protocol/CellocatorProtocolDecoder.java @@ -117,12 +117,7 @@ public class CellocatorProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_STATUS, buf.readUnsignedByte() & 0x0f); - if (alternative) { - buf.readUnsignedByte(); // configuration flags - } else { - buf.readUnsignedByte(); // operator - } - + buf.readUnsignedByte(); // operator / configuration flags buf.readUnsignedByte(); // reason data position.set(Position.KEY_ALARM, decodeAlarm(buf.readUnsignedByte())); diff --git a/src/org/traccar/protocol/FreematicsProtocolDecoder.java b/src/org/traccar/protocol/FreematicsProtocolDecoder.java index 866e0fd6e..ba47699c3 100644 --- a/src/org/traccar/protocol/FreematicsProtocolDecoder.java +++ b/src/org/traccar/protocol/FreematicsProtocolDecoder.java @@ -56,6 +56,7 @@ public class FreematicsProtocolDecoder extends BaseProtocolDecoder { break; case "EV": event = value; + break; case "TS": time = value; break; -- cgit v1.2.3