Implement GalileoSky protocol commands

4 files changed, 104 insertions, 1 deletions

diff --git a/src/org/traccar/helper/Checksum.java b/src/org/traccar/helper/Checksum.java
index f08292392..43ba6a689 100644
--- a/src/org/traccar/helper/Checksum.java
+++ b/src/org/traccar/helper/Checksum.java
@@ -131,6 +131,7 @@ public final class Checksum {
 
     // More info: http://reveng.sourceforge.net/crc-catalogue/16.htm
     public static final String CRC16_IBM = "IBM";
+    public static final String CRC16_MODBUS = "MODBUS";
     public static final String CRC16_X25 = "X-25";
     public static final String CRC16_CCITT_FALSE = "CCITT-FALSE";
     public static final String CRC16_KERMIT = "KERMIT";
@@ -159,6 +160,8 @@ public final class Checksum {
         switch (type) {
             case CRC16_IBM:
                 return crc16Reflected(buf, 0, CRC16_IBM_TABLE);
+            case CRC16_MODBUS:
+                return crc16Reflected(buf, 0xFFFF, CRC16_IBM_TABLE);
             case CRC16_X25:
                 return crc16Reflected(buf, 0xFFFF, CRC16_CCITT_TABLE_REVERSE) ^ 0xFFFF;
             case CRC16_CCITT_FALSE:
diff --git a/src/org/traccar/protocol/GalileoProtocol.java b/src/org/traccar/protocol/GalileoProtocol.java
index 11151e9ca..f76de04a0 100644
--- a/src/org/traccar/protocol/GalileoProtocol.java
+++ b/src/org/traccar/protocol/GalileoProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 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.
@@ -19,6 +19,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.nio.ByteOrder;
 import java.util.List;
@@ -27,6 +28,9 @@ public class GalileoProtocol extends BaseProtocol {
 
     public GalileoProtocol() {
         super("galileo");
+        setSupportedDataCommands(
+                Command.TYPE_CUSTOM,
+                Command.TYPE_OUTPUT_CONTROL);
     }
 
     @Override
@@ -35,6 +39,7 @@ public class GalileoProtocol extends BaseProtocol {
             @Override
             protected void addSpecificHandlers(ChannelPipeline pipeline) {
                 pipeline.addLast("frameDecoder", new GalileoFrameDecoder());
+                pipeline.addLast("objectEncoder", new GalileoProtocolEncoder());
                 pipeline.addLast("objectDecoder", new GalileoProtocolDecoder(GalileoProtocol.this));
             }
         };
diff --git a/src/org/traccar/protocol/GalileoProtocolEncoder.java b/src/org/traccar/protocol/GalileoProtocolEncoder.java
new file mode 100644
index 000000000..2890d0ca1
--- /dev/null
+++ b/src/org/traccar/protocol/GalileoProtocolEncoder.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2017 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.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.ByteOrder;
+import java.nio.charset.StandardCharsets;
+
+public class GalileoProtocolEncoder extends BaseProtocolEncoder {
+
+    private ChannelBuffer encodeText(String uniqueId, String text) {
+
+        ChannelBuffer buf = ChannelBuffers.dynamicBuffer(ByteOrder.LITTLE_ENDIAN, 256);
+
+        buf.writeByte(0x01);
+        buf.writeShort(uniqueId.length() + text.length() + 11); // TODO
+
+        buf.writeByte(0x03); // imei tag
+        buf.writeBytes(uniqueId.getBytes(StandardCharsets.US_ASCII));
+
+        buf.writeByte(0x04); // device id tag
+        buf.writeShort(0); // not needed if imei provided
+
+        buf.writeByte(0xE0); // index tag
+        buf.writeInt(0); // index
+
+        buf.writeByte(0xE1); // command text tag
+        buf.writeByte(text.length());
+        buf.writeBytes(text.getBytes(StandardCharsets.US_ASCII));
+
+        buf.writeShort(Checksum.crc16(Checksum.CRC16_MODBUS, buf.toByteBuffer(0, buf.writerIndex())));
+
+        return buf;
+    }
+
+    @Override
+    protected Object encodeCommand(Command command) {
+
+        switch (command.getType()) {
+            case Command.TYPE_CUSTOM:
+                return encodeText(getUniqueId(command.getId()), command.getString(Command.KEY_DATA));
+            case Command.TYPE_OUTPUT_CONTROL:
+                return encodeText(getUniqueId(command.getId()),
+                        "Out " + command.getInteger(Command.KEY_INDEX) + "," + command.getString(Command.KEY_DATA));
+            default:
+                Log.warning(new UnsupportedOperationException(command.getType()));
+                break;
+        }
+
+        return null;
+    }
+
+}
diff --git a/test/org/traccar/protocol/GalileoProtocolEncoderTest.java b/test/org/traccar/protocol/GalileoProtocolEncoderTest.java
new file mode 100644
index 000000000..34423578d
--- /dev/null
+++ b/test/org/traccar/protocol/GalileoProtocolEncoderTest.java
@@ -0,0 +1,23 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+import org.traccar.model.Command;
+
+public class GalileoProtocolEncoderTest extends ProtocolTest {
+
+    @Test
+    public void testEncode() throws Exception {
+
+        GalileoProtocolEncoder encoder = new GalileoProtocolEncoder();
+
+        Command command = new Command();
+        command.setDeviceId(1);
+        command.setType(Command.TYPE_CUSTOM);
+        command.set(Command.KEY_DATA, "status");
+
+        verifyCommand(encoder, command, binary("01200003313233343536373839303132333435040000e000000000e1067374617475731f64"));
+
+    }
+
+}