From c7f954c6c7c6ab44e94aaa5843cad7408fb27769 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 4 Mar 2022 14:29:50 +1100 Subject: [PATCH] Blimp: 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. --- Blimp/GCS_Mavlink.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Blimp/GCS_Mavlink.cpp b/Blimp/GCS_Mavlink.cpp index 32396aebf0..3601c5bf7f 100644 --- a/Blimp/GCS_Mavlink.cpp +++ b/Blimp/GCS_Mavlink.cpp @@ -123,7 +123,7 @@ void GCS_MAVLINK_Blimp::send_pid_tuning() if (!HAVE_PAYLOAD_SPACE(chan, PID_TUNING)) { return; } - const AP_Logger::PID_Info *pid_info = nullptr; + const AP_PIDInfo *pid_info = nullptr; switch (axes[i]) { case PID_SEND::VELX: pid_info = &blimp.pid_vel_xy.get_pid_info_x();