Skip to content

Commit 72b79a0

Browse files
facchinmfacchinm
committed
Move UARTS mux to variant (and begin)
1 parent 26cb7b2 commit 72b79a0

File tree

9 files changed

+29
-31
lines changed

9 files changed

+29
-31
lines changed

‎cores/arduino/UART.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ void UartClass::begin(unsigned long baud, uint16_t config)
131131
this->end();
132132
}
133133

134+
// Setup port mux
135+
PORTMUX.USARTROUTEA |= _uart_mux;
136+
134137
//uint16_t baud_setting = 0;
135138
int32_t baud_setting = 0;
136139
uint8_t error = 0;

‎cores/arduino/UART.h‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,26 +128,28 @@ class UartClass : public HardwareSerial
128128
volatile uint8_t const _hwserial_rx_pin;
129129
volatile uint8_t const _hwserial_tx_pin;
130130

131+
volatile uint8_t const _uart_mux;
132+
131133
// Has any byte been written to the UART since begin()
132134
bool _written;
133135

134136
volatile rx_buffer_index_t _rx_buffer_head;
135137
volatile rx_buffer_index_t _rx_buffer_tail;
136138
volatile tx_buffer_index_t _tx_buffer_head;
137139
volatile tx_buffer_index_t _tx_buffer_tail;
138-
139-
volatile uint8_t _hwserial_dre_interrupt_vect_num;
140-
volatile uint8_t _hwserial_dre_interrupt_elevated;
141-
volatile uint8_t _prev_lvl1_interrupt_vect;
142-
140+
141+
volatile uint8_t _hwserial_dre_interrupt_vect_num;
142+
volatile uint8_t _hwserial_dre_interrupt_elevated;
143+
volatile uint8_t _prev_lvl1_interrupt_vect;
144+
143145
// Don't put any members after these buffers, since only the first
144146
// 32 bytes of this struct can be accessed quickly using the ldd
145147
// instruction.
146148
unsigned char _rx_buffer[SERIAL_RX_BUFFER_SIZE];
147149
unsigned char _tx_buffer[SERIAL_TX_BUFFER_SIZE];
148150

149151
public:
150-
inline UartClass(volatile USART_t *hwserial_module, uint8_t hwserial_rx_pin, uint8_t hwserial_tx_pin, uint8_t dre_vect_num);
152+
inline UartClass(volatile USART_t *hwserial_module, uint8_t hwserial_rx_pin, uint8_t hwserial_tx_pin, uint8_t dre_vect_num, uint8_t uart_mux);
151153
void begin(unsigned long baud) { begin(baud, SERIAL_8N1); }
152154
void begin(unsigned long, uint16_t);
153155
void end();

‎cores/arduino/UART0.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ISR(HWSERIAL0_DRE_VECTOR)
5555
#endif
5656

5757
#if defined(HWSERIAL0)
58-
UartClass Serial(HWSERIAL0, PIN_WIRE_HWSERIAL0_RX, PIN_WIRE_HWSERIAL0_TX, HWSERIAL0_DRE_VECTOR_NUM);
58+
UartClass Serial(HWSERIAL0, PIN_WIRE_HWSERIAL0_RX, PIN_WIRE_HWSERIAL0_TX, HWSERIAL0_DRE_VECTOR_NUM, HWSERIAL0_MUX);
5959
#endif
6060

6161
// Function that can be weakly referenced by serialEventRun to prevent

‎cores/arduino/UART1.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ISR(HWSERIAL1_DRE_VECTOR)
5555
#endif
5656

5757
#if defined(HWSERIAL1)
58-
UartClass Serial1(HWSERIAL1, PIN_WIRE_HWSERIAL1_RX, PIN_WIRE_HWSERIAL1_TX, HWSERIAL1_DRE_VECTOR_NUM);
58+
UartClass Serial1(HWSERIAL1, PIN_WIRE_HWSERIAL1_RX, PIN_WIRE_HWSERIAL1_TX, HWSERIAL1_DRE_VECTOR_NUM, HWSERIAL1_MUX);
5959
#endif
6060

6161
// Function that can be weakly referenced by serialEventRun to prevent

‎cores/arduino/UART2.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ISR(HWSERIAL2_DRE_VECTOR)
5555
#endif
5656

5757
#if defined(HWSERIAL2)
58-
UartClass Serial2(HWSERIAL2, PIN_WIRE_HWSERIAL2_RX, PIN_WIRE_HWSERIAL2_TX, HWSERIAL2_DRE_VECTOR_NUM);
58+
UartClass Serial2(HWSERIAL2, PIN_WIRE_HWSERIAL2_RX, PIN_WIRE_HWSERIAL2_TX, HWSERIAL2_DRE_VECTOR_NUM, HWSERIAL2_MUX);
5959
#endif
6060

6161
// Function that can be weakly referenced by serialEventRun to prevent

‎cores/arduino/UART3.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ISR(HWSERIAL3_DRE_VECTOR)
5555
#endif
5656

5757
#if defined(HWSERIAL3)
58-
UartClass Serial3(HWSERIAL3, PIN_WIRE_HWSERIAL3_RX, PIN_WIRE_HWSERIAL3_TX, HWSERIAL3_DRE_VECTOR_NUM);
58+
UartClass Serial3(HWSERIAL3, PIN_WIRE_HWSERIAL3_RX, PIN_WIRE_HWSERIAL3_TX, HWSERIAL3_DRE_VECTOR_NUM, HWSERIAL3_MUX);
5959
#endif
6060

6161
// Function that can be weakly referenced by serialEventRun to prevent

