djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pico w: re-use previous connection if ssid matches

Browse Source
This commit is contained in:
Jeff Epler 2022-12-08 12:44:34 -06:00
parent ef2bfdb5db
commit 1fe05cb8cd
No known key found for this signature in database
GPG Key ID: D5BF15AB975AB4DE
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ports/raspberrypi/common-hal/wifi/Radio.c
View File

@ -206,6 +206,22 @@ void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self) {
*/ */
} }
static bool connection_unchanged(wifi_radio_obj_t *self, const uint8_t *ssid, size_t ssid_len) {
if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_STA) != CYW43_LINK_UP) {
mp_printf(&mp_plat_print, "(not connected)\n");
return false;
}
if (ssid_len != self->connected_ssid_len) {
mp_printf(&mp_plat_print, "(length mismatch)\n");
return false;
}
if (memcmp(ssid, self->connected_ssid, self->connected_ssid_len)) {
mp_printf(&mp_plat_print, "(ssid mismatch)\n");
return false;
}
return true;
}
wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t *bssid, size_t bssid_len) { wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t *bssid, size_t bssid_len) {
if (!common_hal_wifi_radio_get_enabled(self)) { if (!common_hal_wifi_radio_get_enabled(self)) {
mp_raise_RuntimeError(translate("Wifi is not enabled")); mp_raise_RuntimeError(translate("Wifi is not enabled"));
@ -215,11 +231,19 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
mp_raise_RuntimeError(translate("Wifi is in access point mode.")); mp_raise_RuntimeError(translate("Wifi is in access point mode."));
} }
if (ssid_len > 32) {
return WIFI_RADIO_ERROR_CONNECTION_FAIL;
}
size_t timeout_ms = timeout <= 0 ? 8000 : (size_t)MICROPY_FLOAT_C_FUN(ceil)(timeout * 1000); size_t timeout_ms = timeout <= 0 ? 8000 : (size_t)MICROPY_FLOAT_C_FUN(ceil)(timeout * 1000);
uint64_t start = port_get_raw_ticks(NULL); uint64_t start = port_get_raw_ticks(NULL);
uint64_t deadline = start + timeout_ms; uint64_t deadline = start + timeout_ms;
if (connection_unchanged(self, ssid, ssid_len)) {
mp_printf(&mp_plat_print, "re-used existing wifi connection");
return WIFI_RADIO_ERROR_NONE;
}
// disconnect // disconnect
common_hal_wifi_radio_stop_station(self); common_hal_wifi_radio_stop_station(self);
@ -237,6 +261,8 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
switch (result) { switch (result) {
case CYW43_LINK_UP: case CYW43_LINK_UP:
memcpy(self->connected_ssid, ssid, ssid_len);
self->connected_ssid_len = ssid_len;
bindings_cyw43_wifi_enforce_pm(); bindings_cyw43_wifi_enforce_pm();
return WIFI_RADIO_ERROR_NONE; return WIFI_RADIO_ERROR_NONE;
case CYW43_LINK_FAIL: case CYW43_LINK_FAIL:

2
ports/raspberrypi/common-hal/wifi/Radio.h
View File

@ -35,6 +35,8 @@ typedef struct {
mp_obj_base_t base; mp_obj_base_t base;
char hostname[254]; // hostname max is 253 chars, + 1 for trailing NUL char hostname[254]; // hostname max is 253 chars, + 1 for trailing NUL
wifi_scannednetworks_obj_t *current_scan; wifi_scannednetworks_obj_t *current_scan;
uint8_t connected_ssid[32];
uint8_t connected_ssid_len;
bool enabled; bool enabled;
} wifi_radio_obj_t; } wifi_radio_obj_t;