Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-22 16:48:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_ChibiOS: Use HAL_CANMANAGER_ENABLED instead of HAL_ENABLE_LIBUAVCAN_DRIVERS

Browse Source
This commit is contained in:
Siddharth Purohit 2021-06-20 15:58:24 +05:30 committed by Andrew Tridgell
parent c640f0d3d9
commit f8d313cfd6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL_ChibiOS/CANFDIface.cpp
View File

@ -94,7 +94,7 @@ static_assert(STM32_FDCANCLK <= 80U*1000U*1000U, "FDCAN clock must be max 80MHz"
using namespace ChibiOS; using namespace ChibiOS;
#if HAL_ENABLE_LIBUAVCAN_DRIVERS #if HAL_CANMANAGER_ENABLED
#define Debug(fmt, args...) do { AP::can().log_text(AP_CANManager::LOG_DEBUG, "CANFDIface", fmt, ##args); } while (0) #define Debug(fmt, args...) do { AP::can().log_text(AP_CANManager::LOG_DEBUG, "CANFDIface", fmt, ##args); } while (0)
#else #else
#define Debug(fmt, args...) #define Debug(fmt, args...)

2
libraries/AP_HAL_ChibiOS/CanIface.cpp
View File

@ -70,7 +70,7 @@
#define CAN2_RX1_IRQ_Handler STM32_CAN2_RX1_HANDLER #define CAN2_RX1_IRQ_Handler STM32_CAN2_RX1_HANDLER
#endif // #if defined(STM32F3XX) #endif // #if defined(STM32F3XX)
#if HAL_ENABLE_LIBUAVCAN_DRIVERS #if HAL_CANMANAGER_ENABLED
#define Debug(fmt, args...) do { AP::can().log_text(AP_CANManager::LOG_DEBUG, "CANIface", fmt, ##args); } while (0) #define Debug(fmt, args...) do { AP::can().log_text(AP_CANManager::LOG_DEBUG, "CANIface", fmt, ##args); } while (0)
#else #else
#define Debug(fmt, args...) #define Debug(fmt, args...)

4
libraries/AP_HAL_ChibiOS/Util.cpp
View File

@ -29,7 +29,7 @@
#include "sdcard.h" #include "sdcard.h"
#include "shared_dma.h" #include "shared_dma.h"
#include <AP_Common/ExpandingString.h> #include <AP_Common/ExpandingString.h>
#if defined(HAL_PWM_ALARM) || HAL_DSHOT_ALARM || HAL_ENABLE_LIBUAVCAN_DRIVERS #if defined(HAL_PWM_ALARM) || HAL_DSHOT_ALARM || HAL_CANMANAGER_ENABLED
#include <AP_Notify/AP_Notify.h> #include <AP_Notify/AP_Notify.h>
#endif #endif
#if HAL_ENABLE_SAVE_PERSISTENT_PARAMS #if HAL_ENABLE_SAVE_PERSISTENT_PARAMS
@ -167,7 +167,7 @@ bool Util::toneAlarm_init(uint8_t types)
#endif #endif
_toneAlarm_types = types; _toneAlarm_types = types;
#if !defined(HAL_PWM_ALARM) && !HAL_DSHOT_ALARM && !HAL_ENABLE_LIBUAVCAN_DRIVERS #if !defined(HAL_PWM_ALARM) && !HAL_DSHOT_ALARM && !HAL_CANMANAGER_ENABLED
// Nothing to do // Nothing to do
return false; return false;
#else #else