Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-01-11 15:29:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
GullCode 2023-03-13 22:56:47 +01:00
parent 37cfcb0d5c
commit 8db44d1a92
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -524,15 +524,21 @@ namespace ui {
if(frequency_list[index].description.size() > 0) desc_cycle.set( frequency_list[index].description ); //Show new description if(frequency_list[index].description.size() > 0) desc_cycle.set( frequency_list[index].description ); //Show new description
} }
big_display.set_style(&style_white); big_display.set_style(&style_white);
if( !userpause )
button_pause.set_text("<PAUSE>");
else
button_pause.set_text("<RESUME>");
} }
else if( freq_lock == 1 && recon_lock_nb_match != 1 ) else if( freq_lock == 1 && recon_lock_nb_match != 1 )
{ {
//STARTING LOCK FREQ //STARTING LOCK FREQ
big_display.set_style(&style_yellow); big_display.set_style(&style_yellow);
button_pause.set_text("<SKPLCK>");
} }
else if( index < 1000 && freq_lock >= recon_thread -> get_lock_nb_match() ) else if( index < 1000 && freq_lock >= recon_thread -> get_lock_nb_match() )
{ {
big_display.set_style( &style_green); big_display.set_style( &style_green);
button_pause.set_text("<UNLOCK>");
//FREQ IS STRONG: GREEN and recon will pause when on_statistics_update() //FREQ IS STRONG: GREEN and recon will pause when on_statistics_update()
if( (!scanner_mode) && autosave && last_freq != freq ) { if( (!scanner_mode) && autosave && last_freq != freq ) {
@ -874,6 +880,13 @@ namespace ui {
nav_.pop(); nav_.pop();
nav_.push<AnalogAudioView>(); nav_.push<AnalogAudioView>();
}; };
rssi.set_focusable(true);
rssi.on_select = [this](RSSI&) {
recon_thread->stop();
nav_.pop();
nav_.push<LevelView>();
};
button_mic_app.on_select = [this](Button&) { button_mic_app.on_select = [this](Button&) {
recon_thread->stop(); recon_thread->stop();
@ -1653,7 +1666,7 @@ namespace ui {
void ReconView::user_pause() { void ReconView::user_pause() {
timer = 0 ; // Will trigger a recon_resume() on_statistics_update, also advancing to next freq. timer = 0 ; // Will trigger a recon_resume() on_statistics_update, also advancing to next freq.
button_pause.set_text("<RESUME>"); //PAUSED, show resume //button_pause.set_text("<RESUME>"); //PAUSED, show resume
userpause=true; userpause=true;
continuous_lock=false; continuous_lock=false;
recon_pause(); recon_pause();
@ -1661,7 +1674,7 @@ namespace ui {
void ReconView::user_resume() { void ReconView::user_resume() {
timer = 0 ; // Will trigger a recon_resume() on_statistics_update, also advancing to next freq. timer = 0 ; // Will trigger a recon_resume() on_statistics_update, also advancing to next freq.
button_pause.set_text("<PAUSE>"); //Show button for pause //button_pause.set_text("<PAUSE>"); //Show button for pause
userpause=false; // Resume recon userpause=false; // Resume recon
continuous_lock=false; continuous_lock=false;
recon_resume(); recon_resume();

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

@ -31,6 +31,7 @@
#include "analog_audio_app.hpp" #include "analog_audio_app.hpp"
#include "audio.hpp" #include "audio.hpp"
#include "ui_mictx.hpp" #include "ui_mictx.hpp"
#include "ui_level.hpp"
#include "portapack_persistent_memory.hpp" #include "portapack_persistent_memory.hpp"
#include "baseband_api.hpp" #include "baseband_api.hpp"
#include "string_format.hpp" #include "string_format.hpp"
@ -307,10 +308,9 @@ namespace ui {
}; };
Text file_name { //Show file used Text file_name { //Show file used
{ 0 , 8 * 16 + 4 , 20 * 8, 16 }, { 0 , 8 * 16 + 4 , 21 * 8, 16 },
}; };
ButtonWithEncoder button_manual_start { ButtonWithEncoder button_manual_start {
{ 0 * 8, 11 * 16, 11 * 8, 28 }, { 0 * 8, 11 * 16, 11 * 8, 28 },
"" ""