Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added ui_scanner load button for any .txt frequency file

Browse Source
This commit is contained in:
Rascafr 2020-09-11 21:11:42 +02:00
parent 3425ca8d54
commit dbdb0bd379
2 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
firmware/application/apps/ui_scanner.cpp
View File

@ -21,6 +21,7 @@
*/ */
#include "ui_scanner.hpp" #include "ui_scanner.hpp"
#include "ui_fileman.hpp"
using namespace portapack; using namespace portapack;
@ -182,6 +183,7 @@ ScannerView::ScannerView(
&field_bw, &field_bw,
&field_squelch, &field_squelch,
&field_wait, &field_wait,
&button_load,
&rssi, &rssi,
&text_cycle, &text_cycle,
&text_max, &text_max,
@ -211,6 +213,26 @@ ScannerView::ScannerView(
frequency_range.max = stored_freq + 1000000; frequency_range.max = stored_freq + 1000000;
button_manual_end.set_text(to_string_short_freq(frequency_range.max)); button_manual_end.set_text(to_string_short_freq(frequency_range.max));
button_load.on_select = [this, &nav](Button&) {
// load txt files from the FREQMAN folder
auto open_view = nav.push<FileLoadView>(".TXT");
open_view->on_changed = [this](std::filesystem::path new_file_path) {
std::string dir_filter = "FREQMAN/";
std::string str_file_path = new_file_path.string();
if (str_file_path.find(dir_filter) != string::npos) { // assert file from the FREQMAN folder
scan_pause();
// get the filename without txt extension so we can use load_freqman_file fcn
std::string str_file_name = new_file_path.stem().string();
frequency_file_load(str_file_name, true);
nav_.display_modal("LOAD FREQ FILE", "Successfully loaded:\n" + str_file_name + ".TXT");
} else {
nav_.display_modal("LOAD ERROR", "A valid file from\nFREQMAN directory is\nrequired.");
}
};
};
button_manual_start.on_select = [this, &nav](Button& button) { button_manual_start.on_select = [this, &nav](Button& button) {
auto new_view = nav_.push<FrequencyKeypadView>(frequency_range.min); auto new_view = nav_.push<FrequencyKeypadView>(frequency_range.min);
new_view->on_changed = [this, &button](rf::Frequency f) { new_view->on_changed = [this, &button](rf::Frequency f) {
@ -357,22 +379,36 @@ ScannerView::ScannerView(
field_squelch.on_change = [this](int32_t v) { squelch = v; }; field_squelch.set_value(-10); field_squelch.on_change = [this](int32_t v) { squelch = v; }; field_squelch.set_value(-10);
field_volume.set_value((receiver_model.headphone_volume() - audio::headphone::volume_range().max).decibel() + 99); field_volume.set_value((receiver_model.headphone_volume() - audio::headphone::volume_range().max).decibel() + 99);
field_volume.on_change = [this](int32_t v) { this->on_headphone_volume_changed(v); }; field_volume.on_change = [this](int32_t v) { this->on_headphone_volume_changed(v); };
// LEARN FREQUENCIES // LEARN FREQUENCIES
std::string scanner_txt = "SCANNER"; std::string scanner_txt = "SCANNER";
if ( load_freqman_file(scanner_txt, database) ) { frequency_file_load(scanner_txt);
}
void ScannerView::frequency_file_load(std::string file_name, bool stop_all_before) {
// stop everything running now if required
if (stop_all_before) {
scan_thread->stop();
frequency_list.clear(); // clear the existing frequency list (expected behavior)
description_list.clear();
def_step = step_mode.selected_index_value(); //Use def_step from manual selector
}
if ( load_freqman_file(file_name, database) ) {
for(auto& entry : database) { // READ LINE PER LINE for(auto& entry : database) { // READ LINE PER LINE
if (frequency_list.size() < MAX_DB_ENTRY) { //We got space! if (frequency_list.size() < MAX_DB_ENTRY) { //We got space!
if (entry.type == RANGE) { //RANGE if (entry.type == RANGE) { //RANGE
switch (entry.step) { switch (entry.step) {
case AM_US: def_step = 10000; break ; case AM_US: def_step = 10000; break ;
case AM_EUR:def_step = 9000; break ; case AM_EUR:def_step = 9000; break ;
case NFM_1: def_step = 12500; break ; case NFM_1: def_step = 12500; break ;
case NFM_2: def_step = 6250; break ; case NFM_2: def_step = 6250; break ;
case FM_1: def_step = 100000; break ; case FM_1: def_step = 100000; break ;
case FM_2: def_step = 50000; break ; case FM_2: def_step = 50000; break ;
case N_1: def_step = 25000; break ; case N_1: def_step = 25000; break ;
case N_2: def_step = 250000; break ; case N_2: def_step = 250000; break ;
case AIRBAND:def_step= 8330; break ; case AIRBAND:def_step= 8330; break ;
} }
frequency_list.push_back(entry.frequency_a); //Store starting freq and description frequency_list.push_back(entry.frequency_a); //Store starting freq and description
description_list.push_back("R:" + to_string_short_freq(entry.frequency_a) description_list.push_back("R:" + to_string_short_freq(entry.frequency_a)
@ -397,7 +433,7 @@ ScannerView::ScannerView(
} }
else else
{ {
desc_cycle.set(" NO SCANNER.TXT FILE ..." ); desc_cycle.set(" NO " + file_name + ".TXT FILE ..." );
} }
audio::output::stop(); audio::output::stop();
step_mode.set_by_value(def_step); //Impose the default step into the manual step selector step_mode.set_by_value(def_step); //Impose the default step into the manual step selector

6
firmware/application/apps/ui_scanner.hpp
View File

@ -126,6 +126,7 @@ private:
void scan_pause(); void scan_pause();
void scan_resume(); void scan_resume();
void user_resume(); void user_resume();
void frequency_file_load(std::string file_name, bool stop_all_before = false);
void on_statistics_update(const ChannelStatistics& statistics); void on_statistics_update(const ChannelStatistics& statistics);
void on_headphone_volume_changed(int32_t v); void on_headphone_volume_changed(int32_t v);
@ -278,6 +279,11 @@ private:
"ADD FQ" "ADD FQ"
}; };
Button button_load {
{ 24 * 8, 3 * 16 - 8, 6 * 8, 22 },
"Load"
};
Button button_remove { Button button_remove {
{ 168, (35 * 8) - 4, 72, 28 }, { 168, (35 * 8) - 4, 72, 28 },
"DEL FQ" "DEL FQ"