diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-05-20 11:18:17 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-20 11:18:17 +1200 |
| commit | 6879624fd6290eea9a7f45047ba089ee1435d3ce (patch) | |
| tree | 5e7de0a5669fb22af0bd3d2b70a5847113d37f80 /src/org/traccar/protocol/Jt600ProtocolDecoder.java | |
| parent | f523e3b995f5f1895cf3dea700be34f4b74dccf9 (diff) | |
| parent | ab46ebf23066f91369b0d037f273bed1ea814d82 (diff) | |
| download | traccar-server-6879624fd6290eea9a7f45047ba089ee1435d3ce.tar.gz traccar-server-6879624fd6290eea9a7f45047ba089ee1435d3ce.tar.bz2 traccar-server-6879624fd6290eea9a7f45047ba089ee1435d3ce.zip | |
Merge pull request #3174 from Abyss777/battery_level
Adjust battery and batteryLevel type
Diffstat (limited to 'src/org/traccar/protocol/Jt600ProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/Jt600ProtocolDecoder.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/Jt600ProtocolDecoder.java b/src/org/traccar/protocol/Jt600ProtocolDecoder.java index ef20a9534..2bd02d3f1 100644 --- a/src/org/traccar/protocol/Jt600ProtocolDecoder.java +++ b/src/org/traccar/protocol/Jt600ProtocolDecoder.java @@ -107,7 +107,7 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder { if (battery == 0xff) { position.set(Position.KEY_CHARGE, true); } else { - position.set(Position.KEY_BATTERY, battery + "%"); + position.set(Position.KEY_BATTERY_LEVEL, battery); } CellTower cellTower = CellTower.fromCidLac(buf.readUnsignedShort(), buf.readUnsignedShort()); @@ -218,7 +218,7 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder { .number("(d+.?d*),") // speed .number("(d+),") // course .number("(d+),") // satellites - .number("(d+%),") // battery + .number("(d+)%,") // battery .expression("([01]+),") // status .number("(d+),") // cid .number("(d+),") // lac @@ -257,7 +257,7 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder { position.setCourse(parser.nextDouble(0)); position.set(Position.KEY_SATELLITES, parser.nextInt(0)); - position.set(Position.KEY_BATTERY, parser.next()); + position.set(Position.KEY_BATTERY_LEVEL, parser.nextInt(0)); position.set(Position.KEY_STATUS, parser.nextBinInt(0)); CellTower cellTower = CellTower.fromCidLac(parser.nextInt(0), parser.nextInt(0)); |