From 9d7cbf86f538cb9e011403d955a30b3a38bc90d2 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 4 Mar 2022 14:29:49 +1100 Subject: [PATCH] AntennaTracker: stop libraries including AP_Logger.h in .h files AP_Logger.h is a nexus of includes; while this is being improved over time, there's no reason for the library headers to include AP_Logger.h as the logger itself is access by singleton and the structures are in LogStructure.h This necessitated moving The PID_Info structure out of AP_Logger's namespace. This cleans up a pretty nasty bit - that structure is definitely not simply used for logging, but also used to pass pid information around to controllers! There are a lot of patches in here because AP_Logger.h, acting as a nexus, was providing transitive header file inclusion in many (some unlikely!) places. --- AntennaTracker/GCS_Mavlink.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/AntennaTracker/GCS_Mavlink.cpp b/AntennaTracker/GCS_Mavlink.cpp index 7d17686564..2f6ae171b6 100644 --- a/AntennaTracker/GCS_Mavlink.cpp +++ b/AntennaTracker/GCS_Mavlink.cpp @@ -128,8 +128,7 @@ void GCS_MAVLINK_Tracker::send_pid_tuning() // Pitch PID if (g.gcs_pid_mask & 1) { - const AP_Logger::PID_Info *pid_info; - pid_info = &g.pidPitch2Srv.get_pid_info(); + const AP_PIDInfo *pid_info = &g.pidPitch2Srv.get_pid_info(); mavlink_msg_pid_tuning_send(chan, PID_TUNING_PITCH, pid_info->target, pid_info->actual, @@ -146,8 +145,7 @@ void GCS_MAVLINK_Tracker::send_pid_tuning() // Yaw PID if (g.gcs_pid_mask & 2) { - const AP_Logger::PID_Info *pid_info; - pid_info = &g.pidYaw2Srv.get_pid_info(); + const AP_PIDInfo *pid_info = &g.pidYaw2Srv.get_pid_info(); mavlink_msg_pid_tuning_send(chan, PID_TUNING_YAW, pid_info->target, pid_info->actual,