Decode additional Atrack parameters

1 files changed, 11 insertions, 1 deletions

diff --git a/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java
index 71bb6791c..c018b2651 100644
--- a/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java
@@ -84,6 +84,10 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
         this.custom = custom;
     }
 
+    public void setForm(String form) {
+        this.form = form;
+    }
+
     private static void sendResponse(Channel channel, SocketAddress remoteAddress, long rawId, int index) {
         if (channel != null) {
             ByteBuf response = Unpooled.buffer(12);
@@ -167,6 +171,12 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
                 case "AV1":
                     position.set(Position.PREFIX_ADC + 1, Integer.parseInt(values[i]));
                     break;
+                case "CD":
+                    position.set(Position.KEY_ICCID, values[i]);
+                    break;
+                case "EH":
+                    position.set(Position.KEY_HOURS, UnitsConverter.msFromHours(Integer.parseInt(values[i])));
+                    break;
                 default:
                     break;
             }
@@ -274,7 +284,7 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
                     buf.readUnsignedByte(); // pending code status
                     break;
                 case "CD":
-                    readString(buf); // sim cid
+                    position.set(Position.KEY_ICCID, readString(buf));
                     break;
                 case "CM":
                     buf.readLong(); // imsi