more wifi work

Author: tannewt

ports/zephyr-cp/boards/nordic/nrf7002dk/autogen_board_info.toml

@@ -101,7 +101,7 @@ usb_midi = false
 usb_video = false
 ustack = false
 vectorio = false
-warnings = false
+warnings = true
 watchdog = false
 wifi = true # Zephyr board has wifi
 zephyr_kernel = false

ports/zephyr-cp/common-hal/wifi/Radio.c

@@ -222,10 +222,13 @@ void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self) {
 }
 
 void common_hal_wifi_radio_start_station(wifi_radio_obj_t *self) {
+    printk("common_hal_wifi_radio_start_station\n");
     // set_mode_station(self, true);
 }
 
 void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self) {
+    printk("common_hal_wifi_radio_stop_station\n");
+
     // set_mode_station(self, false);
 }
 
@@ -317,12 +320,38 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
     if (!common_hal_wifi_radio_get_enabled(self)) {
         mp_raise_RuntimeError(MP_ERROR_TEXT("wifi is not enabled"));
     }
-    // wifi_config_t *config = &self->sta_config;
-
-    // size_t timeout_ms = timeout * 1000;
-    // uint32_t start_time = common_hal_time_monotonic_ms();
-    // uint32_t end_time = start_time + timeout_ms;
+    printk("common_hal_wifi_radio_connect\n");
+    printk("ssid: %s\n", ssid);
+
+    // k_poll_signal_init(&self->channel_done);
+    // k_poll_event_init(&self->events[2],
+    //     K_POLL_TYPE_SIGNAL,
+    //     K_POLL_MODE_NOTIFY_ONLY,
+    //     &self->channel_done);
+
+    struct wifi_connect_req_params params = {0};
+    params.ssid = ssid;
+    params.ssid_length = ssid_len;
+    params.psk = password;
+    params.psk_length = password_len;
+    params.timeout = (int)timeout;
+    if (channel > 0) {
+        params.band = WIFI_FREQ_BAND_2_4_GHZ;
+        params.channel = channel;
+    }
+    if (bssid_len > 0) {
+        memcpy(params.bssid, bssid, bssid_len);
+    }
+    int res = net_mgmt(NET_REQUEST_WIFI_CONNECT, self->sta_netif, &params, sizeof(params));
+    if (res != 0) {
+        printk("Failed to start connect to wifi %d\n", res);
+        return WIFI_RADIO_ERROR_AUTH_FAIL;
+    }
+    printk("sleeping past timeout %f\n", timeout);
+    k_sleep(K_SECONDS(timeout + 2));
 
+    printk("sleeping 30 more seconds\n");
+    k_sleep(K_SECONDS(30));
     // EventBits_t bits;
     // // can't block since both bits are false after wifi_init
     // // both bits are true after an existing connection stops
@@ -420,6 +449,7 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
 }
 
 bool common_hal_wifi_radio_get_connected(wifi_radio_obj_t *self) {
+    printk("common_hal_wifi_radio_get_connected\n");
     // return self->sta_mode && esp_netif_is_netif_up(self->netif);
     return false;
 }

ports/zephyr-cp/common-hal/wifi/ScannedNetworks.c

@@ -107,6 +107,7 @@ void wifi_scannednetworks_scan_next_channel(wifi_scannednetworks_obj_t *self) {
             raise_zephyr_error(res);
             wifi_scannednetworks_done(self);
         } else {
+            printk("Scanning channel %d\n", next_channel);
             self->channel_scan_in_progress = true;
         }
     }

ports/zephyr-cp/common-hal/wifi/__init__.c

@@ -265,6 +265,7 @@ void common_hal_wifi_init(bool user_initiated) {
     // self->sta_mode = 0;
     // self->ap_mode = 0;
 
+    printk("registering event callbacks\n");
     net_mgmt_init_event_callback(&wifi_cb, _event_handler,
         NET_EVENT_WIFI_SCAN_DONE |
         NET_EVENT_WIFI_CONNECT_RESULT |

ports/zephyr-cp/cptools/build_circuitpython.py

@@ -52,8 +52,11 @@
     "random",
     "digitalio",
     "zephyr_serial",
+    "errno",
+    "warnings",
+    "io"
 ]
-MPCONFIG_FLAGS = ["ulab", "nvm", "displayio", "warnings", "alarm", "array", "json"]
+MPCONFIG_FLAGS = ["ulab", "warnings", "alarm", "array", "json", "errno", "io"]
 
 
 async def preprocess_and_split_defs(compiler, source_file, build_path, flags):
@@ -204,7 +207,7 @@ async def build_circuitpython():
     circuitpython_flags = ["-DCIRCUITPY"]
     port_flags = []
     enable_mpy_native = False
-    full_build = False
+    full_build = True
     usb_host = False
     tusb_mem_align = 4
     board = cmake_args["BOARD_ALIAS"]
@@ -496,6 +499,9 @@ async def build_circuitpython():
             hal_source.extend(top.glob(f"shared-bindings/{module.name}/*.c"))
             hal_source.extend(top.glob(f"shared-module/{module.name}/*.c"))
 
+            if module.name == "os":
+                circuitpython_flags.append("-DCIRCUITPY_OS_GETENV=1")
+
     if os.environ.get("CI", "false") == "true":
         # Fail the build if it isn't up to date.
         if (
@@ -512,8 +518,12 @@ async def build_circuitpython():
     for mpflag in MPCONFIG_FLAGS:
         enabled = mpflag in DEFAULT_MODULES
         circuitpython_flags.append(f"-DCIRCUITPY_{mpflag.upper()}={1 if enabled else 0}")
+        logger.info(f"CIRCUITPY_{mpflag} enabled: {enabled}")
+        if mpflag == "io":
+            enabled = enabled and "jpegio" in enabled_modules
+            circuitpython_flags.append(f"-DCIRCUITPY_IO_IOBASE={1 if enabled else 0}")
 
-    source_files = supervisor_source + hal_source + ["extmod/vfs.c"]
+    source_files = supervisor_source + hal_source + ["extmod/vfs.c", "extmod/modjson.c"]
     assembly_files = []
     for file in top.glob("py/*.c"):
         source_files.append(file)