From ddfd1866187649b13dca158603bd39dc2c4ed1b8 Mon Sep 17 00:00:00 2001 From: Siddharth Purohit Date: Sun, 31 May 2020 17:16:53 +0530 Subject: [PATCH] Tracker: move to using CANManager library --- AntennaTracker/Parameters.cpp | 6 +++--- AntennaTracker/Parameters.h | 2 +- AntennaTracker/system.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AntennaTracker/Parameters.cpp b/AntennaTracker/Parameters.cpp index e09d08391d..51de25efab 100644 --- a/AntennaTracker/Parameters.cpp +++ b/AntennaTracker/Parameters.cpp @@ -269,10 +269,10 @@ const AP_Param::Info Tracker::var_info[] = { // @Path: ../libraries/AP_BoardConfig/AP_BoardConfig.cpp GOBJECT(BoardConfig, "BRD_", AP_BoardConfig), -#if HAL_WITH_UAVCAN +#if HAL_MAX_CAN_PROTOCOL_DRIVERS // @Group: CAN_ - // @Path: ../libraries/AP_BoardConfig/AP_BoardConfig_CAN.cpp - GOBJECT(BoardConfig_CAN, "CAN_", AP_BoardConfig_CAN), + // @Path: ../libraries/AP_CANManager/AP_CANManager.cpp + GOBJECT(can_mgr, "CAN_", AP_CANManager), #endif // GPS driver diff --git a/AntennaTracker/Parameters.h b/AntennaTracker/Parameters.h index 7d81d498b3..5c6a22e040 100644 --- a/AntennaTracker/Parameters.h +++ b/AntennaTracker/Parameters.h @@ -86,7 +86,7 @@ public: k_param_gcs3, // stream rates for fourth MAVLink port k_param_log_bitmask, // 140 k_param_notify, - k_param_BoardConfig_CAN, + k_param_can_mgr, k_param_battery, // diff --git a/AntennaTracker/system.cpp b/AntennaTracker/system.cpp index 9e650a7498..a003ff80e6 100644 --- a/AntennaTracker/system.cpp +++ b/AntennaTracker/system.cpp @@ -9,8 +9,8 @@ void Tracker::init_ardupilot() stats.init(); BoardConfig.init(); -#if HAL_WITH_UAVCAN - BoardConfig_CAN.init(); +#if HAL_MAX_CAN_PROTOCOL_DRIVERS + can_mgr.init(); #endif // initialise notify