1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 17:25:20 +03:00

Merge commit '9ae2fe6d69' into osd_aux_channel

This commit is contained in:
Alexey Stankevich 2021-06-15 01:22:10 +03:00
commit 6d6e45786d
2 changed files with 6 additions and 3 deletions

View file

@ -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;

View file

@ -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)