aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/MegastekProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-05-23 19:30:43 +1200
committerGitHub <noreply@github.com>2017-05-23 19:30:43 +1200
commit284f2835b4ab9a1a921eb431c2884eeed897dea8 (patch)
treec72d90fded2d7009780c1ed126c49e26ced5217b /src/org/traccar/protocol/MegastekProtocolDecoder.java
parent219b64963ab0a4251e6b9a648d4b06fc81293bab (diff)
parenta88bd71e0245e8d2b9e9c9fc8c69304682449073 (diff)
downloadtrackermap-server-284f2835b4ab9a1a921eb431c2884eeed897dea8.tar.gz
trackermap-server-284f2835b4ab9a1a921eb431c2884eeed897dea8.tar.bz2
trackermap-server-284f2835b4ab9a1a921eb431c2884eeed897dea8.zip
Merge pull request #3181 from Abyss777/sat_and_rssi
Organize satellites and RSSI values
Diffstat (limited to 'src/org/traccar/protocol/MegastekProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/MegastekProtocolDecoder.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/MegastekProtocolDecoder.java b/src/org/traccar/protocol/MegastekProtocolDecoder.java
index 3501dce67..15a384cc0 100644
--- a/src/org/traccar/protocol/MegastekProtocolDecoder.java
+++ b/src/org/traccar/protocol/MegastekProtocolDecoder.java
@@ -166,11 +166,17 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder {
}
position.setDeviceId(deviceSession.getDeviceId());
- position.set(Position.KEY_SATELLITES, parser.next());
+ String sat = parser.next();
+ if (sat.contains("/")) {
+ position.set(Position.KEY_SATELLITES, Integer.parseInt(sat.split("/")[0]));
+ position.set(Position.KEY_SATELLITES_VISIBLE, Integer.parseInt(sat.split("/")[1]));
+ } else {
+ position.set(Position.KEY_SATELLITES, Integer.parseInt(sat));
+ }
position.setAltitude(parser.nextDouble(0));
- position.set(Position.KEY_POWER, parser.nextDouble(0));
+ position.set(Position.KEY_BATTERY_LEVEL, parser.nextDouble(0));
String charger = parser.next();
if (charger != null) {
@@ -206,7 +212,7 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder {
position.setNetwork(new Network(CellTower.from(parser.nextInt(0), parser.nextInt(0),
parser.nextHexInt(0), parser.nextHexInt(0), parser.nextInt(0))));
- position.set(Position.KEY_BATTERY, Double.parseDouble(parser.next()));
+ position.set(Position.KEY_BATTERY_LEVEL, parser.nextDouble());
position.set(Position.KEY_FLAGS, parser.next());
position.set(Position.KEY_INPUT, parser.next());