summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraozima <[email protected]>2018-06-23 19:20:59 +0800
committerGitHub <[email protected]>2018-06-23 19:20:59 +0800
commit7da376280a2c0e7239a250164e078f76c98c3987 (patch)
treeab0dc0262818f3357b6247e57ef4850c27d4b8c7
parent324c5da5cf9d6e7530ea65e5a7336ec6adf2cc5f (diff)
parent7f4b8d21022d4d00075edade9c96e4dbd32295d5 (diff)
Merge pull request #1556 from enkiller/dev
[components][drivers]wlan打印ap信息更加友好
-rw-r--r--components/drivers/wlan/wlan_cmd.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/components/drivers/wlan/wlan_cmd.c b/components/drivers/wlan/wlan_cmd.c
index 33dfac5b75..eda628a357 100644
--- a/components/drivers/wlan/wlan_cmd.c
+++ b/components/drivers/wlan/wlan_cmd.c
@@ -426,13 +426,22 @@ int wifi(int argc, char **argv)
int index, num;
num = scan_result->ap_num;
- rt_kprintf("----Wi-Fi APInformation----\n");
+ rt_kprintf(" SSID MAC rssi chn Mbps\n");
+ rt_kprintf("------------------------------- ----------------- ---- --- ----\n");
for (index = 0; index < num; index ++)
{
- rt_kprintf("SSID:%-.32s, ", scan_result->ap_table[index].ssid);
- rt_kprintf("rssi:%d, ", scan_result->ap_table[index].rssi);
- rt_kprintf("chn:%d, ", scan_result->ap_table[index].channel);
- rt_kprintf("rate:%d\n", scan_result->ap_table[index].datarate);
+ rt_kprintf("%-32.32s", scan_result->ap_table[index].ssid);
+ rt_kprintf("%02x:%02x:%02x:%02x:%02x:%02x ",
+ scan_result->ap_table[index].bssid[0],
+ scan_result->ap_table[index].bssid[1],
+ scan_result->ap_table[index].bssid[2],
+ scan_result->ap_table[index].bssid[3],
+ scan_result->ap_table[index].bssid[4],
+ scan_result->ap_table[index].bssid[5]
+ );
+ rt_kprintf("%4d ", scan_result->ap_table[index].rssi);
+ rt_kprintf("%2d ", scan_result->ap_table[index].channel);
+ rt_kprintf("%d\n", scan_result->ap_table[index].datarate / 1000000);
}
}
rt_wlan_release_scan_result(&scan_result);
@@ -502,7 +511,7 @@ int wifi(int argc, char **argv)
wlan->info->bssid[4],
wlan->info->bssid[5]);
rt_kprintf(" Channel: %d\n", wlan->info->channel);
- rt_kprintf("DataRate: %dMbps\n", wlan->info->datarate / 1000);
+ rt_kprintf("DataRate: %dMbps\n", wlan->info->datarate / 1000000);
rt_kprintf(" RSSI: %d\n", rssi);
}
else