From 30004a1c3cfef04075dc8658eb36e3f0713453d1 Mon Sep 17 00:00:00 2001 From: GullCode Date: Sun, 26 Mar 2023 21:04:43 +0200 Subject: [PATCH] cosmetic, ui moves --- firmware/application/apps/ui_recon.cpp | 2 +- firmware/application/apps/ui_recon.hpp | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/firmware/application/apps/ui_recon.cpp b/firmware/application/apps/ui_recon.cpp index e94f3346..9d9479b4 100644 --- a/firmware/application/apps/ui_recon.cpp +++ b/firmware/application/apps/ui_recon.cpp @@ -676,7 +676,7 @@ namespace ui { { if( refresh_display ) { - text_max.set( " " ); + text_max.set( to_string_dec_int( db ) + " db" ); freq_stats.set( "RSSI: " +to_string_dec_int( rssi.get_min() )+"/"+to_string_dec_int( rssi.get_avg() )+"/"+to_string_dec_int( rssi.get_max() )+" db" ); text_timer.set( "TIMER: " + to_string_dec_int( timer ) ); } diff --git a/firmware/application/apps/ui_recon.hpp b/firmware/application/apps/ui_recon.hpp index 87794007..a7543103 100644 --- a/firmware/application/apps/ui_recon.hpp +++ b/firmware/application/apps/ui_recon.hpp @@ -270,7 +270,7 @@ namespace ui { }; RSSI rssi { - { 0 * 16, 2 * 16, 240 - 4 * 8 - 1 , 16 }, + { 0 * 16, 2 * 16, 240 - 5 * 8 - 1 , 16 }, }; ButtonWithEncoder text_cycle { @@ -304,28 +304,30 @@ namespace ui { { 0, 7 * 16 , 11 * 8, 16 }, }; + // T: Senn. 32.000k Text text_ctcss { { 12 * 8 + 4, 7 * 16 , 14 * 8, 1 * 8 }, "" }; Button button_recon_setup { - { 240 - 4 * 8 , 2 * 16 , 4 * 8, 28 }, + { 240 - 5 * 8 , 2 * 16 , 5 * 8, 28 }, "OPT" }; Button button_looking_glass { - { 240 - 5 * 8 , 6 * 16 - 4 , 5 * 8, 28 }, + { 240 - 5 * 8 , 5 * 16 , 5 * 8, 28 }, "GLASS" }; + // Button can be RECON or SCANNER Button button_scanner_mode { - { 240 - 8 * 8 , 8 * 16 , 8 * 8, 28 }, + { 240 - 7 * 8 , 8 * 16 , 7 * 8, 28 }, "RECON" }; Text file_name { //Show file used - { 0 , 8 * 16 + 6 , 21 * 8, 16 }, + { 0 , 8 * 16 + 6 , 240 - 7 * 8, 16 }, }; ButtonWithEncoder button_manual_start {