From de99afa19bf74b521c23e249caf13d10c37e81f6 Mon Sep 17 00:00:00 2001 From: GullCode Date: Fri, 28 Apr 2023 12:55:58 +0200 Subject: [PATCH 1/3] Took out unused func declaration --- firmware/application/apps/ui_recon.hpp | 2 -- firmware/application/apps/ui_scanner.hpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/firmware/application/apps/ui_recon.hpp b/firmware/application/apps/ui_recon.hpp index 8526c5c61..53279c6c8 100644 --- a/firmware/application/apps/ui_recon.hpp +++ b/firmware/application/apps/ui_recon.hpp @@ -118,8 +118,6 @@ namespace ui { void focus() override; - void big_display_freq( int64_t f ); - const Style style_grey { // recon .font = font::fixed_8x16, .background = Color::black(), diff --git a/firmware/application/apps/ui_scanner.hpp b/firmware/application/apps/ui_scanner.hpp index 39791655e..b7160b43a 100644 --- a/firmware/application/apps/ui_scanner.hpp +++ b/firmware/application/apps/ui_scanner.hpp @@ -88,8 +88,6 @@ public: void focus() override; - void big_display_freq(rf::Frequency f); - const Style style_grey { // scanning .font = font::fixed_8x16, .background = Color::black(), From 63f7be02b6fec99c864c0d1a78b98d5d669771e9 Mon Sep 17 00:00:00 2001 From: GullCode Date: Fri, 28 Apr 2023 12:57:00 +0200 Subject: [PATCH 2/3] Used correct to_string_short_freq instead of erroneous calculation --- firmware/application/apps/ui_recon.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/firmware/application/apps/ui_recon.cpp b/firmware/application/apps/ui_recon.cpp index 38b49563f..fe1d08ce5 100644 --- a/firmware/application/apps/ui_recon.cpp +++ b/firmware/application/apps/ui_recon.cpp @@ -443,9 +443,7 @@ namespace ui { void ReconView::set_display_freq( int64_t freq ) { - int64_t freqMHz = ( freq / 1000000 ); - int64_t freqMhzFloatingPart = ( freq - ( 1000000 * freqMHz ) ) / 100 ; - big_display.set( "FREQ: "+to_string_dec_int( freqMHz )+"."+to_string_dec_int( freqMhzFloatingPart )+" MHz" ); + big_display.set( "FREQ: "+to_string_short_freq( freq )+" MHz" ); } void ReconView::handle_retune( int64_t freq , uint32_t index ) { From 596c304b0899a61400284fa08ff1c685446a4ff6 Mon Sep 17 00:00:00 2001 From: GullCode Date: Fri, 28 Apr 2023 12:59:51 +0200 Subject: [PATCH 3/3] Took out unused func declaration --- firmware/application/apps/ui_level.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/firmware/application/apps/ui_level.hpp b/firmware/application/apps/ui_level.hpp index e23fbe69a..b289ab9f1 100644 --- a/firmware/application/apps/ui_level.hpp +++ b/firmware/application/apps/ui_level.hpp @@ -48,8 +48,6 @@ namespace ui { void focus() override; - void big_display_freq( int64_t f ); - const Style style_grey { // level .font = font::fixed_8x16, .background = Color::black(),