3 files changed, 92 insertions, 0 deletions
diff --git a/src/org/traccar/protocol/PretraceProtocol.java b/src/org/traccar/protocol/PretraceProtocol.java
index 456807c1b..811c387f6 100644
--- a/src/org/traccar/protocol/PretraceProtocol.java
+++ b/src/org/traccar/protocol/PretraceProtocol.java
@@ -21,6 +21,7 @@ import org.traccar.BaseProtocol;
 import org.traccar.CharacterDelimiterFrameDecoder;
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
+import org.traccar.model.Command;
 
 import java.util.List;
 
@@ -28,6 +29,9 @@ public class PretraceProtocol extends BaseProtocol {
 
     public PretraceProtocol() {
         super("pretrace");
+        setSupportedDataCommands(
+                Command.TYPE_CUSTOM,
+                Command.TYPE_POSITION_PERIODIC);
     }
 
     @Override
@@ -38,6 +42,7 @@ public class PretraceProtocol extends BaseProtocol {
                 pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, ')'));
                 pipeline.addLast("stringEncoder", new StringEncoder());
                 pipeline.addLast("stringDecoder", new StringDecoder());
+                pipeline.addLast("objectEncoder", new PretraceProtocolEncoder());
                 pipeline.addLast("objectDecoder", new PretraceProtocolDecoder(PretraceProtocol.this));
             }
         });
diff --git a/src/org/traccar/protocol/PretraceProtocolEncoder.java b/src/org/traccar/protocol/PretraceProtocolEncoder.java
new file mode 100644
index 000000000..e8e2f66c7
--- /dev/null
+++ b/src/org/traccar/protocol/PretraceProtocolEncoder.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ *
+ * 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.traccar.BaseProtocolEncoder;
+import org.traccar.Context;
+import org.traccar.helper.Checksum;
+import org.traccar.helper.Log;
+import org.traccar.model.Command;
+
+public class PretraceProtocolEncoder extends BaseProtocolEncoder {
+
+    private String formatCommand(String uniqueId, String data) {
+        String content = uniqueId + data;
+        return String.format("(%s^%02X)", content, Checksum.xor(content));
+    }
+
+    @Override
+    protected Object encodeCommand(Command command) {
+
+        String uniqueId = Context.getIdentityManager().getById(command.getDeviceId()).getUniqueId();
+
+        switch (command.getType()) {
+            case Command.TYPE_CUSTOM:
+                return formatCommand(uniqueId, command.getString(Command.KEY_DATA));
+            case Command.TYPE_POSITION_PERIODIC:
+                return formatCommand(
+                        uniqueId, String.format("D221%1$d,%1$d,,", command.getInteger(Command.KEY_FREQUENCY)));
+            default:
+                Log.warning(new UnsupportedOperationException(command.getType()));
+                return null;
+        }
+    }
+
+}
diff --git a/test/org/traccar/protocol/PretraceProtocolEncoderTest.java b/test/org/traccar/protocol/PretraceProtocolEncoderTest.java
new file mode 100644
index 000000000..1b2780325
--- /dev/null
+++ b/test/org/traccar/protocol/PretraceProtocolEncoderTest.java
@@ -0,0 +1,39 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+import org.traccar.model.Command;
+
+import static org.junit.Assert.assertEquals;
+
+public class PretraceProtocolEncoderTest extends ProtocolTest {
+
+    @Test
+    public void testEncodePositionPeriodic() throws Exception {
+
+        PretraceProtocolEncoder encoder = new PretraceProtocolEncoder();
+        
+        Command command = new Command();
+        command.setDeviceId(1);
+        command.setType(Command.TYPE_POSITION_PERIODIC);
+        command.set(Command.KEY_FREQUENCY, 300);
+        
+        assertEquals("(123456789012345D221300,300,,^69)", encoder.encodeCommand(command));
+
+    }
+
+    @Test
+    public void testEncodeCustom() throws Exception {
+
+        PretraceProtocolEncoder encoder = new PretraceProtocolEncoder();
+
+        Command command = new Command();
+        command.setDeviceId(1);
+        command.setType(Command.TYPE_CUSTOM);
+        command.set(Command.KEY_DATA, "D21012");
+
+        assertEquals("(123456789012345D21012^44)", encoder.encodeCommand(command));
+
+    }
+
+}