aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2023-10-30 07:39:56 -0700
committerAnton Tananaev <anton@traccar.org>2023-10-30 07:39:56 -0700
commitecd06b48972f6f7390c4b133e1244a7f8f61f844 (patch)
tree8123d439edfab20821e8027cc9557bfb90ad97c6 /src/main
parent1db5f2aac51279c65ff2b983923452c6f4bad4e9 (diff)
downloadtrackermap-server-ecd06b48972f6f7390c4b133e1244a7f8f61f844.tar.gz
trackermap-server-ecd06b48972f6f7390c4b133e1244a7f8f61f844.tar.bz2
trackermap-server-ecd06b48972f6f7390c4b133e1244a7f8f61f844.zip
OBD speed in km/h units
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java2
-rw-r--r--src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java2
-rw-r--r--src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java4
-rw-r--r--src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java2
-rw-r--r--src/main/java/org/traccar/protocol/Xt2400ProtocolDecoder.java2
5 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java b/src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java
index 4d8e7e7ea..d0402cc94 100644
--- a/src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java
@@ -165,7 +165,7 @@ public class FreematicsProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_RPM, Integer.parseInt(value));
break;
case 0x10d:
- position.set(Position.KEY_OBD_SPEED, UnitsConverter.knotsFromKph(Integer.parseInt(value)));
+ position.set(Position.KEY_OBD_SPEED, Integer.parseInt(value));
break;
case 0x111:
position.set(Position.KEY_THROTTLE, Integer.parseInt(value));
diff --git a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
index 911af8d73..530ab836a 100644
--- a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
@@ -422,7 +422,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_RPM, Integer.parseInt(values[index - 1]));
}
if (BitUtil.check(reportMask, 4) && !values[index++].isEmpty()) {
- position.set(Position.KEY_OBD_SPEED, UnitsConverter.knotsFromKph(Integer.parseInt(values[index - 1])));
+ position.set(Position.KEY_OBD_SPEED, Integer.parseInt(values[index - 1]));
}
if (BitUtil.check(reportMask, 6) && !values[index++].isEmpty()) {
position.set(Position.KEY_COOLANT_TEMP, Integer.parseInt(values[index - 1]));
diff --git a/src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java b/src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java
index ffcaa0c6c..cd7ffa0e1 100644
--- a/src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java
@@ -375,9 +375,7 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder {
break;
case 69:
value = buf.readUnsignedByte();
- position.set(
- Position.KEY_OBD_SPEED,
- (value != 0xFF) ? UnitsConverter.knotsFromKph(value) : null);
+ position.set(Position.KEY_OBD_SPEED, (value != 0xFF) ? value : null);
break;
case 78:
case 79:
diff --git a/src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java b/src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java
index d4f9808ae..cde626c5f 100644
--- a/src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java
@@ -150,7 +150,7 @@ public class RuptelaProtocolDecoder extends BaseProtocolDecoder {
}
break;
case 95:
- position.set(Position.KEY_OBD_SPEED, UnitsConverter.knotsFromKph(readValue(buf, length, true)));
+ position.set(Position.KEY_OBD_SPEED, readValue(buf, length, true));
break;
case 134:
if (readValue(buf, length, false) > 0) {
diff --git a/src/main/java/org/traccar/protocol/Xt2400ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Xt2400ProtocolDecoder.java
index edcb3f535..11f9e0654 100644
--- a/src/main/java/org/traccar/protocol/Xt2400ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Xt2400ProtocolDecoder.java
@@ -177,7 +177,7 @@ public class Xt2400ProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_POWER, buf.readUnsignedByte() * 0.1);
break;
case 0x57:
- position.set(Position.KEY_OBD_SPEED, UnitsConverter.knotsFromKph(buf.readUnsignedShort()));
+ position.set(Position.KEY_OBD_SPEED, buf.readUnsignedShort());
break;
case 0x65:
position.set(Position.KEY_VIN, buf.readSlice(17).toString(StandardCharsets.US_ASCII));