NANO 33 IoT: remove references to R0

Author: facchinm

boards.txt

@@ -211,7 +211,7 @@ nano_33_iot.build.usb_product="Arduino NANO 33 IoT"
 nano_33_iot.build.usb_manufacturer="Arduino LLC"
 nano_33_iot.build.board=SAMD_NANO_33_IOT
 nano_33_iot.build.core=arduino
-nano_33_iot.build.extra_flags=-DCRYSTALLESS -D__SAMD21G18A__ {build.usb_flags} {build.tx_rx_swap}
+nano_33_iot.build.extra_flags=-DCRYSTALLESS -D__SAMD21G18A__ {build.usb_flags}
 nano_33_iot.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
 nano_33_iot.build.openocdscript=openocd_scripts/arduino_zero.cfg
 nano_33_iot.build.variant=nano_33_iot
@@ -220,12 +220,6 @@ nano_33_iot.build.pid=0x8057
 nano_33_iot.bootloader.tool=openocd
 nano_33_iot.bootloader.file=nano_33_iot/samd21_sam_ba_arduino_nano_33_iot.bin
 
-menu.r0_tx_rx_bug=TX RX swapped
-nano_33_iot.menu.r0_tx_rx_bug.no=No
-nano_33_iot.menu.r0_tx_rx_bug.no.build.tx_rx_swap=
-nano_33_iot.menu.r0_tx_rx_bug.yes=Yes
-nano_33_iot.menu.r0_tx_rx_bug.yes.build.tx_rx_swap=-DTX_RX_NINA_SWAPPED_R0
-
 # Arduino MKR FOX 1200
 # --------------------
 mkrfox1200.name=Arduino MKR FOX 1200

cores/arduino/USB/samd21_host.c

@@ -143,8 +143,10 @@ void UHD_Init(void)
 	uhd_state = UHD_STATE_NO_VBUS;
 
 	// Put VBUS on USB port
+	#ifdef PIN_USB_HOST_ENABLE
 	pinMode( PIN_USB_HOST_ENABLE, OUTPUT );
 	digitalWrite( PIN_USB_HOST_ENABLE, HIGH );
+	#endif
 
 	uhd_enable_connection_int();
 

variants/nano_33_iot/variant.cpp

@@ -162,7 +162,7 @@ const PinDescription g_APinDescription[]=
  | 24         |                  |  PA14  | NINA_CS         |   14   |     |     |     |     |   2/02  |   4/02  |  TC3/0 | TCC0/4 |          | GCLK_IO0 |
  | 25         |                  |  PA15  | NINA_SCK        |   15   |     |     |     |     |  *2/03  |   4/03  |  TC3/1 | TCC0/5 |          | GCLK_IO1 |
  | 26         |                  |  PA27  | NINA_GPIO0      |  *15   |     |     |     |     |         |         |        |        |          | GCLK_IO0 |
- | 27         |                  |  PB08  | NINA_RESETN     |   08   |  02 |     | Y14 |     |         |   4/00  |  TC4/0 |        |          |          |
+ | 27         |                  |  PA08  | NINA_RESETN     |   08   |  02 |     | Y14 |     |         |   4/00  |  TC4/0 |        |          |          |
  | 28         |                  |  PA28  | NINA_ACK        |   01   |     |     |     |     |         |   1/01  | TCC2/1 |        |          |          |
 +------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
 */

variants/nano_33_iot/variant.h

@@ -158,9 +158,8 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 
 // USB
 // ---
-#define PIN_USB_HOST_ENABLE (0xFF)
-#define PIN_USB_DM          (29ul)
-#define PIN_USB_DP          (30ul)
+#define PIN_USB_DM          (31ul)
+#define PIN_USB_DP          (32ul)
 
 // I2S Interfaces
 // --------------
@@ -189,18 +188,10 @@ extern Uart Serial1;
 
 // Serial1
 extern Uart Serial2;
-#ifdef TX_RX_NINA_SWAPPED_R0
-// bug in R0, use MixedSerial(Serial2, 30) as SerialNina - 115200bps max
-#define PIN_SERIAL2_RX       (29ul)
-#define PIN_SERIAL2_TX       (30ul)
-#define PAD_SERIAL2_TX       (UART_TX_PAD_2)
-#define PAD_SERIAL2_RX       (SERCOM_RX_PAD_0)
-#else
 #define PIN_SERIAL2_RX       (30ul)
 #define PIN_SERIAL2_TX       (29ul)
 #define PAD_SERIAL2_TX       (UART_TX_PAD_0)
 #define PAD_SERIAL2_RX       (SERCOM_RX_PAD_1)
-#endif
 
 extern Uart SerialHCI;
 #define PIN_SERIALHCI_RX (23ul)