Updated protocols to record additional information as reported in comments and confirmed in available documentation;

1 files changed, 4 insertions, 4 deletions

diff --git a/src/org/traccar/protocol/CarcellProtocolDecoder.java b/src/org/traccar/protocol/CarcellProtocolDecoder.java
index 615115147..feec7a83c 100644
--- a/src/org/traccar/protocol/CarcellProtocolDecoder.java
+++ b/src/org/traccar/protocol/CarcellProtocolDecoder.java
@@ -127,7 +127,7 @@ public class CarcellProtocolDecoder extends BaseProtocolDecoder {
         position.set("jamming", parser.next().equals("1"));
         position.set(Position.KEY_GPS, parser.nextInt());
 
-        parser.next(); // clock type
+        position.set("clockType", parser.next()); // clock type
 
         DateBuilder dateBuilder = new DateBuilder().
                 setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt())
@@ -140,7 +140,7 @@ public class CarcellProtocolDecoder extends BaseProtocolDecoder {
         if (parser.hasNext(4)) {
             position.set("cloned", parser.next().equals("1"));
 
-            parser.next(); // panic button status
+            position.set(Position.KEY_ALARM, parser.next()); // panic button status
 
             String painelStatus = parser.next();
             if (painelStatus.equals("1")) {
@@ -154,8 +154,8 @@ public class CarcellProtocolDecoder extends BaseProtocolDecoder {
 
         if (parser.hasNext(5)) {
             position.set("timeUntilDelivery", parser.nextInt());
-            parser.next(); // panic button status
-            parser.next(); // aux
+            position.set(Position.KEY_ALARM, parser.next()); // panic button status
+            position.set(Position.KEY_INPUT, parser.next()); // aux
 
             Double mainVoltage = parser.nextDouble() / 100d;
             position.set(Position.KEY_POWER, mainVoltage);