happyz
/
iw_intel8260_localization
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

bug fix; now parsing new output

This commit is contained in:
HappyZ 2018-02-01 15:35:30 -06:00
parent 97bcb841d4
commit 5894ccc163
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
iw/event.c
View File

@ -365,9 +365,8 @@ static void parse_ftm_results(struct nlattr **attrs, int status,
rssi = tb[NL80211_FTM_RESP_ENTRY_ATTR_RSSI] ?
(signed int)nla_get_s8(tb[NL80211_FTM_RESP_ENTRY_ATTR_RSSI]) : 0;
printf("Target: %s, status: %d, " +
"rtt: %lld (±%lld) psec, " +
"distance: %lld (±%lld)cm, rssi: %d dBm",
printf(
"Target: %s, status: %d, rtt: %lld (±%lld) psec, distance: %lld (±%lld) cm, rssi: %d dBm",
macbuf, nla_get_u8(tb[NL80211_FTM_RESP_ENTRY_ATTR_STATUS]),
rtt, rtt_var, dist, dist_var, rssi);

9
libMeasurement.py
View File

@ -45,8 +45,8 @@ class Measurement(object):
print(str(e))
self.regex = (
r"Target: (([0-9a-f]{2}:*){6}), " +
r"status: ([0-9]), rtt: ([0-9\-]+) psec, " +
r"distance: ([0-9\-]+) cm"
r"status: ([0-9]), rtt: ([0-9\-]+) \(±([0-9\-]+)\) psec, " +
r"distance: ([0-9\-]+) \(±([0-9\-]+)\) cm, rssi: ([0-9\-]+) dBm"
)
self.cali = cali
if not self.check_iw_validity():
@ -111,7 +111,10 @@ class Measurement(object):
mac = match.group(1)
status = int(match.group(3))
rtt = int(match.group(4))
raw_distance = int(match.group(5))
rtt_var = int(match.group(5))
raw_distance = int(match.group(6))
raw_distance_var = int(match.group(7))
rssi = int(match.group(8))
if status is not 0 or raw_distance < -1000:
continue
distance = self.cali[0] * raw_distance + self.cali[1]