fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-03 06:51:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added support for timers 6 and 7

Browse Source
This commit is contained in:
Pavel Kirienko
2014-04-05 10:43:58 +04:00
parent e04a32662e
commit c92573b840
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#define TIMX_IRQn UAVCAN_STM32_GLUE3(TIM, UAVCAN_STM32_TIMER_NUMBER, _IRQn) #define TIMX_IRQn UAVCAN_STM32_GLUE3(TIM, UAVCAN_STM32_TIMER_NUMBER, _IRQn)
#define TIMX_IRQHandler UAVCAN_STM32_GLUE3(TIM, UAVCAN_STM32_TIMER_NUMBER, _IRQHandler) #define TIMX_IRQHandler UAVCAN_STM32_GLUE3(TIM, UAVCAN_STM32_TIMER_NUMBER, _IRQHandler)
#if UAVCAN_STM32_TIMER_NUMBER >= 2 && UAVCAN_STM32_TIMER_NUMBER <= 5 #if UAVCAN_STM32_TIMER_NUMBER >= 2 && UAVCAN_STM32_TIMER_NUMBER <= 7
# define TIMX_RCC_ENR RCC->APB1ENR # define TIMX_RCC_ENR RCC->APB1ENR
# define TIMX_RCC_RSTR RCC->APB1RSTR # define TIMX_RCC_RSTR RCC->APB1RSTR
# define TIMX_RCC_ENR_MASK UAVCAN_STM32_GLUE3(RCC_APB1ENR_TIM, UAVCAN_STM32_TIMER_NUMBER, EN) # define TIMX_RCC_ENR_MASK UAVCAN_STM32_GLUE3(RCC_APB1ENR_TIM, UAVCAN_STM32_TIMER_NUMBER, EN)
libuavcan_drivers/stm32/test_stm32f107/Makefile
+1 -1
View File
@@ -16,7 +16,7 @@ UDEFS = -DUAVCAN_STM32_CHIBIOS=1 -DUAVCAN_STM32_DEBUG=1
# UAVCAN library # UAVCAN library
# #
UDEFS += -DUAVCAN_STM32_TIMER_NUMBER=2 UDEFS += -DUAVCAN_STM32_TIMER_NUMBER=7
include ../../../libuavcan/include.mk include ../../../libuavcan/include.mk
CPPSRC += $(LIBUAVCAN_SRC) CPPSRC += $(LIBUAVCAN_SRC)