Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-17 19:54:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Restoring part of old timer, fixed sd loading (#1385)

Browse Source
This commit is contained in:
gullradriel 2023-08-17 17:28:12 +02:00 committed by GitHub
parent deeb81c183
commit bd2ee03e44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,12 +221,15 @@ bool ReconView::recon_load_config_from_sd() {
parse_int(line, frequency_range.max); parse_int(line, frequency_range.max);
button_manual_end.set_text(to_string_short_freq(frequency_range.max)); button_manual_end.set_text(to_string_short_freq(frequency_range.max));
} }
complete = true; complete = true; // NB: Last entry.
break; break;
default: default:
complete = false;
break; break;
} }
if (complete) break; if (complete) break;
line_nb++; line_nb++;
} }
@ -250,6 +253,7 @@ bool ReconView::recon_save_config_to_sd() {
settings_file.write_line(to_string_dec_int(wait)); settings_file.write_line(to_string_dec_int(wait));
settings_file.write_line(to_string_dec_uint(frequency_range.min)); settings_file.write_line(to_string_dec_uint(frequency_range.min));
settings_file.write_line(to_string_dec_uint(frequency_range.max)); settings_file.write_line(to_string_dec_uint(frequency_range.max));
return true; return true;
} }
@ -872,6 +876,7 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
uint32_t local_recon_lock_duration = recon_lock_duration; uint32_t local_recon_lock_duration = recon_lock_duration;
chrono_end = chTimeNow(); chrono_end = chTimeNow();
if (field_mode.selected_index_value() == SPEC_MODULATION) {
time_interval = chrono_end - chrono_start; time_interval = chrono_end - chrono_start;
if (field_lock_wait.value() == 0) { if (field_lock_wait.value() == 0) {
if (time_interval <= 1) // capping here to avoid freeze because too quick if (time_interval <= 1) // capping here to avoid freeze because too quick
@ -879,6 +884,7 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
else else
local_recon_lock_duration = time_interval; local_recon_lock_duration = time_interval;
} }
}
chrono_start = chrono_end; chrono_start = chrono_end;
// hack to reload the list if it was cleared by going into CONFIG // hack to reload the list if it was cleared by going into CONFIG
@ -898,10 +904,7 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
if (!timer) { if (!timer) {
status = 0; status = 0;
freq_lock = 0; freq_lock = 0;
last_freq_lock = -1; // need to reset these two as else the green coloration can not occur on consecutive matches
last_nb_match = -1;
timer = local_recon_lock_duration; timer = local_recon_lock_duration;
big_display.set_style(&Styles::white);
} }
if (freq_lock < recon_lock_nb_match) // LOCKING if (freq_lock < recon_lock_nb_match) // LOCKING
{ {
@ -916,7 +919,7 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
if (db > squelch) // MATCHING LEVEL if (db > squelch) // MATCHING LEVEL
{ {
freq_lock++; freq_lock++;
timer += local_recon_lock_duration; // give some more time for next lock timer += time_interval; // give some more time for next lock
} else { } else {
// continuous, direct cut it if not consecutive match after 1 first match // continuous, direct cut it if not consecutive match after 1 first match
if (recon_match_mode == RECON_MATCH_CONTINUOUS) { if (recon_match_mode == RECON_MATCH_CONTINUOUS) {
@ -970,7 +973,7 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
} }
if (timer != 0) { if (timer != 0) {
timer -= local_recon_lock_duration; timer -= time_interval;
if (timer < 0) { if (timer < 0) {
timer = 0; timer = 0;
} }