From 0f6a2399433c65b3b03c1f660e148cd1dd1436a7 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 4 Feb 2017 23:14:46 +1300
Subject: Extend GPS103 protocol decoder

---
 src/org/traccar/model/Position.java                 |  4 ++++
 src/org/traccar/protocol/Gps103ProtocolDecoder.java | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)

(limited to 'src/org')

diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index 6163227b3..a88e16804 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -93,6 +93,10 @@ public class Position extends Message {
     public static final String ALARM_JAMMING = "jamming";
     public static final String ALARM_TEMPERATURE = "temperature";
     public static final String ALARM_PARKING = "parking";
+    public static final String ALARM_SHOCK = "shock";
+    public static final String ALARM_BONNET = "bonnet";
+    public static final String ALARM_FOOT_BRAKE = "footBrake";
+    public static final String ALARM_OIL_LEAK = "oilLeak";
 
     private String protocol;
 
diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
index 0320f785f..2f8fe4bba 100644
--- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
@@ -102,6 +102,11 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
             .compile();
 
     private String decodeAlarm(String value) {
+        if (value.startsWith("T:")) {
+            return Position.ALARM_TEMPERATURE;
+        } else if (value.startsWith("oil")) {
+            return Position.ALARM_OIL_LEAK;
+        }
         switch (value) {
             case "tracker":
                 return null;
@@ -123,6 +128,16 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
                 return Position.ALARM_DOOR;
             case "ac alarm":
                 return Position.ALARM_POWER_CUT;
+            case "accident alarm":
+                return Position.ALARM_ACCIDENT;
+            case "sensor alarm":
+                return Position.ALARM_SHOCK;
+            case "bonnet alarm":
+                return Position.ALARM_BONNET;
+            case "footbrake alarm":
+                return Position.ALARM_FOOT_BRAKE;
+            case "DTC":
+                return Position.ALARM_FAULT;
             default:
                 return null;
         }
@@ -232,6 +247,10 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
             position.set(Position.KEY_IGNITION, true);
         } else if (alarm.equals("acc off")) {
             position.set(Position.KEY_IGNITION, false);
+        } else if (alarm.startsWith("T:")) {
+            position.set(Position.PREFIX_TEMP + 1, alarm.substring(2));
+        } else if (alarm.startsWith("oil ")) {
+            position.set("oil", alarm.substring(4));
         }
 
         DateBuilder dateBuilder = new DateBuilder()
-- 
cgit v1.2.3