Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-08 17:08:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

HAL_PX4: add support for api change in AP_HAL::CANManager

Browse Source
This commit is contained in:
Siddharth Purohit 2018-02-02 01:07:18 +05:30 committed by Andrew Tridgell
parent a55f1c85af
commit 17fef4b630
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL_PX4/CAN.cpp
View File

@ -820,7 +820,7 @@ int32_t PX4CAN::tx_pending()
*/
PX4CANManager::PX4CANManager() :
update_event_(*this), if0_(bxcan::Can[0], nullptr, 0, CAN_STM32_RX_QUEUE_SIZE), if1_(
AP_HAL::CANManager(this), update_event_(*this), if0_(bxcan::Can[0], nullptr, 0, CAN_STM32_RX_QUEUE_SIZE), if1_(
bxcan::Can[1], nullptr, 1, CAN_STM32_RX_QUEUE_SIZE), initialized_(false), p_uavcan(nullptr)
{
uavcan::StaticAssert<(CAN_STM32_RX_QUEUE_SIZE <= PX4CAN::MaxRxQueueCapacity)>::check();

2
libraries/AP_HAL_PX4/CAN.h
View File

@ -255,7 +255,7 @@ public:
bool is_initialized() override;
};
class PX4CANManager: public AP_HAL::CANManager {
class PX4CANManager: public AP_HAL::CANManager, public uavcan::ICanDriver {
BusEvent update_event_;
PX4CAN if0_;
PX4CAN if1_;