From d4f1eacbed0957e0c573f4fda6a40fac61a69ac5 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Thu, 25 Mar 2021 17:08:27 +0900 Subject: [PATCH] AP_Logger: use of AP_Proximity checks HAL_PROXIMITY_ENABLED --- libraries/AP_Logger/AP_Logger.h | 2 ++ libraries/AP_Logger/LogFile.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libraries/AP_Logger/AP_Logger.h b/libraries/AP_Logger/AP_Logger.h index 0b548d774d..292667e249 100644 --- a/libraries/AP_Logger/AP_Logger.h +++ b/libraries/AP_Logger/AP_Logger.h @@ -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); diff --git a/libraries/AP_Logger/LogFile.cpp b/libraries/AP_Logger/LogFile.cpp index 2d5e961a32..19db9fb4b5 100644 --- a/libraries/AP_Logger/LogFile.cpp +++ b/libraries/AP_Logger/LogFile.cpp @@ -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) {