Skip to content

Commit 3b0028a

Browse files
committed
fix SSL flag setup; enable CIRCUITPY_WIFI_AIRLIFT for more boards
1 parent a490203 commit 3b0028a

File tree

6 files changed

+16
-9
lines changed

6 files changed

+16
-9
lines changed

devices/airlift/common-hal/wifi/Radio.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,15 +1072,16 @@ void common_hal_wifi_radio_set_ipv4_dns(wifi_radio_obj_t *self, mp_obj_t ipv4_dn
10721072

10731073
const uint8_t *params[3] = { &valid_params_arg, dns_bytes, zero_dns_bytes };
10741074
size_t param_lengths[3] = { 1, IPV4_LENGTH, IPV4_LENGTH };
1075-
uint8_t *responses[1];
1075+
uint8_t result = 0;
1076+
uint8_t *responses[1] = { &result };
10761077
size_t response_lengths[1];
10771078

10781079
size_t num_responses = wifi_radio_send_command_get_response(self, SET_DNS_CONFIG,
10791080
params, param_lengths, LENGTHS_8, MP_ARRAY_SIZE(params),
10801081
responses, response_lengths, LENGTHS_8, MP_ARRAY_SIZE(responses),
10811082
AIRLIFT_DEFAULT_TIMEOUT_MS);
10821083

1083-
if (num_responses == 0 || responses[0][0] != 1) {
1084+
if (num_responses == 0 || result != 1) {
10841085
mp_raise_RuntimeError(MP_ERROR_TEXT("Failed"));
10851086
}
10861087
}

ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ LONGINT_IMPL = MPZ
1212

1313
CIRCUITPY_LTO_PARTITION = one
1414

15+
CIRCUITPY_WIFI_AIRLIFT = 1
16+
1517
CIRCUITPY_AESIO = 0
1618
CIRCUITPY_FLOPPYIO = 0
1719
CIRCUITPY_PARALLELDISPLAYBUS = 0

ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ QSPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C, W25Q16JVxQ"
1111
LONGINT_IMPL = MPZ
1212

13-
CIRCUITPY__EVE = 0
14-
CIRCUITPY_CODEOP = 0
13+
CIRCUITPY_WIFI_AIRLIFT = 1
14+
15+
CIRCUITPY_AESIO = 0
1516
CIRCUITPY_FLOPPYIO = 0
1617
CIRCUITPY_JPEGIO = 0
17-
CIRCUITPY_MSGPACK = 0
18-
CIRCUITPY_SYNTHIO = 0
19-
CIRCUITPY_VECTORIO = 0
18+
CIRCUITPY_ULAB = 0
2019

2120

2221
# We don't have room for the fonts for terminalio for certain languages,

ports/mimxrt10xx/mpconfigport.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ USB_NUM_ENDPOINT_PAIRS = 8
88
CIRCUITPY_TUSB_MEM_ALIGN = 32
99

1010
INTERNAL_FLASH_FILESYSTEM = 1
11+
LONGINT_IMPL = MPZ
1112

1213
CIRCUITPY_AUDIOBUSIO ?= 1
1314
CIRCUITPY_AUDIOBUSIO_PDMIN = 0
@@ -27,6 +28,6 @@ CIRCUITPY_PULSEIO = 0
2728
CIRCUITPY_ROTARYIO = 1
2829
CIRCUITPY_ROTARYIO_SOFTENCODER = 1
2930
CIRCUITPY_USB_MIDI = 1
30-
LONGINT_IMPL = MPZ
31+
CIRCUITPY_WIFI_AIRLIFT = 1
3132

3233
CIRCUITPY_BUILD_EXTENSIONS ?= hex,uf2

ports/raspberrypi/mpconfigport.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ CIRCUITPY_SYNTHIO_MAX_CHANNELS = 24
2525
CIRCUITPY_USB_HOST ?= 1
2626
CIRCUITPY_USB_VIDEO ?= 1
2727

28+
ifeq ($(CIRCUITPY_CYW43),0)
29+
CIRCUITPY_WIFI_AIRLIFT ?= 1
30+
endif
31+
2832
# Things that need to be implemented.
2933
CIRCUITPY_FREQUENCYIO = 0
3034

py/circuitpy_mpconfig.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ CIRCUITPY_SPITARGET ?= 0
554554
CFLAGS += -DCIRCUITPY_SPITARGET=$(CIRCUITPY_SPITARGET)
555555

556556
CIRCUITPY_SSL_AIRLIFT ?= $(CIRCUITPY_WIFI_AIRLIFT)
557-
CFLAGS += -DCIRCUITPY_WIFI_AIRLIFT=$(CIRCUITPY_SSL_AIRLIFT)
557+
CFLAGS += -DCIRCUITPY_SSL_AIRLIFT=$(CIRCUITPY_SSL_AIRLIFT)
558558

559559
CIRCUITPY_SSL_NATIVE ?= 0
560560
CFLAGS += -DCIRCUITPY_SSL_NATIVE=$(CIRCUITPY_SSL_NATIVE)

0 commit comments

Comments
 (0)