TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-14 12:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Recon/FreqMan set limit in load_freqman_file_ex (#1098)

Browse Source 
* changed a hardcoded value by a define, changed the order for the database clean so it happens first, changed load_freqman_file_ex so it can take a max num of freqs as a parameter with a default to FREQMAN_MAX_PER_FILE
* added a swap and a set_db to clear as much as possible before the loading of a category
* added a define for Recon max per files
* remove unneeded comment
This commit is contained in:
gullradriel 2023-06-03 22:42:34 +02:00 committed by GitHub
parent 2fd3bf0136
commit f66f438487
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/application/apps/ui_freqman.cpp
View File

@ -95,6 +95,9 @@ void FreqManBaseView::change_category(int32_t category_id) {
last_category_id = current_category_id = category_id; last_category_id = current_category_id = category_id;
std::vector<freqman_entry>().swap(database);
menu_view.set_db(database);
if (!load_freqman_file(file_list[categories[current_category_id].second], database)) if (!load_freqman_file(file_list[categories[current_category_id].second], database))
error_ = ERROR_ACCESS; error_ = ERROR_ACCESS;
else { else {

4
firmware/application/apps/ui_recon.cpp
View File

@ -930,7 +930,7 @@ void ReconView::frequency_file_load(bool stop_all_before) {
button_scanner_mode.set_text("RECON"); button_scanner_mode.set_text("RECON");
} }
desc_cycle.set_style(&style_white); desc_cycle.set_style(&style_white);
if (!load_freqman_file_ex(file_input, frequency_list, load_freqs, load_ranges, load_hamradios)) { if (!load_freqman_file_ex(file_input, frequency_list, load_freqs, load_ranges, load_hamradios, RECON_FREQMAN_MAX_PER_FILE)) {
file_name.set_style(&style_red); file_name.set_style(&style_red);
desc_cycle.set_style(&style_red); desc_cycle.set_style(&style_red);
desc_cycle.set(" NO " + file_input + ".TXT FILE ..."); desc_cycle.set(" NO " + file_input + ".TXT FILE ...");
@ -943,7 +943,7 @@ void ReconView::frequency_file_load(bool stop_all_before) {
desc_cycle.set("/0 no entries in list"); desc_cycle.set("/0 no entries in list");
file_name.set("BadOrEmpty " + file_input); file_name.set("BadOrEmpty " + file_input);
} else { } else {
if (frequency_list.size() > FREQMAN_MAX_PER_FILE) { if (frequency_list.size() > RECON_FREQMAN_MAX_PER_FILE) {
file_name.set_style(&style_yellow); file_name.set_style(&style_yellow);
desc_cycle.set_style(&style_yellow); desc_cycle.set_style(&style_yellow);
} }

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

@ -44,6 +44,7 @@
namespace ui { namespace ui {
#define RECON_CFG_FILE "SETTINGS/recon.cfg" #define RECON_CFG_FILE "SETTINGS/recon.cfg"
#define RECON_FREQMAN_MAX_PER_FILE 99 // maximum tested limit for load frequency from freqman to work
class ReconView : public View { class ReconView : public View {
public: public:

34
firmware/application/freqman.cpp
View File

@ -103,10 +103,13 @@ std::vector<std::string> get_freqman_files() {
}; };
bool load_freqman_file(std::string& file_stem, freqman_db& db) { bool load_freqman_file(std::string& file_stem, freqman_db& db) {
return load_freqman_file_ex(file_stem, db, true, true, true); return load_freqman_file_ex(file_stem, db, true, true, true, FREQMAN_MAX_PER_FILE);
} }
bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freqs, bool load_ranges, bool load_hamradios) { bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freqs, bool load_ranges, bool load_hamradios, uint8_t max_num_freqs = FREQMAN_MAX_PER_FILE) {
// swap with empty vector to ensure memory is immediately released
std::vector<freqman_entry>().swap(db);
File freqman_file; File freqman_file;
size_t length, n = 0, file_position = 0; size_t length, n = 0, file_position = 0;
char* pos; char* pos;
@ -114,40 +117,33 @@ bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freq
char* line_end; char* line_end;
std::string description; std::string description;
rf::Frequency frequency_a, frequency_b; rf::Frequency frequency_a, frequency_b;
const int read_buf_size = 128; char file_data[FREQMAN_READ_BUF_SIZE + 1];
char file_data[read_buf_size + 1];
freqman_entry_type type; freqman_entry_type type;
freqman_index_t modulation = 0; freqman_index_t modulation = 0;
freqman_index_t bandwidth = 0; freqman_index_t bandwidth = 0;
freqman_index_t step = 0; freqman_index_t step = 0;
freqman_index_t tone = 0; freqman_index_t tone = 0;
// these are not enough to really start with a new, clean, empty vector
// swap is the only way to achieve a perfect memory liberation
// db.clear();
// db.shrink_to_fit():
std::vector<freqman_entry>().swap(db);
auto result = freqman_file.open("FREQMAN/" + file_stem + ".TXT"); auto result = freqman_file.open("FREQMAN/" + file_stem + ".TXT");
if (result.is_valid()) if (result.is_valid())
return false; return false;
while (1) { while (1) {
// Read a read_buf_size bytes block from file // Read a FREQMAN_READ_BUF_SIZE block from file
freqman_file.seek(file_position); freqman_file.seek(file_position);
memset(file_data, 0, read_buf_size + 1); memset(file_data, 0, FREQMAN_READ_BUF_SIZE + 1);
auto read_size = freqman_file.read(file_data, read_buf_size); auto read_size = freqman_file.read(file_data, FREQMAN_READ_BUF_SIZE);
if (read_size.is_error()) if (read_size.is_error())
return false; // Read error return false; // Read error
file_position += read_buf_size; file_position += FREQMAN_READ_BUF_SIZE;
// Reset line_start to beginning of buffer // Reset line_start to beginning of buffer
line_start = file_data; line_start = file_data;
// If EOF reached, insert 0x0A after, in case the last line doesn't have a C/R // If EOF reached, insert 0x0A after, in case the last line doesn't have a C/R
if (read_size.value() < read_buf_size) if (read_size.value() < FREQMAN_READ_BUF_SIZE)
*(line_start + read_size.value()) = 0x0A; *(line_start + read_size.value()) = 0x0A;
// Look for complete lines in buffer // Look for complete lines in buffer
@ -231,18 +227,18 @@ bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freq
if ((type == SINGLE && load_freqs) || (type == RANGE && load_ranges) || (type == HAMRADIO && load_hamradios)) { if ((type == SINGLE && load_freqs) || (type == RANGE && load_ranges) || (type == HAMRADIO && load_hamradios)) {
db.push_back({frequency_a, frequency_b, description, type, modulation, bandwidth, step, tone}); db.push_back({frequency_a, frequency_b, description, type, modulation, bandwidth, step, tone});
n++; n++;
if (n > FREQMAN_MAX_PER_FILE) return true; if (n > max_num_freqs) return true;
} }
line_start = line_end + 1; line_start = line_end + 1;
if (line_start - file_data >= read_buf_size) break; if (line_start - file_data >= FREQMAN_READ_BUF_SIZE) break;
} }
if (read_size.value() != read_buf_size) if (read_size.value() != FREQMAN_READ_BUF_SIZE)
break; // End of file break; // End of file
// Restart at beginning of last incomplete line // Restart at beginning of last incomplete line
file_position -= (file_data + read_buf_size - line_start); file_position -= (file_data + FREQMAN_READ_BUF_SIZE - line_start);
} }
/* populate implicitly specified modulation / bandwidth */ /* populate implicitly specified modulation / bandwidth */

3
firmware/application/freqman.hpp
View File

@ -36,6 +36,7 @@
#define FREQMAN_MAX_PER_FILE 60 // Maximum of entries we can read. This is a hardware limit #define FREQMAN_MAX_PER_FILE 60 // Maximum of entries we can read. This is a hardware limit
// It was tested and lowered to leave a bit of space to the caller // It was tested and lowered to leave a bit of space to the caller
#define FREQMAN_MAX_PER_FILE_STR "60" // STRING OF FREQMAN_MAX_PER_FILE #define FREQMAN_MAX_PER_FILE_STR "60" // STRING OF FREQMAN_MAX_PER_FILE
#define FREQMAN_READ_BUF_SIZE 96 // max freqman line size including desc is 90, +6 for a bit of space
using namespace ui; using namespace ui;
using namespace std; using namespace std;
@ -96,7 +97,7 @@ using freqman_db = std::vector<freqman_entry>;
std::vector<std::string> get_freqman_files(); std::vector<std::string> get_freqman_files();
bool load_freqman_file(std::string& file_stem, freqman_db& db); bool load_freqman_file(std::string& file_stem, freqman_db& db);
bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freqs, bool load_ranges, bool load_hamradios); bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freqs, bool load_ranges, bool load_hamradios, uint8_t limit);
bool get_freq_string(freqman_entry& entry, std::string& item_string); bool get_freq_string(freqman_entry& entry, std::string& item_string);
bool save_freqman_file(std::string& file_stem, freqman_db& db); bool save_freqman_file(std::string& file_stem, freqman_db& db);
bool create_freqman_file(std::string& file_stem, File& freqman_file); bool create_freqman_file(std::string& file_stem, File& freqman_file);