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

Merge pull request #7439 from jepler/issue7438

Browse Source 
Update cyw43-driver, fix no-password wifi
This commit is contained in:
Dan Halbert 2023-01-10 20:09:38 -05:00 committed by GitHub
commit 828fd7f445
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/raspberrypi/Makefile
View File

@ -233,7 +233,7 @@ SRC_SDK := \
$(SRC_SDK_CYW43) \
SRC_SDK := $(addprefix sdk/, $(SRC_SDK))
$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef -Wno-unused-function -Wno-nested-externs -Wno-strict-prototypes -Wno-double-promotion -Wno-sign-compare -Wno-unused-variable -Wno-strict-overflow
$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef -Wno-unused-function -Wno-nested-externs -Wno-strict-prototypes -Wno-double-promotion -Wno-sign-compare -Wno-unused-variable -Wno-strict-overflow -Ilib/cyw43-driver
SRC_C += \
boards/$(BOARD)/board.c \

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

@ -244,7 +244,8 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
common_hal_wifi_radio_stop_station(self);
// connect
cyw43_arch_wifi_connect_async((const char *)ssid, (const char *)password, CYW43_AUTH_WPA2_AES_PSK);
int auth_mode = password_len ? CYW43_AUTH_WPA2_AES_PSK : CYW43_AUTH_OPEN;
cyw43_arch_wifi_connect_async((const char *)ssid, (const char *)password, auth_mode);
// TODO: Implement authmode check like in espressif
while (port_get_raw_ticks(NULL) < deadline) {

2
ports/raspberrypi/lib/cyw43-driver

@ -1 +1 @@
Subproject commit 746e0636033d0550b7652688124a77a6a1639cf9
Subproject commit 2cf328d9e41603405a037a29e081a7d30dd519e6

5
supervisor/shared/web_workflow/web_workflow.c
View File

@ -264,7 +264,10 @@ void supervisor_start_web_workflow(void) {
}
result = common_hal_os_getenv_str("CIRCUITPY_WIFI_PASSWORD", password, sizeof(password));
if (result != GETENV_OK) {
if (result == GETENV_ERR_NOT_FOUND) {
// if password is unspecified, assume an open network
password[0] = '\0';
} else if (result != GETENV_OK) {
return;
}