Merge pull request #920 from zxkmm/ready_to_pr_2_20230426_imp_issue_917

implemented issue#917

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

firmware/application/apps/ert_app.cpp

@@ -41,6 +41,7 @@ std::string type(Packet::Type value) {
 	case Packet::Type::Unknown:	return "???";
 	case Packet::Type::IDM:		return "IDM";
 	case Packet::Type::SCM:		return "SCM";
+	case Packet::Type::SCMPLUS:	return "SCM+";
 	}
 }
 
@@ -62,7 +63,8 @@ std::string commodity_type(CommodityType value) {
 
 void ERTLogger::on_packet(const ert::Packet& packet) {
 	const auto formatted = packet.symbols_formatted();
-	log_file.write_entry(packet.received_at(), formatted.data + "/" + formatted.errors);
+	std::string entry = ert::format::type(packet.type()) + " " + formatted.data + "/" + formatted.errors;
+	log_file.write_entry(packet.received_at(), entry);
 }
 
 const ERTRecentEntry::Key ERTRecentEntry::invalid_key { };

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<int8_t>(receiver_model.lna()),
 		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) {

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

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

firmware/application/apps/ui_fileman.cpp

@@ -263,28 +263,41 @@ 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) {
 
-        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);
-        }
+		std::string destination_path = current_path.string();
+		if (destination_path.back() != '/')//if the path is not ended with '/', add '/'
+			destination_path += '/';
+
+		auto selected_path = get_selected_path();
+		auto extension = selected_path.extension().string();
+
+		if(extension.empty()){// Is Dir
+			destination_path = destination_path + buffer;
+			extension_buffer = "";
+		}else{//is File
+			destination_path = destination_path + buffer + extension_buffer;
+		}
+
+		rename_file(get_selected_path(), destination_path);  //rename the selected file
+
+		if (!extension.empty() && selected_path.string().back() != '/' && extension.substr(1) == "C16") { //substr(1) is for ignore the dot
+			// 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();
+
+	});
 
-        load_directory_contents(current_path);
-        refresh_list();
-    });
 }
 
 void FileManagerView::on_delete() {
@@ -355,6 +368,13 @@ FileManagerView::FileManagerView(
 
 		button_refactor.on_select = [this, &nav](Button&) {
 			name_buffer = entry_list[menu_view.highlighted_index()].entry_path.filename().string().substr(0, max_filename_length);
+			size_t pos = name_buffer.find_last_of(".");
+
+			if (pos != std::string::npos) {
+				extension_buffer = name_buffer.substr(pos);
+				name_buffer = name_buffer.substr(0, pos);
+			}
+
 			on_refactor(nav);
 		};
 

firmware/application/apps/ui_fileman.hpp

@@ -67,8 +67,8 @@ protected:
 		{ ".TXT", &bitmap_icon_file_text, ui::Color::white() },
 		{ ".PNG", &bitmap_icon_file_image, ui::Color::green() },
 		{ ".BMP", &bitmap_icon_file_image, ui::Color::green() },
-		{ ".C8",  &bitmap_icon_file_iq, ui::Color::blue() },
-		{ ".C16", &bitmap_icon_file_iq, ui::Color::blue() },
+		{ ".C8",  &bitmap_icon_file_iq, ui::Color::dark_cyan() },
+		{ ".C16", &bitmap_icon_file_iq, ui::Color::dark_cyan() },
 		{ ".WAV", &bitmap_icon_file_wav, ui::Color::dark_magenta() },
 		{ "", &bitmap_icon_file, ui::Color::light_grey() }
 	};
@@ -143,6 +143,7 @@ public:
 
 private:
 	std::string name_buffer { };
+	std::string extension_buffer { };
 	
 	void refresh_widgets(const bool v);
 	void on_rename(NavigationView& nav);
@@ -159,7 +160,7 @@ private:
 	};
 
 	Button button_rename {
-		{ 0 * 8, 29 * 8, 10 * 8, 32 },
+		{ 0 * 8, 29 * 8, 9 * 8, 32 },
 		"Rename"
 	};
 
@@ -169,7 +170,7 @@ private:
 	};
 
 	Button button_delete {
-		{ 20 * 8, 29 * 8, 10 * 8, 32 },
+		{ 21 * 8, 29 * 8, 9 * 8, 32 },
 		"Delete"
 	};
 	

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 ;

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<preset_entry> 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();

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("<PAUSE>");	

firmware/application/event_m0.cpp

@@ -43,6 +43,7 @@ using namespace lpc43xx;
 #include <array>
 
 #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<ui::SystemView *>(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<ui::KeyEvent>(i);
 			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;

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);

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() {

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

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
 )
 

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
 

firmware/baseband/debug.cpp

@@ -26,6 +26,7 @@
 #include <hal.h>
 
 #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" */

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);
 }
+

firmware/baseband/proc_ert.cpp

@@ -87,6 +87,7 @@ void ERTProcessor::consume_symbol(
 ) {
 	const uint_fast8_t sliced_symbol = (raw_symbol >= 0.0f) ? 1 : 0;
 	scm_builder.execute(sliced_symbol);
+	scmplus_builder.execute(sliced_symbol);
 	idm_builder.execute(sliced_symbol);
 }
 
@@ -97,6 +98,13 @@ void ERTProcessor::scm_handler(
 	shared_memory.application_queue.push(message);
 }
 
