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

AC_AutoTune: use structure assignment for test results

This commit is contained in:
Peter Barker 2022-02-09 10:42:14 +11:00 committed by Randy Mackay
parent 3686f32671
commit 55af020639
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/AC_AutoTune/AC_AutoTune_Heli.cpp
View File

@ -1345,19 +1345,13 @@ void AC_AutoTune_Heli::angle_dwell_test_run(float start_frq, float stop_frq, flo
// set sweep data if a frequency sweep is being conducted // set sweep data if a frequency sweep is being conducted
if (!is_equal(start_frq,stop_frq)) { if (!is_equal(start_frq,stop_frq)) {
if (curr_test.phase <= 160.0f && curr_test.phase >= 150.0f) { if (curr_test.phase <= 160.0f && curr_test.phase >= 150.0f) {
sweep.ph180.freq = curr_test.freq; sweep.ph180 = curr_test;
sweep.ph180.gain = curr_test.gain;
sweep.ph180.phase = curr_test.phase;
} }
if (curr_test.phase <= 250.0f && curr_test.phase >= 240.0f) { if (curr_test.phase <= 250.0f && curr_test.phase >= 240.0f) {
sweep.ph270.freq = curr_test.freq; sweep.ph270 = curr_test;
sweep.ph270.gain = curr_test.gain;
sweep.ph270.phase = curr_test.phase;
} }
if (curr_test.gain > sweep.maxgain.gain) { if (curr_test.gain > sweep.maxgain.gain) {
sweep.maxgain.gain = curr_test.gain; sweep.maxgain = curr_test;
sweep.maxgain.freq = curr_test.freq;
sweep.maxgain.phase = curr_test.phase;
} }
if (now - step_start_time_ms >= sweep_time_ms + 200) { if (now - step_start_time_ms >= sweep_time_ms + 200) {
// we have passed the maximum stop time // we have passed the maximum stop time