Browse Source

Revert "AP_Vehicle: make sure that if ESC telemetry is missing notch updates are not misordered"

This reverts commit 27998db12e6c62021dd9f97fa4c05aad1183b7ac.

reverted as it breaks non-contiguous motors for quadplanes
release-4.2.3
Andrew Tridgell 3 years ago committed by Randy Mackay
parent
commit
f19b636da4
  1. 10
      libraries/AP_Vehicle/AP_Vehicle.cpp

10
libraries/AP_Vehicle/AP_Vehicle.cpp

@ -443,14 +443,12 @@ void AP_Vehicle::update_dynamic_notch(AP_InertialSensor::HarmonicNotch &notch) @@ -443,14 +443,12 @@ void AP_Vehicle::update_dynamic_notch(AP_InertialSensor::HarmonicNotch &notch)
if (notch.params.hasOption(HarmonicNotchFilterParams::Options::DynamicHarmonic)) {
float notches[INS_MAX_NOTCHES];
const uint8_t num_notches = AP::esc_telem().get_motor_frequencies_hz(notch.num_dynamic_notches, notches);
// ESC telemetry will return 0 for missing data, but only after 1s
for (uint8_t i = 0; i < notch.num_dynamic_notches; i++) {
if (!is_zero(notches[i])) {
notches[i] = MAX(ref_freq, notches[i]);
}
for (uint8_t i = 0; i < num_notches; i++) {
notches[i] = MAX(ref_freq, notches[i]);
}
if (num_notches > 0) {
notch.update_frequencies_hz(notch.num_dynamic_notches, notches);
notch.update_frequencies_hz(num_notches, notches);
} else { // throttle fallback
notch.update_freq_hz(throttle_freq);
}

Loading…
Cancel
Save