Merge pull request #10790 from mikeller/fix_uart_bugs
Fixed bugs in UART configuration introduced by #10704.
This commit is contained in:
commit
9ae2fe6d69
|
@ -94,10 +94,10 @@ const serialPortIdentifier_e serialPortIdentifiers[SERIAL_PORT_COUNT] = {
|
||||||
SERIAL_PORT_USART8,
|
SERIAL_PORT_USART8,
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_UART9
|
#ifdef USE_UART9
|
||||||
SERIAL_PORT_UART9_INSTANCE,
|
SERIAL_PORT_UART9,
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_UART10
|
#ifdef USE_UART10
|
||||||
SERIAL_PORT_UART10_INSTANCE,
|
SERIAL_PORT_UART10,
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_SOFTSERIAL1
|
#ifdef USE_SOFTSERIAL1
|
||||||
SERIAL_PORT_SOFTSERIAL1,
|
SERIAL_PORT_SOFTSERIAL1,
|
||||||
|
@ -105,6 +105,9 @@ const serialPortIdentifier_e serialPortIdentifiers[SERIAL_PORT_COUNT] = {
|
||||||
#ifdef USE_SOFTSERIAL2
|
#ifdef USE_SOFTSERIAL2
|
||||||
SERIAL_PORT_SOFTSERIAL2,
|
SERIAL_PORT_SOFTSERIAL2,
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef USE_LPUART1
|
||||||
|
SERIAL_PORT_LPUART1
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
static uint8_t serialPortCount;
|
static uint8_t serialPortCount;
|
||||||
|
|
|
@ -155,7 +155,7 @@
|
||||||
#define USE_UART3
|
#define USE_UART3
|
||||||
#define USE_UART4
|
#define USE_UART4
|
||||||
#define USE_UART5
|
#define USE_UART5
|
||||||
#define USE_UART9
|
#define USE_LPUART1
|
||||||
|
|
||||||
#define SERIAL_PORT_COUNT (UNIFIED_SERIAL_PORT_COUNT + 6)
|
#define SERIAL_PORT_COUNT (UNIFIED_SERIAL_PORT_COUNT + 6)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue