Merge pull request #4 from traccar/master

upgrade to current master

1 files changed, 94 insertions, 9 deletions

diff --git a/src/org/traccar/protocol/Ivt401ProtocolDecoder.java b/src/org/traccar/protocol/Ivt401ProtocolDecoder.java
index f209ee09e..d2f1d3d69 100644
--- a/src/org/traccar/protocol/Ivt401ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Ivt401ProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2018 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.
@@ -43,7 +43,7 @@ public class Ivt401ProtocolDecoder extends BaseProtocolDecoder {
             .number("(d+),")                     // speed
             .number("(d+),")                     // course
             .number("(-?d+.?d*),")               // altitude
-            .number("(d+),")                     // satellites
+            .number("d+,")                       // satellites or battery status
             .number("(d),")                      // gps status
             .number("(d+),")                     // rssi
             .number("(d+),")                     // input
@@ -51,6 +51,30 @@ public class Ivt401ProtocolDecoder extends BaseProtocolDecoder {
             .number("(d+.d+),")                  // adc
             .number("(d+.d+),")                  // power
             .number("(d+.d+),")                  // battery
+            .number("(-?d+.?d*),")               // pcb temp
+            .expression("([^,]+),")              // temp
+            .number("(d+),")                     // movement
+            .number("(d+.d+),")                  // acceleration
+            .number("(-?d+),")                   // tilt
+            .number("(d+),")                     // trip
+            .number("(d+),")                     // odometer
+            .groupBegin()
+            .number("([01]),")                   // overspeed
+            .number("[01],")                     // input 2 misuse
+            .number("[01],")                     // immobilizer
+            .number("[01],")                     // temperature alert
+            .number("[0-2]+,")                   // geofence
+            .number("([0-3]),")                  // harsh driving
+            .number("[01],")                     // reconnect
+            .number("([01]),")                   // low battery
+            .number("([01]),")                   // power disconnected
+            .number("[01],")                     // gps failure
+            .number("([01]),")                   // towing
+            .number("[01],")                     // server unreachable
+            .number("[128],")                    // sleep mode
+            .expression("([^,]+)?,")             // driver id
+            .number("d+,")                       // sms count
+            .groupEnd("?")
             .any()
             .compile();
 
@@ -68,8 +92,7 @@ public class Ivt401ProtocolDecoder extends BaseProtocolDecoder {
             return null;
         }
 
-        Position position = new Position();
-        position.setProtocol(getProtocolName());
+        Position position = new Position(getProtocolName());
         position.setDeviceId(deviceSession.getDeviceId());
 
         position.setTime(parser.nextDateTime(Parser.DateTimeFormat.DMY_HMS));
@@ -79,17 +102,79 @@ public class Ivt401ProtocolDecoder extends BaseProtocolDecoder {
         position.setSpeed(UnitsConverter.knotsFromKph(parser.nextInt()));
         position.setCourse(parser.nextInt());
         position.setAltitude(parser.nextDouble());
-
-        position.set(Position.KEY_SATELLITES, parser.nextInt());
-
         position.setValid(parser.nextInt() > 0);
 
         position.set(Position.KEY_RSSI, parser.nextInt());
-        position.set(Position.KEY_INPUT, parser.nextBinInt());
-        position.set(Position.KEY_OUTPUT, parser.nextBinInt());
+
+        String input = parser.next();
+        for (int i = 0; i < input.length(); i++) {
+            int value = Character.getNumericValue(input.charAt(i));
+            if (value < 2) {
+                position.set(Position.PREFIX_IN + (i + 1), value > 0);
+            }
+        }
+
+        String output = parser.next();
+        for (int i = 0; i < output.length(); i++) {
+            position.set(Position.PREFIX_OUT + (i + 1), Character.getNumericValue(output.charAt(i)) > 0);
+        }
+
         position.set(Position.PREFIX_ADC + 1, parser.nextDouble());
         position.set(Position.KEY_POWER, parser.nextDouble());
         position.set(Position.KEY_BATTERY, parser.nextDouble());
+        position.set(Position.KEY_DEVICE_TEMP, parser.nextDouble());
+
+        String temp = parser.next();
+        if (temp.startsWith("M")) {
+            int index = 1;
+            int startIndex = 1;
+            int endIndex;
+            while (startIndex < temp.length()) {
+                endIndex = temp.indexOf('-', startIndex + 1);
+                if (endIndex < 0) {
+                    endIndex = temp.indexOf('+', startIndex + 1);
+                }
+                if (endIndex < 0) {
+                    endIndex = temp.length();
+                }
+                if (endIndex > 0) {
+                    double value = Double.parseDouble(temp.substring(startIndex, endIndex));
+                    position.set(Position.PREFIX_TEMP + index++, value);
+                }
+                startIndex = endIndex;
+            }
+        } else {
+            position.set(Position.PREFIX_TEMP + 1, Double.parseDouble(temp));
+        }
+
+        position.set(Position.KEY_MOTION, parser.nextInt() > 0);
+        position.set(Position.KEY_ACCELERATION, parser.nextDouble());
+
+        parser.nextInt(); // tilt
+        parser.nextInt(); // trip state
+
+        position.set(Position.KEY_ODOMETER, parser.nextLong());
+
+        if (parser.hasNext(6)) {
+            position.set(Position.KEY_ALARM, parser.nextInt() == 1 ? Position.ALARM_OVERSPEED : null);
+            switch (parser.nextInt()) {
+                case 1:
+                    position.set(Position.KEY_ALARM, Position.ALARM_ACCELERATION);
+                    break;
+                case 2:
+                    position.set(Position.KEY_ALARM, Position.ALARM_BRAKING);
+                    break;
+                case 3:
+                    position.set(Position.KEY_ALARM, Position.ALARM_CORNERING);
+                    break;
+                default:
+                    break;
+            }
+            position.set(Position.KEY_ALARM, parser.nextInt() == 1 ? Position.ALARM_LOW_BATTERY : null);
+            position.set(Position.KEY_ALARM, parser.nextInt() == 1 ? Position.ALARM_POWER_CUT : null);
+            position.set(Position.KEY_ALARM, parser.nextInt() == 1 ? Position.ALARM_TOW : null);
+            position.set(Position.KEY_DRIVER_UNIQUE_ID, parser.next());
+        }
 
         return position;
     }