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/GlobalSatProtocolDecoder.java | |
| parent | f523e3b995f5f1895cf3dea700be34f4b74dccf9 (diff) | |
| parent | ab46ebf23066f91369b0d037f273bed1ea814d82 (diff) | |
| download | trackermap-server-6879624fd6290eea9a7f45047ba089ee1435d3ce.tar.gz trackermap-server-6879624fd6290eea9a7f45047ba089ee1435d3ce.tar.bz2 trackermap-server-6879624fd6290eea9a7f45047ba089ee1435d3ce.zip | |
Merge pull request #3174 from Abyss777/battery_level
Adjust battery and batteryLevel type
Diffstat (limited to 'src/org/traccar/protocol/GlobalSatProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/GlobalSatProtocolDecoder.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/GlobalSatProtocolDecoder.java b/src/org/traccar/protocol/GlobalSatProtocolDecoder.java index 4357c93dc..317a253ec 100644 --- a/src/org/traccar/protocol/GlobalSatProtocolDecoder.java +++ b/src/org/traccar/protocol/GlobalSatProtocolDecoder.java @@ -165,7 +165,12 @@ public class GlobalSatProtocolDecoder extends BaseProtocolDecoder { position.setCourse(Double.parseDouble(value)); break; case 'N': - position.set(Position.KEY_BATTERY, value); + if (value.endsWith("mV")) { + position.set(Position.KEY_BATTERY, + Integer.parseInt(value.substring(0, value.length() - 2)) / 1000.0); + } else { + position.set(Position.KEY_BATTERY_LEVEL, Integer.parseInt(value)); + } break; default: // Unsupported |