diff --git a/firmware/application/CMakeLists.txt b/firmware/application/CMakeLists.txt index 9e03d7376..fd41cc63f 100644 --- a/firmware/application/CMakeLists.txt +++ b/firmware/application/CMakeLists.txt @@ -155,6 +155,7 @@ set(CPPSRC ${COMMON}/ui_widget.cpp ${COMMON}/utility.cpp ${COMMON}/wm8731.cpp + ${COMMON}/performance_counter.cpp app_settings.cpp audio.cpp baseband_api.cpp @@ -230,6 +231,7 @@ set(CPPSRC apps/ui_nrf_rx.cpp apps/ui_aprs_tx.cpp apps/ui_bht_tx.cpp + apps/ui_dfu_menu.cpp apps/ui_coasterp.cpp apps/ui_debug.cpp apps/ui_encoders.cpp diff --git a/firmware/application/apps/replay_app.cpp b/firmware/application/apps/replay_app.cpp index d129a8baf..20b2943d0 100644 --- a/firmware/application/apps/replay_app.cpp +++ b/firmware/application/apps/replay_app.cpp @@ -161,10 +161,16 @@ void ReplayAppView::start() { sample_rate * 8, baseband_bandwidth, rf::Direction::Transmit, - rf_amp, // previous code line : "receiver_model.rf_amp()," was passing the same rf_amp of all Receiver Apps + rf_amp, // previous code line : "receiver_model.rf_amp()," was passing the same rf_amp of all Receiver Apps static_cast(receiver_model.lna()), static_cast(receiver_model.vga()) }); + + if (portapack::persistent_memory::stealth_mode()){ + DisplaySleepMessage message; + EventDispatcher::send_message(message); + } + } void ReplayAppView::stop(const bool do_loop) { diff --git a/firmware/application/apps/ui_dfu_menu.cpp b/firmware/application/apps/ui_dfu_menu.cpp new file mode 100644 index 000000000..08fe1f3eb --- /dev/null +++ b/firmware/application/apps/ui_dfu_menu.cpp @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2023 Bernd Herzog + * + * This file is part of PortaPack. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#include "ui_dfu_menu.hpp" +#include "portapack_shared_memory.hpp" +#include "performance_counter.hpp" + +namespace ui { + +DfuMenu::DfuMenu(NavigationView& nav) : nav_ (nav) { + add_children({ + &text_head, + &labels, + &text_info_line_1, + &text_info_line_2, + &text_info_line_3, + &text_info_line_4, + &text_info_line_5, + &text_info_line_6, + &text_info_line_7 + }); +} + +void DfuMenu::paint(Painter& painter) { + auto utilisation = get_cpu_utilisation_in_percent(); + + text_info_line_1.set(to_string_dec_uint(chCoreStatus(), 6)); + text_info_line_2.set(to_string_dec_uint((uint32_t)get_free_stack_space(), 6)); + text_info_line_3.set(to_string_dec_uint(utilisation, 6)); + text_info_line_4.set(to_string_dec_uint(shared_memory.m4_heap_usage, 6)); + text_info_line_5.set(to_string_dec_uint(shared_memory.m4_stack_usage, 6)); + text_info_line_6.set(to_string_dec_uint(shared_memory.m4_cpu_usage, 6)); + text_info_line_7.set(to_string_dec_uint(chTimeNow()/1000, 6)); + + constexpr auto margin = 5; + + painter.fill_rectangle( + { + {6 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin}, + {15 * CHARACTER_WIDTH + margin * 2, 9 * LINE_HEIGHT + margin * 2} + }, + ui::Color::black() + ); + + painter.fill_rectangle( + { + {5 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin}, + {CHARACTER_WIDTH, 9 * LINE_HEIGHT + margin * 2} + }, + ui::Color::dark_cyan() + ); + + painter.fill_rectangle( + { + {21 * CHARACTER_WIDTH + margin, 3 * LINE_HEIGHT - margin}, + {CHARACTER_WIDTH, 9 * LINE_HEIGHT + margin * 2} + }, + ui::Color::dark_cyan() + ); + + painter.fill_rectangle( + { + {5 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin - 8}, + {17 * CHARACTER_WIDTH + margin * 2, 8} + }, + ui::Color::dark_cyan() + ); + + painter.fill_rectangle( + { + {5 * CHARACTER_WIDTH - margin, 12 * LINE_HEIGHT + margin}, + {17 * CHARACTER_WIDTH + margin * 2, 8} + }, + ui::Color::dark_cyan() + ); +} + +} /* namespace ui */ diff --git a/firmware/application/apps/ui_dfu_menu.hpp b/firmware/application/apps/ui_dfu_menu.hpp new file mode 100644 index 000000000..9c2fa1a7e --- /dev/null +++ b/firmware/application/apps/ui_dfu_menu.hpp @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2023 Bernd Herzog + * + * This file is part of PortaPack. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef __UI_DFU_MENU_H__ +#define __UI_DFU_MENU_H__ + +#include + +#include "ui_widget.hpp" +#include "event_m0.hpp" +#include "debug.hpp" +#include "string_format.hpp" + +#define LINE_HEIGHT 16 +#define CHARACTER_WIDTH 8 + +namespace ui { +class NavigationView; + +class DfuMenu : public View { +public: + DfuMenu(NavigationView& nav); + ~DfuMenu() = default; + + void paint(Painter& painter) override; + +private: + NavigationView& nav_; + + Text text_head {{ 6 * CHARACTER_WIDTH, 3 * LINE_HEIGHT, 11 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, "Performance"}; + + Labels labels { + { { 6 * CHARACTER_WIDTH, 5 * LINE_HEIGHT }, "M0 heap:", Color::dark_cyan() }, + { { 6 * CHARACTER_WIDTH, 6 * LINE_HEIGHT }, "M0 stack:", Color::dark_cyan() }, + { { 6 * CHARACTER_WIDTH, 7 * LINE_HEIGHT }, "M0 cpu %:", Color::dark_cyan() }, + { { 6 * CHARACTER_WIDTH, 8 * LINE_HEIGHT }, "M4 heap:", Color::dark_cyan() }, + { { 6 * CHARACTER_WIDTH, 9 * LINE_HEIGHT }, "M4 stack:", Color::dark_cyan() }, + { { 6 * CHARACTER_WIDTH,10 * LINE_HEIGHT }, "M4 cpu %:", Color::dark_cyan() }, + { { 6 * CHARACTER_WIDTH,11 * LINE_HEIGHT }, "uptime:", Color::dark_cyan() } + }; + + Text text_info_line_1 {{ 15 * CHARACTER_WIDTH, 5 * LINE_HEIGHT, 5 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, ""}; + Text text_info_line_2 {{ 15 * CHARACTER_WIDTH, 6 * LINE_HEIGHT, 5 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, ""}; + Text text_info_line_3 {{ 15 * CHARACTER_WIDTH, 7 * LINE_HEIGHT, 5 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, ""}; + Text text_info_line_4 {{ 15 * CHARACTER_WIDTH, 8 * LINE_HEIGHT, 5 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, ""}; + Text text_info_line_5 {{ 15 * CHARACTER_WIDTH, 9 * LINE_HEIGHT, 5 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, ""}; + Text text_info_line_6 {{ 15 * CHARACTER_WIDTH,10 * LINE_HEIGHT, 5 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, ""}; + Text text_info_line_7 {{ 15 * CHARACTER_WIDTH,11 * LINE_HEIGHT, 5 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, ""}; +}; + +} /* namespace ui */ + +#endif/*__UI_DFU_MENU_H__*/ diff --git a/firmware/application/apps/ui_fileman.cpp b/firmware/application/apps/ui_fileman.cpp index 9097d6027..9271bc92c 100644 --- a/firmware/application/apps/ui_fileman.cpp +++ b/firmware/application/apps/ui_fileman.cpp @@ -263,28 +263,32 @@ void FileManagerView::on_rename(NavigationView& nav) { } void FileManagerView::on_refactor(NavigationView& nav) { - text_prompt(nav, name_buffer, max_filename_length, [this](std::string& buffer) { - std::string destination_path = current_path.string(); - if (destination_path.back() != '/') - destination_path += '/'; - destination_path = destination_path + buffer; - rename_file(get_selected_path(), destination_path); //rename the selected file + text_prompt(nav, name_buffer, max_filename_length, [this](std::string& buffer) { + std::string destination_path = current_path.string(); + if (destination_path.back() != '/') + destination_path += '/'; + destination_path = destination_path + buffer; - if (get_selected_path().extension().string().substr(1) == "C16") {//rename it's partner ( C16 <-> TXT ) file. - auto selected_path = get_selected_path(); - auto partner_file_path = selected_path.string().substr(0, selected_path.string().size()-4) + ".TXT"; - destination_path = destination_path.substr(0, destination_path.size()-4) + ".TXT"; - rename_file(partner_file_path, destination_path); - }else if (get_selected_path().extension().string().substr(1) == "TXT") {//If the file user choose is a TXT file - auto selected_path = get_selected_path(); - auto partner_file_path = selected_path.string().substr(0, selected_path.string().size()-4) + ".C16"; - destination_path = destination_path.substr(0, destination_path.size()-4) + ".C16"; - rename_file(partner_file_path, destination_path); - } + rename_file(get_selected_path(), destination_path); //rename the selected file - load_directory_contents(current_path); - refresh_list(); - }); + auto selected_path = get_selected_path(); + auto extension = selected_path.extension().string(); + + if (!extension.empty() && selected_path.string().back() != '/' && extension.substr(1) == "C16") { + // Rename its partner ( C16 <-> TXT ) file. + auto partner_file_path = selected_path.string().substr(0, selected_path.string().size() - 4) + ".TXT"; + destination_path = destination_path.substr(0, destination_path.size() - 4) + ".TXT"; + rename_file(partner_file_path, destination_path); + } else if (!extension.empty() && selected_path.string().back() != '/' && extension.substr(1) == "TXT") { + // If the file user choose is a TXT file. + auto partner_file_path = selected_path.string().substr(0, selected_path.string().size() - 4) + ".C16"; + destination_path = destination_path.substr(0, destination_path.size() - 4) + ".C16"; + rename_file(partner_file_path, destination_path); + } + + load_directory_contents(current_path); + refresh_list(); + }); } void FileManagerView::on_delete() { diff --git a/firmware/application/apps/ui_fileman.hpp b/firmware/application/apps/ui_fileman.hpp index ea2b90cc9..261295e86 100644 --- a/firmware/application/apps/ui_fileman.hpp +++ b/firmware/application/apps/ui_fileman.hpp @@ -159,7 +159,7 @@ private: }; Button button_rename { - { 0 * 8, 29 * 8, 10 * 8, 32 }, + { 0 * 8, 29 * 8, 9 * 8, 32 }, "Rename" }; @@ -169,7 +169,7 @@ private: }; Button button_delete { - { 20 * 8, 29 * 8, 10 * 8, 32 }, + { 21 * 8, 29 * 8, 9 * 8, 32 }, "Delete" }; diff --git a/firmware/application/apps/ui_looking_glass_app.cpp b/firmware/application/apps/ui_looking_glass_app.cpp index 17fdcca97..5d696476c 100644 --- a/firmware/application/apps/ui_looking_glass_app.cpp +++ b/firmware/application/apps/ui_looking_glass_app.cpp @@ -1,7 +1,6 @@ /* * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc. * Copyright (C) 2020 euquiq - * Copyright (C) 2023 gullradriel, Nilorea Studio Inc. * * This file is part of PortaPack. * @@ -39,6 +38,16 @@ namespace ui baseband::shutdown(); } + // Returns the next multiple of num that is a multiple of multiplier + int64_t GlassView::next_mult_of(int64_t num, int64_t multiplier) { + return ((num / multiplier) + 1) * multiplier; + } + + // Returns the previous multiple of num that is a multiple of multiplier + //int64_t GlassView::prev_mult_of(int64_t num, int64_t multiplier) { + // return (num / multiplier) * multiplier; + //} + void GlassView::adjust_range(int64_t* f_min, int64_t* f_max, int64_t width) { int64_t span = *f_max - *f_min; int64_t num_intervals = span / width; @@ -136,7 +145,7 @@ namespace ui void GlassView::on_channel_spectrum(const ChannelSpectrum &spectrum) { baseband::spectrum_streaming_stop(); - if( fast_scan ) + if( fast_scan || ( LOOKING_GLASS_SLICE_WIDTH < LOOKING_GLASS_SLICE_WIDTH_MAX ) ) { // Convert bins of this spectrum slice into a representative max_power and when enough, into pixels // Spectrum.db has 256 bins. Center 12 bins are ignored (DC spike is blanked) Leftmost and rightmost 2 bins are ignored @@ -168,7 +177,7 @@ namespace ui if (!pixel_index) // Received indication that a waterfall line has been completed { bins_Hz_size = 0; // Since this is an entire pixel line, we don't carry "Pixels into next bin" - f_center = f_center_ini; // Start a new sweep + f_center = f_center_ini - 2 * each_bin_size ; // Start a new sweep radio::set_tuning_frequency(f_center); // tune rx for this new slice directly, faster than using persistent memory saving chThdSleepMilliseconds(10); baseband::spectrum_streaming_start(); // Do the RX @@ -177,15 +186,14 @@ namespace ui bins_Hz_size -= marker_pixel_step; // reset bins size, but carrying the eventual excess Hz into next pixel } } - - f_center += LOOKING_GLASS_SLICE_WIDTH; // Move into the next bandwidth slice NOTE: spectrum.sampling_rate = LOOKING_GLASS_SLICE_WIDTH + f_center += 240 * each_bin_size ; // Move into the next bandwidth slice NOTE: spectrum.sampling_rate = LOOKING_GLASS_SLICE_WIDTH } else //slow scan { - for( int16_t bin = 0 ; bin < 120 ; bin++) + for (uint8_t bin = 0; bin < 120 ; bin++) { if (spectrum.db[134 + bin] > max_power) // 134 - max_power = spectrum.db[134 + bin]; + max_power = spectrum.db[134 + bin]; bins_Hz_size += each_bin_size; // add this bin Hz count into the "pixel fulfilled bag of Hz" @@ -200,8 +208,8 @@ namespace ui if (!pixel_index) // Received indication that a waterfall line has been completed { - bins_Hz_size = 0; // Since this is an entire pixel line, we don't carry "Pixels into next bin" - f_center = f_center_ini; // Start a new sweep + bins_Hz_size = 0; // Since this is an entire pixel line, we don't carry "Pixels into next bin" + f_center = f_center_ini - 2 * each_bin_size ; // Start a new sweep radio::set_tuning_frequency(f_center); // tune rx for this new slice directly, faster than using persistent memory saving chThdSleepMilliseconds(10); baseband::spectrum_streaming_start(); // Do the RX @@ -210,11 +218,10 @@ namespace ui bins_Hz_size -= marker_pixel_step; // reset bins size, but carrying the eventual excess Hz into next pixel } } - f_center += LOOKING_GLASS_SLICE_WIDTH / 2 ; + f_center += 120 * each_bin_size ; } radio::set_tuning_frequency(f_center); // tune rx for this new slice directly, faster than using persistent memory saving chThdSleepMilliseconds(5); - // receiver_model.set_tuning_frequency(f_center); //tune rx for this slice baseband::spectrum_streaming_start(); // Do the RX } @@ -269,7 +276,20 @@ namespace ui pixel_index = 0; // reset pixel counter max_power = 0; bins_Hz_size = 0; // reset amount of Hz filled up by pixels - + if( next_mult_of( (f_max - f_min) , 240 ) <= LOOKING_GLASS_SLICE_WIDTH_MAX ) + { + LOOKING_GLASS_SLICE_WIDTH = next_mult_of( (f_max - f_min) , 240 ); + receiver_model.set_sampling_rate(LOOKING_GLASS_SLICE_WIDTH); + receiver_model.set_baseband_bandwidth(LOOKING_GLASS_SLICE_WIDTH/2); + } + else if( LOOKING_GLASS_SLICE_WIDTH != LOOKING_GLASS_SLICE_WIDTH_MAX ) + { + LOOKING_GLASS_SLICE_WIDTH = LOOKING_GLASS_SLICE_WIDTH_MAX ; + receiver_model.set_sampling_rate(LOOKING_GLASS_SLICE_WIDTH); + receiver_model.set_baseband_bandwidth(LOOKING_GLASS_SLICE_WIDTH); + } + receiver_model.set_squelch_level(0); + each_bin_size = LOOKING_GLASS_SLICE_WIDTH / 240 ; baseband::set_spectrum(LOOKING_GLASS_SLICE_WIDTH, field_trigger.value()); receiver_model.set_tuning_frequency(f_center_ini); // tune rx for this slice } @@ -324,8 +344,8 @@ namespace ui int32_t min_size = steps ; if( locked_range ) min_size = search_span ; - if( min_size < 20 ) - min_size = 20 ; + if( min_size < 2 ) + min_size = 2 ; if( v > 7200 - min_size ) { v = 7200 - min_size ; @@ -347,8 +367,8 @@ namespace ui int32_t min_size = steps ; if( locked_range ) min_size = search_span ; - if( min_size < 20 ) - min_size = 20 ; + if( min_size < 2 ) + min_size = 2 ; if( freq > (7200 - min_size ) ) freq = 7200 - min_size ; field_frequency_min.set_value( freq ); @@ -364,8 +384,8 @@ namespace ui int32_t min_size = steps ; if( locked_range ) min_size = search_span ; - if( min_size < 20 ) - min_size = 20 ; + if( min_size < 2 ) + min_size = 2 ; if( v < min_size ) { v = min_size ; @@ -386,8 +406,8 @@ namespace ui int32_t min_size = steps ; if( locked_range ) min_size = search_span ; - if( min_size < 20 ) - min_size = 20 ; + if( min_size < 2 ) + min_size = 2 ; int32_t freq = f / 1000000 ; if( freq < min_size ) freq = min_size ; diff --git a/firmware/application/apps/ui_looking_glass_app.hpp b/firmware/application/apps/ui_looking_glass_app.hpp index 6a885c443..5b1df967a 100644 --- a/firmware/application/apps/ui_looking_glass_app.hpp +++ b/firmware/application/apps/ui_looking_glass_app.hpp @@ -37,6 +37,7 @@ namespace ui { +#define LOOKING_GLASS_SLICE_WIDTH_MAX 19999920 #define MHZ_DIV 1000000 #define X2_MHZ_DIV 2000000 @@ -80,11 +81,16 @@ namespace ui std::vector presets_db{}; - int64_t LOOKING_GLASS_SLICE_WIDTH = 19999920; // Each slice bandwidth 20 MHz and a multiple of 240 - // since we are using LOOKING_GLASS_SLICE_WIDTH/240 as the each_bin_size - // it should also be a multiple of 2 since we are using LOOKING_GLASS_SLICE_WIDTH / 2 as centering freq + // Each slice bandwidth 20 MHz and a multiple of 240 + // since we are using LOOKING_GLASS_SLICE_WIDTH/240 as the each_bin_size + // it should also be a multiple of 2 since we are using LOOKING_GLASS_SLICE_WIDTH / 2 as centering freq + int64_t LOOKING_GLASS_SLICE_WIDTH = 19999920; + // frequency rounding helpers + int64_t next_mult_of(int64_t num, int64_t multiplier); + //int64_t prev_mult_of(int64_t num, int64_t multiplier); void adjust_range(int64_t* f_min, int64_t* f_max, int64_t width); + void on_channel_spectrum(const ChannelSpectrum& spectrum); void do_timers(); void on_range_changed(); diff --git a/firmware/application/apps/ui_recon.cpp b/firmware/application/apps/ui_recon.cpp index afe70eadf..38b49563f 100644 --- a/firmware/application/apps/ui_recon.cpp +++ b/firmware/application/apps/ui_recon.cpp @@ -528,32 +528,28 @@ namespace ui { } } } - } - - uint32_t freq_lock = recon_thread->is_freq_lock(); - - if( freq_lock == 0 ) { - //NO FREQ LOCK, ONGOING STANDARD SCANNING - if( index < 1000 && index < frequency_list.size() ) + text_cycle.set_text( to_string_dec_uint( index + 1 , 3 ) ); + if(frequency_list[index].description.size() > 0) { - text_cycle.set_text( to_string_dec_uint( index + 1 , 3 ) ); - if(frequency_list[index].description.size() > 0) + switch( frequency_list[current_index].type ) { - switch( frequency_list[current_index].type ) - { - case RANGE: - desc_cycle.set( "R: " + frequency_list[current_index].description ); //Show new description - break ; - case HAMRADIO: - desc_cycle.set( "H: " + frequency_list[current_index].description ); //Show new description - break ; - default: - case SINGLE: - desc_cycle.set( "S: " + frequency_list[current_index].description ); //Show new description - break ; - } + case RANGE: + desc_cycle.set( "R: " + frequency_list[current_index].description ); //Show new description + break ; + case HAMRADIO: + desc_cycle.set( "H: " + frequency_list[current_index].description ); //Show new description + break ; + default: + case SINGLE: + desc_cycle.set( "S: " + frequency_list[current_index].description ); //Show new description + break ; } } + } + + uint32_t freq_lock = recon_thread->is_freq_lock(); + if( freq_lock == 0 ) { + //NO FREQ LOCK, ONGOING STANDARD SCANNING big_display.set_style(&style_white); if( !userpause ) button_pause.set_text(""); diff --git a/firmware/application/event_m0.cpp b/firmware/application/event_m0.cpp index 583c40049..146492b93 100644 --- a/firmware/application/event_m0.cpp +++ b/firmware/application/event_m0.cpp @@ -43,6 +43,7 @@ using namespace lpc43xx; #include #include "ui_font_fixed_8x16.hpp" +#include "ui_navigation.hpp" extern "C" { @@ -262,6 +263,8 @@ void EventDispatcher::on_touch_event(ui::TouchEvent event) { void EventDispatcher::handle_lcd_frame_sync() { DisplayFrameSyncMessage message; message_map.send(&message); + + static_cast(top_widget)->paint_overlay(); painter.paint_widget_tree(top_widget); portapack::backlight()->on(); @@ -304,7 +307,12 @@ void EventDispatcher::handle_switches() { if( switches_state[i] ) { const auto event = static_cast(i); if( !event_bubble_key(event) ) { - context.focus_manager().update(top_widget, event); + if (switches_state[(size_t)ui::KeyEvent::Dfu]) { + static_cast(top_widget)->toggle_overlay(); + } + else { + context.focus_manager().update(top_widget, event); + } } in_key_event = true; diff --git a/firmware/application/main.cpp b/firmware/application/main.cpp index d9bef9fb1..7af337ec4 100755 --- a/firmware/application/main.cpp +++ b/firmware/application/main.cpp @@ -145,14 +145,14 @@ Continuous (Fox-oring) rffc507x::RFFC507x first_if; static void event_loop() { - ui::Context context; - ui::SystemView system_view { + static ui::Context context; + static ui::SystemView system_view { context, portapack::display.screen_rect() }; EventDispatcher event_dispatcher { &system_view, context }; - MessageHandlerRegistration message_handler_display_sleep { + static MessageHandlerRegistration message_handler_display_sleep { Message::ID::DisplaySleep, [&event_dispatcher](const Message* const) { event_dispatcher.set_display_sleep(true); diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index 179e734fc..1870b126f 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -29,6 +29,7 @@ #include "bmp_splash.hpp" #include "bmp_modal_warning.hpp" #include "portapack_persistent_memory.hpp" +#include "portapack_shared_memory.hpp" #include "ui_about_simple.hpp" #include "ui_adsb_rx.hpp" @@ -748,6 +749,36 @@ Context& SystemView::context() const { return context_; } +void SystemView::toggle_overlay() { + if (overlay_active){ + this->remove_child(&this->overlay); + this->set_dirty(); + shared_memory.request_m4_performance_counter = 0; + } + else{ + this->add_child(&this->overlay); + this->set_dirty(); + shared_memory.request_m4_performance_counter = 1; + shared_memory.m4_cpu_usage = 0; + shared_memory.m4_heap_usage = 0; + shared_memory.m4_stack_usage = 0; + } + + overlay_active = !overlay_active; +} + +void SystemView::paint_overlay() { + static bool last_paint_state = false; + if (overlay_active){ + // paint background only every other second + if ((((chTimeNow()>>10) & 0x01) == 0x01) == last_paint_state) + return; + + last_paint_state = !last_paint_state; + this->overlay.set_dirty(); + } +} + /* ***********************************************************************/ void BMPView::focus() { diff --git a/firmware/application/ui_navigation.hpp b/firmware/application/ui_navigation.hpp index aecce49f9..6a8d9b8f8 100644 --- a/firmware/application/ui_navigation.hpp +++ b/firmware/application/ui_navigation.hpp @@ -33,6 +33,7 @@ #include "ui_channel.hpp" #include "ui_audio.hpp" #include "ui_sd_card_status_view.hpp" +#include "ui_dfu_menu.hpp" #include "bitmap.hpp" #include "ff.h" @@ -290,10 +291,15 @@ namespace ui const Rect parent_rect); Context &context() const override; + void toggle_overlay(); + void paint_overlay(); private: + bool overlay_active {false}; + SystemStatusView status_view{navigation_view}; InformationView info_view{navigation_view}; + DfuMenu overlay{navigation_view}; NavigationView navigation_view{}; Context &context_; }; diff --git a/firmware/baseband/CMakeLists.txt b/firmware/baseband/CMakeLists.txt index 0d6e69474..b19059d47 100644 --- a/firmware/baseband/CMakeLists.txt +++ b/firmware/baseband/CMakeLists.txt @@ -139,6 +139,7 @@ set(CPPSRC ${COMMON}/chibios_cpp.cpp debug.cpp ${COMMON}/gcc.cpp + ${COMMON}/performance_counter.cpp tone_gen.cpp ) diff --git a/firmware/baseband/chconf.h b/firmware/baseband/chconf.h index 0ad245292..f5b451962 100755 --- a/firmware/baseband/chconf.h +++ b/firmware/baseband/chconf.h @@ -508,6 +508,8 @@ } #endif + + /** * @brief System tick event hook. * @details This hook is invoked in the system tick handler immediately @@ -516,6 +518,8 @@ #if !defined(SYSTEM_TICK_EVENT_HOOK) || defined(__DOXYGEN__) #define SYSTEM_TICK_EVENT_HOOK() { \ /* System tick event code here.*/ \ + extern void update_performance_counters(); \ + update_performance_counters(); \ } #endif diff --git a/firmware/baseband/debug.cpp b/firmware/baseband/debug.cpp index f69f40537..58548e7a7 100644 --- a/firmware/baseband/debug.cpp +++ b/firmware/baseband/debug.cpp @@ -26,6 +26,7 @@ #include #include "portapack_shared_memory.hpp" +#include "performance_counter.hpp" void write_m4_panic_msg(const char *panic_message, struct extctx *ctxp) { if (ctxp == nullptr) { @@ -116,5 +117,28 @@ CH_IRQ_HANDLER(HardFaultVector) { #endif } +void update_performance_counters() { + auto performance_counter_active = shared_memory.request_m4_performance_counter; + if (performance_counter_active == 0x00) + return; + + static bool last_paint_state = false; + if ((((chTimeNow()>>10) & 0x01) == 0x01) == last_paint_state) + return; + + // Idle thread state is sometimes unuseable + if (chThdGetTicks(chSysGetIdleThread()) > 0x10000000) + return; + + last_paint_state = !last_paint_state; + + auto utilisation = get_cpu_utilisation_in_percent(); + auto free_stack = (uint32_t)get_free_stack_space(); + auto free_heap = chCoreStatus(); + + shared_memory.m4_cpu_usage = utilisation; + shared_memory.m4_stack_usage = free_stack; + shared_memory.m4_heap_usage = free_heap; } +} /* extern "C" */ diff --git a/firmware/baseband/event_m4.cpp b/firmware/baseband/event_m4.cpp index c1b395b2b..ee0079eb1 100644 --- a/firmware/baseband/event_m4.cpp +++ b/firmware/baseband/event_m4.cpp @@ -20,6 +20,7 @@ */ #include "event_m4.hpp" +#include "debug.hpp" #include "portapack_shared_memory.hpp" @@ -120,3 +121,4 @@ void EventDispatcher::handle_spectrum() { const UpdateSpectrumMessage message; baseband_processor->on_message(&message); } + diff --git a/firmware/baseband/sd_over_usb/proc_sd_over_usb.cpp b/firmware/baseband/sd_over_usb/proc_sd_over_usb.cpp index 3645804e4..01bcef05d 100644 --- a/firmware/baseband/sd_over_usb/proc_sd_over_usb.cpp +++ b/firmware/baseband/sd_over_usb/proc_sd_over_usb.cpp @@ -45,3 +45,5 @@ int main() { return 0; } + +void update_performance_counters() {} diff --git a/firmware/common/performance_counter.cpp b/firmware/common/performance_counter.cpp new file mode 100644 index 000000000..d5de2ebcb --- /dev/null +++ b/firmware/common/performance_counter.cpp @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2023 Bernd Herzog + * + * This file is part of PortaPack. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#include "performance_counter.hpp" +#include "ch.h" + +uint8_t get_cpu_utilisation_in_percent() { + static systime_t last_time = 0; + static systime_t last_idle_ticks = 0; + + auto now = chTimeNow(); + auto idle_ticks = chThdGetTicks(chSysGetIdleThread()); + + if (last_time == 0) { + last_time = now; + last_idle_ticks = idle_ticks; + + return 0; + } + + int32_t time_elapsed = now - last_time; + int32_t idle_elapsed = idle_ticks - last_idle_ticks; + + int32_t working_ticks = time_elapsed - idle_elapsed; + + if (working_ticks < 0) + working_ticks = 0; + + auto utilisation = working_ticks * 100 / time_elapsed; + + last_time = now; + last_idle_ticks = idle_ticks; + + if (utilisation > 100) { + return 100; + } + + return (uint8_t) utilisation; +} diff --git a/firmware/common/performance_counter.hpp b/firmware/common/performance_counter.hpp new file mode 100644 index 000000000..ee3655adf --- /dev/null +++ b/firmware/common/performance_counter.hpp @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2023 Bernd Herzog + * + * This file is part of PortaPack. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef __PERFORMANCE_COUNTER_H__ +#define __PERFORMANCE_COUNTER_H__ + +#include + +uint8_t get_cpu_utilisation_in_percent(); + +#endif /* __PERFORMANCE_COUNTER_H__ */ diff --git a/firmware/common/portapack_shared_memory.hpp b/firmware/common/portapack_shared_memory.hpp index 3235cef15..014c92db7 100644 --- a/firmware/common/portapack_shared_memory.hpp +++ b/firmware/common/portapack_shared_memory.hpp @@ -64,6 +64,11 @@ struct SharedMemory { JammerChannel jammer_channels[24]; uint8_t data[512]; } bb_data { { { { 0, 0 } }, 0, { 0 } } }; + + uint8_t volatile request_m4_performance_counter{ 0 }; + uint8_t volatile m4_cpu_usage{ 0 }; + uint16_t volatile m4_stack_usage{ 0 }; + uint16_t volatile m4_heap_usage{ 0 }; }; extern SharedMemory& shared_memory;