Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-09-20 16:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Save new frequencies into the default / user loaded freqman txt file

Browse Source
This commit is contained in:
Rascafr 2020-09-11 22:15:35 +02:00
parent d2c66f4515
commit 200c57f990
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,7 +335,8 @@ ScannerView::ScannerView(
button_add.on_select = [this](Button&) { //frequency_list[current_index] button_add.on_select = [this](Button&) { //frequency_list[current_index]
File scanner_file; File scanner_file;
auto result = scanner_file.open("FREQMAN/SCANNER.TXT"); //First search if freq is already in txt std::string freq_file_path = "FREQMAN/" + loaded_file_name + ".TXT";
auto result = scanner_file.open(freq_file_path); //First search if freq is already in txt
if (!result.is_valid()) { if (!result.is_valid()) {
std::string frequency_to_add = "f=" std::string frequency_to_add = "f="
+ to_string_dec_uint(frequency_list[current_index] / 1000) + to_string_dec_uint(frequency_list[current_index] / 1000)
@ -363,12 +364,12 @@ ScannerView::ScannerView(
big_display.set(frequency_list[current_index]); //After showing an error big_display.set(frequency_list[current_index]); //After showing an error
} }
else { else {
auto result = scanner_file.append("FREQMAN/SCANNER.TXT"); //Second: append if it is not there auto result = scanner_file.append(freq_file_path); //Second: append if it is not there
scanner_file.write_line(frequency_to_add + ",d=ADD FQ"); scanner_file.write_line(frequency_to_add + ",d=ADD FQ");
} }
} else } else
{ {
nav_.display_modal("Error", "Cannot open SCANNER.TXT\nfor appending freq."); nav_.display_modal("Error", "Cannot open " + loaded_file_name + ".TXT\nfor appending freq.");
big_display.set(frequency_list[current_index]); //After showing an error big_display.set(frequency_list[current_index]); //After showing an error
} }
}; };
@ -386,6 +387,8 @@ ScannerView::ScannerView(
void ScannerView::frequency_file_load(std::string file_name, bool stop_all_before) { void ScannerView::frequency_file_load(std::string file_name, bool stop_all_before) {
loaded_file_name = file_name; // keep loaded filename in memory
// stop everything running now if required // stop everything running now if required
if (stop_all_before) { if (stop_all_before) {
scan_thread->stop(); scan_thread->stop();

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

@ -138,6 +138,7 @@ private:
uint32_t wait { 0 }; uint32_t wait { 0 };
size_t def_step { 0 }; size_t def_step { 0 };
freqman_db database { }; freqman_db database { };
std::string loaded_file_name;
uint32_t current_index { 0 }; uint32_t current_index { 0 };
bool userpause { false }; bool userpause { false };