add samples per burst

This commit is contained in:
HappyZ 2018-02-01 15:29:18 -06:00
parent bd4a18ac26
commit 97bcb841d4
2 changed files with 22 additions and 7 deletions

View File

@ -317,7 +317,8 @@ static void parse_ftm_results(struct nlattr **attrs, int status,
struct nlattr *tb[NL80211_FTM_RESP_ENTRY_ATTR_MAX + 1];
unsigned char bssid[ETH_ALEN];
char macbuf[6 * 3];
long long int rtt, dist;
long long int rtt, rtt_var, dist, dist_var;
signed int rssi;
int err;
printf("FTM result! Status: %d\n", status);
@ -352,13 +353,23 @@ static void parse_ftm_results(struct nlattr **attrs, int status,
mac_addr_n2a(macbuf, bssid);
rtt = (long long int)nla_get_u64(tb[NL80211_FTM_RESP_ENTRY_ATTR_RTT]);
rtt_var = tb[NL80211_FTM_RESP_ENTRY_ATTR_RTT_VAR] ?
(long long int)nla_get_u64(
tb[NL80211_FTM_RESP_ENTRY_ATTR_RTT_VAR]) : 0;
dist = tb[NL80211_FTM_RESP_ENTRY_ATTR_DISTANCE] ?
(long long int)nla_get_u64(tb[NL80211_FTM_RESP_ENTRY_ATTR_DISTANCE]) :
rtt * SOL_CM_PSEC;
dist_var = tb[NL80211_FTM_RESP_ENTRY_ATTR_DISTANCE_VAR] ?
(long long int)nla_get_u64(
tb[NL80211_FTM_RESP_ENTRY_ATTR_DISTANCE_VAR]) : 0;
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 psec, distance: %lld cm",
macbuf, nla_get_u8(tb[NL80211_FTM_RESP_ENTRY_ATTR_STATUS]), rtt,
dist);
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);
if (tb[NL80211_FTM_RESP_ENTRY_ATTR_LCI])
iw_hexdump("LCI",

View File

@ -81,10 +81,12 @@ class Measurement(object):
with open(self.config_fp, 'w') as of:
for bssid in targets:
of.write(
"{0} bw={1} cf={2} retries=5 asap\n".format(
"{0} bw={1} cf={2} retries={3} asap spb={4}\n".format(
bssid,
targets[bssid]['bw'],
targets[bssid]['cf']
targets[bssid]['cf'],
targets[bssid]['retries'],
targets[bssid]['spb'],
)
)
return True
@ -151,7 +153,9 @@ def wrapper(args):
args['config_entry'] = {
'34:f6:4b:5e:69:1f': {
'bw': 20,
'cf': 2462
'cf': 2462,
'spb': 255,
'retries': 3
}
}
counter = 1