Implement GlobalSat commands

2 files changed, 65 insertions, 1 deletions

diff --git a/src/main/java/org/traccar/protocol/GlobalSatProtocol.java b/src/main/java/org/traccar/protocol/GlobalSatProtocol.java
index 7243be72a..e86b5dc30 100644
--- a/src/main/java/org/traccar/protocol/GlobalSatProtocol.java
+++ b/src/main/java/org/traccar/protocol/GlobalSatProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2020 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.
@@ -21,16 +21,22 @@ import org.traccar.BaseProtocol;
 import org.traccar.CharacterDelimiterFrameDecoder;
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
+import org.traccar.model.Command;
 
 public class GlobalSatProtocol extends BaseProtocol {
 
     public GlobalSatProtocol() {
+        setSupportedDataCommands(
+                Command.TYPE_CUSTOM,
+                Command.TYPE_ALARM_DISMISS,
+                Command.TYPE_OUTPUT_CONTROL);
         addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new CharacterDelimiterFrameDecoder(1024, "!\r\n", "!"));
                 pipeline.addLast(new StringEncoder());
                 pipeline.addLast(new StringDecoder());
+                pipeline.addLast(new GlobalSatProtocolEncoder(GlobalSatProtocol.this));
                 pipeline.addLast(new GlobalSatProtocolDecoder(GlobalSatProtocol.this));
             }
         });
diff --git a/src/main/java/org/traccar/protocol/GlobalSatProtocolEncoder.java b/src/main/java/org/traccar/protocol/GlobalSatProtocolEncoder.java
new file mode 100644
index 000000000..4f56274da
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/GlobalSatProtocolEncoder.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2020 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.Protocol;
+import org.traccar.StringProtocolEncoder;
+import org.traccar.helper.Checksum;
+import org.traccar.model.Command;
+
+public class GlobalSatProtocolEncoder extends StringProtocolEncoder {
+
+    public GlobalSatProtocolEncoder(Protocol protocol) {
+        super(protocol);
+    }
+
+    @Override
+    protected Object encodeCommand(Command command) {
+
+        String formattedCommand = null;
+
+        switch (command.getType()) {
+            case Command.TYPE_CUSTOM:
+                formattedCommand = formatCommand(
+                        command, "GSC,%s,%s", Command.KEY_UNIQUE_ID, Command.KEY_DATA);
+                break;
+            case Command.TYPE_ALARM_DISMISS:
+                formattedCommand = formatCommand(
+                        command, "GSC,%s,Na", Command.KEY_UNIQUE_ID);
+                break;
+            case Command.TYPE_OUTPUT_CONTROL:
+                formattedCommand = formatCommand(
+                        command, "GSC,%s,Lo(%s,%s)", Command.KEY_UNIQUE_ID, Command.KEY_INDEX, Command.KEY_DATA);
+                break;
+            default:
+                break;
+        }
+
+        if (formattedCommand != null) {
+            return formattedCommand + Checksum.nmea(formattedCommand) + '!';
+        } else {
+            return null;
+        }
+    }
+
+}