Merge pull request #104 from MonashUAS/master

STM32F303 support for baremetal driver
OpenCyphal-Garage · Apr 2, 2017 · 4a9da04 · 4a9da04
2 parents e97164d + 797f459
commit 4a9da04
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/libuavcan_drivers/stm32/driver/src/internal.hpp b/libuavcan_drivers/stm32/driver/src/internal.hpp
@@ -14,7 +14,7 @@
 # include <chip/stm32_tim.h>
 # include <syslog.h>
 #elif UAVCAN_STM32_BAREMETAL
-# include <chip.h>
+#include <chip.h>	// See http://uavcan.org/Implementations/Libuavcan/Platforms/STM32/
 #elif UAVCAN_STM32_FREERTOS
 # include <chip.h>
 # include <cmsis_os.h>

diff --git a/libuavcan_drivers/stm32/driver/src/uc_stm32_can.cpp b/libuavcan_drivers/stm32/driver/src/uc_stm32_can.cpp
@@ -15,14 +15,14 @@
 # include <nuttx/irq.h>
 # include <arch/board/board.h>
 #elif UAVCAN_STM32_BAREMETAL
-#include <chip.h>
+#include <chip.h>	// See http://uavcan.org/Implementations/Libuavcan/Platforms/STM32/
 #elif UAVCAN_STM32_FREERTOS
 #else
 # error "Unknown OS"
 #endif
 
 #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
 #  define CAN1_RX0_IRQn USB_LP_CAN1_RX0_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_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
 #endif