Skip to content

Commit 2f5b47a

Browse files
committed
Pico Wireless: Fixup for GCC 13.x.
These changes are giving me "how did this ever work?" vibes.
1 parent aa34f12 commit 2f5b47a

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

micropython/modules/pico_wireless/pico_wireless.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ mp_obj_t picowireless_init() {
5959

6060
mp_obj_t picowireless_get_network_data() {
6161
if(wireless != nullptr) {
62-
uint8_t *ip = nullptr;
63-
uint8_t *mask = nullptr;
64-
uint8_t *gwip = nullptr;
65-
wireless->get_network_data(ip, mask, gwip);
62+
IPAddress ip;
63+
IPAddress mask;
64+
IPAddress gwip;
65+
wireless->get_network_data((uint8_t *)&ip, (uint8_t *)&mask, (uint8_t *)&gwip);
6666

6767
mp_obj_t tuple[3];
68-
tuple[0] = mp_obj_new_bytes(ip, WL_IPV4_LENGTH);
69-
tuple[1] = mp_obj_new_bytes(mask, WL_IPV4_LENGTH);
70-
tuple[2] = mp_obj_new_bytes(gwip, WL_IPV4_LENGTH);
68+
tuple[0] = mp_obj_new_bytes((uint8_t *)&ip, WL_IPV4_LENGTH);
69+
tuple[1] = mp_obj_new_bytes((uint8_t *)&mask, WL_IPV4_LENGTH);
70+
tuple[2] = mp_obj_new_bytes((uint8_t *)&gwip, WL_IPV4_LENGTH);
7171
return mp_obj_new_tuple(3, tuple);
7272
}
7373
else
@@ -86,13 +86,13 @@ mp_obj_t picowireless_get_remote_data(size_t n_args, const mp_obj_t *pos_args, m
8686
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
8787
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
8888

89-
uint8_t *ip = nullptr;
90-
uint8_t *port = nullptr;
91-
wireless->get_remote_data(args[ARG_sock].u_int, ip, port);
89+
IPAddress ip;
90+
uint16_t port = 0;
91+
wireless->get_remote_data(args[ARG_sock].u_int, (uint8_t *)&ip, (uint8_t *)&port);
9292

9393
mp_obj_t tuple[2];
94-
tuple[0] = mp_obj_new_bytes(ip, WL_IPV4_LENGTH);
95-
tuple[1] = mp_obj_new_int((uint16_t)port[0] << 8 | (uint16_t)port[1]); //TODO verify size and ordering of port
94+
tuple[0] = mp_obj_new_bytes((uint8_t *)&ip, WL_IPV4_LENGTH);
95+
tuple[1] = mp_obj_new_int(port); //TODO verify size and ordering of port
9696
return mp_obj_new_tuple(2, tuple);
9797
}
9898
else

0 commit comments

Comments
 (0)