aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_RangeFinder: allow separate enable of MSP rangefinder

Browse Source
This commit is contained in:
Andrew Tridgell 2020-08-31 19:16:32 +10:00
parent 4a8290508d
commit 84f7589f2d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_RangeFinder/AP_RangeFinder.cpp
View File

@ -542,13 +542,13 @@ void RangeFinder::detect_instance(uint8_t instance, uint8_t& serial_instance)
break;
#endif
#if HAL_MSP_ENABLED
#if HAL_MSP_RANGEFINDER_ENABLED
case Type::MSP:
if (AP_RangeFinder_MSP::detect()) {
drivers[instance] = new AP_RangeFinder_MSP(state[instance], params[instance]);
}
break;
#endif //HAL_MSP_ENABLED
#endif // HAL_MSP_RANGEFINDER_ENABLED
default:
break;
@ -596,7 +596,7 @@ void RangeFinder::handle_msg(const mavlink_message_t &msg)
}
}
#if HAL_MSP_ENABLED
#if HAL_MSP_RANGEFINDER_ENABLED
void RangeFinder::handle_msp(const MSP::msp_rangefinder_sensor_t &pkt)
{
uint8_t i;
@ -606,7 +606,7 @@ void RangeFinder::handle_msp(const MSP::msp_rangefinder_sensor_t &pkt)
}
}
}
#endif //HAL_MSP_ENABLED
#endif // HAL_MSP_RANGEFINDER_ENABLED
// return true if we have a range finder with the specified orientation
bool RangeFinder::has_orientation(enum Rotation orientation) const

8
libraries/AP_RangeFinder/AP_RangeFinder.h
View File

@ -34,6 +34,10 @@
#define RANGEFINDER_PREARM_REQUIRED_CHANGE_CM 50
#endif
#ifndef HAL_MSP_RANGEFINDER_ENABLED
#define HAL_MSP_RANGEFINDER_ENABLED HAL_MSP_ENABLED && !HAL_MINIMIZE_FEATURES
#endif
class AP_RangeFinder_Backend;
class RangeFinder
@ -136,10 +140,10 @@ public:
// Handle an incoming DISTANCE_SENSOR message (from a MAVLink enabled range finder)
void handle_msg(const mavlink_message_t &msg);
#if HAL_MSP_ENABLED
#if HAL_MSP_RANGEFINDER_ENABLED
// Handle an incoming DISTANCE_SENSOR message (from a MSP enabled range finder)
void handle_msp(const MSP::msp_rangefinder_sensor_t &pkt);
#endif //HAL_MSP_ENABLED
#endif //HAL_MSP_RANGEFINDER_ENABLED
// return true if we have a range finder with the specified orientation
bool has_orientation(enum Rotation orientation) const;