aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/Gps103ProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-05-30 16:19:50 +1200
committerGitHub <noreply@github.com>2018-05-30 16:19:50 +1200
commit6464535a57284d3243e715ee424e39e5834596cb (patch)
tree319299aee3b1cab390547996ec08e3cfe6a40026 /src/org/traccar/protocol/Gps103ProtocolDecoder.java
parent6d9874c9980cad42df8f4b4f1e47e7efbeb300b1 (diff)
parent9c2830b50b667b188c844102dd9ed91fd487d386 (diff)
downloadtrackermap-server-6464535a57284d3243e715ee424e39e5834596cb.tar.gz
trackermap-server-6464535a57284d3243e715ee424e39e5834596cb.tar.bz2
trackermap-server-6464535a57284d3243e715ee424e39e5834596cb.zip
Merge pull request #3896 from Abyss777/engineHours_others
Store engine hours in milliseconds for the rest of protocols
Diffstat (limited to 'src/org/traccar/protocol/Gps103ProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/Gps103ProtocolDecoder.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
index 43481889a..3d31326ae 100644
--- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
@@ -21,6 +21,7 @@ import org.traccar.DeviceSession;
import org.traccar.helper.DateBuilder;
import org.traccar.helper.Parser;
import org.traccar.helper.PatternBuilder;
+import org.traccar.helper.UnitsConverter;
import org.traccar.model.CellTower;
import org.traccar.model.Network;
import org.traccar.model.Position;
@@ -253,7 +254,10 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_ODOMETER, parser.nextInt(0));
parser.nextDouble(0); // instant fuel consumption
position.set(Position.KEY_FUEL_CONSUMPTION, parser.nextDouble(0));
- position.set(Position.KEY_HOURS, parser.nextInt());
+ Integer hours = parser.nextInt();
+ if (hours != null) {
+ position.set(Position.KEY_HOURS, UnitsConverter.msFromHours(hours));
+ }
position.set(Position.KEY_OBD_SPEED, parser.nextInt(0));
position.set(Position.KEY_ENGINE_LOAD, parser.next());
position.set(Position.KEY_COOLANT_TEMP, parser.nextInt());