aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorK-J-Dod24 <kieran.dodson@complexus.uk>2023-05-05 14:29:50 +0100
committerK-J-Dod24 <kieran.dodson@complexus.uk>2023-05-05 14:29:50 +0100
commit445366d9a49fbee7a28a41e1f95423c07b54b725 (patch)
treebd28f2e212df22fd615fcc5e90424485fd38b86c /src/main/java
parent3dad196b882c031e4ed36536c3b2deeb1b3bbff6 (diff)
downloadtrackermap-server-445366d9a49fbee7a28a41e1f95423c07b54b725.tar.gz
trackermap-server-445366d9a49fbee7a28a41e1f95423c07b54b725.tar.bz2
trackermap-server-445366d9a49fbee7a28a41e1f95423c07b54b725.zip
io32 to coolant correcting io115 to engine temp
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/traccar/model/Position.java1
-rw-r--r--src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/model/Position.java b/src/main/java/org/traccar/model/Position.java
index 3ed340703..c48e34e03 100644
--- a/src/main/java/org/traccar/model/Position.java
+++ b/src/main/java/org/traccar/model/Position.java
@@ -81,6 +81,7 @@ public class Position extends Message {
public static final String KEY_ACCELERATION = "acceleration";
public static final String KEY_DEVICE_TEMP = "deviceTemp"; // celsius
public static final String KEY_COOLANT_TEMP = "coolantTemp"; // celsius
+ public static final String KEY_ENGINE_TEMP = "engineTemp"; // celsius
public static final String KEY_ENGINE_LOAD = "engineLoad";
public static final String KEY_OPERATOR = "operator";
public static final String KEY_COMMAND = "command";
diff --git a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
index 969b24297..3cb89d6f7 100644
--- a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -231,6 +231,7 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
register(26, null, (p, b) -> p.set("bleTemp2", b.readShort() * 0.01));
register(27, null, (p, b) -> p.set("bleTemp3", b.readShort() * 0.01));
register(28, null, (p, b) -> p.set("bleTemp4", b.readShort() * 0.01));
+ register(32, fmbXXX, (p, b) -> p.set(Position.KEY_COOLANT_TEMP, b.readByte()));
register(66, null, (p, b) -> p.set(Position.KEY_POWER, b.readUnsignedShort() * 0.001));
register(67, null, (p, b) -> p.set(Position.KEY_BATTERY, b.readUnsignedShort() * 0.001));
register(68, fmbXXX, (p, b) -> p.set("batteryCurrent", b.readUnsignedShort() * 0.001));
@@ -246,7 +247,7 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
});
register(80, fmbXXX, (p, b) -> p.set("dataMode", b.readUnsignedByte()));
register(90, null, (p, b) -> p.set(Position.KEY_DOOR, b.readUnsignedShort()));
- register(115, fmbXXX, (p, b) -> p.set(Position.KEY_COOLANT_TEMP, b.readShort() * 0.1));
+ register(115, fmbXXX, (p, b) -> p.set(Position.KEY_ENGINE_TEMP, b.readShort() * 0.1));
register(179, null, (p, b) -> p.set(Position.PREFIX_OUT + 1, b.readUnsignedByte() > 0));
register(180, null, (p, b) -> p.set(Position.PREFIX_OUT + 2, b.readUnsignedByte() > 0));
register(181, null, (p, b) -> p.set(Position.KEY_PDOP, b.readUnsignedShort() * 0.1));