mirror of
https://github.com/portapack-mayhem/mayhem-firmware.git
synced 2026-08-24 16:39:04 +00:00
Feature/sliding freq (#3280)
* Add sliding-frequency audio receiver tuning * Move ADS-B receiver to external app * Move AIS receiver to external app * Move APRS receiver to external app * Move APRS transmitter to external app * Isolate filtered spectrum collection from WFM * Fixed the issues #3280 * fpga_bridge.c: init registers per reference fpga_init, add quarter-shift mode setter * radio.hpp: expose cached FPGA quarter-rate shift * radio.cpp: program FPGA quarter-rate shift together with tuning offset * tuning.hpp: pass AFE rate and direction to tuning config, add quarter_shift field * tuning.cpp: import full PRALINE RX/TX tuning tables with quarter-shift offsets * clock_manager: stop writing bogus RX digital gain, keep quarter shift across rate changes * receiver_model: port LPF bandwidth from reference auto_bandwidth, use cached quarter shift * adsb_rx: enable RF amp by default on first run * ui_geomap.hpp: add hemisphere fields, degrees become magnitude * ui_geomap: use hemisphere selector for lat/lon sign, fix minute/second wrap carry * ui_menu: guard select against empty menu * waterfall_designer: header updates for profile file handling * waterfall_designer: exception-free profile parsing, CRLF handling, deferred nav callbacks, backup cleanup * external.ld: scope app section globs to their own object directories * CMakeLists: relink when external.ld changes * tools: add external app symbol placement checker * tools: add guru meditation address lookup script * tools: add per-function stack usage report script Co-authored-by: gullradriel <gullradriel@users.noreply.github.com>
This commit is contained in:
@@ -39,6 +39,8 @@ class BoundFrequencyField : public FrequencyField {
|
||||
|
||||
public:
|
||||
decltype(FrequencyField::on_change) updated{};
|
||||
std::function<bool(rf::Frequency)> changing{};
|
||||
std::function<void(rf::Frequency)> entered{};
|
||||
|
||||
BoundFrequencyField(Point parent_pos, NavigationView& nav)
|
||||
: FrequencyField(parent_pos) {
|
||||
@@ -47,7 +49,8 @@ class BoundFrequencyField : public FrequencyField {
|
||||
set_value(model->target_frequency());
|
||||
|
||||
on_change = [this](rf::Frequency f) {
|
||||
model->set_target_frequency(f);
|
||||
if (!changing || !changing(f))
|
||||
model->set_target_frequency(f);
|
||||
if (updated)
|
||||
updated(f);
|
||||
};
|
||||
@@ -57,7 +60,10 @@ class BoundFrequencyField : public FrequencyField {
|
||||
on_edit_shown();
|
||||
auto freq_view = nav.push<FrequencyKeypadView>(model->target_frequency());
|
||||
freq_view->on_changed = [this](rf::Frequency f) {
|
||||
set_value(f);
|
||||
if (entered)
|
||||
entered(f);
|
||||
else
|
||||
set_value(f);
|
||||
};
|
||||
nav.set_on_pop([this]() {
|
||||
if (on_edit_hidden)
|
||||
@@ -76,4 +82,4 @@ using TxFrequencyField = BoundFrequencyField<TransmitterModel, &portapack::trans
|
||||
|
||||
} // namespace ui
|
||||
|
||||
#endif // __UI_FREQ_FIELD_H__
|
||||
#endif // __UI_FREQ_FIELD_H__
|
||||
|
||||
@@ -88,16 +88,29 @@ void FrequencyScale::set_spectrum_sampling_rate(const int new_sampling_rate) {
|
||||
}
|
||||
|
||||
void FrequencyScale::set_channel_filter(
|
||||
const int offset,
|
||||
const int low_frequency,
|
||||
const int high_frequency,
|
||||
const int transition) {
|
||||
if ((channel_filter_low_frequency != low_frequency) ||
|
||||
const bool shape_changed =
|
||||
(channel_filter_low_frequency != low_frequency) ||
|
||||
(channel_filter_high_frequency != high_frequency) ||
|
||||
(channel_filter_transition != transition)) {
|
||||
(channel_filter_transition != transition);
|
||||
const bool offset_changed = channel_filter_offset != offset;
|
||||
|
||||
if (shape_changed) {
|
||||
channel_filter_offset = offset;
|
||||
channel_filter_low_frequency = low_frequency;
|
||||
channel_filter_high_frequency = high_frequency;
|
||||
channel_filter_transition = transition;
|
||||
set_dirty();
|
||||
} else if (offset_changed) {
|
||||
const auto old_offset = channel_filter_offset;
|
||||
channel_filter_offset = offset;
|
||||
if (live_tuning && spectrum_sampling_rate && drawn())
|
||||
redraw_filter_cursor(old_offset);
|
||||
else
|
||||
set_dirty();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -123,12 +136,14 @@ void FrequencyScale::paint(Painter& painter) {
|
||||
draw_filter_ranges(painter, r);
|
||||
draw_frequency_ticks(painter, r);
|
||||
|
||||
const Rect r_cursor{
|
||||
(screen_width / 2 - 2) + cursor_position, r.bottom() - filter_band_height,
|
||||
5, filter_band_height};
|
||||
painter.fill_rectangle(
|
||||
r_cursor,
|
||||
Color::red());
|
||||
if (!live_tuning) {
|
||||
const Rect r_cursor{
|
||||
(screen_width / 2 - 2) + cursor_position, r.bottom() - filter_band_height,
|
||||
5, filter_band_height};
|
||||
painter.fill_rectangle(
|
||||
r_cursor,
|
||||
Color::red());
|
||||
}
|
||||
}
|
||||
|
||||
void FrequencyScale::clear() {
|
||||
@@ -184,9 +199,79 @@ void FrequencyScale::draw_frequency_ticks(Painter& painter, const Rect r) {
|
||||
}
|
||||
}
|
||||
|
||||
void FrequencyScale::redraw_filter_cursor(const int old_offset) {
|
||||
const auto r = screen_rect();
|
||||
const auto x_center = r.width() / 2;
|
||||
const auto trans =
|
||||
channel_filter_transition * spectrum_bins / spectrum_sampling_rate;
|
||||
|
||||
const auto cursor_left = [&](const int offset) {
|
||||
return r.left() + x_center +
|
||||
(offset + channel_filter_low_frequency) *
|
||||
spectrum_bins / spectrum_sampling_rate -
|
||||
trans;
|
||||
};
|
||||
const auto cursor_right = [&](const int offset) {
|
||||
return r.left() + x_center +
|
||||
(offset + channel_filter_high_frequency) *
|
||||
spectrum_bins / spectrum_sampling_rate +
|
||||
trans;
|
||||
};
|
||||
|
||||
const auto dirty_left =
|
||||
std::min(cursor_left(old_offset), cursor_left(channel_filter_offset)) - 1;
|
||||
const auto dirty_right =
|
||||
std::max(cursor_right(old_offset), cursor_right(channel_filter_offset)) + 1;
|
||||
const Rect dirty{
|
||||
dirty_left,
|
||||
r.bottom() - filter_band_height,
|
||||
dirty_right - dirty_left,
|
||||
filter_band_height};
|
||||
|
||||
Painter painter;
|
||||
painter.fill_rectangle(dirty, Theme::getInstance()->bg_darkest->background);
|
||||
draw_filter_ranges(painter, r);
|
||||
restore_tick_lines(painter, r, dirty);
|
||||
}
|
||||
|
||||
void FrequencyScale::restore_tick_lines(
|
||||
Painter& painter,
|
||||
const Rect r,
|
||||
const Rect dirty) {
|
||||
const auto draw_if_dirty = [&](const Coord x) {
|
||||
if (x >= dirty.left() && x < dirty.right()) {
|
||||
painter.fill_rectangle(
|
||||
{x, dirty.top(), 1, dirty.height()},
|
||||
Theme::getInstance()->bg_darkest->foreground);
|
||||
}
|
||||
};
|
||||
|
||||
const auto x_center = r.left() + r.width() / 2;
|
||||
draw_if_dirty(x_center);
|
||||
|
||||
constexpr int tick_count_max = 4;
|
||||
float rough_tick_interval = float(spectrum_sampling_rate) / tick_count_max;
|
||||
int magnitude = 1;
|
||||
while (rough_tick_interval >= 10.0f) {
|
||||
rough_tick_interval /= 10;
|
||||
magnitude *= 10;
|
||||
}
|
||||
|
||||
const int tick_interval = std::ceil(rough_tick_interval);
|
||||
auto tick_offset = tick_interval;
|
||||
while ((tick_offset * magnitude) < spectrum_sampling_rate / 2) {
|
||||
const Dim pixel_offset =
|
||||
tick_offset * magnitude * spectrum_bins / spectrum_sampling_rate;
|
||||
draw_if_dirty(x_center - pixel_offset);
|
||||
draw_if_dirty(x_center + pixel_offset);
|
||||
tick_offset += tick_interval;
|
||||
}
|
||||
}
|
||||
|
||||
void FrequencyScale::draw_filter_ranges(Painter& painter, const Rect r) {
|
||||
if (channel_filter_low_frequency != channel_filter_high_frequency) {
|
||||
const auto x_center = r.width() / 2;
|
||||
const auto x_center = r.width() / 2 +
|
||||
channel_filter_offset * spectrum_bins / spectrum_sampling_rate;
|
||||
|
||||
const auto x_low = x_center + channel_filter_low_frequency * spectrum_bins / spectrum_sampling_rate;
|
||||
const auto x_high = x_center + channel_filter_high_frequency * spectrum_bins / spectrum_sampling_rate;
|
||||
@@ -220,6 +305,11 @@ void FrequencyScale::on_blur() {
|
||||
}
|
||||
|
||||
bool FrequencyScale::on_encoder(const EncoderEvent delta) {
|
||||
if (live_tuning) {
|
||||
if (on_select) on_select(delta);
|
||||
return true;
|
||||
}
|
||||
|
||||
cursor_position += delta;
|
||||
|
||||
cursor_position = std::min<int32_t>(cursor_position, screen_width / 2 - 1);
|
||||
@@ -326,9 +416,11 @@ WaterfallView::WaterfallView(const bool cursor) {
|
||||
frequency_scale.focus(); // focus on frequency scale to show cursor
|
||||
|
||||
if (sampling_rate) {
|
||||
// screen x to frequency scale x, NB we need two widgets align
|
||||
int32_t cursor_position = x - (screen_width / 2);
|
||||
frequency_scale.set_cursor_position(cursor_position);
|
||||
const int32_t cursor_position = x - (screen_width / 2);
|
||||
if (!frequency_scale.is_live_tuning()) {
|
||||
// screen x to frequency scale x, NB we need two widgets align
|
||||
frequency_scale.set_cursor_position(cursor_position);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -405,6 +497,7 @@ void WaterfallView::on_channel_spectrum(const ChannelSpectrum& spectrum) {
|
||||
sampling_rate = spectrum.sampling_rate;
|
||||
frequency_scale.set_spectrum_sampling_rate(sampling_rate);
|
||||
frequency_scale.set_channel_filter(
|
||||
spectrum.channel_filter_offset,
|
||||
spectrum.channel_filter_low_frequency,
|
||||
spectrum.channel_filter_high_frequency,
|
||||
spectrum.channel_filter_transition);
|
||||
|
||||
@@ -72,6 +72,8 @@ class AudioSpectrumView : public View {
|
||||
|
||||
class FrequencyScale : public Widget {
|
||||
public:
|
||||
/* Receives a frequency offset in Hz for key/touch selection. With live
|
||||
* tuning enabled, encoder events instead pass the raw encoder delta. */
|
||||
std::function<void(int32_t offset)> on_select{};
|
||||
|
||||
void on_show() override;
|
||||
@@ -83,8 +85,10 @@ class FrequencyScale : public Widget {
|
||||
bool on_touch(const TouchEvent touch) override;
|
||||
|
||||
void set_spectrum_sampling_rate(const int new_sampling_rate);
|
||||
void set_channel_filter(const int low_frequency, const int high_frequency, const int transition);
|
||||
void set_channel_filter(const int offset, const int low_frequency, const int high_frequency, const int transition);
|
||||
void set_cursor_position(const int32_t position);
|
||||
void set_live_tuning(const bool enabled) { live_tuning = enabled; }
|
||||
bool is_live_tuning() const { return live_tuning; }
|
||||
|
||||
void paint(Painter& painter) override;
|
||||
|
||||
@@ -94,15 +98,19 @@ class FrequencyScale : public Widget {
|
||||
int32_t cursor_position{0};
|
||||
int spectrum_sampling_rate{0};
|
||||
const int spectrum_bins = std::tuple_size<decltype(ChannelSpectrum::db)>::value;
|
||||
int channel_filter_offset{0};
|
||||
int channel_filter_low_frequency{0};
|
||||
int channel_filter_high_frequency{0};
|
||||
int channel_filter_transition{0};
|
||||
bool live_tuning{false};
|
||||
|
||||
void clear();
|
||||
void clear_background(Painter& painter, const Rect r);
|
||||
|
||||
void draw_frequency_ticks(Painter& painter, const Rect r);
|
||||
void draw_filter_ranges(Painter& painter, const Rect r);
|
||||
void redraw_filter_cursor(const int old_offset);
|
||||
void restore_tick_lines(Painter& painter, const Rect r, const Rect dirty);
|
||||
};
|
||||
|
||||
/* NB: These visualizations rely on having a baseband image running.
|
||||
@@ -147,6 +155,7 @@ class WaterfallView : public View {
|
||||
void set_parent_rect(const Rect new_parent_rect) override;
|
||||
void show_audio_spectrum_view(const bool show);
|
||||
void load_gradient();
|
||||
void set_live_tuning(const bool enabled) { frequency_scale.set_live_tuning(enabled); }
|
||||
|
||||
private:
|
||||
void update_widgets_rect();
|
||||
|
||||
Reference in New Issue
Block a user