aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-07-11 16:47:11 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-07-11 16:47:11 +1200
commit2cc6f2e4b4610ddc5aafd8b043ff86a86d57cc29 (patch)
tree5be5960b967f50a14f4aef9783124c08a2cf52f3
parent4421f18d004bc51c67007c1a3bab8c3e03930acc (diff)
downloadtrackermap-server-2cc6f2e4b4610ddc5aafd8b043ff86a86d57cc29.tar.gz
trackermap-server-2cc6f2e4b4610ddc5aafd8b043ff86a86d57cc29.tar.bz2
trackermap-server-2cc6f2e4b4610ddc5aafd8b043ff86a86d57cc29.zip
Implement Teltonika commands (fix #1948)
-rw-r--r--src/org/traccar/protocol/TeltonikaProtocol.java5
-rw-r--r--src/org/traccar/protocol/TeltonikaProtocolDecoder.java6
-rw-r--r--src/org/traccar/protocol/TeltonikaProtocolEncoder.java62
-rw-r--r--test/org/traccar/protocol/TeltonikaProtocolEncoderTest.java23
4 files changed, 93 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/TeltonikaProtocol.java b/src/org/traccar/protocol/TeltonikaProtocol.java
index f944c3003..5a550d4c0 100644
--- a/src/org/traccar/protocol/TeltonikaProtocol.java
+++ b/src/org/traccar/protocol/TeltonikaProtocol.java
@@ -20,6 +20,7 @@ import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.ChannelPipeline;
import org.traccar.BaseProtocol;
import org.traccar.TrackerServer;
+import org.traccar.model.Command;
import java.util.List;
@@ -27,6 +28,8 @@ public class TeltonikaProtocol extends BaseProtocol {
public TeltonikaProtocol() {
super("teltonika");
+ setSupportedCommands(
+ Command.TYPE_CUSTOM);
}
@Override
@@ -35,12 +38,14 @@ public class TeltonikaProtocol extends BaseProtocol {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
pipeline.addLast("frameDecoder", new TeltonikaFrameDecoder());
+ pipeline.addLast("objectEncoder", new TeltonikaProtocolEncoder());
pipeline.addLast("objectDecoder", new TeltonikaProtocolDecoder(TeltonikaProtocol.this));
}
});
serverList.add(new TrackerServer(new ConnectionlessBootstrap(), this.getName()) {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
+ pipeline.addLast("objectEncoder", new TeltonikaProtocolEncoder());
pipeline.addLast("objectDecoder", new TeltonikaProtocolDecoder(TeltonikaProtocol.this));
}
});
diff --git a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
index 1706a34a5..eb77cf350 100644
--- a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -52,9 +52,9 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
}
}
- private static final int CODEC_GH3000 = 0x07;
- private static final int CODEC_FM4X00 = 0x08;
- private static final int CODEC_12 = 0x0C;
+ public static final int CODEC_GH3000 = 0x07;
+ public static final int CODEC_FM4X00 = 0x08;
+ public static final int CODEC_12 = 0x0C;
private void decodeSerial(Position position, ChannelBuffer buf) {
diff --git a/src/org/traccar/protocol/TeltonikaProtocolEncoder.java b/src/org/traccar/protocol/TeltonikaProtocolEncoder.java
new file mode 100644
index 000000000..d91f7f7bf
--- /dev/null
+++ b/src/org/traccar/protocol/TeltonikaProtocolEncoder.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.traccar.BaseProtocolEncoder;
+import org.traccar.helper.Checksum;
+import org.traccar.helper.Log;
+import org.traccar.model.Command;
+
+import java.nio.charset.StandardCharsets;
+
+public class TeltonikaProtocolEncoder extends BaseProtocolEncoder {
+
+ private ChannelBuffer encodeContent(String content) {
+
+ ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
+
+ buf.writeInt(0);
+ buf.writeInt(content.length() + 10);
+ buf.writeByte(TeltonikaProtocolDecoder.CODEC_12);
+ buf.writeByte(1); // quantity
+ buf.writeByte(5); // type
+ buf.writeInt(content.length() + 2);
+ buf.writeBytes(content.getBytes(StandardCharsets.US_ASCII));
+ buf.writeByte('\r');
+ buf.writeByte('\n');
+ buf.writeByte(1); // quantity
+ buf.writeInt(Checksum.crc16(Checksum.CRC16_IBM, buf.toByteBuffer(8, buf.writerIndex() - 8)));
+
+ return buf;
+ }
+
+ @Override
+ protected Object encodeCommand(Command command) {
+
+ switch (command.getType()) {
+ case Command.TYPE_CUSTOM:
+ return encodeContent((String) command.getAttributes().get(Command.KEY_DATA));
+ default:
+ Log.warning(new UnsupportedOperationException(command.getType()));
+ break;
+ }
+
+ return null;
+ }
+
+}
diff --git a/test/org/traccar/protocol/TeltonikaProtocolEncoderTest.java b/test/org/traccar/protocol/TeltonikaProtocolEncoderTest.java
new file mode 100644
index 000000000..83ea961b4
--- /dev/null
+++ b/test/org/traccar/protocol/TeltonikaProtocolEncoderTest.java
@@ -0,0 +1,23 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+import org.traccar.model.Command;
+
+public class TeltonikaProtocolEncoderTest extends ProtocolTest {
+
+ @Test
+ public void testEncode() throws Exception {
+
+ TeltonikaProtocolEncoder encoder = new TeltonikaProtocolEncoder();
+
+ Command command = new Command();
+ command.setDeviceId(1);
+ command.setType(Command.TYPE_CUSTOM);
+ command.set(Command.KEY_DATA, "setdigout 11");
+
+ verifyCommand(encoder, command, binary("00000000000000160C01050000000E7365746469676F75742031310D0A010000E258"));
+
+ }
+
+}