Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-10 18:03:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_RangeFinder: aligned msp message data struct name to gps,baro and mag

Browse Source
This commit is contained in:
yaapu 2020-09-08 00:29:23 +02:00 committed by Andrew Tridgell
parent efca0c04eb
commit bc21e505e3
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_RangeFinder/AP_RangeFinder.cpp
View File

@ -597,7 +597,7 @@ void RangeFinder::handle_msg(const mavlink_message_t &msg)
} }
#if HAL_MSP_RANGEFINDER_ENABLED #if HAL_MSP_RANGEFINDER_ENABLED
void RangeFinder::handle_msp(const MSP::msp_rangefinder_sensor_t &pkt) void RangeFinder::handle_msp(const MSP::msp_rangefinder_data_message_t &pkt)
{ {
uint8_t i; uint8_t i;
for (i=0; i<num_instances; i++) { for (i=0; i<num_instances; i++) {

2
libraries/AP_RangeFinder/AP_RangeFinder.h
View File

@ -142,7 +142,7 @@ public:
#if HAL_MSP_RANGEFINDER_ENABLED #if HAL_MSP_RANGEFINDER_ENABLED
// Handle an incoming DISTANCE_SENSOR message (from a MSP enabled range finder) // Handle an incoming DISTANCE_SENSOR message (from a MSP enabled range finder)
void handle_msp(const MSP::msp_rangefinder_sensor_t &pkt); void handle_msp(const MSP::msp_rangefinder_data_message_t &pkt);
#endif #endif
// return true if we have a range finder with the specified orientation // return true if we have a range finder with the specified orientation
bool has_orientation(enum Rotation orientation) const; bool has_orientation(enum Rotation orientation) const;

2
libraries/AP_RangeFinder/AP_RangeFinder_Backend.h
View File

@ -33,7 +33,7 @@ public:
virtual void handle_msg(const mavlink_message_t &msg) { return; } virtual void handle_msg(const mavlink_message_t &msg) { return; }
#if HAL_MSP_RANGEFINDER_ENABLED #if HAL_MSP_RANGEFINDER_ENABLED
virtual void handle_msp(const MSP::msp_rangefinder_sensor_t &pkt) { return; } virtual void handle_msp(const MSP::msp_rangefinder_data_message_t &pkt) { return; }
#endif #endif
enum Rotation orientation() const { return (Rotation)params.orientation.get(); } enum Rotation orientation() const { return (Rotation)params.orientation.get(); }

2
libraries/AP_RangeFinder/AP_RangeFinder_MSP.cpp
View File

@ -46,7 +46,7 @@ bool AP_RangeFinder_MSP::detect()
/* /*
Set the distance based on a MSP message Set the distance based on a MSP message
*/ */
void AP_RangeFinder_MSP::handle_msp(const MSP::msp_rangefinder_sensor_t &pkt) void AP_RangeFinder_MSP::handle_msp(const MSP::msp_rangefinder_data_message_t &pkt)
{ {
state.last_reading_ms = AP_HAL::millis(); state.last_reading_ms = AP_HAL::millis();
distance_cm = pkt.distance_mm / 10; distance_cm = pkt.distance_mm / 10;

2
libraries/AP_RangeFinder/AP_RangeFinder_MSP.h
View File

@ -22,7 +22,7 @@ public:
void update(void) override; void update(void) override;
// Get update from msp // Get update from msp
void handle_msp(const MSP::msp_rangefinder_sensor_t &pkt) override; void handle_msp(const MSP::msp_rangefinder_data_message_t &pkt) override;
protected: protected: