feat: Totem - basic support for SMS and GPRS commands

3 files changed, 77 insertions, 27 deletions

diff --git a/src/main/java/org/traccar/protocol/TotemProtocol.java b/src/main/java/org/traccar/protocol/TotemProtocol.java
index 7cf30475b..ecf7c858a 100644
--- a/src/main/java/org/traccar/protocol/TotemProtocol.java
+++ b/src/main/java/org/traccar/protocol/TotemProtocol.java
@@ -25,7 +25,7 @@ import org.traccar.model.Command;
 public class TotemProtocol extends BaseProtocol {
 
     public TotemProtocol() {
-        setSupportedDataCommands(
+        String[] supportedCommands = new String[]{
                 Command.TYPE_CUSTOM,
                 Command.TYPE_REBOOT_DEVICE,
                 Command.TYPE_FACTORY_RESET,
@@ -33,7 +33,12 @@ public class TotemProtocol extends BaseProtocol {
                 Command.TYPE_POSITION_SINGLE,
                 Command.TYPE_ENGINE_RESUME,
                 Command.TYPE_ENGINE_STOP
-        );
+        };
+        setSupportedDataCommands(supportedCommands);
+
+        setTextCommandEncoder(new TotemProtocolSmsEncoder(this));
+        setSupportedTextCommands(supportedCommands);
+
         addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
diff --git a/src/main/java/org/traccar/protocol/TotemProtocolEncoder.java b/src/main/java/org/traccar/protocol/TotemProtocolEncoder.java
index 4717c3920..ab2584e9e 100644
--- a/src/main/java/org/traccar/protocol/TotemProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/TotemProtocolEncoder.java
@@ -1,12 +1,11 @@
 /*
- * Copyright 2015 Irving Gonzalez
- * Copyright 2015 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2019 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
+ *     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,
@@ -16,40 +15,27 @@
  */
 package org.traccar.protocol;
 
-import org.traccar.StringProtocolEncoder;
 import org.traccar.model.Command;
 import org.traccar.Protocol;
+import org.traccar.helper.Checksum;
 
-public class TotemProtocolEncoder extends StringProtocolEncoder {
+public class TotemProtocolEncoder extends TotemProtocolSmsEncoder {
 
     public TotemProtocolEncoder(Protocol protocol) {
         super(protocol);
     }
 
+    private String encodeCommand(String commandString) {
+        String builtCommand = String.format("$$%04dCF%s", 10 + commandString.getBytes().length, commandString);
+        return String.format("%s%02X", builtCommand, Checksum.xor(builtCommand));
+    }
+
     @Override
-    protected Object encodeCommand(Command command) {
+    protected String encodeCommand(Command command) {
 
         initDevicePassword(command, "000000");
 
-        switch (command.getType()) {
-            case Command.TYPE_CUSTOM:
-                return formatCommand(command, "*%s,%s#", Command.KEY_DEVICE_PASSWORD, Command.KEY_DATA);
-            case Command.TYPE_REBOOT_DEVICE:
-                return formatCommand(command, "*%s,006#", Command.KEY_DEVICE_PASSWORD);
-            case Command.TYPE_FACTORY_RESET:
-                return formatCommand(command, "*%s,007#", Command.KEY_DEVICE_PASSWORD);
-            case Command.TYPE_GET_VERSION:
-                return formatCommand(command, "*%s,056#", Command.KEY_DEVICE_PASSWORD);
-            case Command.TYPE_POSITION_SINGLE:
-                return formatCommand(command, "*%s,012#", Command.KEY_DEVICE_PASSWORD);
-            // Assuming PIN 8 (Output C) is the power wire, like manual says but it can be PIN 5,7,8
-            case Command.TYPE_ENGINE_STOP:
-                return formatCommand(command, "*%s,025,C,1#", Command.KEY_DEVICE_PASSWORD);
-            case Command.TYPE_ENGINE_RESUME:
-                return formatCommand(command, "*%s,025,C,0#", Command.KEY_DEVICE_PASSWORD);
-            default:
-                return null;
-        }
+        return encodeCommand(super.getCommandString(command));
     }
 
 }
diff --git a/src/main/java/org/traccar/protocol/TotemProtocolSmsEncoder.java b/src/main/java/org/traccar/protocol/TotemProtocolSmsEncoder.java
new file mode 100644
index 000000000..2384b9730
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/TotemProtocolSmsEncoder.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015 Irving Gonzalez
+ * Copyright 2015 - 2019 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.StringProtocolEncoder;
+import org.traccar.model.Command;
+import org.traccar.Protocol;
+
+public class TotemProtocolSmsEncoder extends StringProtocolEncoder {
+
+    public TotemProtocolSmsEncoder(Protocol protocol) {
+        super(protocol);
+    }
+
+    protected String getCommandString(Command command) {
+        switch (command.getType()) {
+            case Command.TYPE_CUSTOM:
+                return formatCommand(command, "%s,%s", Command.KEY_DEVICE_PASSWORD, Command.KEY_DATA);
+            case Command.TYPE_REBOOT_DEVICE:
+                return formatCommand(command, "%s,006", Command.KEY_DEVICE_PASSWORD);
+            case Command.TYPE_FACTORY_RESET:
+                return formatCommand(command, "%s,007", Command.KEY_DEVICE_PASSWORD);
+            case Command.TYPE_GET_VERSION:
+                return formatCommand(command, "%s,056", Command.KEY_DEVICE_PASSWORD);
+            case Command.TYPE_POSITION_SINGLE:
+                return formatCommand(command, "%s,012", Command.KEY_DEVICE_PASSWORD);
+            // Assuming PIN 8 (Output C) is the power wire, like manual says but it can be PIN 5,7,8
+            case Command.TYPE_ENGINE_STOP:
+                return formatCommand(command, "%s,025,C,1", Command.KEY_DEVICE_PASSWORD);
+            case Command.TYPE_ENGINE_RESUME:
+                return formatCommand(command, "%s,025,C,0", Command.KEY_DEVICE_PASSWORD);
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    protected String encodeCommand(Command command) {
+
+        initDevicePassword(command, "000000");
+
+        return String.format("*%s#", getCommandString(command));
+    }
+
+}