aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-12-07 15:08:51 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2017-12-07 15:08:51 +1300
commita07a7eaa97e972242b6c3d03b17669e4833d9825 (patch)
tree6276bbdd486c4a0a6dc7a65b23b216a67e496c06 /src
parent4d903ef0ef21cd6575ed9a55426b18f6b94e63ef (diff)
downloadtrackermap-server-a07a7eaa97e972242b6c3d03b17669e4833d9825.tar.gz
trackermap-server-a07a7eaa97e972242b6c3d03b17669e4833d9825.tar.bz2
trackermap-server-a07a7eaa97e972242b6c3d03b17669e4833d9825.zip
Minor T580w cleanup
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/protocol/Tk103FrameDecoder.java8
-rw-r--r--src/org/traccar/protocol/Tk103ProtocolDecoder.java5
2 files changed, 2 insertions, 11 deletions
diff --git a/src/org/traccar/protocol/Tk103FrameDecoder.java b/src/org/traccar/protocol/Tk103FrameDecoder.java
index e8e0325da..390e38906 100644
--- a/src/org/traccar/protocol/Tk103FrameDecoder.java
+++ b/src/org/traccar/protocol/Tk103FrameDecoder.java
@@ -25,9 +25,7 @@ public class Tk103FrameDecoder extends FrameDecoder {
@Override
protected Object decode(
- ChannelHandlerContext ctx,
- Channel channel,
- ChannelBuffer buf) throws Exception {
+ ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception {
if (buf.readableBytes() < 2) {
return null;
@@ -70,10 +68,8 @@ public class Tk103FrameDecoder extends FrameDecoder {
}
buf.readerIndex(frameStartIndex);
- ChannelBuffer result = buf.readBytes(frameEndIndex + 1 - frameStartIndex);
-
- return result;
+ return buf.readBytes(frameEndIndex + 1 - frameStartIndex);
}
}
diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java
index 7e2cb06cb..eda29e3f8 100644
--- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java
@@ -195,11 +195,6 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder {
case "DW60":
position.set(Position.KEY_ALARM, Position.ALARM_LOW_POWER);
break;
- case "ZC28":
- case "DW41":
- case "DW61":
- position.set(Position.KEY_ALARM, "badBattery");
- break;
default:
break;
}