Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #866 from gullradriel/recon-gui-update

Browse Source 
Recon gui update
This commit is contained in:
gullradriel 2023-04-03 12:49:22 +02:00 committed by GitHub
commit 3db3e78b44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -766,7 +766,7 @@ namespace ui {
} }
button_scanner_mode.set_style( &style_blue ); button_scanner_mode.set_style( &style_blue );
button_scanner_mode.set_text( "RECON" ); button_scanner_mode.set_text( "RECON" );
file_name.set( "USE:" ); file_name.set( "=>" );
field_squelch.set_value( squelch ); field_squelch.set_value( squelch );
@ -1194,7 +1194,7 @@ namespace ui {
button_scanner_mode.set_style( &style_white ); button_scanner_mode.set_style( &style_white );
button_scanner_mode.set_text( "MSEARCH" ); 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( "=> MANUAL RANGE" );
start_recon_thread(); start_recon_thread();
user_resume(); user_resume();
@ -1574,12 +1574,12 @@ namespace ui {
{ {
desc_cycle.set(" NO " + input_file + ".TXT FILE ..." ); desc_cycle.set(" NO " + input_file + ".TXT FILE ..." );
file_name.set_style( &style_white ); file_name.set_style( &style_white );
file_name.set( "USE: NO DATA" ); file_name.set( "=> NO DATA" );
} }
else else
{ {
file_name.set_style( &style_blue ); file_name.set_style( &style_blue );
file_name.set( "USE: "+input_file + ".TXT" ); file_name.set( "=> "+input_file );
} }
step_mode.set_selected_index(def_step); //Impose the default step into the manual step selector step_mode.set_selected_index(def_step); //Impose the default step into the manual step selector
} }
@ -1591,11 +1591,11 @@ namespace ui {
{ {
desc_cycle.set(" NO " + output_file + ".TXT FILE ..." ); desc_cycle.set(" NO " + output_file + ".TXT FILE ..." );
file_name.set_style( &style_white ); file_name.set_style( &style_white );
file_name.set( "USE:" ); file_name.set( "=> EMPTY" );
} }
else else
{ {
file_name.set( "USE: "+output_file + ".TXT" ); file_name.set( "=> "+output_file );
file_name.set_style( &style_red ); file_name.set_style( &style_red );
} }
step_mode.set_selected_index(def_step); //Impose the default step into the manual step selector step_mode.set_selected_index(def_step); //Impose the default step into the manual step selector

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

@ -270,16 +270,16 @@ namespace ui {
}; };
RSSI rssi { RSSI rssi {
{ 0 * 16, 2 * 16, 240 - 5 * 8 - 1 , 16 }, { 0 * 16, 2 * 16, 240 - 8 * 8 + 4 , 16 },
}; };
ButtonWithEncoder text_cycle { ButtonWithEncoder text_cycle {
{ 0, 3 * 16, 3 * 8, 16 }, { 0, 3 * 16, 4 * 8, 16 },
"" ""
}; };
Text text_max { Text text_max {
{ 3 * 8, 3 * 16, 20 * 8 , 16 }, { 4 * 8, 3 * 16, 240 - 7 * 8 - 4 * 8 , 16 },
}; };
Text desc_cycle { Text desc_cycle {
@ -292,11 +292,11 @@ namespace ui {
}; */ }; */
Text big_display { //Show frequency in text mode Text big_display { //Show frequency in text mode
{ 0, 5 * 16 , 21 * 8, 16 }, { 0, 5 * 16 , 23 * 8, 16 },
}; };
Text freq_stats { //Show frequency stats in text mode Text freq_stats { //Show frequency stats in text mode
{ 0, 6 * 16 , 21 * 8, 16 }, { 0, 6 * 16 , 23 * 8, 16 },
}; };
// TIMER: 9999 // TIMER: 9999
@ -311,12 +311,12 @@ namespace ui {
}; };
Button button_recon_setup { Button button_recon_setup {
{ 240 - 5 * 8 , 2 * 16 , 5 * 8, 28 }, { 240 - 7 * 8 , 2 * 16 , 7 * 8, 28 },
"OPT" "CONFIG"
}; };
Button button_looking_glass { Button button_looking_glass {
{ 240 - 5 * 8 , 5 * 16 , 5 * 8, 28 }, { 240 - 7 * 8 , 5 * 16 , 7 * 8, 28 },
"GLASS" "GLASS"
}; };

4
firmware/application/ui/ui_rssi.cpp
View File

@ -102,7 +102,7 @@ namespace ui {
// show green peak value // show green peak value
if( peak_enabled ) if( peak_enabled )
{ {
const Rect r5 { r.left() + peak - 1 , r.top() , 3 , r.height() }; const Rect r5 { r.left() + peak - 3 , r.top() , 3 , r.height() };
painter.fill_rectangle( painter.fill_rectangle(
r5, r5,
Color::green() Color::green()
@ -160,7 +160,7 @@ namespace ui {
// show green peak value if enabled // show green peak value if enabled
if( peak_enabled ) if( peak_enabled )
{ {
const Rect r5 { r.left(), r.bottom() - peak - 1 , r.width() , 3 }; const Rect r5 { r.left(), r.bottom() - peak - 3 , r.width() , 3 };
painter.fill_rectangle( painter.fill_rectangle(
r5, r5,
Color::green() Color::green()