From 8b1d2b855115a3199e5aaf52a30618096f57ee3a Mon Sep 17 00:00:00 2001 From: honglang Date: Mon, 7 Jun 2021 14:31:56 +0800 Subject: [PATCH] change fmu-v5's uavcan timer5 to timer6 --- boards/px4/fmu-v5/default.cmake | 1 + src/drivers/uavcan/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+) diff --git a/boards/px4/fmu-v5/default.cmake b/boards/px4/fmu-v5/default.cmake index a7993d236e..fd38e3ddac 100644 --- a/boards/px4/fmu-v5/default.cmake +++ b/boards/px4/fmu-v5/default.cmake @@ -9,6 +9,7 @@ px4_add_board( ROMFSROOT px4fmu_common IO px4_io-v2_default UAVCAN_INTERFACES 2 + UAVCAN_TIMER_OVERRIDE 6 SERIAL_PORTS GPS1:/dev/ttyS0 TEL1:/dev/ttyS1 diff --git a/src/drivers/uavcan/CMakeLists.txt b/src/drivers/uavcan/CMakeLists.txt index a03333b153..003b624c49 100644 --- a/src/drivers/uavcan/CMakeLists.txt +++ b/src/drivers/uavcan/CMakeLists.txt @@ -52,6 +52,9 @@ if(CONFIG_ARCH_CHIP) elseif(${CONFIG_ARCH_CHIP} MATCHES "stm32") set(UAVCAN_DRIVER "stm32") set(UAVCAN_TIMER 5) # The default timer is TIM5 + if (DEFINED config_uavcan_timer_override) + set (UAVCAN_TIMER ${config_uavcan_timer_override}) + endif() endif() endif()