mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-19 22:23:33 +08:00
Merge branch 'master' into nuttx-merge-5447
This commit is contained in:
@@ -3,10 +3,12 @@
|
||||
# see misc/tools/kconfig-language.txt.
|
||||
#
|
||||
|
||||
config LOWLEVEL_CONSOLE
|
||||
config DEV_LOWCONSOLE
|
||||
bool "Low-level console support"
|
||||
default n
|
||||
depends on ARCH_LOWPUTC
|
||||
---help---
|
||||
Use the simple, low-level, write-only serial console driver (minimal support)
|
||||
|
||||
config 16550_UART
|
||||
bool "16550 UART Chip support"
|
||||
@@ -317,7 +319,7 @@ config STANDARD_SERIAL
|
||||
bool "Enable standard \"upper-half\" serial driver"
|
||||
default y if MCU_SERIAL
|
||||
default n if !MCU_SERIAL
|
||||
depends on !LOWLEVEL_CONSOLE
|
||||
depends on !DEV_LOWCONSOLE
|
||||
---help---
|
||||
Enable the standard, upper-half serial driver used by most MCU serial peripherals.
|
||||
|
||||
@@ -422,7 +424,7 @@ config UART_TXBUFSIZE
|
||||
|
||||
config UART_BAUD
|
||||
int "baud rate"
|
||||
default 11520
|
||||
default 115200
|
||||
help
|
||||
The configured BAUD of the UART.
|
||||
|
||||
@@ -465,7 +467,7 @@ config UART0_TXBUFSIZE
|
||||
|
||||
config UART0_BAUD
|
||||
int "baud rate"
|
||||
default 11520
|
||||
default 115200
|
||||
help
|
||||
The configured BAUD of the UART.
|
||||
|
||||
@@ -508,7 +510,7 @@ config USART0_TXBUFSIZE
|
||||
|
||||
config USART0_BAUD
|
||||
int "baud rate"
|
||||
default 11520
|
||||
default 115200
|
||||
help
|
||||
The configured BAUD of the USART.
|
||||
|
||||
@@ -551,7 +553,7 @@ config UART1_TXBUFSIZE
|
||||
|
||||
config UART1_BAUD
|
||||
int "baud rate"
|
||||
default 11520
|
||||
default 115200
|
||||
help
|
||||
The configured BAUD of the UART.
|
||||
|
||||
@@ -594,7 +596,7 @@ config USART1_TXBUFSIZE
|
||||
|
||||
config USART1_BAUD
|
||||
int "baud rate"
|
||||
default 11520
|
||||
default 115200
|
||||
help
|
||||
The configured BAUD of the USART.
|
||||
|
||||
@@ -637,7 +639,7 @@ config UART2_TXBUFSIZE
|
||||
|
||||
config UART2_BAUD
|
||||
int "baud rate"
|
||||
default 11520
|
||||
default 115200
|
||||
help
|
||||
The configured BAUD of the UART.
|
||||
|
||||
@@ -680,7 +682,7 @@ config USART2_TXBUFSIZE
|
||||
|
||||
config USART2_BAUD
|
||||
int "baud rate"
|
||||
default 11520
|
||||
default 115200
|
||||
help
|
||||
The configured BAUD of the USART.
|
||||
|
||||
@@ -723,7 +725,7 @@ config UART3_TXBUFSIZE
|
||||
|
||||
config UART3_BAUD
|
||||
int "baud rate"
|
||||
default 11520
|
||||
default 115200
|
||||
help
|
||||
The configured BAUD of the UART.
|
||||
|
||||
@@ -766,7 +768,7 @@ config USART3_TXBUFSIZE
|
||||
|
||||
config USART3_BAUD
|
||||
int "baud rate"
|
||||
default 11520
|
||||
default 115200
|
||||
help
|
||||
The configured BAUD of the USART.
|
||||
|
||||
@@ -809,7 +811,7 @@ config UART4_TXBUFSIZE
|
||||
|
||||
config UART4_BAUD
|
||||
int "baud rate"
|
||||
default 11520
|
||||
default 115200
|
||||
help
|
||||
The configured BAUD of the UART.
|
||||
|
||||
@@ -852,7 +854,7 @@ config USART4_TXBUFSIZE
|
||||
|
||||
config USART4_BAUD
|
||||
int "baud rate"
|
||||
default 11520
|
||||
default 115200
|
||||
help
|
||||
The configured BAUD of the USART.
|
||||
|
||||
@@ -895,7 +897,7 @@ config UART5_TXBUFSIZE
|
||||
|
||||
config UART5_BAUD
|
||||
int "baud rate"
|
||||
default 11520
|
||||
default 115200
|
||||
help
|
||||
The configured BAUD of the UART.
|
||||
|
||||
@@ -938,7 +940,7 @@ config USART5_TXBUFSIZE
|
||||
|
||||
config USART5_BAUD
|
||||
int "baud rate"
|
||||
default 11520
|
||||
default 115200
|
||||
help
|
||||
The configured BAUD of the USART.
|
||||
|
||||
@@ -981,7 +983,7 @@ config USART6_TXBUFSIZE
|
||||
|
||||
config USART6_BAUD
|
||||
int "baud rate"
|
||||
default 11520
|
||||
default 115200
|
||||
help
|
||||
The configured BAUD of the USART.
|
||||
|
||||
@@ -1024,7 +1026,7 @@ config UART6_TXBUFSIZE
|
||||
|
||||
config UART6_BAUD
|
||||
int "baud rate"
|
||||
default 11520
|
||||
default 115200
|
||||
help
|
||||
The configured BAUD of the UART.
|
||||
|
||||
|
||||
@@ -233,7 +233,9 @@ static int uart_putxmitchar(FAR uart_dev_t *dev, int ch)
|
||||
}
|
||||
}
|
||||
|
||||
/* We won't get here */
|
||||
/* We won't get here. Some compilers may complain that this code is
|
||||
* unreachable.
|
||||
*/
|
||||
|
||||
return OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user