Skip to content

Commit df57f9f

Browse files
committed
TEMP: NONA_WLAN: add workaround for R0
1 parent 67d5556 commit df57f9f

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

boards.txt

+7-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ nona_wlan.build.usb_product="Arduino NONA WLAN"
211211
nona_wlan.build.usb_manufacturer="Arduino LLC"
212212
nona_wlan.build.board=SAMD_NONA_WLAN
213213
nona_wlan.build.core=arduino
214-
nona_wlan.build.extra_flags=-DCRYSTALLESS -D__SAMD21G18A__ {build.usb_flags}
214+
nona_wlan.build.extra_flags=-DCRYSTALLESS -D__SAMD21G18A__ {build.usb_flags} {build.tx_rx_swap}
215215
nona_wlan.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
216216
nona_wlan.build.openocdscript=openocd_scripts/arduino_zero.cfg
217217
nona_wlan.build.variant=nona_wlan
@@ -220,6 +220,12 @@ nona_wlan.build.pid=0x8057
220220
nona_wlan.bootloader.tool=openocd
221221
nona_wlan.bootloader.file=nona_wlan/samd21_sam_ba_arduino_nona_wlan.bin
222222

223+
menu.r0_tx_rx_bug=TX RX swapped
224+
nona_wlan.menu.r0_tx_rx_bug.no=No
225+
nona_wlan.menu.r0_tx_rx_bug.no.build.tx_rx_swap=
226+
nona_wlan.menu.r0_tx_rx_bug.yes=Yes
227+
nona_wlan.menu.r0_tx_rx_bug.yes.build.tx_rx_swap=-DTX_RX_NINA_SWAPPED_R0
228+
223229
# Arduino MKR FOX 1200
224230
# --------------------
225231
mkrfox1200.name=Arduino MKR FOX 1200

variants/nona_wlan/variant.h

+8-5
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,18 @@ extern Uart Serial1;
186186

187187
// Serial1
188188
extern Uart Serial2;
189-
extern Uart SerialBLE;
189+
#ifdef TX_RX_NINA_SWAPPED_R0
190+
// bug in R0, use MixedSerial(Serial2, 30) as SerialNina - 115200bps max
190191
#define PIN_SERIAL2_RX (29ul)
191192
#define PIN_SERIAL2_TX (30ul)
192-
//#define PAD_SERIAL2_TX (UART_TX_RTS_CTS_PAD_0_2_3)
193193
#define PAD_SERIAL2_TX (UART_TX_PAD_2)
194-
//#define PAD_SERIAL2_RX (SERCOM_RX_PAD_1)
195194
#define PAD_SERIAL2_RX (SERCOM_RX_PAD_0)
196-
#define PIN_SERIAL2_RTS (24u)
197-
#define PIN_SERIAL2_CTS (25u)
195+
#else
196+
#define PIN_SERIAL2_RX (30ul)
197+
#define PIN_SERIAL2_TX (29ul)
198+
#define PAD_SERIAL2_TX (UART_TX_PAD_0)
199+
#define PAD_SERIAL2_RX (SERCOM_RX_PAD_1)
200+
#endif
198201

199202
extern Uart SerialHCI;
200203
#define PIN_SERIALHCI_RX (23ul)

0 commit comments

Comments
 (0)