Skip to content

Commit 8ed2ae4

Browse files
tannewttannewt
committed
more wifi work
1 parent 515bd70 commit 8ed2ae4

File tree

2 files changed

+79
-77
lines changed

2 files changed

+79
-77
lines changed

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

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -69,27 +69,27 @@ static void _event_handler(struct net_mgmt_event_callback *cb, uint32_t mgmt_eve
6969
break;
7070
case NET_EVENT_WIFI_CONNECT_RESULT:
7171
printk("NET_EVENT_WIFI_CONNECT_RESULT\n");
72-
const struct wifi_status *status = (const struct wifi_status *) cb->info;
72+
const struct wifi_status *status = (const struct wifi_status *)cb->info;
7373
printk(" wifi status %d\n", status);
7474
switch (status->conn_status) {
75-
case WIFI_STATUS_CONN_SUCCESS:
76-
printk(" WIFI_STATUS_CONN_SUCCESS\n");
77-
break;
78-
case WIFI_STATUS_CONN_FAIL:
79-
printk(" WIFI_STATUS_CONN_FAIL\n");
80-
break;
81-
case WIFI_STATUS_CONN_WRONG_PASSWORD:
82-
printk(" WIFI_STATUS_CONN_WRONG_PASSWORD\n");
83-
break;
84-
case WIFI_STATUS_CONN_TIMEOUT:
85-
printk(" WIFI_STATUS_CONN_TIMEOUT\n");
86-
break;
87-
case WIFI_STATUS_CONN_AP_NOT_FOUND:
88-
printk(" WIFI_STATUS_CONN_AP_NOT_FOUND\n");
89-
break;
90-
default:
91-
printk(" wifi status %d status %d not found %d timeout %d\n", status->conn_status, status->status, WIFI_STATUS_CONN_AP_NOT_FOUND, WIFI_STATUS_CONN_TIMEOUT);
92-
break;
75+
case WIFI_STATUS_CONN_SUCCESS:
76+
printk(" WIFI_STATUS_CONN_SUCCESS\n");
77+
break;
78+
case WIFI_STATUS_CONN_FAIL:
79+
printk(" WIFI_STATUS_CONN_FAIL\n");
80+
break;
81+
case WIFI_STATUS_CONN_WRONG_PASSWORD:
82+
printk(" WIFI_STATUS_CONN_WRONG_PASSWORD\n");
83+
break;
84+
case WIFI_STATUS_CONN_TIMEOUT:
85+
printk(" WIFI_STATUS_CONN_TIMEOUT\n");
86+
break;
87+
case WIFI_STATUS_CONN_AP_NOT_FOUND:
88+
printk(" WIFI_STATUS_CONN_AP_NOT_FOUND\n");
89+
break;
90+
default:
91+
printk(" wifi status %d status %d not found %d timeout %d\n", status->conn_status, status->status, WIFI_STATUS_CONN_AP_NOT_FOUND, WIFI_STATUS_CONN_TIMEOUT);
92+
break;
9393
}
9494
k_poll_signal_raise(&self->done, status->status);
9595
break;
@@ -161,63 +161,63 @@ static void _event_handler(struct net_mgmt_event_callback *cb, uint32_t mgmt_eve
161161
break;
162162
case NET_EVENT_SUPPLICANT_INT_EVENT:
163163
printk("NET_EVENT_SUPPLICANT_INT_EVENT\n");
164-
struct supplicant_int_event_data* event_data = (struct supplicant_int_event_data *)cb->info;
165-
union supplicant_event_data* data = (union supplicant_event_data*) event_data->data;
164+
struct supplicant_int_event_data *event_data = (struct supplicant_int_event_data *)cb->info;
165+
union supplicant_event_data *data = (union supplicant_event_data *)event_data->data;
166166
switch (event_data->event) {
167-
case SUPPLICANT_EVENT_CONNECTED:
168-
printk(" SUPPLICANT_EVENT_CONNECTED\n");
169-
break;
170-
case SUPPLICANT_EVENT_DISCONNECTED:
171-
printk(" SUPPLICANT_EVENT_DISCONNECTED\n");
172-
break;
173-
case SUPPLICANT_EVENT_ASSOC_REJECT:
174-
printk(" SUPPLICANT_EVENT_ASSOC_REJECT\n");
175-
break;
176-
case SUPPLICANT_EVENT_AUTH_REJECT:
177-
printk(" SUPPLICANT_EVENT_AUTH_REJECT\n");
178-
break;
179-
case SUPPLICANT_EVENT_TERMINATING:
180-
printk(" SUPPLICANT_EVENT_TERMINATING\n");
181-
break;
182-
case SUPPLICANT_EVENT_SSID_TEMP_DISABLED:
183-
printk(" SUPPLICANT_EVENT_SSID_TEMP_DISABLED\n");
184-
break;
185-
case SUPPLICANT_EVENT_SSID_REENABLED:
186-
printk(" SUPPLICANT_EVENT_SSID_REENABLED\n");
187-
break;
188-
case SUPPLICANT_EVENT_SCAN_STARTED:
189-
printk(" SUPPLICANT_EVENT_SCAN_STARTED\n");
190-
break;
191-
case SUPPLICANT_EVENT_SCAN_RESULTS:
192-
printk(" SUPPLICANT_EVENT_SCAN_RESULTS\n");
193-
break;
194-
case SUPPLICANT_EVENT_SCAN_FAILED:
195-
printk(" SUPPLICANT_EVENT_SCAN_FAILED\n");
196-
break;
197-
case SUPPLICANT_EVENT_BSS_ADDED:
198-
printk(" SUPPLICANT_EVENT_BSS_ADDED\n");
199-
break;
200-
case SUPPLICANT_EVENT_BSS_REMOVED:
201-
printk(" SUPPLICANT_EVENT_BSS_REMOVED\n");
202-
break;
203-
case SUPPLICANT_EVENT_NETWORK_NOT_FOUND:
204-
printk(" SUPPLICANT_EVENT_NETWORK_NOT_FOUND\n");
205-
break;
206-
case SUPPLICANT_EVENT_NETWORK_ADDED:
207-
printk(" SUPPLICANT_EVENT_NETWORK_ADDED\n");
208-
break;
209-
case SUPPLICANT_EVENT_NETWORK_REMOVED:
210-
printk(" SUPPLICANT_EVENT_NETWORK_REMOVED\n");
211-
break;
212-
case SUPPLICANT_EVENT_DSCP_POLICY:
213-
printk(" SUPPLICANT_EVENT_DSCP_POLICY\n");
214-
break;
215-
case SUPPLICANT_EVENT_REGDOM_CHANGE:
216-
printk(" SUPPLICANT_EVENT_REGDOM_CHANGE\n");
217-
break;
218-
default:
219-
printk(" supplicant event %d\n", event_data->event);
220-
break;
167+
case SUPPLICANT_EVENT_CONNECTED:
168+
printk(" SUPPLICANT_EVENT_CONNECTED\n");
169+
break;
170+
case SUPPLICANT_EVENT_DISCONNECTED:
171+
printk(" SUPPLICANT_EVENT_DISCONNECTED\n");
172+
break;
173+
case SUPPLICANT_EVENT_ASSOC_REJECT:
174+
printk(" SUPPLICANT_EVENT_ASSOC_REJECT\n");
175+
break;
176+
case SUPPLICANT_EVENT_AUTH_REJECT:
177+
printk(" SUPPLICANT_EVENT_AUTH_REJECT\n");
178+
break;
179+
case SUPPLICANT_EVENT_TERMINATING:
180+
printk(" SUPPLICANT_EVENT_TERMINATING\n");
181+
break;
182+
case SUPPLICANT_EVENT_SSID_TEMP_DISABLED:
183+
printk(" SUPPLICANT_EVENT_SSID_TEMP_DISABLED\n");
184+
break;
185+
case SUPPLICANT_EVENT_SSID_REENABLED:
186+
printk(" SUPPLICANT_EVENT_SSID_REENABLED\n");
187+
break;
188+
case SUPPLICANT_EVENT_SCAN_STARTED:
189+
printk(" SUPPLICANT_EVENT_SCAN_STARTED\n");
190+
break;
191+
case SUPPLICANT_EVENT_SCAN_RESULTS:
192+
printk(" SUPPLICANT_EVENT_SCAN_RESULTS\n");
193+
break;
194+
case SUPPLICANT_EVENT_SCAN_FAILED:
195+
printk(" SUPPLICANT_EVENT_SCAN_FAILED\n");
196+
break;
197+
case SUPPLICANT_EVENT_BSS_ADDED:
198+
printk(" SUPPLICANT_EVENT_BSS_ADDED\n");
199+
break;
200+
case SUPPLICANT_EVENT_BSS_REMOVED:
201+
printk(" SUPPLICANT_EVENT_BSS_REMOVED\n");
202+
break;
203+
case SUPPLICANT_EVENT_NETWORK_NOT_FOUND:
204+
printk(" SUPPLICANT_EVENT_NETWORK_NOT_FOUND\n");
205+
break;
206+
case SUPPLICANT_EVENT_NETWORK_ADDED:
207+
printk(" SUPPLICANT_EVENT_NETWORK_ADDED\n");
208+
break;
209+
case SUPPLICANT_EVENT_NETWORK_REMOVED:
210+
printk(" SUPPLICANT_EVENT_NETWORK_REMOVED\n");
211+
break;
212+
case SUPPLICANT_EVENT_DSCP_POLICY:
213+
printk(" SUPPLICANT_EVENT_DSCP_POLICY\n");
214+
break;
215+
case SUPPLICANT_EVENT_REGDOM_CHANGE:
216+
printk(" SUPPLICANT_EVENT_REGDOM_CHANGE\n");
217+
break;
218+
default:
219+
printk(" supplicant event %d\n", event_data->event);
220+
break;
221221
}
222222
break;
223223
}
@@ -407,7 +407,7 @@ void common_hal_wifi_init(bool user_initiated) {
407407
NET_EVENT_SUPPLICANT_IFACE_ADDED |
408408
NET_EVENT_SUPPLICANT_IFACE_REMOVED |
409409
NET_EVENT_SUPPLICANT_IFACE_REMOVING); // |
410-
// NET_EVENT_SUPPLICANT_INT_EVENT);
410+
// NET_EVENT_SUPPLICANT_INT_EVENT);
411411

412412
net_mgmt_init_event_callback(&ipv4_cb, _event_handler, NET_EVENT_IPV4_ADDR_ADD);
413413

‎ports/zephyr-cp/prj.conf‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ CONFIG_ASSERT=y
2626
CONFIG_LOG_BLOCK_IN_THREAD=y
2727

2828
CONFIG_EVENTS=y
29-
CONFIG_DEBUG=y
29+
CONFIG_LOG=y
3030
CONFIG_WIFI_NRF70_LOG_LEVEL_INF=y
31+
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_INF=y
3132

3233
CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=12288
3334
# For wpa_supplicant use.
3435
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192
36+
CONFIG_BT=y

0 commit comments

Comments
 (0)