Skip to content

zephyr-cp/wifi: route diagnostic output through the log subsystem #11227

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

Draft
mikeysklar wants to merge 2 commits into
base: main
Choose a base branch
from
+62 −45
Draft

zephyr-cp/wifi: route diagnostic output through the log subsystem #11227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c4352f
zephyr-cp/wifi: subscribe to NET_EVENT_WIFI_SCAN_RESULT
mikeysklar Aug 21, 2026
dfe806d
zephyr-cp/wifi: route diagnostic output through the log subsystem
mikeysklar Aug 22, 2026
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
15 changes: 8 additions & 7 deletions ports/zephyr-cp/common-hal/wifi/Radio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "bindings/zephyr_kernel/__init__.h"

#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
#include <zephyr/net/hostname.h>
#include <zephyr/net/wifi.h>
#include <zephyr/net/wifi_mgmt.h>
Expand All @@ -33,6 +34,8 @@
#include "common-hal/mdns/Server.h"
#endif

LOG_MODULE_DECLARE(cp_wifi);

#define MAC_ADDRESS_LENGTH 6

// static void set_mode_station(wifi_radio_obj_t *self, bool state) {
Expand Down Expand Up @@ -85,7 +88,7 @@ void common_hal_wifi_radio_set_enabled(wifi_radio_obj_t *self, bool enabled) {
// #if CIRCUITPY_MDNS
// mdns_server_deinit_singleton();
// #endif
printk("net_if_down\n");
LOG_DBG("net_if_down");
int res = net_if_down(self->sta_netif);
if (res < 0 && res != -EALREADY) {
raise_zephyr_error(res);
Expand All @@ -94,7 +97,7 @@ void common_hal_wifi_radio_set_enabled(wifi_radio_obj_t *self, bool enabled) {
return;
}
if (!self->started && enabled) {
printk("net_if_up\n");
LOG_DBG("net_if_up");
int res = net_if_up(self->sta_netif);
if (res < 0 && res != -EALREADY) {
raise_zephyr_error(res);
Expand Down Expand Up @@ -214,13 +217,11 @@ void common_hal_wifi_radio_set_mac_address_ap(wifi_radio_obj_t *self, const uint
}

mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self, uint8_t start_channel, uint8_t stop_channel) {
printk("common_hal_wifi_radio_start_scanning_networks\n");
LOG_DBG("common_hal_wifi_radio_start_scanning_networks");
if (self->current_scan != NULL) {
printk("Already scanning for wifi networks\n");
mp_raise_RuntimeError(MP_ERROR_TEXT("Already scanning for wifi networks"));
}
if (!common_hal_wifi_radio_get_enabled(self)) {
printk("WiFi is not enabled\n");
mp_raise_RuntimeError(MP_ERROR_TEXT("WiFi is not enabled"));
}

Expand All @@ -246,12 +247,12 @@ mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self, u
K_POLL_MODE_NOTIFY_ONLY,
&scan->msgq);
wifi_scannednetworks_scan_next_channel(scan);
printk("common_hal_wifi_radio_start_scanning_networks done %p\n", scan);
LOG_DBG("common_hal_wifi_radio_start_scanning_networks done %p", scan);
return scan;
}

void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self) {
printk("common_hal_wifi_radio_stop_scanning_networks\n");
LOG_DBG("common_hal_wifi_radio_stop_scanning_networks");
// Return early if self->current_scan is NULL to avoid hang
if (self->current_scan == NULL) {
return;
Expand Down
7 changes: 5 additions & 2 deletions ports/zephyr-cp/common-hal/wifi/ScannedNetworks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@
#include "bindings/zephyr_kernel/__init__.h"

#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
#include <zephyr/net/wifi_mgmt.h>

LOG_MODULE_DECLARE(cp_wifi);


void wifi_scannednetworks_scan_result(wifi_scannednetworks_obj_t *self, struct wifi_scan_result *result) {
if (k_msgq_put(&self->msgq, result, K_NO_WAIT) != 0) {
printk("Dropping scan result!\n");
LOG_WRN("Dropping scan result");
}
}

Expand Down Expand Up @@ -104,7 +107,7 @@ void wifi_scannednetworks_scan_next_channel(wifi_scannednetworks_obj_t *self) {
} else {
int res = net_mgmt(NET_REQUEST_WIFI_SCAN, self->netif, &params, sizeof(params));
if (res != 0) {
printk("Failed to start wifi scan %d\n", res);
LOG_ERR("Failed to start wifi scan %d", res);
raise_zephyr_error(res);
wifi_scannednetworks_done(self);
} else {
Expand Down
85 changes: 49 additions & 36 deletions ports/zephyr-cp/common-hal/wifi/__init__.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,15 @@ wifi_radio_obj_t common_hal_wifi_radio_obj;
#endif

#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
#include <zephyr/net/wifi_mgmt.h>

#include <inttypes.h>

#define MAC_ADDRESS_LENGTH 6

LOG_MODULE_REGISTER(cp_wifi, CONFIG_LOG_DEFAULT_LEVEL);

static void schedule_background_on_cp_core(void *arg) {
#if CIRCUITPY_STATUS_BAR
supervisor_status_bar_request_update(false);
Expand All @@ -56,62 +59,71 @@ static void _event_handler(struct net_mgmt_event_callback *cb, uint64_t mgmt_eve

switch (mgmt_event) {
case NET_EVENT_WIFI_SCAN_RESULT: {
printk("NET_EVENT_WIFI_SCAN_RESULT\n");
LOG_DBG("NET_EVENT_WIFI_SCAN_RESULT");
const struct wifi_scan_result *result = cb->info;
if (result != NULL && self->current_scan != NULL) {
wifi_scannednetworks_scan_result(self->current_scan, result);
}
break;
}
case NET_EVENT_WIFI_SCAN_DONE:
printk("NET_EVENT_WIFI_SCAN_DONE (thread: %s prio=%d)\n",
LOG_DBG("NET_EVENT_WIFI_SCAN_DONE (thread: %s prio=%d)",
k_thread_name_get(k_current_get()),
k_thread_priority_get(k_current_get()));
if (self->current_scan != NULL) {
k_poll_signal_raise(&self->current_scan->channel_done, 0);
}
break;
case NET_EVENT_WIFI_CONNECT_RESULT:
printk("NET_EVENT_WIFI_CONNECT_RESULT\n");
LOG_DBG("NET_EVENT_WIFI_CONNECT_RESULT");
break;
case NET_EVENT_WIFI_DISCONNECT_RESULT:
printk("NET_EVENT_WIFI_DISCONNECT_RESULT\n");
LOG_DBG("NET_EVENT_WIFI_DISCONNECT_RESULT");
break;
case NET_EVENT_WIFI_IFACE_STATUS:
printk("NET_EVENT_WIFI_IFACE_STATUS\n");
LOG_DBG("NET_EVENT_WIFI_IFACE_STATUS");
break;
case NET_EVENT_WIFI_TWT:
printk("NET_EVENT_WIFI_TWT\n");
LOG_DBG("NET_EVENT_WIFI_TWT");
break;
case NET_EVENT_WIFI_TWT_SLEEP_STATE:
printk("NET_EVENT_WIFI_TWT_SLEEP_STATE\n");
LOG_DBG("NET_EVENT_WIFI_TWT_SLEEP_STATE");
break;
case NET_EVENT_WIFI_RAW_SCAN_RESULT:
printk("NET_EVENT_WIFI_RAW_SCAN_RESULT\n");
LOG_DBG("NET_EVENT_WIFI_RAW_SCAN_RESULT");
break;
case NET_EVENT_WIFI_DISCONNECT_COMPLETE:
printk("NET_EVENT_WIFI_DISCONNECT_COMPLETE\n");
LOG_DBG("NET_EVENT_WIFI_DISCONNECT_COMPLETE");
break;
case NET_EVENT_WIFI_SIGNAL_CHANGE:
printk("NET_EVENT_WIFI_SIGNAL_CHANGE\n");
LOG_DBG("NET_EVENT_WIFI_SIGNAL_CHANGE");
break;
case NET_EVENT_WIFI_NEIGHBOR_REP_COMP:
printk("NET_EVENT_WIFI_NEIGHBOR_REP_COMP\n");
LOG_DBG("NET_EVENT_WIFI_NEIGHBOR_REP_COMP");
break;
case NET_EVENT_WIFI_AP_ENABLE_RESULT:
printk("NET_EVENT_WIFI_AP_ENABLE_RESULT\n");
LOG_DBG("NET_EVENT_WIFI_AP_ENABLE_RESULT");
break;
case NET_EVENT_WIFI_AP_DISABLE_RESULT:
printk("NET_EVENT_WIFI_AP_DISABLE_RESULT\n");
LOG_DBG("NET_EVENT_WIFI_AP_DISABLE_RESULT");
break;
case NET_EVENT_WIFI_AP_STA_CONNECTED:
printk("NET_EVENT_WIFI_AP_STA_CONNECTED\n");
LOG_DBG("NET_EVENT_WIFI_AP_STA_CONNECTED");
break;
case NET_EVENT_WIFI_AP_STA_DISCONNECTED:
printk("NET_EVENT_WIFI_AP_STA_DISCONNECTED\n");
LOG_DBG("NET_EVENT_WIFI_AP_STA_DISCONNECTED");
break;
case NET_EVENT_IPV4_ADDR_ADD:
// DHCP bound, or a static address was configured. The address is read
// live by the ipv4_address getter, so nothing is stored here; the
// status bar just needs a refresh or it keeps showing "No IP".
LOG_DBG("NET_EVENT_IPV4_ADDR_ADD");
schedule_background_on_cp_core(NULL);
break;
default:
printk("unhandled net event %x\n", mgmt_event);
// Print all 64 bits. The layer lives in the high bits, so a 32-bit
// print collapses every unhandled event in a layer to one value.
LOG_DBG("unhandled net event %llx", (unsigned long long)mgmt_event);
break;
}
}
Expand Down Expand Up @@ -196,7 +208,7 @@ static bool wifi_user_initiated;

void common_hal_wifi_init(bool user_initiated) {
wifi_radio_obj_t *self = &common_hal_wifi_radio_obj;
printk("common_hal_wifi_init\n");
LOG_DBG("common_hal_wifi_init");

if (wifi_inited) {
if (user_initiated && !wifi_user_initiated) {
Expand All @@ -223,48 +235,48 @@ void common_hal_wifi_init(bool user_initiated) {
// }
self->sta_netif = net_if_get_wifi_sta();
self->ap_netif = net_if_get_wifi_sap();
printk("sta_netif %p\n", self->sta_netif);
printk("ap_netif %p\n", self->ap_netif);
LOG_DBG("sta_netif %p", self->sta_netif);
LOG_DBG("ap_netif %p", self->ap_netif);


struct wifi_iface_status status = { 0 };
if (self->sta_netif != NULL) {
CHECK_ZEPHYR_RESULT(net_mgmt(NET_REQUEST_WIFI_IFACE_STATUS, self->sta_netif, &status,
sizeof(struct wifi_iface_status)));
if (net_if_is_up(self->sta_netif)) {
printk("STA is up\n");
LOG_DBG("STA is up");
} else {
printk("STA is down\n");
LOG_DBG("STA is down");
}
if (net_if_is_carrier_ok(self->sta_netif)) {
printk("STA carrier is ok\n");
LOG_DBG("STA carrier is ok");
} else {
printk("STA carrier is not ok\n");
LOG_DBG("STA carrier is not ok");
}
if (net_if_is_dormant(self->sta_netif)) {
printk("STA is dormant\n");
LOG_DBG("STA is dormant");
} else {
printk("STA is not dormant\n");
LOG_DBG("STA is not dormant");
}
}
if (self->ap_netif != NULL) {
int res = net_mgmt(NET_REQUEST_WIFI_IFACE_STATUS, self->ap_netif, &status,
sizeof(struct wifi_iface_status));
printk("AP status request response %d\n", res);
LOG_DBG("AP status request response %d", res);
if (net_if_is_up(self->ap_netif)) {
printk("AP is up\n");
LOG_DBG("AP is up");
} else {
printk("AP is down\n");
LOG_DBG("AP is down");
}
if (net_if_is_carrier_ok(self->ap_netif)) {
printk("AP carrier is ok\n");
LOG_DBG("AP carrier is ok");
} else {
printk("AP carrier is not ok\n");
LOG_DBG("AP carrier is not ok");
}
if (net_if_is_dormant(self->ap_netif)) {
printk("AP is dormant\n");
LOG_DBG("AP is dormant");
} else {
printk("AP is not dormant\n");
LOG_DBG("AP is not dormant");
}
}

Expand All @@ -278,6 +290,7 @@ void common_hal_wifi_init(bool user_initiated) {
// self->ap_mode = 0;

net_mgmt_init_event_callback(&wifi_cb, _event_handler,
NET_EVENT_WIFI_SCAN_RESULT |
NET_EVENT_WIFI_SCAN_DONE |
NET_EVENT_WIFI_CONNECT_RESULT |
NET_EVENT_WIFI_DISCONNECT_RESULT |
Expand Down Expand Up @@ -317,21 +330,21 @@ void common_hal_wifi_init(bool user_initiated) {
char cpy_default_hostname[board_len + (MAC_ADDRESS_LENGTH * 2) + 6];
struct net_linkaddr *mac = net_if_get_link_addr(self->sta_netif);
if (mac->len < MAC_ADDRESS_LENGTH) {
printk("MAC address too short");
LOG_ERR("MAC address too short");
}
snprintf(cpy_default_hostname, sizeof(cpy_default_hostname), "cpy-%s-%02x%02x%02x%02x%02x%02x", CIRCUITPY_BOARD_ID + board_trim, mac->addr[0], mac->addr[1], mac->addr[2], mac->addr[3], mac->addr[4], mac->addr[5]);

CHECK_ZEPHYR_RESULT(net_hostname_set(cpy_default_hostname, strlen(cpy_default_hostname)));
}
#else
printk("Hostname support disabled in Zephyr config\n");
LOG_WRN("Hostname support disabled in Zephyr config");
#endif
// set station mode to avoid the default SoftAP
common_hal_wifi_radio_start_station(self);
// start wifi
common_hal_wifi_radio_set_enabled(self, true);

printk("common_hal_wifi_init done\n");
LOG_DBG("common_hal_wifi_init done");
}

void wifi_user_reset(void) {
Expand All @@ -342,7 +355,7 @@ void wifi_user_reset(void) {
}

void wifi_reset(void) {
printk("wifi_reset\n");
LOG_DBG("wifi_reset");
if (!wifi_inited) {
return;
}
Expand Down
Loading