Merge pull request #5155 from seym45/gator-commands-engine

Add more commands for Gator protocol

3 files changed, 30 insertions, 4 deletions

diff --git a/src/main/java/org/traccar/protocol/GatorProtocol.java b/src/main/java/org/traccar/protocol/GatorProtocol.java
index c961093ab..d29ed9ce7 100644
--- a/src/main/java/org/traccar/protocol/GatorProtocol.java
+++ b/src/main/java/org/traccar/protocol/GatorProtocol.java
@@ -28,7 +28,12 @@ public class GatorProtocol extends BaseProtocol {
 
     @Inject
     public GatorProtocol(Config config) {
-        setSupportedDataCommands(Command.TYPE_POSITION_SINGLE);
+        setSupportedDataCommands(
+                Command.TYPE_POSITION_SINGLE,
+                Command.TYPE_ENGINE_RESUME,
+                Command.TYPE_ENGINE_STOP,
+                Command.TYPE_SET_SPEED_LIMIT,
+                Command.TYPE_SET_ODOMETER);
         addServer(new TrackerServer(config, getName(), false) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline, Config config) {
diff --git a/src/main/java/org/traccar/protocol/GatorProtocolDecoder.java b/src/main/java/org/traccar/protocol/GatorProtocolDecoder.java
index f7da5dc75..a9c620090 100644
--- a/src/main/java/org/traccar/protocol/GatorProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/GatorProtocolDecoder.java
@@ -38,6 +38,10 @@ public class GatorProtocolDecoder extends BaseProtocolDecoder {
 
     public static final int MSG_HEARTBEAT = 0x21;
     public static final int MSG_POSITION_REQUEST = 0x30;
+    public static final int MSG_OVERSPEED_ALARM = 0x3F;
+    public static final int MSG_RESET_MILEAGE = 0x6B;
+    public static final int MSG_RESTORE_OIL_DUCT = 0x38;
+    public static final int MSG_CLOSE_OIL_DUCT = 0x39;
     public static final int MSG_POSITION_DATA = 0x80;
     public static final int MSG_ROLLCALL_RESPONSE = 0x81;
     public static final int MSG_ALARM_DATA = 0x82;
diff --git a/src/main/java/org/traccar/protocol/GatorProtocolEncoder.java b/src/main/java/org/traccar/protocol/GatorProtocolEncoder.java
index 3d38b7455..6c6b9a54a 100644
--- a/src/main/java/org/traccar/protocol/GatorProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/GatorProtocolEncoder.java
@@ -43,18 +43,23 @@ public class GatorProtocolEncoder extends BaseProtocolEncoder {
         return buf;
     }
 
-    private ByteBuf encodeContent(long deviceId, int type) {
+    private ByteBuf encodeContent(long deviceId, int type, ByteBuf content) {
         ByteBuf buf = Unpooled.buffer();
 
         buf.writeByte(0x24);
         buf.writeByte(0x24);
         buf.writeByte(type);
         buf.writeByte(0x00);
-        buf.writeByte(4 + 1 + 1); // ip 4 bytes, checksum and end byte
+
+        buf.writeByte(4 + 1 + (content != null ? content.readableBytes() : 0) + 1); // length
 
         ByteBuf pseudoIPAddress = encodeId(deviceId);
         buf.writeBytes(pseudoIPAddress);
 
+        if (content != null) {
+            buf.writeBytes(content);
+        }
+
         int checksum = Checksum.xor(buf.nioBuffer());
         buf.writeByte(checksum);
 
@@ -66,9 +71,21 @@ public class GatorProtocolEncoder extends BaseProtocolEncoder {
     @Override
     protected Object encodeCommand(Command command) {
 
+        ByteBuf content = Unpooled.buffer();
+
         switch (command.getType()) {
             case Command.TYPE_POSITION_SINGLE:
-                return encodeContent(command.getDeviceId(), GatorProtocolDecoder.MSG_POSITION_REQUEST);
+                return encodeContent(command.getDeviceId(), GatorProtocolDecoder.MSG_POSITION_REQUEST, null);
+            case Command.TYPE_ENGINE_STOP:
+                return encodeContent(command.getDeviceId(), GatorProtocolDecoder.MSG_CLOSE_OIL_DUCT, null);
+            case Command.TYPE_ENGINE_RESUME:
+                return encodeContent(command.getDeviceId(), GatorProtocolDecoder.MSG_RESTORE_OIL_DUCT, null);
+            case Command.TYPE_SET_SPEED_LIMIT:
+                content.writeByte(command.getInteger(Command.KEY_DATA));
+                return encodeContent(command.getDeviceId(), GatorProtocolDecoder.MSG_RESET_MILEAGE, content);
+            case Command.TYPE_SET_ODOMETER:
+                content.writeShort(command.getInteger(Command.KEY_DATA));
+                return encodeContent(command.getDeviceId(), GatorProtocolDecoder.MSG_OVERSPEED_ALARM, content);
             default:
                 return null;
         }