From 3f0a398a25bf344eebd8ad218a9717fcb71de4b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Tue, 10 Jul 2018 19:10:46 +0200 Subject: [PATCH] Omnibus F4 SD: fix UART4 - do not configure RSSI GPIO pin - disable serial console on UART4 --- .../nuttx/nuttx-configs/omnibus-f4sd/nsh/defconfig | 12 ++++++------ src/drivers/boards/omnibus-f4sd/init.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/platforms/nuttx/nuttx-configs/omnibus-f4sd/nsh/defconfig b/platforms/nuttx/nuttx-configs/omnibus-f4sd/nsh/defconfig index 61bde9c077..539cb7dd03 100644 --- a/platforms/nuttx/nuttx-configs/omnibus-f4sd/nsh/defconfig +++ b/platforms/nuttx/nuttx-configs/omnibus-f4sd/nsh/defconfig @@ -928,7 +928,7 @@ CONFIG_DEV_FIFO_SIZE=0 CONFIG_SERIAL=y # CONFIG_DEV_LOWCONSOLE is not set CONFIG_SERIAL_REMOVABLE=y -CONFIG_SERIAL_CONSOLE=y +# CONFIG_SERIAL_CONSOLE is not set # CONFIG_16550_UART is not set # CONFIG_UART_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_ARCH_HAVE_SERIAL_TERMIOS=y # 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_OTHER_SERIAL_CONSOLE is not set -# CONFIG_NO_SERIAL_CONSOLE is not set +CONFIG_NO_SERIAL_CONSOLE=y # # USART1 Configuration @@ -1043,8 +1043,8 @@ CONFIG_CDCACM_RXBUFSIZE=600 CONFIG_CDCACM_TXBUFSIZE=2000 CONFIG_CDCACM_VENDORID=0x26ac CONFIG_CDCACM_PRODUCTID=0x0001 -CONFIG_CDCACM_VENDORSTR="3D Robotics" -CONFIG_CDCACM_PRODUCTSTR="OMNIBUSF4SD" +CONFIG_CDCACM_VENDORSTR="Airbot" +CONFIG_CDCACM_PRODUCTSTR="PX4 OMNIBUSF4SD" # CONFIG_USBMSC is not set # CONFIG_RNDIS is not set # CONFIG_USBHOST is not set @@ -1062,7 +1062,7 @@ CONFIG_SYSLOG_WRITE=y # CONFIG_SYSLOG_BUFFER is not set # CONFIG_SYSLOG_INTBUFFER 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_CONSOLE=y # CONFIG_SYSLOG_NONE is not set diff --git a/src/drivers/boards/omnibus-f4sd/init.c b/src/drivers/boards/omnibus-f4sd/init.c index bbad226b7e..4537e8e60b 100644 --- a/src/drivers/boards/omnibus-f4sd/init.c +++ b/src/drivers/boards/omnibus-f4sd/init.c @@ -187,7 +187,7 @@ stm32_boardinitialize(void) /* configure ADC pins */ stm32_configgpio(GPIO_ADC1_IN12); /* BATT_VOLTAGE_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 ///* configure power supply control/sense pins */