Browse Source

Rover: move to using CANManager library

zr-v5.1
Siddharth Purohit 5 years ago committed by Andrew Tridgell
parent
commit
6fad42b6fd
  1. 6
      Rover/Parameters.cpp
  2. 2
      Rover/Parameters.h
  3. 4
      Rover/system.cpp

6
Rover/Parameters.cpp

@ -320,10 +320,10 @@ const AP_Param::Info Rover::var_info[] = {
// @Path: ../libraries/AP_BoardConfig/AP_BoardConfig.cpp // @Path: ../libraries/AP_BoardConfig/AP_BoardConfig.cpp
GOBJECT(BoardConfig, "BRD_", AP_BoardConfig), GOBJECT(BoardConfig, "BRD_", AP_BoardConfig),
#if HAL_WITH_UAVCAN #if HAL_MAX_CAN_PROTOCOL_DRIVERS
// @Group: CAN_ // @Group: CAN_
// @Path: ../libraries/AP_BoardConfig/AP_BoardConfig_CAN.cpp // @Path: ../libraries/AP_CANManager/AP_CANManager.cpp
GOBJECT(BoardConfig_CAN, "CAN_", AP_BoardConfig_CAN), GOBJECT(can_mgr, "CAN_", AP_CANManager),
#endif #endif
// GPS driver // GPS driver

2
Rover/Parameters.h

@ -26,7 +26,7 @@ public:
// //
k_param_format_version = 0, k_param_format_version = 0,
k_param_software_type, // unused k_param_software_type, // unused
k_param_BoardConfig_CAN, k_param_can_mgr,
// Misc // Misc
// //

4
Rover/system.cpp

@ -20,8 +20,8 @@ void Rover::init_ardupilot()
#endif #endif
BoardConfig.init(); BoardConfig.init();
#if HAL_WITH_UAVCAN #if HAL_MAX_CAN_PROTOCOL_DRIVERS
BoardConfig_CAN.init(); can_mgr.init();
#endif #endif
// init gripper // init gripper

Loading…
Cancel
Save