wifi retry on connect or dhcp fail, init with country code.

include/config.h

@@ -28,6 +28,8 @@
 #define VOLCANO_AUTO_CONNECT_TIMEOUT_MS 2000
 #define VOLCANO_AUTO_CONNECT_WITHIN_MS 10000
 
+#define COUNTRY_CODE CYW43_COUNTRY_GERMANY
+
 #ifdef NDEBUG
 // Release build
 #define AUTO_MOUNT_MASS_STORAGE

src/main.c

@@ -111,7 +111,7 @@ int main(void) {
 
     // required for BLE and LiPo voltage reading
     debug("cyw43_arch_init");
-    if (cyw43_arch_init()) {
+    if (cyw43_arch_init_with_country(COUNTRY_CODE)) {
         debug("cyw43_arch_init failed");
         lcd_set_backlight(0x00FF);
         while (1) {}

src/wifi.c

@@ -25,17 +25,23 @@
 #include "mem.h"
 #include "wifi.h"
 
+#define CONNECT_TIMEOUT (5 * 1000)
+
 enum wifi_state {
     WS_IDLE = 0,
     WS_SCAN,
     WS_CONNECT,
+    WS_WAIT_FOR_IP,
     WS_READY,
 };
 
 static enum wifi_state state = WS_IDLE;
+static uint32_t start_time = 0;
 
 static void wifi_connect(const char *ssid, const char *pw, uint32_t auth) {
     debug("connecting to '%s'", ssid);
+    start_time = to_ms_since_boot(get_absolute_time());
+    state = WS_CONNECT;
 
     // https://github.com/raspberrypi/pico-sdk/issues/1413
     uint32_t a = 0;
@@ -48,8 +54,7 @@ static void wifi_connect(const char *ssid, const char *pw, uint32_t auth) {
     int r = cyw43_arch_wifi_connect_async(ssid, pw, a);
     if (r != 0) {
         debug("failed to connect %d", r);
-    } else {
-        state = WS_CONNECT;
+        state = WS_SCAN;
     }
 }
 
@@ -75,12 +80,13 @@ static int scan_result(void *env, const cyw43_ev_scan_result_t *result) {
 
 static void wifi_scan(void) {
     debug("starting scan");
+    state = WS_SCAN;
+
     cyw43_wifi_scan_options_t scan_options = {0};
     int err = cyw43_wifi_scan(&cyw43_state, &scan_options, NULL, scan_result);
     if (err != 0) {
         debug("error %d", err);
     }
-    state = WS_SCAN;
 }
 
 void wifi_init(void) {
@@ -117,8 +123,16 @@ const char *wifi_state(void) {
     case WS_CONNECT:
         return "Connecting";
 
-    case WS_READY:
-        return ip4addr_ntoa(netif_ip4_addr(netif_default));
+    case WS_WAIT_FOR_IP:
+        return "Waiting for IP";
+
+    case WS_READY: {
+        cyw43_arch_lwip_begin();
+        const ip4_addr_t *ip = netif_ip4_addr(netif_default);
+        cyw43_arch_lwip_end();
+
+        return ip4addr_ntoa(ip);
+    }
     }
 
     return NULL;
@@ -133,9 +147,49 @@ void wifi_run(void) {
             wifi_scan();
         }
     } else if (state == WS_CONNECT) {
-        if (cyw43_wifi_link_status(&cyw43_state, CYW43_ITF_STA) == CYW43_LINK_JOIN) {
+        int link = cyw43_wifi_link_status(&cyw43_state, CYW43_ITF_STA);
+
+        static int prev_link = 0xFF;
+        if (prev_link != link) {
+            prev_link = link;
+            debug("net link status: %d", link);
+        }
+
+        if (link == CYW43_LINK_JOIN) {
             debug("joined network");
+            start_time = to_ms_since_boot(get_absolute_time());
+            state = WS_WAIT_FOR_IP;
+        } else if (link < CYW43_LINK_DOWN) {
+            debug("net connection failed. retry.");
+            wifi_scan();
+        }
+
+        uint32_t now = to_ms_since_boot(get_absolute_time());
+        if ((now - start_time) >= CONNECT_TIMEOUT) {
+            debug("net connection timeout. retry.");
+            wifi_scan();
+        }
+    } else if (state == WS_WAIT_FOR_IP) {
+        cyw43_arch_lwip_begin();
+        const ip4_addr_t *ip = netif_ip4_addr(netif_default);
+        cyw43_arch_lwip_end();
+
+        if (ip4_addr_get_u32(ip) != 0) {
             state = WS_READY;
+            debug("got IP '%s'", ip4addr_ntoa(ip));
+        }
+
+        uint32_t now = to_ms_since_boot(get_absolute_time());
+        if ((now - start_time) >= CONNECT_TIMEOUT) {
+            debug("net dhcp timeout. retry.");
+            start_time = now;
+
+            //cyw43_arch_lwip_begin();
+            //dhcp_renew(netif_default);
+            //cyw43_arch_lwip_end();
+
+            // DHCP renew does not seem to help, only a full reconnect
+            wifi_scan();
         }
     }