fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-01 22:31:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #104 from MonashUAS/master

Browse Source 
STM32F303 support for baremetal driver
This commit is contained in:
Pavel Kirienko
2017-04-02 14:55:46 +03:00
committed by GitHub
parent e97164d953 797f459289
commit 4a9da04407
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/stm32/driver/src/internal.hpp
+1 -1
View File
@@ -14,7 +14,7 @@
# include <chip/stm32_tim.h> # include <chip/stm32_tim.h>
# include <syslog.h> # include <syslog.h>
#elif UAVCAN_STM32_BAREMETAL #elif UAVCAN_STM32_BAREMETAL
# include <chip.h> #include <chip.h> // See http://uavcan.org/Implementations/Libuavcan/Platforms/STM32/
#elif UAVCAN_STM32_FREERTOS #elif UAVCAN_STM32_FREERTOS
# include <chip.h> # include <chip.h>
# include <cmsis_os.h> # include <cmsis_os.h>
libuavcan_drivers/stm32/driver/src/uc_stm32_can.cpp
+5 -2
View File
@@ -15,14 +15,14 @@
# include <nuttx/irq.h> # include <nuttx/irq.h>
# include <arch/board/board.h> # include <arch/board/board.h>
#elif UAVCAN_STM32_BAREMETAL #elif UAVCAN_STM32_BAREMETAL
#include <chip.h> #include <chip.h> // See http://uavcan.org/Implementations/Libuavcan/Platforms/STM32/
#elif UAVCAN_STM32_FREERTOS #elif UAVCAN_STM32_FREERTOS
#else #else
# error "Unknown OS" # error "Unknown OS"
#endif #endif
#if (UAVCAN_STM32_CHIBIOS && CH_KERNEL_MAJOR == 2) || UAVCAN_STM32_BAREMETAL #if (UAVCAN_STM32_CHIBIOS && CH_KERNEL_MAJOR == 2) || UAVCAN_STM32_BAREMETAL
# if !(defined(STM32F10X_CL) || defined(STM32F2XX) || defined(STM32F4XX)) # if !(defined(STM32F10X_CL) || defined(STM32F2XX) || defined(STM32F3XX) || defined(STM32F4XX))
// IRQ numbers // IRQ numbers
# define CAN1_RX0_IRQn USB_LP_CAN1_RX0_IRQn # define CAN1_RX0_IRQn USB_LP_CAN1_RX0_IRQn
# define CAN1_TX_IRQn USB_HP_CAN1_TX_IRQn # define CAN1_TX_IRQn USB_HP_CAN1_TX_IRQn
@@ -64,6 +64,9 @@ static int can2_irq(const int irq, void*);
#define CAN1_TX_IRQn CAN_TX_IRQn #define CAN1_TX_IRQn CAN_TX_IRQn
#define CAN1_RX0_IRQn CAN_RX0_IRQn #define CAN1_RX0_IRQn CAN_RX0_IRQn
#define CAN1_RX1_IRQn CAN_RX1_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
#endif #endif