wip

Author: tannewt

ports/zephyr-cp/common-hal/socketpool/Socket.c

@@ -184,6 +184,8 @@ static bool _socketpool_socket(socketpool_socketpool_obj_t *self,
     socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type,
     int proto,
     socketpool_socket_obj_t *sock) {
+    printk("socketpool_socket\n");
+
     int addr_family;
     int ipproto;
 
@@ -245,6 +247,9 @@ bool socketpool_socket(socketpool_socketpool_obj_t *self,
 
 socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_t *self,
     socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type, int proto) {
+    printk("common_hal_socketpool_socket\n");
+
+
     switch (family) {
         #if CIRCUITPY_SOCKETPOOL_IPV6
         case SOCKETPOOL_AF_INET6:
@@ -343,6 +348,8 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o
 
 size_t common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self,
     const char *host, size_t hostlen, uint32_t port) {
+    printk("common_hal_socketpool_socket_bind\n");
+
     // struct sockaddr_storage bind_addr;
     const char *broadcast = "<broadcast>";
 

ports/zephyr-cp/common-hal/socketpool/SocketPool.c

@@ -15,6 +15,7 @@ void common_hal_socketpool_socketpool_construct(socketpool_socketpool_obj_t *sel
     if (radio != MP_OBJ_FROM_PTR(&common_hal_wifi_radio_obj)) {
         mp_raise_ValueError(MP_ERROR_TEXT("SocketPool can only be used with wifi.radio"));
     }
+    printk("common_hal_socketpool_socketpool_construct\n");
 }
 
 // common_hal_socketpool_socket is in socketpool/Socket.c to centralize open socket tracking.

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

@@ -335,14 +335,26 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
     params.psk = password;
     params.psk_length = password_len;
     params.timeout = (int)timeout;
+    params.channel = WIFI_CHANNEL_ANY;
+    params.security = WIFI_SECURITY_TYPE_NONE;
+    if (password_len > 0) {
+        params.security = WIFI_SECURITY_TYPE_WPA_PSK;
+    }
+    params.mfp = WIFI_MFP_OPTIONAL;
+    params.eap_ver = 1;
+    params.ignore_broadcast_ssid = 0;
+    params.bandwidth = WIFI_FREQ_BANDWIDTH_20MHZ;
     if (channel > 0) {
         params.band = WIFI_FREQ_BAND_2_4_GHZ;
         params.channel = channel;
     }
+    printk("bssid_len: %d\n", bssid_len);
     if (bssid_len > 0) {
         memcpy(params.bssid, bssid, bssid_len);
     }
+    printk("net_mgmt\n");
     int res = net_mgmt(NET_REQUEST_WIFI_CONNECT, self->sta_netif, &params, sizeof(params));
+    printk("net_mgmt returned\n");
     if (res != 0) {
         printk("Failed to start connect to wifi %d\n", res);
         return WIFI_RADIO_ERROR_AUTH_FAIL;

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

@@ -29,6 +29,8 @@ wifi_radio_obj_t common_hal_wifi_radio_obj;
 #include <zephyr/kernel.h>
 #include <zephyr/net/wifi_mgmt.h>
 
+#include <supp_events.h>
+
 #define MAC_ADDRESS_LENGTH 6
 
 static void schedule_background_on_cp_core(void *arg) {
@@ -43,6 +45,9 @@ static void schedule_background_on_cp_core(void *arg) {
 
 static struct net_mgmt_event_callback wifi_cb;
 static struct net_mgmt_event_callback ipv4_cb;
+static struct net_mgmt_event_callback supp_cb;
+static struct net_mgmt_event_callback iface_cb;
+static struct net_mgmt_event_callback l4_cb;
 
 static void _event_handler(struct net_mgmt_event_callback *cb, uint32_t mgmt_event, struct net_if *iface) {
     wifi_radio_obj_t *self = &common_hal_wifi_radio_obj;
@@ -276,10 +281,25 @@ void common_hal_wifi_init(bool user_initiated) {
         NET_EVENT_WIFI_AP_DISABLE_RESULT |
         NET_EVENT_WIFI_AP_STA_CONNECTED |
         NET_EVENT_WIFI_AP_STA_DISCONNECTED);
+    net_mgmt_init_event_callback(&iface_cb, _event_handler,
+        NET_EVENT_IF_UP |
+        NET_EVENT_IF_DOWN);
+    net_mgmt_init_event_callback(&l4_cb, _event_handler,
+        NET_EVENT_L4_CONNECTED |
+        NET_EVENT_L4_DISCONNECTED);
+    net_mgmt_init_event_callback(&supp_cb, _event_handler,
+        NET_EVENT_SUPPLICANT_READY |
+        NET_EVENT_SUPPLICANT_NOT_READY |
+        NET_EVENT_SUPPLICANT_IFACE_ADDED |
+        NET_EVENT_SUPPLICANT_IFACE_REMOVED |
+        NET_EVENT_SUPPLICANT_IFACE_REMOVING |
+        NET_EVENT_SUPPLICANT_INT_EVENT);
 
     net_mgmt_init_event_callback(&ipv4_cb, _event_handler, NET_EVENT_IPV4_ADDR_ADD);
 
     net_mgmt_add_event_callback(&wifi_cb);
+    net_mgmt_add_event_callback(&iface_cb);
+    net_mgmt_add_event_callback(&supp_cb);
     net_mgmt_add_event_callback(&ipv4_cb);
 
     // Set the default hostname capped at NET_HOSTNAME_MAX_LEN characters. We trim off

ports/zephyr-cp/cptools/build_circuitpython.py

@@ -54,7 +54,7 @@
     "zephyr_serial",
     "errno",
     "warnings",
-    "io"
+    "io",
 ]
 MPCONFIG_FLAGS = ["ulab", "warnings", "alarm", "array", "json", "errno", "io"]
 

ports/zephyr-cp/prj.conf

@@ -7,7 +7,7 @@ CONFIG_DYNAMIC_INTERRUPTS=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 
 CONFIG_FLASH_MAP_LABELS=y
-CONFIG_MAIN_STACK_SIZE=24288
+CONFIG_MAIN_STACK_SIZE=32768
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
@@ -26,3 +26,7 @@ CONFIG_ASSERT=y
 CONFIG_LOG_BLOCK_IN_THREAD=y
 
 CONFIG_EVENTS=y
+CONFIG_DEBUG=y
+CONFIG_WIFI_NRF70_LOG_LEVEL_INF=y
+
+CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=12288