From 60ea60e9dea1f82dd33bdc6c787f12ff24301607 Mon Sep 17 00:00:00 2001 From: Anton Zaytsev Date: Tue, 3 Oct 2017 15:35:16 +0300 Subject: [PATCH] Fixed. Add new CH_KERNEL_MAJOR to stm32 driver. --- libuavcan_drivers/stm32/driver/src/uc_stm32_can.cpp | 2 +- libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libuavcan_drivers/stm32/driver/src/uc_stm32_can.cpp b/libuavcan_drivers/stm32/driver/src/uc_stm32_can.cpp index 2608f6f0c0..13cef40aad 100644 --- a/libuavcan_drivers/stm32/driver/src/uc_stm32_can.cpp +++ b/libuavcan_drivers/stm32/driver/src/uc_stm32_can.cpp @@ -34,7 +34,7 @@ # endif #endif -#if (UAVCAN_STM32_CHIBIOS && (CH_KERNEL_MAJOR == 3 || CH_KERNEL_MAJOR == 4)) +#if (UAVCAN_STM32_CHIBIOS && (CH_KERNEL_MAJOR == 3 || CH_KERNEL_MAJOR == 4 || CH_KERNEL_MAJOR == 5)) #define CAN1_TX_IRQHandler STM32_CAN1_TX_HANDLER #define CAN1_RX0_IRQHandler STM32_CAN1_RX0_HANDLER #define CAN1_RX1_IRQHandler STM32_CAN1_RX1_HANDLER diff --git a/libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp b/libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp index 978f708d38..bfd4ec48ad 100644 --- a/libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp +++ b/libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp @@ -20,7 +20,7 @@ # define TIMX_INPUT_CLOCK STM32_TIMCLK1 # endif -# if (UAVCAN_STM32_CHIBIOS && (CH_KERNEL_MAJOR == 3 || CH_KERNEL_MAJOR == 4)) +# if (UAVCAN_STM32_CHIBIOS && (CH_KERNEL_MAJOR == 3 || CH_KERNEL_MAJOR == 4 || CH_KERNEL_MAJOR == 5)) # define TIMX UAVCAN_STM32_GLUE2(STM32_TIM, UAVCAN_STM32_TIMER_NUMBER) # define TIMX_IRQn UAVCAN_STM32_GLUE3(STM32_TIM, UAVCAN_STM32_TIMER_NUMBER, _NUMBER) # define TIMX_IRQHandler UAVCAN_STM32_GLUE3(STM32_TIM, UAVCAN_STM32_TIMER_NUMBER, _HANDLER)