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

Merge pull request #112 from cvra/master

Browse Source 
Fix redefined IRQ handler in CAN driver for STM32F3 + ChibiOS
This commit is contained in:
Pavel Kirienko
2017-09-26 10:56:16 +02:00
committed by GitHub
parent f45be6fe58 674133e290
commit 38702ff85a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/stm32/driver/src/uc_stm32_can.cpp
+5 -3
View File
@@ -64,9 +64,11 @@ static int can2_irq(const int irq, void*);
#define CAN1_TX_IRQn CAN_TX_IRQn
#define CAN1_RX0_IRQn CAN_RX0_IRQn
#define CAN1_RX1_IRQn CAN_RX1_IRQn
#define CAN1_TX_IRQHandler CAN_TX_IRQHandler
#define CAN1_RX0_IRQHandler CAN_RX0_IRQHandler
#define CAN1_RX1_IRQHandler CAN_RX1_IRQHandler
# if UAVCAN_STM32_BAREMETAL
# define CAN1_TX_IRQHandler CAN_TX_IRQHandler
# define CAN1_RX0_IRQHandler CAN_RX0_IRQHandler
# define CAN1_RX1_IRQHandler CAN_RX1_IRQHandler
# endif
#endif