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

AP_EFI: rename AP_UAVCAN to AP_DroneCAN

This commit is contained in:
Andrew Tridgell 2023-04-07 10:18:01 +10:00
parent 8b096c2987
commit 7e74fde24c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_EFI/AP_EFI_DroneCAN.cpp
View File

@ -5,7 +5,7 @@
#if AP_EFI_DRONECAN_ENABLED #if AP_EFI_DRONECAN_ENABLED
#include <AP_CANManager/AP_CANManager.h> #include <AP_CANManager/AP_CANManager.h>
#include <AP_UAVCAN/AP_UAVCAN.h> #include <AP_DroneCAN/AP_DroneCAN.h>
#include <AP_BoardConfig/AP_BoardConfig.h> #include <AP_BoardConfig/AP_BoardConfig.h>
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
@ -20,13 +20,13 @@ AP_EFI_DroneCAN::AP_EFI_DroneCAN(AP_EFI &_frontend) :
} }
// links the DroneCAN message to this backend // links the DroneCAN message to this backend
void AP_EFI_DroneCAN::subscribe_msgs(AP_UAVCAN *ap_uavcan) void AP_EFI_DroneCAN::subscribe_msgs(AP_DroneCAN *ap_dronecan)
{ {
if (ap_uavcan == nullptr) { if (ap_dronecan == nullptr) {
return; return;
} }
if (Canard::allocate_sub_arg_callback(ap_uavcan, &trampoline_status, ap_uavcan->get_driver_index()) == nullptr) { if (Canard::allocate_sub_arg_callback(ap_dronecan, &trampoline_status, ap_dronecan->get_driver_index()) == nullptr) {
AP_BoardConfig::allocation_error("status_sub"); AP_BoardConfig::allocation_error("status_sub");
} }
} }
@ -37,7 +37,7 @@ void AP_EFI_DroneCAN::update()
} }
// EFI message handler // EFI message handler
void AP_EFI_DroneCAN::trampoline_status(AP_UAVCAN *ap_uavcan, const CanardRxTransfer& transfer, const uavcan_equipment_ice_reciprocating_Status &msg) void AP_EFI_DroneCAN::trampoline_status(AP_DroneCAN *ap_dronecan, const CanardRxTransfer& transfer, const uavcan_equipment_ice_reciprocating_Status &msg)
{ {
if (driver == nullptr) { if (driver == nullptr) {
return; return;

6
libraries/AP_EFI/AP_EFI_DroneCAN.h
View File

@ -4,7 +4,7 @@
#include "AP_EFI_Backend.h" #include "AP_EFI_Backend.h"
#if AP_EFI_DRONECAN_ENABLED #if AP_EFI_DRONECAN_ENABLED
#include <AP_UAVCAN/AP_UAVCAN.h> #include <AP_DroneCAN/AP_DroneCAN.h>
class AP_EFI_DroneCAN : public AP_EFI_Backend { class AP_EFI_DroneCAN : public AP_EFI_Backend {
public: public:
@ -12,8 +12,8 @@ public:
void update() override; void update() override;
static void subscribe_msgs(AP_UAVCAN* ap_uavcan); static void subscribe_msgs(AP_DroneCAN* ap_dronecan);
static void trampoline_status(AP_UAVCAN *ap_uavcan, const CanardRxTransfer& transfer, const uavcan_equipment_ice_reciprocating_Status &msg); static void trampoline_status(AP_DroneCAN *ap_dronecan, const CanardRxTransfer& transfer, const uavcan_equipment_ice_reciprocating_Status &msg);
private: private:
void handle_status(const uavcan_equipment_ice_reciprocating_Status &pkt); void handle_status(const uavcan_equipment_ice_reciprocating_Status &pkt);