From 570bd4f7e2a4183b315242d05ce1ab342c30a973 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 20 May 2019 07:17:42 +0300
Subject: Add support for G sensor

---
 src/main/java/org/traccar/model/Position.java      |  1 +
 .../traccar/protocol/CastelProtocolDecoder.java    | 31 +++++++++++++++++++++-
 .../protocol/CastelProtocolDecoderTest.java        |  3 ---
 3 files changed, 31 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/main/java/org/traccar/model/Position.java b/src/main/java/org/traccar/model/Position.java
index 6032dc588..90444cc9f 100644
--- a/src/main/java/org/traccar/model/Position.java
+++ b/src/main/java/org/traccar/model/Position.java
@@ -82,6 +82,7 @@ public class Position extends Message {
     public static final String KEY_BLOCKED = "blocked";
     public static final String KEY_DOOR = "door";
     public static final String KEY_AXLE_WEIGHT = "axleWeight";
+    public static final String KEY_G_SENSOR = "gSensor";
 
     public static final String KEY_DTCS = "dtcs";
     public static final String KEY_OBD_SPEED = "obdSpeed"; // knots
diff --git a/src/main/java/org/traccar/protocol/CastelProtocolDecoder.java b/src/main/java/org/traccar/protocol/CastelProtocolDecoder.java
index 1f67b6a77..03e4b25fd 100644
--- a/src/main/java/org/traccar/protocol/CastelProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/CastelProtocolDecoder.java
@@ -292,6 +292,7 @@ public class CastelProtocolDecoder extends BaseProtocolDecoder {
             int version, ByteBuf id, short type, DeviceSession deviceSession) {
 
         Position position;
+        int count;
 
         switch (type) {
 
@@ -330,7 +331,7 @@ public class CastelProtocolDecoder extends BaseProtocolDecoder {
                 long status = buf.readUnsignedIntLE();
                 buf.skipBytes(8);
 
-                int count = buf.readUnsignedByte();
+                count = buf.readUnsignedByte();
 
                 List<Position> positions = new LinkedList<>();
 
@@ -380,6 +381,34 @@ public class CastelProtocolDecoder extends BaseProtocolDecoder {
 
                 return position;
 
+            case MSG_SC_G_SENSOR:
+                position = createPosition(deviceSession);
+
+                decodeStat(position, buf);
+
+                buf.readUnsignedShortLE(); // sample rate
+
+                count = buf.readUnsignedByte();
+
+                StringBuilder data = new StringBuilder("[");
+                for (int i = 0; i < count; i++) {
+                    if (i > 0) {
+                        data.append(",");
+                    }
+                    data.append("[");
+                    data.append(buf.readShortLE() * 0.015625);
+                    data.append(",");
+                    data.append(buf.readShortLE() * 0.015625);
+                    data.append(",");
+                    data.append(buf.readShortLE() * 0.015625);
+                    data.append("]");
+                }
+                data.append("]");
+
+                position.set(Position.KEY_G_SENSOR, data.toString());
+
+                return position;
+
             case MSG_SC_DTCS_PASSENGER:
                 position = createPosition(deviceSession);
 
diff --git a/src/test/java/org/traccar/protocol/CastelProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/CastelProtocolDecoderTest.java
index 570845c61..bb8d74b40 100644
--- a/src/test/java/org/traccar/protocol/CastelProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/CastelProtocolDecoderTest.java
@@ -13,9 +13,6 @@ public class CastelProtocolDecoderTest extends ProtocolTest {
         verifyAttributes(decoder, binary(
                 "404043000432313357503230313830303138323400000000004005f064d95c8365d95c9f2f0100c50200004006000000000000040003440068000000000100f3660d0a"));
 
-        verifyNull(decoder, binary(
-                "40409c020432313357503230313830303138323400000000004003f064d95c3b66d95c9f2f0100000d0000400600000000000004000345006800000000e80364f0ff3c00f4fff3ff3d00f4fff1ff3d00f4fff7ff3e00f4fffcff3f00f5fffcff3f00f5fffdff3f00f5fffdff3f00f5fffcff3f00f5fffeff3f00f3fffeff3e00f3fffdff3f00f5fffbff3f00f4fffbff3f00f5fffbff4000f5fffdff3e00f4fffdff4000f6fffeff4100f6ffffff3f00f5ffffff3f00f4ffffff3f00f5fffeff4000f5fffeff3f00f4fffcff3e00f5fff6ff3e00f5fff6ff3e00f5fff6ff3f00f6fff4ff3e00f5fff1ff3e00f5fff5ff3e00f5fff6ff3e00f6fff6ff3e00f3ffeeff3c00f1fff2ff3a00e9fff4ff3b00e9fff7ff3d00e5fff7ff3d00e4fff7ff3a00e1ff00003d00e9ff01003f00f4ff03004000f6ff02003f00f8ff00003f00f7ff00003f00fcfffeff4000f8fffeff4100f7ffffff4100f8fffeff3f00f5fffdff4000f6fffdff3b00f6fffdff4000f6fffdff3f00f4fffbff4400f5fffdff4500f3fffcff3d00f7fffcff3f00f5fffbff3f00fafffcff4100f5fffbff3c00f7fffaff3f00f8fffcff3e00f5fffbff3c00f4fffaff3f00f7fffbff4200f8fffcff3c00fefff9ff4000f4fff8ff3d00f3fffaff3d00f7fffbff3f00f7fffbff3c00f8fffaff3f00f6fffaff4100f5ff"));
-
         verifyAttributes(decoder, binary(
                 "40403a00043231335750323031373030363135360000000000a00200000100000101201100344a474446364545374a4230373632363056ff0d0a"));
 
-- 
cgit v1.2.3