Use rssi focusable, added shortcut to level app, glass app, cut buttons a bit better in the ui, better pause/resume/skiplock/unlock button

This commit is contained in:
GullCode 2023-03-13 23:14:06 +01:00
parent ad4cfe5a44
commit f7df4f3575
2 changed files with 19 additions and 5 deletions

View File

@ -666,6 +666,7 @@ namespace ui {
&field_lock_wait, &field_lock_wait,
&button_recon_setup, &button_recon_setup,
&button_scanner_mode, &button_scanner_mode,
&button_looking_glass,
&file_name, &file_name,
&rssi, &rssi,
&text_cycle, &text_cycle,
@ -881,6 +882,13 @@ namespace ui {
nav_.push<AnalogAudioView>(); nav_.push<AnalogAudioView>();
}; };
button_looking_glass.on_select = [this](Button&) {
recon_thread->stop();
nav_.pop();
nav_.push<GlassView>();
};
rssi.set_focusable(true); rssi.set_focusable(true);
rssi.on_select = [this](RSSI&) { rssi.on_select = [this](RSSI&) {
recon_thread->stop(); recon_thread->stop();
@ -1104,7 +1112,7 @@ namespace ui {
show_max(); /* display step information */ show_max(); /* display step information */
text_cycle.set( "MANUAL SEARCH" ); text_cycle.set( "MANUAL SEARCH" );
button_scanner_mode.set_style( &style_white ); button_scanner_mode.set_style( &style_white );
button_scanner_mode.set_text( "M-SEARCH" ); button_scanner_mode.set_text( "MSEARCH" );
file_name.set_style( &style_white ); file_name.set_style( &style_white );
file_name.set( "USE: MANUAL RANGE" ); file_name.set( "USE: MANUAL RANGE" );

View File

@ -32,6 +32,7 @@
#include "audio.hpp" #include "audio.hpp"
#include "ui_mictx.hpp" #include "ui_mictx.hpp"
#include "ui_level.hpp" #include "ui_level.hpp"
#include "ui_looking_glass_app.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"
@ -286,15 +287,15 @@ namespace ui {
}; */ }; */
Text big_display { //Show frequency in text mode Text big_display { //Show frequency in text mode
{ 0, 5 * 16 , 28 * 8, 16 }, { 0, 5 * 16 , 21 * 8, 16 },
}; };
Text freq_stats { //Show frequency stats in text mode Text freq_stats { //Show frequency stats in text mode
{ 0, 6 * 16 , 28 * 8, 16 }, { 0, 6 * 16 , 21 * 8, 16 },
}; };
Text text_timer { //Show frequency stats in text mode Text text_timer { //Show frequency stats in text mode
{ 0, 7 * 16 , 28 * 8, 16 }, { 0, 7 * 16 , 21 * 8, 16 },
}; };
Button button_recon_setup { Button button_recon_setup {
@ -302,8 +303,13 @@ namespace ui {
"OPT" "OPT"
}; };
Button button_looking_glass {
{ 240 - 5 * 8 , 6 * 16 , 5 * 8, 28 },
"GLASS"
};
Button button_scanner_mode { Button button_scanner_mode {
{ 21 * 8 , 8 * 16 , 9 * 8, 28 }, { 240 - 8 * 8 , 8 * 16 , 8 * 8, 28 },
"RECON" "RECON"
}; };