diff options
| author | jose <joseantonio@grdar.es> | 2016-12-14 18:05:33 +0100 |
|---|---|---|
| committer | jose <joseantonio@grdar.es> | 2016-12-15 08:58:53 +0100 |
| commit | cd81e411f7d122628b255bfc2c1df3a7c9782066 (patch) | |
| tree | 5ef43b1c77edada2e056ffaf784af38986eedbe5 /src/org | |
| parent | fa90c985d9f569216ca4d7fa5d8be3421d9c1534 (diff) | |
| parent | fe5f1c363628d302fa56c2ac3dcd5197d135c0e0 (diff) | |
| download | traccar-server-cd81e411f7d122628b255bfc2c1df3a7c9782066.tar.gz traccar-server-cd81e411f7d122628b255bfc2c1df3a7c9782066.tar.bz2 traccar-server-cd81e411f7d122628b255bfc2c1df3a7c9782066.zip | |
Fix Meiligao Protocol to work with tk228
Style Issues
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/traccar/model/Position.java | 1 | ||||
| -rw-r--r-- | src/org/traccar/protocol/MeiligaoProtocolDecoder.java | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java index 3e8cb27bc..49a304df7 100644 --- a/src/org/traccar/model/Position.java +++ b/src/org/traccar/model/Position.java @@ -68,7 +68,6 @@ public class Position extends Message { public static final String KEY_OBD_DRIVING_RANGE = "drivingRange"; public static final String KEY_OBD_SINGLE_FUEL_CONSUMPTION = "singleFuelConsumption"; public static final String KEY_OBD_TOTAL_FUEL_CONSUMPTION = "totalFuelConsumption"; - public static final String KEY_OBD_CURRENT_ERROR = "currentError"; public static final String KEY_OBD_HARSH_ACCELERATION = "harshAcelerationNo"; public static final String KEY_OBD_HARSH_BREAK = "harshBreakerNo"; public static final String KEY_OBD_TOTAL_IGNITION = "totalIgnitionNo"; diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java index d3a3a2b3a..3d57eecfd 100644 --- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java +++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java @@ -114,11 +114,9 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder { public static final int MSG_SERVER = 0x0002; public static final int MSG_LOGIN = 0x5000; public static final int MSG_LOGIN_RESPONSE = 0x4000; - public static final int MSG_POSITION = 0x9955; public static final int MSG_POSITION_LOGGED = 0x9016; public static final int MSG_ALARM = 0x9999; - public static final int MSG_RFID = 0x9966; public static final int MSG_OBD_RT = 0x9901; @@ -302,7 +300,7 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_ODOMETER, parser.nextDouble()); position.set(Position.KEY_OBD_SINGLE_FUEL_CONSUMPTION, parser.nextDouble()); position.set(Position.KEY_OBD_TOTAL_FUEL_CONSUMPTION, parser.nextDouble()); - position.set(Position.KEY_OBD_CURRENT_ERROR, parser.nextInt()); + position.set(Position.KEY_DTCS, parser.nextInt()); position.set(Position.KEY_OBD_HARSH_ACCELERATION, parser.nextInt()); position.set(Position.KEY_OBD_HARSH_BREAK, parser.nextInt()); return position; |