aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-02-26 14:59:02 +1300
committerGitHub <noreply@github.com>2017-02-26 14:59:02 +1300
commitaea5d9e8df58b37c937db87a272a9d92c64586f5 (patch)
treedda7693ba067874048c1a90c99b14e5ac75e77e8 /src/org/traccar/protocol/TeltonikaProtocolDecoder.java
parente4aa15f0eb0646d6158fd8386f8f9c5477db6bfe (diff)
parent7152670b20a40de809db57ae21acb73c5ad5bea5 (diff)
downloadtrackermap-server-aea5d9e8df58b37c937db87a272a9d92c64586f5.tar.gz
trackermap-server-aea5d9e8df58b37c937db87a272a9d92c64586f5.tar.bz2
trackermap-server-aea5d9e8df58b37c937db87a272a9d92c64586f5.zip
Merge pull request #2951 from jon-stumpf/jss-celltower
CellTowers and capturing additional protocol information
Diffstat (limited to 'src/org/traccar/protocol/TeltonikaProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/TeltonikaProtocolDecoder.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
index 203f62f87..993029ddb 100644
--- a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -166,11 +166,15 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
}
if (BitUtil.check(locationMask, 5)) {
- position.setNetwork(new Network(
- CellTower.fromLacCid(buf.readUnsignedShort(), buf.readUnsignedShort())));
- }
+ CellTower cellTower = CellTower.fromLacCid(buf.readUnsignedShort(), buf.readUnsignedShort());
+
+ if (BitUtil.check(locationMask, 6)) {
+ cellTower.setSignalStrength((int) buf.readUnsignedByte());
+ }
+
+ position.setNetwork(new Network(cellTower));
- if (BitUtil.check(locationMask, 6)) {
+ } else if (BitUtil.check(locationMask, 6)) {
position.set(Position.KEY_RSSI, buf.readUnsignedByte());
}