Skip to content

Commit 61201a3

Browse files
author
Daniel Dunn
committed
Try to fix formatting
1 parent 52374ad commit 61201a3

2 files changed

Lines changed: 27 additions & 88 deletions

File tree

‎ports/espressif/common-hal/wifi/Radio.c‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,7 @@ void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_
217217
set_mode_ap(self, true);
218218

219219
uint8_t esp_authmode = 0;
220-
switch (authmode)
221-
{
220+
switch (authmode) {
222221
case AUTHMODE_OPEN:
223222
esp_authmode = WIFI_AUTH_OPEN;
224223
break;
@@ -269,8 +268,7 @@ mp_obj_t common_hal_wifi_radio_get_stations_ap(wifi_radio_obj_t *self) {
269268
}
270269

271270
esp_netif_pair_mac_ip_t mac_ip_pair[esp_sta_list.num];
272-
for (int i = 0; i < esp_sta_list.num; i++)
273-
{
271+
for (int i = 0; i < esp_sta_list.num; i++) {
274272
memcpy(mac_ip_pair[i].mac, esp_sta_list.sta[i].mac, MAC_ADDRESS_LENGTH);
275273
mac_ip_pair[i].ip.addr = 0;
276274
}
@@ -281,8 +279,7 @@ mp_obj_t common_hal_wifi_radio_get_stations_ap(wifi_radio_obj_t *self) {
281279
}
282280

283281
mp_obj_t mp_sta_list = mp_obj_new_list(0, NULL);
284-
for (int i = 0; i < esp_sta_list.num; i++)
285-
{
282+
for (int i = 0; i < esp_sta_list.num; i++) {
286283
mp_obj_t elems[3] = {
287284
mp_obj_new_bytes(esp_sta_list.sta[i].mac, MAC_ADDRESS_LENGTH),
288285
MP_OBJ_NEW_SMALL_INT(esp_sta_list.sta[i].rssi),
@@ -329,8 +326,7 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
329326
xEventGroupClearBits(self->event_group_handle, WIFI_DISCONNECTED_BIT);
330327
// Trying to switch networks so disconnect first.
331328
esp_wifi_disconnect();
332-
do
333-
{
329+
do {
334330
RUN_BACKGROUND_TASKS;
335331
bits = xEventGroupWaitBits(self->event_group_handle,
336332
WIFI_DISCONNECTED_BIT,
@@ -374,8 +370,7 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
374370
self->retries_left = 5;
375371
esp_wifi_connect();
376372

377-
do
378-
{
373+
do {
379374
RUN_BACKGROUND_TASKS;
380375
bits = xEventGroupWaitBits(self->event_group_handle,
381376
WIFI_CONNECTED_BIT | WIFI_DISCONNECTED_BIT,
@@ -393,7 +388,8 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
393388
(self->last_disconnect_reason == WIFI_REASON_AUTH_FAIL) ||
394389
(self->last_disconnect_reason == WIFI_REASON_4WAY_HANDSHAKE_TIMEOUT) ||
395390
(self->last_disconnect_reason == WIFI_REASON_NO_AP_FOUND_W_COMPATIBLE_SECURITY) ||
396-
(self->last_disconnect_reason == WIFI_REASON_NO_AP_FOUND_IN_AUTHMODE_THRESHOLD)) {
391+
(self->last_disconnect_reason == WIFI_REASON_NO_AP_FOUND_IN_AUTHMODE_THRESHOLD)
392+
) {
397393
return WIFI_RADIO_ERROR_AUTH_FAIL;
398394
} else if (self->last_disconnect_reason == WIFI_REASON_NO_AP_FOUND) {
399395
return WIFI_RADIO_ERROR_NO_AP_FOUND;
@@ -494,8 +490,7 @@ static mp_obj_t common_hal_wifi_radio_get_addresses_netif(wifi_radio_obj_t *self
494490
mp_obj_tuple_t *result = MP_OBJ_TO_PTR(mp_obj_new_tuple(n_addresses, NULL));
495491

496492
#if CIRCUITPY_SOCKETPOOL_IPV6
497-
for (int i = 0; i < n_addresses6; i++)
498-
{
493+
for (int i = 0; i < n_addresses6; i++) {
499494
result->items[i] = espaddr6_to_str(&addresses[i]);
500495
}
501496
#endif

‎shared-bindings/wifi/Radio.c‎

Lines changed: 19 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ static bool hostname_valid(const char *ptr, size_t len) {
5252
}
5353

5454
static void validate_hex_password(const uint8_t *buf, size_t len) {
55-
for (size_t i = 0; i < len; i++)
56-
{
55+
for (size_t i = 0; i < len; i++) {
5756
if (!unichar_isxdigit(buf[i])) {
5857
mp_raise_ValueError_varg(MP_ERROR_TEXT("Invalid hex password"));
5958
}
6059
}
6160
}
6261

62+
6363
//| class Radio:
6464
//| """Native wifi radio.
6565
//|
@@ -133,6 +133,7 @@ MP_PROPERTY_GETSET(wifi_radio_hostname_obj,
133133
//| **Limitations:** Not settable on RP2040 CYW43 boards, such as Pi Pico W.
134134
//| """
135135

136+
136137
static mp_obj_t _wifi_radio_get_mac_address(mp_obj_t self_in) {
137138
wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
138139
return MP_OBJ_FROM_PTR(common_hal_wifi_radio_get_mac_address(self));
@@ -262,11 +263,7 @@ MP_PROPERTY_GETTER(wifi_radio_mac_address_ap_obj,
262263
//| """
263264
//| ...
264265
static mp_obj_t wifi_radio_start_scanning_networks(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
265-
enum
266-
{
267-
ARG_start_channel,
268-
ARG_stop_channel
269-
};
266+
enum { ARG_start_channel, ARG_stop_channel };
270267
static const mp_arg_t allowed_args[] = {
271268
{MP_QSTR_start_channel, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1}},
272269
{MP_QSTR_stop_channel, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 11}},
@@ -359,14 +356,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_station_obj, wifi_radio_stop_station);
359356
//| """
360357
//| ...
361358
static mp_obj_t wifi_radio_start_ap(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
362-
enum
363-
{
364-
ARG_ssid,
365-
ARG_password,
366-
ARG_channel,
367-
ARG_authmode,
368-
ARG_max_connections
369-
};
359+
enum { ARG_ssid, ARG_password, ARG_channel, ARG_authmode, ARG_max_connections };
370360
static const mp_arg_t allowed_args[] = {
371361
{MP_QSTR_ssid, MP_ARG_REQUIRED | MP_ARG_OBJ},
372362
{MP_QSTR_password, MP_ARG_OBJ, {.u_obj = mp_const_empty_bytes}},
@@ -464,14 +454,7 @@ MP_PROPERTY_GETTER(wifi_radio_ap_active_obj,
464454
//| connect to the AP with the given ``bssid`` and ``ssid``."""
465455
//| ...
466456
static mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
467-
enum
468-
{
469-
ARG_ssid,
470-
ARG_password,
471-
ARG_channel,
472-
ARG_bssid,
473-
ARG_timeout
474-
};
457+
enum { ARG_ssid, ARG_password, ARG_channel, ARG_bssid, ARG_timeout };
475458
static const mp_arg_t allowed_args[] = {
476459
{MP_QSTR_ssid, MP_ARG_REQUIRED | MP_ARG_OBJ},
477460
{MP_QSTR_password, MP_ARG_OBJ, {.u_obj = mp_const_empty_bytes}},
@@ -598,26 +581,11 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_ap_obj,
598581
//| """
599582
//| ...
600583
static mp_obj_t wifi_radio_set_ipv4_address(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
601-
enum
602-
{
603-
ARG_ipv4,
604-
ARG_netmask,
605-
ARG_gateway,
606-
ARG_ipv4_dns
607-
};
584+
enum { ARG_ipv4, ARG_netmask, ARG_gateway, ARG_ipv4_dns };
608585
static const mp_arg_t allowed_args[] = {
609-
{
610-
MP_QSTR_ipv4,
611-
MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ,
612-
},
613-
{
614-
MP_QSTR_netmask,
615-
MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ,
616-
},
617-
{
618-
MP_QSTR_gateway,
619-
MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ,
620-
},
586+
{ MP_QSTR_ipv4, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
587+
{ MP_QSTR_netmask, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
588+
{ MP_QSTR_gateway, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
621589
{MP_QSTR_ipv4_dns, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NULL}},
622590
};
623591

@@ -640,25 +608,11 @@ static MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_obj, 1, wifi_radio
640608
//| """Sets the IP v4 address of the access point. Must include the netmask and gateway."""
641609
//| ...
642610
static mp_obj_t wifi_radio_set_ipv4_address_ap(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
643-
enum
644-
{
645-
ARG_ipv4,
646-
ARG_netmask,
647-
ARG_gateway
648-
};
611+
enum { ARG_ipv4, ARG_netmask, ARG_gateway };
649612
static const mp_arg_t allowed_args[] = {
650-
{
651-
MP_QSTR_ipv4,
652-
MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ,
653-
},
654-
{
655-
MP_QSTR_netmask,
656-
MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ,
657-
},
658-
{
659-
MP_QSTR_gateway,
660-
MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ,
661-
},
613+
{ MP_QSTR_ipv4, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
614+
{ MP_QSTR_netmask, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
615+
{ MP_QSTR_gateway, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
662616
};
663617

664618
wifi_radio_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
@@ -776,11 +730,7 @@ MP_PROPERTY_GETTER(wifi_radio_stations_ap_obj,
776730
//| """
777731
//| ...
778732
static mp_obj_t wifi_radio_start_dhcp_client(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
779-
enum
780-
{
781-
ARG_ipv4,
782-
ARG_ipv6
783-
};
733+
enum { ARG_ipv4, ARG_ipv6 };
784734
static const mp_arg_t allowed_args[] = {
785735
{MP_QSTR_ipv4, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = MP_ROM_TRUE}},
786736
{MP_QSTR_ipv6, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = MP_ROM_FALSE}},
@@ -838,16 +788,9 @@ MP_PROPERTY_GETTER(wifi_radio_ap_info_obj,
838788
//| ...
839789
//|
840790
static mp_obj_t wifi_radio_ping(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
841-
enum
842-
{
843-
ARG_ip,
844-
ARG_timeout
845-
};
791+
enum { ARG_ip, ARG_timeout };
846792
static const mp_arg_t allowed_args[] = {
847-
{
848-
MP_QSTR_ip,
849-
MP_ARG_REQUIRED | MP_ARG_OBJ,
850-
},
793+
{ MP_QSTR_ip, MP_ARG_REQUIRED | MP_ARG_OBJ, },
851794
{MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none}},
852795
};
853796

@@ -925,7 +868,8 @@ MP_DEFINE_CONST_OBJ_TYPE(
925868
wifi_radio_type,
926869
MP_QSTR_Radio,
927870
MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS,
928-
locals_dict, &wifi_radio_locals_dict);
871+
locals_dict, &wifi_radio_locals_dict
872+
);
929873

930874
const mp_obj_namedtuple_type_t wifi_radio_station_type = {
931875
NAMEDTUPLE_TYPE_BASE_AND_SLOTS(MP_QSTR_WifiRadioStation),

0 commit comments

Comments
 (0)