TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-05-31 23:49:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'eried:next' into next

Browse Source
This commit is contained in:
Mark Thompson 2023-04-26 01:25:46 -05:00 committed by GitHub
commit 509f86c1f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 442 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/application/CMakeLists.txt
View File

@ -155,6 +155,7 @@ set(CPPSRC
${COMMON}/ui_widget.cpp ${COMMON}/ui_widget.cpp
${COMMON}/utility.cpp ${COMMON}/utility.cpp
${COMMON}/wm8731.cpp ${COMMON}/wm8731.cpp
${COMMON}/performance_counter.cpp
app_settings.cpp app_settings.cpp
audio.cpp audio.cpp
baseband_api.cpp baseband_api.cpp
@ -230,6 +231,7 @@ set(CPPSRC
apps/ui_nrf_rx.cpp apps/ui_nrf_rx.cpp
apps/ui_aprs_tx.cpp apps/ui_aprs_tx.cpp
apps/ui_bht_tx.cpp apps/ui_bht_tx.cpp
apps/ui_dfu_menu.cpp
apps/ui_coasterp.cpp apps/ui_coasterp.cpp
apps/ui_debug.cpp apps/ui_debug.cpp
apps/ui_encoders.cpp apps/ui_encoders.cpp

8
firmware/application/apps/replay_app.cpp
View File

@ -161,10 +161,16 @@ void ReplayAppView::start() {
sample_rate * 8, sample_rate * 8,
baseband_bandwidth, baseband_bandwidth,
rf::Direction::Transmit, 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<int8_t>(receiver_model.lna()), static_cast<int8_t>(receiver_model.lna()),
static_cast<int8_t>(receiver_model.vga()) static_cast<int8_t>(receiver_model.vga())
}); });
if (portapack::persistent_memory::stealth_mode()){
DisplaySleepMessage message;
EventDispatcher::send_message(message);
}
} }
void ReplayAppView::stop(const bool do_loop) { void ReplayAppView::stop(const bool do_loop) {

96
firmware/application/apps/ui_dfu_menu.cpp Normal file
View File

@ -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 */

71
firmware/application/apps/ui_dfu_menu.hpp Normal file
View File

@ -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 <cstdint>
#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__*/

44
firmware/application/apps/ui_fileman.cpp
View File

@ -263,28 +263,32 @@ void FileManagerView::on_rename(NavigationView& nav) {
} }
void FileManagerView::on_refactor(NavigationView& nav) { void FileManagerView::on_refactor(NavigationView& nav) {
text_prompt(nav, name_buffer, max_filename_length, [this](std::string& buffer) { text_prompt(nav, name_buffer, max_filename_length, [this](std::string& buffer) {
std::string destination_path = current_path.string(); std::string destination_path = current_path.string();
if (destination_path.back() != '/') if (destination_path.back() != '/')
destination_path += '/'; destination_path += '/';
destination_path = destination_path + buffer; destination_path = destination_path + buffer;
rename_file(get_selected_path(), destination_path); //rename the selected file
if (get_selected_path().extension().string().substr(1) == "C16") {//rename it's partner ( C16 <-> TXT ) file. rename_file(get_selected_path(), destination_path); //rename the selected 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);
}
load_directory_contents(current_path); auto selected_path = get_selected_path();
refresh_list(); 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() { void FileManagerView::on_delete() {

4
firmware/application/apps/ui_fileman.hpp
View File

@ -159,7 +159,7 @@ private:
}; };
Button button_rename { Button button_rename {
{ 0 * 8, 29 * 8, 10 * 8, 32 }, { 0 * 8, 29 * 8, 9 * 8, 32 },
"Rename" "Rename"
}; };
@ -169,7 +169,7 @@ private:
}; };
Button button_delete { Button button_delete {
{ 20 * 8, 29 * 8, 10 * 8, 32 }, { 21 * 8, 29 * 8, 9 * 8, 32 },
"Delete" "Delete"
}; };

60
firmware/application/apps/ui_looking_glass_app.cpp
View File

@ -1,7 +1,6 @@
/* /*
* Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc. * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
* Copyright (C) 2020 euquiq * Copyright (C) 2020 euquiq
* Copyright (C) 2023 gullradriel, Nilorea Studio Inc.
* *
* This file is part of PortaPack. * This file is part of PortaPack.
* *
@ -39,6 +38,16 @@ namespace ui
baseband::shutdown(); 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) { void GlassView::adjust_range(int64_t* f_min, int64_t* f_max, int64_t width) {
int64_t span = *f_max - *f_min; int64_t span = *f_max - *f_min;
int64_t num_intervals = span / width; int64_t num_intervals = span / width;
@ -136,7 +145,7 @@ namespace ui
void GlassView::on_channel_spectrum(const ChannelSpectrum &spectrum) void GlassView::on_channel_spectrum(const ChannelSpectrum &spectrum)
{ {
baseband::spectrum_streaming_stop(); 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 // 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 // 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 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" 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 radio::set_tuning_frequency(f_center); // tune rx for this new slice directly, faster than using persistent memory saving
chThdSleepMilliseconds(10); chThdSleepMilliseconds(10);
baseband::spectrum_streaming_start(); // Do the RX 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 bins_Hz_size -= marker_pixel_step; // reset bins size, but carrying the eventual excess Hz into next pixel
} }
} }
f_center += 240 * each_bin_size ; // Move into the next bandwidth slice NOTE: spectrum.sampling_rate = LOOKING_GLASS_SLICE_WIDTH
f_center += LOOKING_GLASS_SLICE_WIDTH; // Move into the next bandwidth slice NOTE: spectrum.sampling_rate = LOOKING_GLASS_SLICE_WIDTH
} }
else //slow scan 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 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" 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 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" 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 radio::set_tuning_frequency(f_center); // tune rx for this new slice directly, faster than using persistent memory saving
chThdSleepMilliseconds(10); chThdSleepMilliseconds(10);
baseband::spectrum_streaming_start(); // Do the RX 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 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 radio::set_tuning_frequency(f_center); // tune rx for this new slice directly, faster than using persistent memory saving
chThdSleepMilliseconds(5); chThdSleepMilliseconds(5);
// receiver_model.set_tuning_frequency(f_center); //tune rx for this slice
baseband::spectrum_streaming_start(); // Do the RX baseband::spectrum_streaming_start(); // Do the RX
} }
@ -269,7 +276,20 @@ namespace ui
pixel_index = 0; // reset pixel counter pixel_index = 0; // reset pixel counter
max_power = 0; max_power = 0;
bins_Hz_size = 0; // reset amount of Hz filled up by pixels 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()); baseband::set_spectrum(LOOKING_GLASS_SLICE_WIDTH, field_trigger.value());
receiver_model.set_tuning_frequency(f_center_ini); // tune rx for this slice receiver_model.set_tuning_frequency(f_center_ini); // tune rx for this slice
} }
@ -324,8 +344,8 @@ namespace ui
int32_t min_size = steps ; int32_t min_size = steps ;
if( locked_range ) if( locked_range )
min_size = search_span ; min_size = search_span ;
if( min_size < 20 ) if( min_size < 2 )
min_size = 20 ; min_size = 2 ;
if( v > 7200 - min_size ) if( v > 7200 - min_size )
{ {
v = 7200 - min_size ; v = 7200 - min_size ;
@ -347,8 +367,8 @@ namespace ui
int32_t min_size = steps ; int32_t min_size = steps ;
if( locked_range ) if( locked_range )
min_size = search_span ; min_size = search_span ;
if( min_size < 20 ) if( min_size < 2 )
min_size = 20 ; min_size = 2 ;
if( freq > (7200 - min_size ) ) if( freq > (7200 - min_size ) )
freq = 7200 - min_size ; freq = 7200 - min_size ;
field_frequency_min.set_value( freq ); field_frequency_min.set_value( freq );
@ -364,8 +384,8 @@ namespace ui
int32_t min_size = steps ; int32_t min_size = steps ;
if( locked_range ) if( locked_range )
min_size = search_span ; min_size = search_span ;
if( min_size < 20 ) if( min_size < 2 )
min_size = 20 ; min_size = 2 ;
if( v < min_size ) if( v < min_size )
{ {
v = min_size ; v = min_size ;
@ -386,8 +406,8 @@ namespace ui
int32_t min_size = steps ; int32_t min_size = steps ;
if( locked_range ) if( locked_range )
min_size = search_span ; min_size = search_span ;
if( min_size < 20 ) if( min_size < 2 )
min_size = 20 ; min_size = 2 ;
int32_t freq = f / 1000000 ; int32_t freq = f / 1000000 ;
if( freq < min_size ) if( freq < min_size )
freq = min_size ; freq = min_size ;

12
firmware/application/apps/ui_looking_glass_app.hpp
View File

@ -37,6 +37,7 @@
namespace ui namespace ui
{ {
#define LOOKING_GLASS_SLICE_WIDTH_MAX 19999920
#define MHZ_DIV 1000000 #define MHZ_DIV 1000000
#define X2_MHZ_DIV 2000000 #define X2_MHZ_DIV 2000000
@ -80,11 +81,16 @@ namespace ui
std::vector<preset_entry> presets_db{}; std::vector<preset_entry> presets_db{};
int64_t LOOKING_GLASS_SLICE_WIDTH = 19999920; // Each slice bandwidth 20 MHz and a multiple of 240 // Each slice bandwidth 20 MHz and a multiple of 240
// since we are using LOOKING_GLASS_SLICE_WIDTH/240 as the each_bin_size // 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 // 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 adjust_range(int64_t* f_min, int64_t* f_max, int64_t width);
void on_channel_spectrum(const ChannelSpectrum& spectrum); void on_channel_spectrum(const ChannelSpectrum& spectrum);
void do_timers(); void do_timers();
void on_range_changed(); void on_range_changed();

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

@ -528,32 +528,28 @@ namespace ui {
} }
} }
} }
} text_cycle.set_text( to_string_dec_uint( index + 1 , 3 ) );
if(frequency_list[index].description.size() > 0)
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 ) ); switch( frequency_list[current_index].type )
if(frequency_list[index].description.size() > 0)
{ {
switch( frequency_list[current_index].type ) case RANGE:
{ desc_cycle.set( "R: " + frequency_list[current_index].description ); //Show new description
case RANGE: break ;
desc_cycle.set( "R: " + frequency_list[current_index].description ); //Show new description case HAMRADIO:
break ; desc_cycle.set( "H: " + frequency_list[current_index].description ); //Show new description
case HAMRADIO: break ;
desc_cycle.set( "H: " + frequency_list[current_index].description ); //Show new description default:
break ; case SINGLE:
default: desc_cycle.set( "S: " + frequency_list[current_index].description ); //Show new description
case SINGLE: break ;
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); big_display.set_style(&style_white);
if( !userpause ) if( !userpause )
button_pause.set_text("<PAUSE>"); button_pause.set_text("<PAUSE>");

10
firmware/application/event_m0.cpp
View File

@ -43,6 +43,7 @@ using namespace lpc43xx;
#include <array> #include <array>
#include "ui_font_fixed_8x16.hpp" #include "ui_font_fixed_8x16.hpp"
#include "ui_navigation.hpp"
extern "C" { extern "C" {
@ -262,6 +263,8 @@ void EventDispatcher::on_touch_event(ui::TouchEvent event) {
void EventDispatcher::handle_lcd_frame_sync() { void EventDispatcher::handle_lcd_frame_sync() {
DisplayFrameSyncMessage message; DisplayFrameSyncMessage message;
message_map.send(&message); message_map.send(&message);
static_cast<ui::SystemView *>(top_widget)->paint_overlay();
painter.paint_widget_tree(top_widget); painter.paint_widget_tree(top_widget);
portapack::backlight()->on(); portapack::backlight()->on();
@ -304,7 +307,12 @@ void EventDispatcher::handle_switches() {
if( switches_state[i] ) { if( switches_state[i] ) {
const auto event = static_cast<ui::KeyEvent>(i); const auto event = static_cast<ui::KeyEvent>(i);
if( !event_bubble_key(event) ) { if( !event_bubble_key(event) ) {
context.focus_manager().update(top_widget, event); if (switches_state[(size_t)ui::KeyEvent::Dfu]) {
static_cast<ui::SystemView *>(top_widget)->toggle_overlay();
}
else {
context.focus_manager().update(top_widget, event);
}
} }
in_key_event = true; in_key_event = true;

6
firmware/application/main.cpp
View File

@ -145,14 +145,14 @@ Continuous (Fox-oring)
rffc507x::RFFC507x first_if; rffc507x::RFFC507x first_if;
static void event_loop() { static void event_loop() {
ui::Context context; static ui::Context context;
ui::SystemView system_view { static ui::SystemView system_view {
context, context,
portapack::display.screen_rect() portapack::display.screen_rect()
}; };
EventDispatcher event_dispatcher { &system_view, context }; EventDispatcher event_dispatcher { &system_view, context };
MessageHandlerRegistration message_handler_display_sleep { static MessageHandlerRegistration message_handler_display_sleep {
Message::ID::DisplaySleep, Message::ID::DisplaySleep,
[&event_dispatcher](const Message* const) { [&event_dispatcher](const Message* const) {
event_dispatcher.set_display_sleep(true); event_dispatcher.set_display_sleep(true);

31
firmware/application/ui_navigation.cpp
View File

@ -29,6 +29,7 @@
#include "bmp_splash.hpp" #include "bmp_splash.hpp"
#include "bmp_modal_warning.hpp" #include "bmp_modal_warning.hpp"
#include "portapack_persistent_memory.hpp" #include "portapack_persistent_memory.hpp"
#include "portapack_shared_memory.hpp"
#include "ui_about_simple.hpp" #include "ui_about_simple.hpp"
#include "ui_adsb_rx.hpp" #include "ui_adsb_rx.hpp"
@ -748,6 +749,36 @@ Context& SystemView::context() const {
return context_; 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() { void BMPView::focus() {

6
firmware/application/ui_navigation.hpp
View File

@ -33,6 +33,7 @@
#include "ui_channel.hpp" #include "ui_channel.hpp"
#include "ui_audio.hpp" #include "ui_audio.hpp"
#include "ui_sd_card_status_view.hpp" #include "ui_sd_card_status_view.hpp"
#include "ui_dfu_menu.hpp"
#include "bitmap.hpp" #include "bitmap.hpp"
#include "ff.h" #include "ff.h"
@ -290,10 +291,15 @@ namespace ui
const Rect parent_rect); const Rect parent_rect);
Context &context() const override; Context &context() const override;
void toggle_overlay();
void paint_overlay();
private: private:
bool overlay_active {false};
SystemStatusView status_view{navigation_view}; SystemStatusView status_view{navigation_view};
InformationView info_view{navigation_view}; InformationView info_view{navigation_view};
DfuMenu overlay{navigation_view};
NavigationView navigation_view{}; NavigationView navigation_view{};
Context &context_; Context &context_;
}; };

1
firmware/baseband/CMakeLists.txt
View File

@ -139,6 +139,7 @@ set(CPPSRC
${COMMON}/chibios_cpp.cpp ${COMMON}/chibios_cpp.cpp
debug.cpp debug.cpp
${COMMON}/gcc.cpp ${COMMON}/gcc.cpp
${COMMON}/performance_counter.cpp
tone_gen.cpp tone_gen.cpp
) )

4
firmware/baseband/chconf.h
View File

@ -508,6 +508,8 @@
} }
#endif #endif
/** /**
* @brief System tick event hook. * @brief System tick event hook.
* @details This hook is invoked in the system tick handler immediately * @details This hook is invoked in the system tick handler immediately
@ -516,6 +518,8 @@
#if !defined(SYSTEM_TICK_EVENT_HOOK) || defined(__DOXYGEN__) #if !defined(SYSTEM_TICK_EVENT_HOOK) || defined(__DOXYGEN__)
#define SYSTEM_TICK_EVENT_HOOK() { \ #define SYSTEM_TICK_EVENT_HOOK() { \
/* System tick event code here.*/ \ /* System tick event code here.*/ \
extern void update_performance_counters(); \
update_performance_counters(); \
} }
#endif #endif

24
firmware/baseband/debug.cpp
View File

@ -26,6 +26,7 @@
#include <hal.h> #include <hal.h>
#include "portapack_shared_memory.hpp" #include "portapack_shared_memory.hpp"
#include "performance_counter.hpp"
void write_m4_panic_msg(const char *panic_message, struct extctx *ctxp) { void write_m4_panic_msg(const char *panic_message, struct extctx *ctxp) {
if (ctxp == nullptr) { if (ctxp == nullptr) {
@ -116,5 +117,28 @@ CH_IRQ_HANDLER(HardFaultVector) {
#endif #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" */

2
firmware/baseband/event_m4.cpp
View File

@ -20,6 +20,7 @@
*/ */
#include "event_m4.hpp" #include "event_m4.hpp"
#include "debug.hpp"
#include "portapack_shared_memory.hpp" #include "portapack_shared_memory.hpp"
@ -120,3 +121,4 @@ void EventDispatcher::handle_spectrum() {
const UpdateSpectrumMessage message; const UpdateSpectrumMessage message;
baseband_processor->on_message(&message); baseband_processor->on_message(&message);
} }

2
firmware/baseband/sd_over_usb/proc_sd_over_usb.cpp
View File

@ -45,3 +45,5 @@ int main() {
return 0; return 0;
} }
void update_performance_counters() {}

57
firmware/common/performance_counter.cpp Normal file
View File

@ -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;
}

29
firmware/common/performance_counter.hpp Normal file
View File

@ -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 <stdint.h>
uint8_t get_cpu_utilisation_in_percent();
#endif /* __PERFORMANCE_COUNTER_H__ */

5
firmware/common/portapack_shared_memory.hpp
View File

@ -64,6 +64,11 @@ struct SharedMemory {
JammerChannel jammer_channels[24]; JammerChannel jammer_channels[24];
uint8_t data[512]; uint8_t data[512];
} bb_data { { { { 0, 0 } }, 0, { 0 } } }; } 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; extern SharedMemory& shared_memory;