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

AP_Logger: use of AP_Proximity checks HAL_PROXIMITY_ENABLED

This commit is contained in:
Randy Mackay 2021-03-25 17:08:27 +09:00
parent f67cdf5a81
commit d4f1eacbed
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Logger/AP_Logger.h
View File

@ -330,7 +330,9 @@ public:
uint8_t sequence,
const RallyLocation &rally_point);
void Write_Beacon(AP_Beacon &beacon);
#if HAL_PROXIMITY_ENABLED
void Write_Proximity(AP_Proximity &proximity);
#endif
void Write_SRTL(bool active, uint16_t num_points, uint16_t max_points, uint8_t action, const Vector3f& point);
void Write_OABendyRuler(uint8_t type, bool active, float target_yaw, float target_pitch, bool ignore_chg, float margin, const Location &final_dest, const Location &oa_dest);
void Write_OADijkstra(uint8_t state, uint8_t error_id, uint8_t curr_point, uint8_t tot_points, const Location &final_dest, const Location &oa_dest);

2
libraries/AP_Logger/LogFile.cpp
View File

@ -546,6 +546,7 @@ void AP_Logger::Write_Beacon(AP_Beacon &beacon)
WriteBlock(&pkt_beacon, sizeof(pkt_beacon));
}
#if HAL_PROXIMITY_ENABLED
// Write proximity sensor distances
void AP_Logger::Write_Proximity(AP_Proximity &proximity)
{
@ -608,6 +609,7 @@ void AP_Logger::Write_Proximity(AP_Proximity &proximity)
}
}
}
#endif
void AP_Logger::Write_SRTL(bool active, uint16_t num_points, uint16_t max_points, uint8_t action, const Vector3f& breadcrumb)
{