Windy/traccar
1
0
Fork 0
mirror of https://github.com/traccar/traccar.git synced 2025-01-08 11:47:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't convert Castel OBD values

Browse Source
This commit is contained in:
Anton Tananaev 2016-09-20 21:21:06 +12:00
parent b14c80aff0
commit 411edf2fec
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/traccar/helper/ObdDecoder.java
View File

@ -44,7 +44,7 @@ public final class ObdDecoder {
case MODE_FREEZE_FRAME:
return decodeData(
Integer.parseInt(value.substring(0, 2), 16),
Integer.parseInt(value.substring(2), 16));
Integer.parseInt(value.substring(2), 16), true);
case MODE_CODES:
return decodeCodes(value);
default:
@ -84,22 +84,22 @@ public final class ObdDecoder {
}
}
public static Map.Entry<String, Object> decodeData(int pid, int value) {
public static Map.Entry<String, Object> decodeData(int pid, int value, boolean convert) {
switch (pid) {
case PID_ENGINE_LOAD:
return createEntry("engineLoad", value * 100 / 255);
return createEntry("engineLoad", convert ? value * 100 / 255 : value);
case PID_COOLANT_TEMPERATURE:
return createEntry("coolantTemperature", value - 40);
return createEntry("coolantTemperature", convert ? value - 40 : value);
case PID_ENGINE_RPM:
return createEntry(Position.KEY_RPM, value / 4);
return createEntry(Position.KEY_RPM, convert ? value / 4 : value);
case PID_VEHICLE_SPEED:
return createEntry(Position.KEY_OBD_SPEED, value);
case PID_THROTTLE_POSITION:
return createEntry("throttle", value * 100 / 255);
return createEntry("throttle", convert ? value * 100 / 255 : value);
case PID_MIL_DISTANCE:
return createEntry("milDistance", value);
case PID_FUEL_LEVEL:
return createEntry(Position.KEY_FUEL, value * 100 / 255);
return createEntry(Position.KEY_FUEL, convert ? value * 100 / 255 : value);
case PID_DISTANCE_CLEARED:
return createEntry("clearedDistance", value);
default:

2
src/org/traccar/protocol/CastelProtocolDecoder.java
View File

@ -167,7 +167,7 @@ public class CastelProtocolDecoder extends BaseProtocolDecoder {
value = 0;
break;
}
position.add(ObdDecoder.decodeData(pids[i], value));
position.add(ObdDecoder.decodeData(pids[i], value, false));
}
}