fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-30 07:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

boards: add UAVCAN timer override mechanism and CUAV X7 add CAN (#15348)

Browse Source 
* X7Pro adds CAN driver
* UAVCAN timer selection moved to default.cmake
* Modify some details about @CUAVcaijie UAVCAN timer selection moved to default.cmake
* Put some timer parameters to micro_hal.h from board_config.h. Fix all h7 boards

Co-authored-by: honglang <honglang@cuav.net>
This commit is contained in:
CUAVcaijie
2020-08-28 12:16:48 -04:00
committed by GitHub
co-authored by honglang
parent 8c0671e93d
commit 536877cf0a
9 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/cuav/nora/src/board_config.h
+1 -2
View File
@@ -153,8 +153,7 @@
/* High-resolution timer */
#define HRT_TIMER 3 /* use timer3 for the HRT */
#define HRT_TIMER_CHANNEL 3 /* use capture/compare channel 3 */
#define STM32_RCC_APB1ENR STM32_RCC_APB1LENR
#define RCC_APB1ENR_TIM3EN RCC_APB1LENR_TIM3EN
#define HRT_PPM_CHANNEL /* T3C1 */ 1 /* use capture/compare channel 1 */
#define GPIO_PPM_IN /* PB4 T3C1 */ GPIO_TIM3_CH1IN_2
boards/cuav/x7pro/default.cmake
+3 -2
View File
@@ -9,7 +9,8 @@ px4_add_board(
ROMFSROOT px4fmu_common
BUILD_BOOTLOADER
TESTING
# UAVCAN_INTERFACES 2 - No H7 or FD can support in UAVCAN
UAVCAN_INTERFACES 2
UAVCAN_TIMER_OVERRIDE 2
SERIAL_PORTS
GPS1:/dev/ttyS0
TEL1:/dev/ttyS1
@@ -56,7 +57,7 @@ px4_add_board(
telemetry # all available telemetry drivers
test_ppm
tone_alarm
# uavcan - No H7 or FD can support in UAVCAN yet
uavcan
MODULES
airspeed_selector
attitude_estimator_q
boards/cuav/x7pro/nuttx-config/include/board.h
+3
View File
@@ -193,6 +193,9 @@
#define STM32_RCC_D3CCIPR_SPI6SRC RCC_D3CCIPR_SPI6SEL_PLL2 /* SPI6 clock source */
#define STM32_RCC_D2CCIP2R_USBSRC RCC_D2CCIP2R_USBSEL_PLL3 /* USB 1 and 2 clock source */
#define STM32_RCC_D3CCIPR_ADCSEL RCC_D3CCIPR_ADCSEL_PLL2 /* ADC 1 2 3 clock source */
#define STM32_RCC_D2CCIP1R_FDCANSEL RCC_D2CCIP1R_FDCANSEL_HSE /* FDCAN 1 2 clock source */
#define STM32_FDCANCLK STM32_HSE_FREQUENCY
/* FLASH wait states */
#define BOARD_FLASH_WAITSTATES 2
boards/cuav/x7pro/src/board_config.h
+1 -2
View File
@@ -153,8 +153,7 @@
/* High-resolution timer */
#define HRT_TIMER 3 /* use timer3 for the HRT */
#define HRT_TIMER_CHANNEL 3 /* use capture/compare channel 3 */
#define STM32_RCC_APB1ENR STM32_RCC_APB1LENR
#define RCC_APB1ENR_TIM3EN RCC_APB1LENR_TIM3EN
#define HRT_PPM_CHANNEL /* T3C1 */ 1 /* use capture/compare channel 1 */
#define GPIO_PPM_IN /* PB4 T3C1 */ GPIO_TIM3_CH1IN_2