+void ERTProcessor::scmplus_handler(
+	const baseband::Packet& packet
+) {
+	const ERTPacketMessage message { ert::Packet::Type::SCMPLUS, packet };
+	shared_memory.application_queue.push(message);
+}
+
 void ERTProcessor::idm_handler(
 	const baseband::Packet& packet
 ) {

firmware/baseband/proc_ert.hpp

@@ -44,10 +44,14 @@ constexpr uint64_t scm_preamble_and_sync_manchester { 0b101010101001011001100110
 constexpr size_t scm_preamble_and_sync_length { 42 - 10 };
 constexpr size_t scm_payload_length_max { 150 };
 
+// ''.join(['%d%d' % (c, 1-c) for c in map(int, bin(0x16a3)[2:].zfill(16))])
+constexpr uint64_t scmplus_preamble_and_sync_manchester { 0b01010110011010011001100101011010 };
+constexpr size_t scmplus_preamble_and_sync_length { 32 - 0 };
+constexpr size_t scmplus_payload_length_max { 224 };
+
 // ''.join(['%d%d' % (c, 1-c) for c in map(int, bin(0x555516a3)[2:].zfill(32))])
 constexpr uint64_t idm_preamble_and_sync_manchester { 0b0110011001100110011001100110011001010110011010011001100101011010 };
 constexpr size_t idm_preamble_and_sync_length { 64 - 16 };
-
 constexpr size_t idm_payload_length_max { 1408 };
 
 class ERTProcessor : public BasebandProcessor {
@@ -80,6 +84,15 @@ private:
 		}
 	};
 
+	PacketBuilder<BitPattern, NeverMatch, FixedLength> scmplus_builder {
+		{ scmplus_preamble_and_sync_manchester, scmplus_preamble_and_sync_length, 1 },
+		{ },
+		{ scmplus_payload_length_max },
+		[this](const baseband::Packet& packet) {
+			this->scmplus_handler(packet);
+		}
+	};
+	
 	PacketBuilder<BitPattern, NeverMatch, FixedLength> idm_builder {
 		{ idm_preamble_and_sync_manchester, idm_preamble_and_sync_length, 1 },
 		{ },
@@ -91,6 +104,7 @@ private:
 
 	void consume_symbol(const float symbol);
 	void scm_handler(const baseband::Packet& packet);
+	void scmplus_handler(const baseband::Packet& packet);
 	void idm_handler(const baseband::Packet& packet);
 
 	float sum_half_period[2];

firmware/baseband/sd_over_usb/proc_sd_over_usb.cpp

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

firmware/common/ert_packet.cpp

@@ -47,6 +47,9 @@ ID Packet::id() const {
 		const auto lsb = reader_.read(35, 24);
 		return (msb << 24) | lsb;
 	}
+	if( type() == Type::SCMPLUS ) {
+		return reader_.read(2 * 8, 32);
+	}
 	if( type() == Type::IDM ) {
 		return reader_.read(5 * 8, 32);
 	}
@@ -57,6 +60,9 @@ Consumption Packet::consumption() const {
 	if( type() == Type::SCM ) {
 		return reader_.read(11, 24);
 	}
+	if( type() == Type::SCMPLUS ) {
+		return reader_.read(6 * 8, 32);
+	}	
 	if( type() == Type::IDM ) {
 		return reader_.read(25 * 8, 32);
 	}
@@ -67,6 +73,9 @@ CommodityType Packet::commodity_type() const {
 	if( type() == Type::SCM ) {
 		return reader_.read(5, 4);
 	}
+	if( type() == Type::SCMPLUS ) {
+		return reader_.read(1 * 8 + 4, 4);
+	}	
 	if( type() == Type::IDM ) {
 		return reader_.read(4 * 8 + 4, 4);
 	}
@@ -80,7 +89,8 @@ FormattedSymbols Packet::symbols_formatted() const {
 bool Packet::crc_ok() const {
 	switch(type()) {
 	case Type::SCM:	return crc_ok_scm();
-	case Type::IDM:	return crc_ok_idm();
+	case Type::SCMPLUS:
+	case Type::IDM:	return crc_ok_ccitt();
 	default:		return false;
 	}
 }
@@ -95,7 +105,7 @@ bool Packet::crc_ok_scm() const {
 	return ert_bch.checksum() == 0x0000;
 }
 
-bool Packet::crc_ok_idm() const {
+bool Packet::crc_ok_ccitt() const {
 	CRC<16> ert_crc_ccitt { 0x1021, 0xffff, 0x1d0f };
 	for(size_t i=0; i<length(); i+=8) {
 		ert_crc_ccitt.process_byte(reader_.read(i, 8));

firmware/common/ert_packet.hpp

@@ -45,6 +45,7 @@ public:
 		Unknown = 0,
 		IDM = 1,
 		SCM = 2,
+		SCMPLUS = 3,
 	};
 
 	Packet(
@@ -80,7 +81,7 @@ private:
 	const Reader reader_;
 	const Type type_;
 
-	bool crc_ok_idm() const;
+	bool crc_ok_ccitt() const;
 	bool crc_ok_scm() const;
 };
 

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

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

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;

flashing/flash_portapack_mayhem.bat

@@ -12,4 +12,6 @@ pause
 echo.
 hackrf_update.exe portapack-h1_h2-mayhem.bin
 echo.
+echo If your device never boot after flashing, please refer to https://github.com/eried/portapack-mayhem/wiki/Won't-boot
+echo.
 pause