Browse Source

AP_HAL_ChibiOS: save a sliding window of frequency bins

apm_2208
Andy Piper 3 years ago committed by Peter Hall
parent
commit
58b04db242
  1. 10
      libraries/AP_HAL_ChibiOS/DSP.cpp
  2. 4
      libraries/AP_HAL_ChibiOS/DSP.h

10
libraries/AP_HAL_ChibiOS/DSP.cpp

@ -50,9 +50,9 @@ extern const AP_HAL::HAL& hal;
// important as frequency resolution. Referred to as [Heinz] throughout the code. // important as frequency resolution. Referred to as [Heinz] throughout the code.
// initialize the FFT state machine // initialize the FFT state machine
AP_HAL::DSP::FFTWindowState* DSP::fft_init(uint16_t window_size, uint16_t sample_rate) AP_HAL::DSP::FFTWindowState* DSP::fft_init(uint16_t window_size, uint16_t sample_rate, uint8_t sliding_window_size)
{ {
DSP::FFTWindowStateARM* fft = new DSP::FFTWindowStateARM(window_size, sample_rate); DSP::FFTWindowStateARM* fft = new DSP::FFTWindowStateARM(window_size, sample_rate, sliding_window_size);
if (fft == nullptr || fft->_hanning_window == nullptr || fft->_rfft_data == nullptr || fft->_freq_bins == nullptr || fft->_derivative_freq_bins == nullptr) { if (fft == nullptr || fft->_hanning_window == nullptr || fft->_rfft_data == nullptr || fft->_freq_bins == nullptr || fft->_derivative_freq_bins == nullptr) {
delete fft; delete fft;
return nullptr; return nullptr;
@ -78,8 +78,8 @@ uint16_t DSP::fft_analyse(AP_HAL::DSP::FFTWindowState* state, uint16_t start_bin
} }
// create an instance of the FFT state machine // create an instance of the FFT state machine
DSP::FFTWindowStateARM::FFTWindowStateARM(uint16_t window_size, uint16_t sample_rate) DSP::FFTWindowStateARM::FFTWindowStateARM(uint16_t window_size, uint16_t sample_rate, uint8_t sliding_window_size)
: AP_HAL::DSP::FFTWindowState::FFTWindowState(window_size, sample_rate) : AP_HAL::DSP::FFTWindowState::FFTWindowState(window_size, sample_rate, sliding_window_size)
{ {
if (_freq_bins == nullptr || _hanning_window == nullptr || _rfft_data == nullptr || _derivative_freq_bins == nullptr) { if (_freq_bins == nullptr || _hanning_window == nullptr || _rfft_data == nullptr || _derivative_freq_bins == nullptr) {
GCS_SEND_TEXT(MAV_SEVERITY_WARNING, "Failed to allocate %u bytes for window %u for DSP", GCS_SEND_TEXT(MAV_SEVERITY_WARNING, "Failed to allocate %u bytes for window %u for DSP",
@ -130,6 +130,7 @@ extern "C" {
void DSP::step_hanning(FFTWindowStateARM* fft, FloatBuffer& samples, uint16_t advance) void DSP::step_hanning(FFTWindowStateARM* fft, FloatBuffer& samples, uint16_t advance)
{ {
TIMER_START(_hanning_timer); TIMER_START(_hanning_timer);
// 5us // 5us
// apply hanning window to gyro samples and store result in _freq_bins // apply hanning window to gyro samples and store result in _freq_bins
// hanning starts and ends with 0, could be skipped for minor speed improvement // hanning starts and ends with 0, could be skipped for minor speed improvement
@ -212,6 +213,7 @@ void DSP::step_stage_rfft_f32(FFTWindowStateARM* fft)
void DSP::step_arm_cmplx_mag_f32(FFTWindowStateARM* fft, uint16_t start_bin, uint16_t end_bin, float noise_att_cutoff) void DSP::step_arm_cmplx_mag_f32(FFTWindowStateARM* fft, uint16_t start_bin, uint16_t end_bin, float noise_att_cutoff)
{ {
TIMER_START(_arm_cmplx_mag_f32_timer); TIMER_START(_arm_cmplx_mag_f32_timer);
// 8us (BF) // 8us (BF)
// 32 - 4us F7, 5us F4, 5us H7 // 32 - 4us F7, 5us F4, 5us H7
// 64 - 7us F7, 13us F4 // 64 - 7us F7, 13us F4

4
libraries/AP_HAL_ChibiOS/DSP.h

@ -29,7 +29,7 @@
class ChibiOS::DSP : public AP_HAL::DSP { class ChibiOS::DSP : public AP_HAL::DSP {
public: public:
// initialise an FFT instance // initialise an FFT instance
virtual FFTWindowState* fft_init(uint16_t window_size, uint16_t sample_rate) override; virtual FFTWindowState* fft_init(uint16_t window_size, uint16_t sample_rate, uint8_t sliding_window_size) override;
// start an FFT analysis with an ObjectBuffer // start an FFT analysis with an ObjectBuffer
virtual void fft_start(FFTWindowState* state, FloatBuffer& samples, uint16_t advance) override; virtual void fft_start(FFTWindowState* state, FloatBuffer& samples, uint16_t advance) override;
// perform remaining steps of an FFT analysis // perform remaining steps of an FFT analysis
@ -39,7 +39,7 @@ public:
class FFTWindowStateARM : public AP_HAL::DSP::FFTWindowState { class FFTWindowStateARM : public AP_HAL::DSP::FFTWindowState {
friend class ChibiOS::DSP; friend class ChibiOS::DSP;
public: public:
FFTWindowStateARM(uint16_t window_size, uint16_t sample_rate); FFTWindowStateARM(uint16_t window_size, uint16_t sample_rate, uint8_t sliding_window_size);
virtual ~FFTWindowStateARM(); virtual ~FFTWindowStateARM();
private: private:

Loading…
Cancel
Save