Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename AP_CANDriver.cpp to AP_CANManager_CANDriver_Param.cpp #26533

Merged
merged 2 commits into from Mar 20, 2024
Merged

Rename AP_CANDriver.cpp to AP_CANManager_CANDriver_Param.cpp #26533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9e03a3
AP_CANManager: correct filename for CANDriver_Params
peterbarker Mar 16, 2024
31f568e
AP_CANManager: correct includes
peterbarker Mar 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions libraries/AP_CANManager/AP_CANManager.cpp
View file
Open in desktop
Expand Up @@ -70,19 +70,19 @@ const AP_Param::GroupInfo AP_CANManager::var_info[] = {

#if HAL_MAX_CAN_PROTOCOL_DRIVERS > 0
// @Group: D1_
// @Path: ../AP_CANManager/AP_CANDriver.cpp
// @Path: ../AP_CANManager/AP_CANManager_CANDriver_Params.cpp
AP_SUBGROUPINFO(_drv_param[0], "D1_", 4, AP_CANManager, AP_CANManager::CANDriver_Params),
#endif

#if HAL_MAX_CAN_PROTOCOL_DRIVERS > 1
// @Group: D2_
// @Path: ../AP_CANManager/AP_CANDriver.cpp
// @Path: ../AP_CANManager/AP_CANManager_CANDriver_Params.cpp
AP_SUBGROUPINFO(_drv_param[1], "D2_", 5, AP_CANManager, AP_CANManager::CANDriver_Params),
#endif

#if HAL_MAX_CAN_PROTOCOL_DRIVERS > 2
// @Group: D3_
// @Path: ../AP_CANManager/AP_CANDriver.cpp
// @Path: ../AP_CANManager/AP_CANManager_CANDriver_Params.cpp
AP_SUBGROUPINFO(_drv_param[2], "D3_", 6, AP_CANManager, AP_CANManager::CANDriver_Params),
#endif

Expand Down
3 changes: 0 additions & 3 deletions libraries/AP_CANManager/AP_CANDriver.cpp → ...anager/AP_CANManager_CANDriver_Params.cpp
View file
Open in desktop
Expand Up @@ -17,12 +17,9 @@

#if HAL_MAX_CAN_PROTOCOL_DRIVERS && HAL_CANMANAGER_ENABLED
#include "AP_CANManager.h"
#include <AP_Vehicle/AP_Vehicle_Type.h>

#include <AP_DroneCAN/AP_DroneCAN.h>
#include <AP_PiccoloCAN/AP_PiccoloCAN.h>
#include <AP_KDECAN/AP_KDECAN.h>


// table of user settable CAN bus parameters
const AP_Param::GroupInfo AP_CANManager::CANDriver_Params::var_info[] = {
Expand Down