‎cores/arduino/UART_private.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@ UartClass::UartClass(
3333
volatile USART_t *hwserial_module,
3434
volatile uint8_t hwserial_rx_pin,
3535
volatile uint8_t hwserial_tx_pin,
36-
volatile uint8_t hwserial_dre_interrupt_vect_num) :
36+
volatile uint8_t hwserial_dre_interrupt_vect_num,
37+
volatile uint8_t uart_mux) :
3738
_hwserial_module(hwserial_module),
3839
_hwserial_rx_pin(hwserial_rx_pin),
3940
_hwserial_tx_pin(hwserial_tx_pin),
40-
_hwserial_dre_interrupt_vect_num(hwserial_dre_interrupt_vect_num),
41+
_uart_mux(uart_mux),
4142
_rx_buffer_head(0), _rx_buffer_tail(0),
4243
_tx_buffer_head(0), _tx_buffer_tail(0),
44+
_hwserial_dre_interrupt_vect_num(hwserial_dre_interrupt_vect_num),
4345
_hwserial_dre_interrupt_elevated(0),
4446
_prev_lvl1_interrupt_vect(0)
4547
{

‎cores/arduino/wiring.c‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -350,26 +350,12 @@ void init()
350350
/* Enable ADC */
351351
ADC0.CTRLA |= ADC_ENABLE_bm;
352352

353-
//#endif
354-
355-
/****************************** USART *****************************************/
353+
#endif
356354

357-
#ifdef REV_A_ENGINEERING_SAMPLE
358-
/* Configure PORTMUX for USARTS */
359-
//PORTMUX.USARTROUTEA = (PORTMUX_USART1_ALT1_gc // MAIN
360-
//| PORTMUX_USART0_ALT1_gc // SPARE
361-
//| PORTMUX_USART3_ALT1_gc); // DEBUG
362355

363-
PORTMUX.USARTROUTEA = (PORTMUX_USART0_ALT1_gc // SPARE
364-
| PORTMUX_USART3_ALT1_gc); // DEBUG
365-
#else
366-
/* Configure PORTMUX for USARTS */
367-
PORTMUX.USARTROUTEA = (PORTMUX_USART1_ALT1_gc // MAIN
368-
| PORTMUX_USART0_ALT1_gc // SPARE
369-
| PORTMUX_USART3_ALT1_gc); // DEBUG
370-
#endif
356+
setup_timers();
371357

372-
/********************* TCB3 for system time tracking **************************/
358+
/********************* TCB3 for system time tracking **************************/
373359

374360
/* Calculate relevant time tracking values */
375361
microseconds_per_timerb3_overflow = clockCyclesToMicroseconds(TIME_TRACKING_CYCLES_PER_OVF);

‎variants/uno2018/pins_arduino.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ static const uint8_t SCL = PIN_WIRE_SCL;
6161
#define HWSERIAL0_DRE_VECTOR_NUM (USART1_DRE_vect_num)
6262
#define HWSERIAL0_RXC_VECTOR (USART1_RXC_vect)
6363
#ifdef REV_A_ENGINEERING_SAMPLE
64+
#define HWSERIAL0_MUX (PORTMUX_USART1_DEFAULT_gc)
6465
#define PIN_WIRE_HWSERIAL0_RX (12)
6566
#define PIN_WIRE_HWSERIAL0_TX (11)
6667
#else
68+
#define HWSERIAL0_MUX (PORTMUX_USART1_ALT1_gc)
6769
#define PIN_WIRE_HWSERIAL0_RX (0)
6870
#define PIN_WIRE_HWSERIAL0_TX (1)
6971
#endif
@@ -75,6 +77,7 @@ static const uint8_t SCL = PIN_WIRE_SCL;
7577
#define HWSERIAL1_DRE_VECTOR (USART3_DRE_vect)
7678
#define HWSERIAL1_DRE_VECTOR_NUM (USART3_DRE_vect_num)
7779
#define HWSERIAL1_RXC_VECTOR (USART3_RXC_vect)
80+
#define HWSERIAL1_MUX (PORTMUX_USART3_ALT1_gc)
7881
#define PIN_WIRE_HWSERIAL1_RX (26)
7982
#define PIN_WIRE_HWSERIAL1_TX (27)
8083

@@ -85,9 +88,13 @@ static const uint8_t SCL = PIN_WIRE_SCL;
8588
#define HWSERIAL2_DRE_VECTOR (USART0_DRE_vect)
8689
#define HWSERIAL2_DRE_VECTOR_NUM (USART0_DRE_vect_num)
8790
#define HWSERIAL2_RXC_VECTOR (USART0_RXC_vect)
91+
#define HWSERIAL2_MUX (PORTMUX_USART0_ALT1_gc)
8892
#define PIN_WIRE_HWSERIAL2_RX (23)
8993
#define PIN_WIRE_HWSERIAL2_TX (24)
9094

95+
#define HWSERIAL3_MUX (PORTMUX_USART2_NONE_gc)
96+
#define TWI_MUX (PORTMUX_TWI0_DEFAULT_gc) //PORTMUX_TWI0_ALT1_gc
97+
9198
#define LED_BUILTIN 25
9299

93100
#define PIN_A0 (0)
@@ -350,6 +357,4 @@ const uint8_t PROGMEM digital_pin_to_timer[] = {
350357
#define SERIAL_PORT_USBVIRTUAL Serial1
351358
#define SERIAL_PORT_HARDWARE_OPEN Serial2
352359

353-
#define TWI_MUX PORTMUX_TWI0_DEFAULT_gc //PORTMUX_TWI0_ALT1_gc
354-
355360
#endif

0 commit comments

Comments
 (0)