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

fix complicated timing logic (#1480)

Browse Source
This commit is contained in:
gullradriel 2023-10-09 20:01:40 +02:00 committed by GitHub
parent 65e71508ac
commit 264b1b38ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -494,6 +494,7 @@ ReconView::ReconView(NavigationView& nav)
button_manual_recon.on_select = [this](Button&) { button_manual_recon.on_select = [this](Button&) {
button_remove.set_text("DELETE"); button_remove.set_text("DELETE");
button_add.hidden(false);
scanner_mode = false; scanner_mode = false;
manual_mode = true; manual_mode = true;
recon_pause(); recon_pause();
@ -620,7 +621,8 @@ ReconView::ReconView(NavigationView& nav)
recon_pause(); recon_pause();
} }
button_add.hidden(scanner_mode); button_add.hidden(scanner_mode);
set_dirty(); if (scanner_mode) // only needed when hiding, UI mayhem
set_dirty();
}; };
button_config.on_select = [this, &nav](Button&) { button_config.on_select = [this, &nav](Button&) {
@ -775,19 +777,8 @@ void ReconView::frequency_file_load(bool) {
} }
void ReconView::on_statistics_update(const ChannelStatistics& statistics) { void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
systime_t time_interval = 100;
uint32_t local_recon_lock_duration = recon_lock_duration;
chrono_end = chTimeNow(); chrono_end = chTimeNow();
if (field_mode.selected_index_value() == SPEC_MODULATION) { systime_t time_interval = chrono_end - chrono_start;
time_interval = chrono_end - chrono_start;
if (field_lock_wait.value() == 0) {
if (time_interval <= 1) // capping here to avoid freeze because too quick
local_recon_lock_duration = 2; // minimum working tested value
else
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
@ -807,7 +798,7 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
if (!timer) { if (!timer) {
status = 0; status = 0;
freq_lock = 0; freq_lock = 0;
timer = local_recon_lock_duration; timer = recon_lock_duration;
} }
if (freq_lock < recon_lock_nb_match) // LOCKING if (freq_lock < recon_lock_nb_match) // LOCKING
{ {

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

@ -303,7 +303,7 @@ class ReconView : public View {
NumberField field_lock_wait{ NumberField field_lock_wait{
{25 * 8, 24 * 8 + 4}, {25 * 8, 24 * 8 + 4},
4, 4,
{0, RECON_MAX_LOCK_DURATION}, {STATS_UPDATE_INTERVAL, RECON_MAX_LOCK_DURATION},
STATS_UPDATE_INTERVAL, STATS_UPDATE_INTERVAL,
' ', ' ',
}; };