aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/model/Event.java1
-rw-r--r--src/org/traccar/protocol/Gps103ProtocolDecoder.java10
2 files changed, 6 insertions, 5 deletions
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 1781bcee4..8f5678dff 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -75,6 +75,7 @@ public abstract class Event {
public static final String KEY_IGNITION = "ignition";
public static final String KEY_FLAGS = "flags";
public static final String KEY_CHARGE = "charge";
+ public static final String KEY_IP = "ip";
// Starts with 1 not 0
public static final String PREFIX_TEMP = "temp";
diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
index 38e6ec834..60714fbcf 100644
--- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
@@ -52,11 +52,11 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
"(\\d+\\.?\\d*)?,?" + // Speed
"(\\d+\\.?\\d*)?,?" + // Course
"(\\d+\\.?\\d*)?,?" + // Altitude
- "([^,]+)?,?" +
- "([^,]+)?,?" +
- "([^,]+)?,?" +
- "([^,]+)?,?" +
- "([^,]+)?,?" +
+ "([^,;]+)?,?" +
+ "([^,;]+)?,?" +
+ "([^,;]+)?,?" +
+ "([^,;]+)?,?" +
+ "([^,;]+)?,?" +
".*");
@Override