Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 18:47:21 +08:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

Omnibus F4 SD: fix UART4

Browse Source 
- do not configure RSSI GPIO pin
- disable serial console on UART4
This commit is contained in:
Beat Küng
2018-07-10 19:10:46 +02:00
committed by Lorenz Meier
parent 93da0416fa
commit 3f0a398a25
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/nuttx/nuttx-configs/omnibus-f4sd/nsh/defconfig
+6 -6
View File
@@ -928,7 +928,7 @@ CONFIG_DEV_FIFO_SIZE=0
CONFIG_SERIAL=y CONFIG_SERIAL=y
# CONFIG_DEV_LOWCONSOLE is not set # CONFIG_DEV_LOWCONSOLE is not set
CONFIG_SERIAL_REMOVABLE=y CONFIG_SERIAL_REMOVABLE=y
CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_CONSOLE is not set
# CONFIG_16550_UART is not set # CONFIG_16550_UART is not set
# CONFIG_UART_SERIALDRIVER is not set # CONFIG_UART_SERIALDRIVER is not set
# CONFIG_UART0_SERIALDRIVER is not set # CONFIG_UART0_SERIALDRIVER is not set
@@ -960,10 +960,10 @@ CONFIG_SERIAL_NPOLLWAITERS=2
# CONFIG_SERIAL_DMA is not set # CONFIG_SERIAL_DMA is not set
CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
# CONFIG_USART1_SERIAL_CONSOLE is not set # CONFIG_USART1_SERIAL_CONSOLE is not set
CONFIG_UART4_SERIAL_CONSOLE=y # CONFIG_UART4_SERIAL_CONSOLE is not set
# CONFIG_USART6_SERIAL_CONSOLE is not set # CONFIG_USART6_SERIAL_CONSOLE is not set
# CONFIG_OTHER_SERIAL_CONSOLE is not set # CONFIG_OTHER_SERIAL_CONSOLE is not set
# CONFIG_NO_SERIAL_CONSOLE is not set CONFIG_NO_SERIAL_CONSOLE=y
# #
# USART1 Configuration # USART1 Configuration
@@ -1043,8 +1043,8 @@ CONFIG_CDCACM_RXBUFSIZE=600
CONFIG_CDCACM_TXBUFSIZE=2000 CONFIG_CDCACM_TXBUFSIZE=2000
CONFIG_CDCACM_VENDORID=0x26ac CONFIG_CDCACM_VENDORID=0x26ac
CONFIG_CDCACM_PRODUCTID=0x0001 CONFIG_CDCACM_PRODUCTID=0x0001
CONFIG_CDCACM_VENDORSTR="3D Robotics" CONFIG_CDCACM_VENDORSTR="Airbot"
CONFIG_CDCACM_PRODUCTSTR="OMNIBUSF4SD" CONFIG_CDCACM_PRODUCTSTR="PX4 OMNIBUSF4SD"
# CONFIG_USBMSC is not set # CONFIG_USBMSC is not set
# CONFIG_RNDIS is not set # CONFIG_RNDIS is not set
# CONFIG_USBHOST is not set # CONFIG_USBHOST is not set
@@ -1062,7 +1062,7 @@ CONFIG_SYSLOG_WRITE=y
# CONFIG_SYSLOG_BUFFER is not set # CONFIG_SYSLOG_BUFFER is not set
# CONFIG_SYSLOG_INTBUFFER is not set # CONFIG_SYSLOG_INTBUFFER is not set
# CONFIG_SYSLOG_TIMESTAMP is not set # CONFIG_SYSLOG_TIMESTAMP is not set
CONFIG_SYSLOG_SERIAL_CONSOLE=y # CONFIG_SYSLOG_SERIAL_CONSOLE is not set
# CONFIG_SYSLOG_CHAR is not set # CONFIG_SYSLOG_CHAR is not set
CONFIG_SYSLOG_CONSOLE=y CONFIG_SYSLOG_CONSOLE=y
# CONFIG_SYSLOG_NONE is not set # CONFIG_SYSLOG_NONE is not set
src/drivers/boards/omnibus-f4sd/init.c
+1 -1
View File
@@ -187,7 +187,7 @@ stm32_boardinitialize(void)
/* configure ADC pins */ /* configure ADC pins */
stm32_configgpio(GPIO_ADC1_IN12); /* BATT_VOLTAGE_SENS */ stm32_configgpio(GPIO_ADC1_IN12); /* BATT_VOLTAGE_SENS */
stm32_configgpio(GPIO_ADC1_IN11); /* BATT_CURRENT_SENS */ stm32_configgpio(GPIO_ADC1_IN11); /* BATT_CURRENT_SENS */
stm32_configgpio(GPIO_ADC1_IN0); /* RSSI analog in */ //stm32_configgpio(GPIO_ADC1_IN0); /* RSSI analog in (TX of UART4 instead) */
// TODO: power peripherals // TODO: power peripherals
///* configure power supply control/sense pins */ ///* configure power supply control/sense pins */