From 8db44d1a9284e0b7ec2f85d69970c69db47b45d1 Mon Sep 17 00:00:00 2001 From: GullCode Date: Mon, 13 Mar 2023 22:56:47 +0100 Subject: [PATCH] fixed a text size, used new rssi focusable property so you can launch the level app by touching or selecting and clicking the rssi bars --- firmware/application/apps/ui_recon.cpp | 17 +++++++++++++++-- firmware/application/apps/ui_recon.hpp | 4 ++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/firmware/application/apps/ui_recon.cpp b/firmware/application/apps/ui_recon.cpp index 9f185e94f..170ed0443 100644 --- a/firmware/application/apps/ui_recon.cpp +++ b/firmware/application/apps/ui_recon.cpp @@ -524,15 +524,21 @@ namespace ui { if(frequency_list[index].description.size() > 0) desc_cycle.set( frequency_list[index].description ); //Show new description } big_display.set_style(&style_white); + if( !userpause ) + button_pause.set_text(""); + else + button_pause.set_text(""); } else if( freq_lock == 1 && recon_lock_nb_match != 1 ) { //STARTING LOCK FREQ big_display.set_style(&style_yellow); + button_pause.set_text(""); } else if( index < 1000 && freq_lock >= recon_thread -> get_lock_nb_match() ) { big_display.set_style( &style_green); + button_pause.set_text(""); //FREQ IS STRONG: GREEN and recon will pause when on_statistics_update() if( (!scanner_mode) && autosave && last_freq != freq ) { @@ -874,6 +880,13 @@ namespace ui { nav_.pop(); nav_.push(); }; + + rssi.set_focusable(true); + rssi.on_select = [this](RSSI&) { + recon_thread->stop(); + nav_.pop(); + nav_.push(); + }; button_mic_app.on_select = [this](Button&) { recon_thread->stop(); @@ -1653,7 +1666,7 @@ namespace ui { void ReconView::user_pause() { timer = 0 ; // Will trigger a recon_resume() on_statistics_update, also advancing to next freq. - button_pause.set_text(""); //PAUSED, show resume + //button_pause.set_text(""); //PAUSED, show resume userpause=true; continuous_lock=false; recon_pause(); @@ -1661,7 +1674,7 @@ namespace ui { void ReconView::user_resume() { timer = 0 ; // Will trigger a recon_resume() on_statistics_update, also advancing to next freq. - button_pause.set_text(""); //Show button for pause + //button_pause.set_text(""); //Show button for pause userpause=false; // Resume recon continuous_lock=false; recon_resume(); diff --git a/firmware/application/apps/ui_recon.hpp b/firmware/application/apps/ui_recon.hpp index 1bfaf6e0c..0783928d6 100644 --- a/firmware/application/apps/ui_recon.hpp +++ b/firmware/application/apps/ui_recon.hpp @@ -31,6 +31,7 @@ #include "analog_audio_app.hpp" #include "audio.hpp" #include "ui_mictx.hpp" +#include "ui_level.hpp" #include "portapack_persistent_memory.hpp" #include "baseband_api.hpp" #include "string_format.hpp" @@ -307,10 +308,9 @@ namespace ui { }; Text file_name { //Show file used - { 0 , 8 * 16 + 4 , 20 * 8, 16 }, + { 0 , 8 * 16 + 4 , 21 * 8, 16 }, }; - ButtonWithEncoder button_manual_start { { 0 * 8, 11 * 16, 11 * 8, 28 }, ""