From f64c6f9ba1395704ce444eaced7d43bb895d66ae Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 14 Apr 2021 11:34:04 +1000 Subject: [PATCH] APM_Control: fixed cygwin build FF0 is a macro in cygwin --- libraries/APM_Control/AP_AutoTune.cpp | 2 +- libraries/APM_Control/AP_AutoTune.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/APM_Control/AP_AutoTune.cpp b/libraries/APM_Control/AP_AutoTune.cpp index d1bfe86795..98ad583655 100644 --- a/libraries/APM_Control/AP_AutoTune.cpp +++ b/libraries/APM_Control/AP_AutoTune.cpp @@ -239,7 +239,7 @@ void AP_AutoTune::update(AP_Logger::PID_Info &pinfo, float scaler, float angle_e actuator : actuator, desired_rate : desired_rate, actual_rate : actual_rate, - FF0: FF_single, + FF_single: FF_single, FF: current.FF, P: current.P, I: current.I, diff --git a/libraries/APM_Control/AP_AutoTune.h b/libraries/APM_Control/AP_AutoTune.h index e57e8037a0..d523df961d 100644 --- a/libraries/APM_Control/AP_AutoTune.h +++ b/libraries/APM_Control/AP_AutoTune.h @@ -28,7 +28,7 @@ public: float actuator; float desired_rate; float actual_rate; - float FF0; + float FF_single; float FF; float P; float I;