Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-02-23 16:19:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reorder methods in source file to indicate call order.

Browse Source
This commit is contained in:
Jared Boone 2015-12-11 17:17:12 -08:00
parent 088f60f2bc
commit d1637db2fc
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
firmware/baseband/spectrum_collector.cpp
View File

@ -29,6 +29,30 @@
#include <algorithm> #include <algorithm>
void SpectrumCollector::feed(
const buffer_c16_t& channel,
const uint32_t filter_pass_frequency,
const uint32_t filter_stop_frequency
) {
channel_filter_pass_frequency = filter_pass_frequency;
channel_filter_stop_frequency = filter_stop_frequency;
channel_spectrum_decimator.feed(
channel,
[this](const buffer_c16_t& data) {
this->post_message(data);
}
);
}
void SpectrumCollector::post_message(const buffer_c16_t& data) {
if( !channel_spectrum_request_update ) {
fft_swap(data, channel_spectrum);
channel_spectrum_sampling_rate = data.sampling_rate;
channel_spectrum_request_update = true;
events_flag(EVT_MASK_SPECTRUM);
}
}
void SpectrumCollector::update() { void SpectrumCollector::update() {
// Called from idle thread (after EVT_MASK_SPECTRUM is flagged) // Called from idle thread (after EVT_MASK_SPECTRUM is flagged)
if( channel_spectrum_request_update ) { if( channel_spectrum_request_update ) {
@ -53,27 +77,3 @@ void SpectrumCollector::update() {
shared_memory.application_queue.push(spectrum_message); shared_memory.application_queue.push(spectrum_message);
} }
} }
void SpectrumCollector::feed(
const buffer_c16_t& channel,
const uint32_t filter_pass_frequency,
const uint32_t filter_stop_frequency
) {
channel_filter_pass_frequency = filter_pass_frequency;
channel_filter_stop_frequency = filter_stop_frequency;
channel_spectrum_decimator.feed(
channel,
[this](const buffer_c16_t& data) {
this->post_message(data);
}
);
}
void SpectrumCollector::post_message(const buffer_c16_t& data) {
if( !channel_spectrum_request_update ) {
fft_swap(data, channel_spectrum);
channel_spectrum_sampling_rate = data.sampling_rate;
channel_spectrum_request_update = true;
events_flag(EVT_MASK_SPECTRUM);
}
}

4
firmware/baseband/spectrum_collector.hpp
View File

@ -38,14 +38,14 @@ public:
{ {
} }
void update();
void feed( void feed(
const buffer_c16_t& channel, const buffer_c16_t& channel,
const uint32_t filter_pass_frequency, const uint32_t filter_pass_frequency,
const uint32_t filter_stop_frequency const uint32_t filter_stop_frequency
); );
void update();
private: private:
BlockDecimator<256> channel_spectrum_decimator; BlockDecimator<256> channel_spectrum_decimator;