Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_UAVCAN: cleanup ifdefs for SLCAN enable

This commit is contained in:
Andrew Tridgell 2019-10-06 16:29:15 +11:00
parent 53fab5767f
commit 08b3bc4506
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/AP_UAVCAN/AP_UAVCAN_SLCAN.cpp
View File

@ -19,7 +19,7 @@
#include <AP_HAL/AP_HAL.h>
#if HAL_WITH_UAVCAN && !HAL_MINIMIZE_FEATURES && CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
#if AP_UAVCAN_SLCAN_ENABLED
#include "AP_UAVCAN_SLCAN.h"
#include <AP_SerialManager/AP_SerialManager.h>
@ -568,4 +568,5 @@ void SLCAN::CANManager::reader_trampoline(void)
}
}
#endif //HAL_WITH_UAVCAN
#endif // AP_UAVCAN_SLCAN_ENABLED

6
libraries/AP_UAVCAN/AP_UAVCAN_SLCAN.h
View File

@ -2,7 +2,8 @@
#pragma once
#include <AP_HAL/AP_HAL.h>
#if HAL_WITH_UAVCAN && CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
#if AP_UAVCAN_SLCAN_ENABLED
#include <AP_UAVCAN/AP_UAVCAN.h>
#include "AP_HAL/utility/RingBuffer.h"
@ -235,4 +236,5 @@ public:
}
#include <AP_HAL_ChibiOS/CANSerialRouter.h>
#endif //#if HAL_WITH_UAVCAN && !HAL_MINIMIZE_FEATURES
#endif // AP_UAVCAN_SLCAN_ENABLED