From 5469f8700ea083b7eb72cb5a2366c65a0f2cf87f Mon Sep 17 00:00:00 2001 From: PX4 BuildBot Date: Fri, 15 Nov 2024 12:00:28 +0000 Subject: [PATCH] boards: update all NuttX defconfigs --- boards/ark/fpv/nuttx-config/nsh/defconfig | 16 +++++++--------- .../tropic-community/nuttx-config/nsh/defconfig | 1 - src/modules/zenoh/Kconfig.topics | 6 +++++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/boards/ark/fpv/nuttx-config/nsh/defconfig b/boards/ark/fpv/nuttx-config/nsh/defconfig index 9a213aca4711..f43478025cca 100644 --- a/boards/ark/fpv/nuttx-config/nsh/defconfig +++ b/boards/ark/fpv/nuttx-config/nsh/defconfig @@ -213,13 +213,13 @@ CONFIG_STM32H7_SPI1_DMA_BUFFER=1024 CONFIG_STM32H7_SPI6=y CONFIG_STM32H7_SPI6_DMA=y CONFIG_STM32H7_SPI6_DMA_BUFFER=1024 +CONFIG_STM32H7_TIM12=y CONFIG_STM32H7_TIM1=y CONFIG_STM32H7_TIM2=y CONFIG_STM32H7_TIM3=y CONFIG_STM32H7_TIM4=y CONFIG_STM32H7_TIM5=y CONFIG_STM32H7_TIM8=y -CONFIG_STM32H7_TIM12=y CONFIG_STM32H7_UART4=y CONFIG_STM32H7_UART5=y CONFIG_STM32H7_UART7=y @@ -239,8 +239,8 @@ CONFIG_UART4_RXBUFSIZE=600 CONFIG_UART4_TXBUFSIZE=1500 CONFIG_UART5_IFLOWCONTROL=y CONFIG_UART5_OFLOWCONTROL=y -CONFIG_UART5_RXDMA=y CONFIG_UART5_RXBUFSIZE=600 +CONFIG_UART5_RXDMA=y CONFIG_UART5_TXBUFSIZE=10000 CONFIG_UART5_TXDMA=y CONFIG_UART7_BAUD=57600 @@ -251,15 +251,15 @@ CONFIG_UART7_RXDMA=y CONFIG_UART7_TXBUFSIZE=3000 CONFIG_UART7_TXDMA=y CONFIG_USART1_BAUD=57600 -CONFIG_USART1_RXDMA=y -CONFIG_USART1_TXDMA=y CONFIG_USART1_RXBUFSIZE=600 +CONFIG_USART1_RXDMA=y CONFIG_USART1_TXBUFSIZE=1500 +CONFIG_USART1_TXDMA=y CONFIG_USART2_BAUD=57600 -CONFIG_USART2_RXDMA=y -CONFIG_USART2_TXDMA=y CONFIG_USART2_RXBUFSIZE=600 +CONFIG_USART2_RXDMA=y CONFIG_USART2_TXBUFSIZE=1500 +CONFIG_USART2_TXDMA=y CONFIG_USART3_BAUD=57600 CONFIG_USART3_RXBUFSIZE=180 CONFIG_USART3_RXDMA=y @@ -267,10 +267,8 @@ CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=1500 CONFIG_USART3_TXDMA=y CONFIG_USART6_BAUD=57600 -CONFIG_USART6_RXDMA=y -CONFIG_USART6_RXBUFSIZE=600 -CONFIG_USART6_TXBUFSIZE=1500 CONFIG_USART6_RXBUFSIZE=600 +CONFIG_USART6_RXDMA=y CONFIG_USART6_TXBUFSIZE=1500 CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y diff --git a/boards/nxp/tropic-community/nuttx-config/nsh/defconfig b/boards/nxp/tropic-community/nuttx-config/nsh/defconfig index db4942dd9af0..4b789eb35850 100644 --- a/boards/nxp/tropic-community/nuttx-config/nsh/defconfig +++ b/boards/nxp/tropic-community/nuttx-config/nsh/defconfig @@ -206,7 +206,6 @@ CONFIG_SCHED_INSTRUMENTATION_SWITCH=y CONFIG_SCHED_LPWORK=y CONFIG_SCHED_LPWORKPRIORITY=50 CONFIG_SCHED_LPWORKSTACKSIZE=2032 -CONFIG_SCHED_WAITPID=y CONFIG_SDIO_BLOCKSETUP=y CONFIG_SEM_PREALLOCHOLDERS=32 CONFIG_SERIAL_IFLOWCONTROL_WATERMARKS=y diff --git a/src/modules/zenoh/Kconfig.topics b/src/modules/zenoh/Kconfig.topics index cf4be643aeba..585831cd2f9a 100644 --- a/src/modules/zenoh/Kconfig.topics +++ b/src/modules/zenoh/Kconfig.topics @@ -589,6 +589,10 @@ menu "Zenoh publishers/subscribers" bool "rover_ackermann_guidance_status" default n + config ZENOH_PUBSUB_ROVER_ACKERMANN_SETPOINT + bool "rover_ackermann_setpoint" + default n + config ZENOH_PUBSUB_ROVER_ACKERMANN_STATUS bool "rover_ackermann_status" default n @@ -934,7 +938,6 @@ config ZENOH_PUBSUB_ALL_SELECTION select ZENOH_PUBSUB_CAN_INTERFACE_STATUS select ZENOH_PUBSUB_CELLULAR_STATUS select ZENOH_PUBSUB_COLLISION_CONSTRAINTS - select ZENOH_PUBSUB_COLLISION_REPORT select ZENOH_PUBSUB_CONFIG_OVERRIDES select ZENOH_PUBSUB_CONTROL_ALLOCATOR_STATUS select ZENOH_PUBSUB_CPULOAD @@ -1058,6 +1061,7 @@ config ZENOH_PUBSUB_ALL_SELECTION select ZENOH_PUBSUB_REGISTER_EXT_COMPONENT_REPLY select ZENOH_PUBSUB_REGISTER_EXT_COMPONENT_REQUEST select ZENOH_PUBSUB_ROVER_ACKERMANN_GUIDANCE_STATUS + select ZENOH_PUBSUB_ROVER_ACKERMANN_SETPOINT select ZENOH_PUBSUB_ROVER_ACKERMANN_STATUS select ZENOH_PUBSUB_ROVER_DIFFERENTIAL_GUIDANCE_STATUS select ZENOH_PUBSUB_ROVER_DIFFERENTIAL_SETPOINT