Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-24 23:09:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Looking Glass optimizations

Browse Source
This commit is contained in:
euquiq 2023-02-27 23:29:13 -03:00
parent c8774e82d9
commit 19fed78b7f
1 changed files with 305 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
firmware/application/apps/ui_looking_glass_app.cpp
View File

@ -22,27 +22,30 @@
#include "ui_looking_glass_app.hpp"
using namespace portapack;
namespace ui
{
void GlassView::focus() {
void GlassView::focus()
{
field_marker.focus();
}
GlassView::~GlassView() {
GlassView::~GlassView()
{
receiver_model.set_sampling_rate(3072000); // Just a hack to avoid hanging other apps
receiver_model.disable();
baseband::shutdown();
}
void GlassView::on_lna_changed(int32_t v_db) {
void GlassView::on_lna_changed(int32_t v_db)
{
receiver_model.set_lna(v_db);
}
void GlassView::on_vga_changed(int32_t v_db) {
void GlassView::on_vga_changed(int32_t v_db)
{
receiver_model.set_vga(v_db);
}
@ -51,8 +54,7 @@ void GlassView::add_spectrum_pixel(Color color)
spectrum_row[pixel_index++] = color;
if (pixel_index == 240) // got an entire waterfall line
{
const auto draw_y = display.scroll(1); //Scroll 1 pixel down
display.draw_pixels( {{0, draw_y}, {240, 1}}, spectrum_row); //new line at top
display.draw_pixels({{0, display.scroll(1)}, {240, 1}}, spectrum_row); // new line at top, one less var, speedier
pixel_index = 0; // Start New cascade line
}
}
@ -68,13 +70,14 @@ void GlassView::on_channel_spectrum(const ChannelSpectrum &spectrum)
// All things said and done, we actually need 240 of those bins:
for (uint8_t bin = 0; bin < 240; bin++)
{
if (bin < 120) {
if (spectrum.db[134 + bin] > max_power)
if (bin < 120)
{
if (spectrum.db[134 + bin] > max_power) // 134
max_power = spectrum.db[134 + bin];
}
else
{
if (spectrum.db[bin - 118] > max_power)
if (spectrum.db[bin - 118] > max_power) // 118
max_power = spectrum.db[bin - 118];
}
@ -92,19 +95,21 @@ void GlassView::on_channel_spectrum(const ChannelSpectrum &spectrum)
if (!pixel_index) // Received indication that a waterfall line has been completed
{
bins_Hz_size = 0; // Since this is an entire pixel line, we don't carry "Pixels into next bin"
break;
} else {
f_center = f_center_ini; // Start a new sweep
radio::set_tuning_frequency(f_center); // tune rx for this new slice directly, faster than using persistent memory saving
chThdSleepMilliseconds(10);
baseband::spectrum_streaming_start(); // Do the RX
return;
}
bins_Hz_size -= marker_pixel_step; // reset bins size, but carrying the eventual excess Hz into next pixel
}
}
}
if (pixel_index)
f_center += LOOKING_GLASS_SLICE_WIDTH; // Move into the next bandwidth slice NOTE: spectrum.sampling_rate = LOOKING_GLASS_SLICE_WIDTH
else
f_center = f_center_ini; //Start a new sweep
radio::set_tuning_frequency(f_center); // tune rx for this new slice directly, faster than using persistent memory saving
chThdSleepMilliseconds(5);
receiver_model.set_tuning_frequency(f_center); //tune rx for this slice
// receiver_model.set_tuning_frequency(f_center); //tune rx for this slice
baseband::spectrum_streaming_start(); // Do the RX
}
@ -144,7 +149,6 @@ void GlassView::on_range_changed()
field_marker.set_step(marker_step); // step needs to be a pixel wide.
f_center_ini = f_min + (LOOKING_GLASS_SLICE_WIDTH / 2); // Initial center frequency for sweep
f_center_ini += LOOKING_GLASS_SLICE_WIDTH; //euquiq: Why do I need to move the center ???!!! (shift needed for marker accuracy)
PlotMarker(field_marker.value()); // Refresh marker on screen
@ -157,16 +161,16 @@ void GlassView::on_range_changed()
receiver_model.set_tuning_frequency(f_center_ini); // tune rx for this slice
}
void GlassView::PlotMarker(rf::Frequency fpos)
void GlassView::PlotMarker(rf::Frequency pos)
{
int64_t pos = fpos * MHZ_DIV;
pos = pos * MHZ_DIV;
pos -= f_min;
pos = pos / marker_pixel_step; // Real pixel
portapack::display.fill_rectangle({0, 100, 240, 8}, Color::black()); // Clear old marker and whole marker rectangle btw
portapack::display.fill_rectangle({(int16_t)pos - 2, 100, 5, 3}, Color::red()); //Red marker middle
portapack::display.fill_rectangle({(int16_t)pos - 1, 103, 3, 3}, Color::red()); //Red marker middle
portapack::display.fill_rectangle({(int16_t)pos, 106, 1, 2}, Color::red()); //Red marker middle
portapack::display.fill_rectangle({(int)pos - 2, 100, 5, 3}, Color::red()); // Red marker top
portapack::display.fill_rectangle({(int)pos - 1, 103, 3, 3}, Color::red()); // Red marker middle
portapack::display.fill_rectangle({(int)pos, 106, 1, 2}, Color::red()); // Red marker bottom
}
GlassView::GlassView(
@ -185,53 +189,60 @@ GlassView::GlassView(
&range_presets,
&field_marker,
&text_marker_pm,
&field_trigger
});
&field_trigger});
load_Presets(); // Load available presets from TXT files (or default)
field_frequency_min.set_value(presets_db[0].min); // Defaults to first preset
field_frequency_min.on_change = [this](int32_t v) {
field_frequency_min.on_change = [this](int32_t v)
{
if (v >= field_frequency_max.value())
field_frequency_max.set_value(v + 240);
this->on_range_changed();
};
field_frequency_max.set_value(presets_db[0].max); // Defaults to first preset
field_frequency_max.on_change = [this](int32_t v) {
field_frequency_max.on_change = [this](int32_t v)
{
if (v <= field_frequency_min.value())
field_frequency_min.set_value(v - 240);
this->on_range_changed();
};
field_lna.set_value(receiver_model.lna());
field_lna.on_change = [this](int32_t v) {
field_lna.on_change = [this](int32_t v)
{
this->on_lna_changed(v);
};
field_vga.set_value(receiver_model.vga());
field_vga.on_change = [this](int32_t v_db) {
field_vga.on_change = [this](int32_t v_db)
{
this->on_vga_changed(v_db);
};
filter_config.set_selected_index(0);
filter_config.on_change = [this](size_t n, OptionsField::value_t v) {
filter_config.on_change = [this](size_t n, OptionsField::value_t v)
{
(void)n;
min_color_power = v;
};
range_presets.on_change = [this](size_t n, OptionsField::value_t v) {
range_presets.on_change = [this](size_t n, OptionsField::value_t v)
{
(void)n;
field_frequency_min.set_value(presets_db[v].min, false);
field_frequency_max.set_value(presets_db[v].max, false);
this->on_range_changed();
};
field_marker.on_change = [this](int32_t v) {
field_marker.on_change = [this](int32_t v)
{
PlotMarker(v); // Refresh marker on screen
};
field_marker.on_select = [this](NumberField&) {
field_marker.on_select = [this](NumberField &)
{
f_center = field_marker.value();
f_center = f_center * MHZ_DIV;
receiver_model.set_tuning_frequency(f_center); // Center tune rx in marker freq.
@ -241,7 +252,8 @@ GlassView::GlassView(
};
field_trigger.set_value(32); // Defaults to 32, as normal triggering resolution
field_trigger.on_change = [this](int32_t v) {
field_trigger.on_change = [this](int32_t v)
{
baseband::set_spectrum(LOOKING_GLASS_SLICE_WIDTH, v);
};
@ -260,56 +272,69 @@ GlassView::GlassView(
receiver_model.enable();
}
void GlassView::load_Presets() {
void GlassView::load_Presets()
{
File presets_file; // LOAD /WHIPCALC/ANTENNAS.TXT from microSD
auto result = presets_file.open("LOOKINGGLASS/PRESETS.TXT");
presets_db.clear(); // Start with fresh db
if (result.is_valid()) {
if (result.is_valid())
{
presets_Default(); // There is no txt, store a default range
} else {
}
else
{
std::string line; // There is a txt file
char one_char[1]; // Read it char by char
for (size_t pointer=0; pointer < presets_file.size();pointer++) {
for (size_t pointer = 0; pointer < presets_file.size(); pointer++)
{
presets_file.seek(pointer);
presets_file.read(one_char, 1);
if ((int)one_char[0] > 31) { //ascii space upwards
if ((int)one_char[0] > 31)
{ // ascii space upwards
line += one_char[0]; // Add it to the textline
}
else if (one_char[0] == '\n') { //New Line
else if (one_char[0] == '\n')
{ // New Line
txtline_process(line); // make sense of this textline
line.clear(); // Ready for next textline
}
}
if (line.length() > 0) txtline_process(line); //Last line had no newline at end ?
if (!presets_db.size()) presets_Default(); //no antenna on txt, use default
if (line.length() > 0)
txtline_process(line); // Last line had no newline at end ?
if (!presets_db.size())
presets_Default(); // no antenna on txt, use default
}
populate_Presets();
}
void GlassView::txtline_process(std::string &line)
{
if (line.find("#") != std::string::npos) return; //Line is just a comment
if (line.find("#") != std::string::npos)
return; // Line is just a comment
size_t comma = line.find(","); // Get first comma position
if (comma == std::string::npos) return; //No comma at all
if (comma == std::string::npos)
return; // No comma at all
size_t previous = 0;
preset_entry new_preset;
new_preset.min = std::stoi(line.substr(0, comma));
if (!new_preset.min) return; //No frequency!
if (!new_preset.min)
return; // No frequency!
previous = comma + 1;
comma = line.find(",", previous); // Search for next delimiter
if (comma == std::string::npos) return; //No comma at all
if (comma == std::string::npos)
return; // No comma at all
new_preset.max = std::stoi(line.substr(previous, comma - previous));
if (!new_preset.max) return; //No frequency!
if (!new_preset.max)
return; // No frequency!
new_preset.label = line.substr(comma + 1);
if (new_preset.label.size() == 0) return; //No label ?
if (new_preset.label.size() == 0)
return; // No label ?
presets_db.push_back(new_preset); // Add this preset.
}