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

Merge pull request #722 from GullCode/scanner-freqman-update-max_files-steps

Browse Source 
Scanner freqman update max files steps
This commit is contained in:
GullCode
2022-10-11 12:52:10 +02:00
committed by GitHub
parent 3ca57f634c ae8633c569
commit 11558b9843
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,9 +160,9 @@ ScannerView::~ScannerView() {
} }
void ScannerView::show_max() { //show total number of freqs to scan void ScannerView::show_max() { //show total number of freqs to scan
if (frequency_list.size() == MAX_DB_ENTRY) { if (frequency_list.size() == FREQMAN_MAX_PER_FILE ) {
text_max.set_style(&style_red); text_max.set_style(&style_red);
text_max.set( "/ " + to_string_dec_uint(MAX_DB_ENTRY) + " (DB MAX!)"); text_max.set( "/ " + to_string_dec_uint(FREQMAN_MAX_PER_FILE ) + " (DB MAX!)");
} }
else { else {
text_max.set_style(&style_grey); text_max.set_style(&style_grey);
@@ -304,7 +304,7 @@ ScannerView::ScannerView(
); );
rf::Frequency frequency = frequency_range.min; rf::Frequency frequency = frequency_range.min;
while (frequency_list.size() < MAX_DB_ENTRY && frequency <= frequency_range.max) { //add manual range while (frequency_list.size() < FREQMAN_MAX_PER_FILE && frequency <= frequency_range.max) { //add manual range
frequency_list.push_back(frequency); frequency_list.push_back(frequency);
description_list.push_back(""); //If empty, will keep showing the last description description_list.push_back(""); //If empty, will keep showing the last description
frequency+=def_step; frequency+=def_step;
@@ -398,7 +398,7 @@ void ScannerView::frequency_file_load(std::string file_name, bool stop_all_befor
if ( load_freqman_file(file_name, database) ) { if ( load_freqman_file(file_name, database) ) {
loaded_file_name = file_name; // keep loaded filename in memory loaded_file_name = file_name; // keep loaded filename in memory
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() < FREQMAN_MAX_PER_FILE ) { //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 ;
@@ -421,7 +421,7 @@ void ScannerView::frequency_file_load(std::string file_name, bool stop_all_befor
+ ">" + to_string_short_freq(entry.frequency_b) + ">" + to_string_short_freq(entry.frequency_b)
+ " S" + to_string_short_freq(def_step).erase(0,1) //euquiq: lame kludge to reduce spacing in step freq + " S" + to_string_short_freq(def_step).erase(0,1) //euquiq: lame kludge to reduce spacing in step freq
); );
while (frequency_list.size() < MAX_DB_ENTRY && entry.frequency_a <= entry.frequency_b) { //add the rest of the range while (frequency_list.size() < FREQMAN_MAX_PER_FILE && entry.frequency_a <= entry.frequency_b) { //add the rest of the range
entry.frequency_a+=def_step; entry.frequency_a+=def_step;
frequency_list.push_back(entry.frequency_a); frequency_list.push_back(entry.frequency_a);
description_list.push_back(""); //Token (keep showing the last description) description_list.push_back(""); //Token (keep showing the last description)

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

@@ -34,7 +34,6 @@
#include "file.hpp" #include "file.hpp"
#define MAX_DB_ENTRY 500
#define MAX_FREQ_LOCK 10 //50ms cycles scanner locks into freq when signal detected, to verify signal is not spureous #define MAX_FREQ_LOCK 10 //50ms cycles scanner locks into freq when signal detected, to verify signal is not spureous
namespace ui { namespace ui {

4
firmware/application/freqman.hpp
View File

@@ -32,8 +32,8 @@
#include "ui_widget.hpp" #include "ui_widget.hpp"
#define FREQMAN_DESC_MAX_LEN 30 #define FREQMAN_DESC_MAX_LEN 30
#define FREQMAN_MAX_PER_FILE 99 #define FREQMAN_MAX_PER_FILE 500 /* MAX PER FILES */
#define FREQMAN_MAX_PER_FILE_STR "99" #define FREQMAN_MAX_PER_FILE_STR "500" /*STRING OF FREQMAN_MAX_PER_FILE */
using namespace ui; using namespace ui;
using namespace std; using namespace std;