Skip to content

Add wifi_mgmr_set_hostname() and fix AP selection logic #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kruzer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add wifi_mgmr_set_hostname() and fix AP selection logic #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/network/lwip/bouffalo.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ COMPONENT_PRIV_INCLUDEDIRS := src/apps/altcp_tls
#COMPONENT_SRCS :=
#COMPONENT_OBJS := $(patsubst %.c,%.o, $(COMPONENT_SRCS))

COMPONENT_SRCDIRS := src/api src/core src/core/ipv4 src/netif lwip-port/FreeRTOS lwip-port src/apps/altcp_tls src/apps/mqtt
COMPONENT_SRCDIRS := src/api src/core src/core/ipv4 src/netif lwip-port/FreeRTOS lwip-port src/apps/altcp_tls src/apps/mqtt src/apps/mdns

ifeq ($(CONFIG_COMPONENT_BUGKILLER_ENABLE),1)
COMPONENT_ADD_INCLUDEDIRS += bugkiller/include
Expand Down
2 changes: 2 additions & 0 deletions components/network/wifi_manager/bl60x_wifi_driver/include/wifi_mgmr_ext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,8 @@ int wifi_mgmr_bcnind_cipher_to_ext(int cipher);
struct sm_connect_tlv_desc* wifi_mgmr_diagnose_tlv_get_ele(void);
void wifi_mgmr_diagnose_tlv_free_ele(struct sm_connect_tlv_desc* ele);

void wifi_mgmr_set_hostname(char *hostname);

#if defined(__cplusplus)
}
#endif
Expand Down
13 changes: 8 additions & 5 deletions components/network/wifi_manager/bl60x_wifi_driver/wifi_mgmr_ext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,16 +919,14 @@ int wifi_mgmr_scan_ap(char *ssid, wifi_mgmr_ap_item_t *item)
for (i = 0; i < sizeof(wifiMgmr.scan_items)/sizeof(wifiMgmr.scan_items[0]); i++) {
if (wifiMgmr.scan_items[i].is_used &&
(!wifi_mgmr_scan_item_is_timeout(&wifiMgmr, &(wifiMgmr.scan_items[i]))) && 0 == strcmp(wifiMgmr.scan_items[i].ssid, ssid)) {
/*found the ssid*/
index = i;
if (wifiMgmr.scan_items[i].rssi > rssi) {
/*found ap with better rssi*/
/*found ap with better rssi - select it*/
rssi = wifiMgmr.scan_items[i].rssi;
index = i;
}
break;
}
}
if ((sizeof(wifiMgmr.scan_items)/sizeof(wifiMgmr.scan_items[0]) != i) && (index >= 0)) {
if (index >= 0) {
/*proper item found, copy back data now*/
//TODO FIXME we should scan the ap from the cache within the Wi-Fi manager thread
scan = &wifiMgmr.scan_items[index];
Expand Down Expand Up @@ -1159,3 +1157,8 @@ void wifi_mgmr_diagnose_tlv_free_ele(struct sm_connect_tlv_desc *ele)

bl_os_free(ele);
}

void wifi_mgmr_set_hostname(char *hostname) {
snprintf(wifiMgmr.hostname, sizeof(wifiMgmr.hostname), "%s", hostname);
wifiMgmr.hostname[sizeof(wifiMgmr.hostname) - 1] = '\0';
}