Skip to content

Add retries for wifi setup #21

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
Ponderosa wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add retries for wifi setup #21

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
12 changes: 12 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,18 @@ if (PICOWOTA_WIFI_AP)
message("Building in WiFi AP mode.")
endif()

# Set default values if not already defined
if(NOT DEFINED PICOWOTA_RETRY_COUNT)
set(PICOWOTA_RETRY_COUNT 1)
endif()

if(NOT DEFINED PICOWOTA_RETRY_TIMEOUT_MS)
set(PICOWOTA_RETRY_TIMEOUT_MS 500)
endif()

target_compile_definitions(picowota PUBLIC PICOWOTA_RETRY_COUNT=${PICOWOTA_RETRY_COUNT})
target_compile_definitions(picowota PUBLIC PICOWOTA_RETRY_TIMEOUT_MS=${PICOWOTA_RETRY_TIMEOUT_MS})

# Provide a helper to build a standalone target
function(picowota_build_standalone NAME)
get_target_property(PICOWOTA_SRC_DIR picowota SOURCE_DIR)
Expand Down
36 changes: 26 additions & 10 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,15 @@ static void network_deinit()
cyw43_arch_deinit();
}

static void retry(int i) {
if (i >= PICOWOTA_RETRY_COUNT - 1) {
DBG_PRINTF("attempt return to app\n");
picowota_reboot(false);
}
DBG_PRINTF("failed... retry #%d in %dms\n", (i + 1), PICOWOTA_RETRY_TIMEOUT_MS);
sleep_ms(PICOWOTA_RETRY_TIMEOUT_MS);
}

int main()
{
err_t err;
Expand All @@ -593,10 +602,15 @@ int main()

queue_init(&event_queue, sizeof(struct event), EVENT_QUEUE_LENGTH);

if (cyw43_arch_init()) {
DBG_PRINTF("failed to initialise\n");
return 1;
}
DBG_PRINTF("Initializing CYW43...\n");
for (int i = 0; i < PICOWOTA_RETRY_COUNT; i++) {
if (cyw43_arch_init()) {
retry(i);
} else {
break;
}
}
DBG_PRINTF("Initialized.\n");

#if PICOWOTA_WIFI_AP == 1
cyw43_arch_enable_ap_mode(wifi_ssid, wifi_pass, CYW43_AUTH_WPA2_AES_PSK);
Expand All @@ -613,12 +627,14 @@ int main()
cyw43_arch_enable_sta_mode();

DBG_PRINTF("Connecting to WiFi...\n");
if (cyw43_arch_wifi_connect_timeout_ms(wifi_ssid, wifi_pass, CYW43_AUTH_WPA2_AES_PSK, 30000)) {
DBG_PRINTF("failed to connect.\n");
return 1;
} else {
DBG_PRINTF("Connected.\n");
}
for (int i = 0; i < PICOWOTA_RETRY_COUNT; i++) {
if (cyw43_arch_wifi_connect_timeout_ms(wifi_ssid, wifi_pass, CYW43_AUTH_WPA2_AES_PSK, 30000)) {
retry(i);
} else {
break;
}
}
DBG_PRINTF("Connected.\n");
#endif

critical_section_init(&critical_section);
Expand Down