Added clang formatting spec and PR validation (#992)

* Update .clang-format

.clang-format

@@ -0,0 +1,7 @@
+---
+BasedOnStyle: Chromium
+IndentWidth: '2'
+TabWidth: '2'
+UseTab: Always
+
+...

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,7 +9,7 @@ assignees: ''
 
 ----
 
-(Please try the latest nightly release before submitting this. You can find the latest nightly verison here: https://github.com/eried/portapack-mayhem/releases)
+(Please try the latest nightly release before submitting this. You can find the latest nightly version here: https://github.com/eried/portapack-mayhem/releases)
 
 ----
 

.github/ISSUE_TEMPLATE/problem-upgrading-the-firmware.md

@@ -31,7 +31,7 @@ You can find the list of versions here: https://github.com/eried/portapack-mayhe
 
 **Affected versions**
 Please tell us what version you are running. 
-Also please try the latest nightly release before submitting this. 
+If your device is still functional, try the latest nightly release before submitting this. 
 You can find the latest nightly version here https://github.com/eried/portapack-mayhem/releases
 
 **Were you able to update the firmware before?**

.github/workflows/check_formatting.yml

@@ -0,0 +1,18 @@
+name: Check formatting
+
+on: #[push, pull_request] To be enabled once formatting is fixed in repo
+  workflow_dispatch:
+
+jobs:  
+  check_date:
+    runs-on: ubuntu-latest
+    name: Check formatting
+    steps:
+      - uses: actions/checkout@v2
+      - name: print latest_commit
+        run: echo ${{ github.sha }}
+      - name: clang-format Check
+        uses: jidicula/clang-format-action@v4.11.0
+        with:
+          check-path: "firmware"
+          fallback-style: Chromium

.github/workflows/past_version.txt

@@ -1 +1 @@
-v1.5.4
+v1.6.0

.github/workflows/version.txt

@@ -1 +1 @@
-v1.6.0
+v1.7.0

.gitignore

@@ -13,6 +13,7 @@
 /sdcard/FREQMAN/BHT*
 /sdcard/FREQMAN/R.TXT
 /sdcard/FREQMAN/XXX.TXT
+/armbin
 
 # Compiled Object files
 *.slo
@@ -59,6 +60,9 @@ CMakeFiles/
 *.sublime-workspace
 .vscode
 
+# VSCodium extensions
+.history
+
 # Host OS leftovers
 .DS_Store
 /firmware/CMakeCache.txt

CMakeLists.txt

@@ -45,7 +45,7 @@ endif()
 set(LICENSE_PATH ${CMAKE_CURRENT_LIST_DIR}/LICENSE)
 set(HARDWARE_PATH ${CMAKE_CURRENT_LIST_DIR}/hardware)
 
-add_subdirectory(hackrf/firmware/hackrf_usb)
+add_subdirectory(hackrf-portapack)
 
 set(HACKRF_FIRMWARE_DFU_FILENAME hackrf_usb.dfu)
 set(HACKRF_FIRMWARE_BIN_FILENAME hackrf_usb_ram.bin)

README.md

@@ -39,7 +39,7 @@ The current **stable release** is on the [![GitHub release (latest by date)](htt
 ## How can I collaborate
 You can write [documentation](https://github.com/eried/portapack-mayhem/wiki), fix bugs and [answer issues](https://github.com/eried/portapack-mayhem/issues) or add new functionality. Please check the following [guide](https://github.com/eried/portapack-mayhem/wiki/How-to-collaborate) with details.
 
-Consider that the hardware and firmware has been created and maintain by a [lot](https://github.com/mossmann/hackrf/graphs/contributors) of [people](https://github.com/eried/portapack-mayhem/graphs/contributors), so always try colaborating your time and effort first. For coding related questions, if something does not fit as an issue, please join our Discord by clicking the chat badge on [top](#portapack-mayhem).
+Consider that the hardware and firmware has been created and maintain by a [lot](https://github.com/mossmann/hackrf/graphs/contributors) of [people](https://github.com/eried/portapack-mayhem/graphs/contributors), so always try collaborating your time and effort first. For coding related questions, if something does not fit as an issue, please join our Discord by clicking the chat badge on [top](#portapack-mayhem).
 
 [![Contributors](https://contrib.rocks/image?repo=eried/portapack-mayhem)](https://github.com/eried/portapack-mayhem/graphs/contributors)
 

dockerfile

@@ -14,7 +14,7 @@ COPY ./ /havocsrc
 
 #Fetch dependencies from APT
 RUN apt-get update && \
-        apt-get install -y tar wget dfu-util cmake python bzip2 curl python3 python3-yaml && \
+        apt-get install -y tar wget dfu-util cmake python bzip2 lz4 curl python3 python3-yaml && \
         apt-get -qy autoremove
 
 #Install current pip from PyPa

dockerfile-alpine

@@ -13,7 +13,7 @@ COPY ./ /havocsrc
 # Fetch dependencies from APK
 RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
 RUN apk update -U
-RUN apk add --no-cache git tar wget cmake curl bzip2 make
+RUN apk add --no-cache git tar wget cmake curl bzip2 lz4 make
 RUN apk add --no-cache dfu-util ccache icu-data-full
 RUN apk add --no-cache python3 py3-pip py3-yaml
 RUN apk add --no-cache py3-pyyaml-env-tag

dockerfile-nogit

@@ -11,7 +11,7 @@ WORKDIR /havoc/firmware
 
 # Fetch dependencies from APT
 RUN apt-get update && \
-	apt-get install -y git tar wget dfu-util cmake python3 ccache bzip2 curl && \
+	apt-get install -y git tar wget dfu-util cmake python3 ccache bzip2 liblz4-tool curl && \
 	apt-get -qy autoremove
 
 #Install current pip from PyPa

dockerfile-nogit-alpine

@@ -10,7 +10,7 @@ WORKDIR /havoc/firmware
 # Fetch dependencies from APK
 RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
 RUN apk update -U
-RUN apk add --no-cache git tar wget cmake curl bzip2 make
+RUN apk add --no-cache git tar wget cmake curl bzip2 lz4 make
 RUN apk add --no-cache dfu-util ccache icu-data-full
 RUN apk add --no-cache python3 py3-pip py3-yaml
 RUN apk add --no-cache py3-pyyaml-env-tag

firmware/CMakeLists.txt

@@ -28,6 +28,7 @@ set(CHIBIOS_PORTAPACK ${PROJECT_SOURCE_DIR}/chibios-portapack)
 set(EXTRACT_CPLD_DATA ${PROJECT_SOURCE_DIR}/tools/extract_cpld_data.py)
 set(MAKE_SPI_IMAGE ${PROJECT_SOURCE_DIR}/tools/make_spi_image.py)
 set(MAKE_IMAGE_CHUNK ${PROJECT_SOURCE_DIR}/tools/make_image_chunk.py)
+set(LZ4 lz4)
 
 set(FIRMWARE_NAME portapack-h1_h2-mayhem)
 set(FIRMWARE_FILENAME ${FIRMWARE_NAME}.bin)

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,10 +231,13 @@ 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
 	apps/ui_fileman.cpp
+	apps/ui_flash_utility.cpp
+	apps/ui_sd_over_usb.cpp
 	apps/ui_freqman.cpp
 	apps/ui_jammer.cpp
 	apps/ui_keyfob.cpp
@@ -277,6 +281,9 @@ set(CPPSRC
 	apps/ui_level.cpp  
 	apps/tpms_app.cpp
 	apps/tpms_app.cpp
+	apps/ui_spectrum_painter.cpp
+	apps/ui_spectrum_painter_image.cpp
+	apps/ui_spectrum_painter_text.cpp
 	protocols/aprs.cpp
 	protocols/ax25.cpp
 	protocols/bht.cpp
@@ -317,7 +324,10 @@ set(TCSRC)
 set(TCPPSRC)
 
 # List ASM source files here
-set(ASMSRC ${PORTASM})
+set(ASMSRC
+	${PORTASM}
+	lz4.S
+)
 
 set(INCDIR ${CMAKE_CURRENT_BINARY_DIR} ${COMMON} ${PORTINC} ${KERNINC} ${TESTINC}
 	${HALINC} ${PLATFORMINC} ${BOARDINC}

firmware/application/apps/acars_app.cpp

@@ -100,7 +100,7 @@ ACARSAppView::ACARSAppView(NavigationView& nav) {
 	
 	logger = std::make_unique<ACARSLogger>();
 	if (logger)
-		logger->append("acars.txt");
+		logger->append(LOG_ROOT_DIR "/ACARS.TXT");
 }
 
 ACARSAppView::~ACARSAppView() {

firmware/application/apps/ais_app.cpp

@@ -399,7 +399,7 @@ AISAppView::AISAppView(NavigationView& nav) : nav_ { nav } {
 
 	logger = std::make_unique<AISLogger>();
 	if( logger ) {
-		logger->append(u"ais.txt");
+		logger->append( LOG_ROOT_DIR "/AIS.TXT" );
 	}
 }
 

firmware/application/apps/analog_audio_app.cpp

@@ -36,6 +36,8 @@ using namespace tonekey;
 
 #include "string_format.hpp"
 
+#include "freqman.hpp"
+
 namespace ui {
 
 /* AMOptionsView *********************************************************/
@@ -51,6 +53,7 @@ AMOptionsView::AMOptionsView(
 		&options_config,
 	});
 
+	freqman_set_bandwidth_option( AM_MODULATION , options_config );		// adding the common message from freqman.cpp to the options_config
 	options_config.set_selected_index(receiver_model.am_configuration());
 	options_config.on_change = [this](size_t n, OptionsField::value_t) {
 		receiver_model.set_am_configuration(n);
@@ -72,6 +75,7 @@ NBFMOptionsView::NBFMOptionsView(
 		&field_squelch
 	});
 
+	freqman_set_bandwidth_option( NFM_MODULATION , options_config );		// adding the common message from freqman.cpp to the options_config
 	options_config.set_selected_index(receiver_model.nbfm_configuration());
 	options_config.on_change = [this](size_t n, OptionsField::value_t) {
 		receiver_model.set_nbfm_configuration(n);
@@ -83,6 +87,27 @@ NBFMOptionsView::NBFMOptionsView(
 	};
 }
 
+/* WFMOptionsView *******************************************************/
+
+WFMOptionsView::WFMOptionsView(
+	const Rect parent_rect, const Style* const style
+) : View { parent_rect }
+{
+	set_style(style);
+
+	add_children({
+		&label_config,
+		&options_config,
+	});
+
+	freqman_set_bandwidth_option( WFM_MODULATION , options_config );		// adding the common message from freqman.cpp to the options_config
+	options_config.set_selected_index(receiver_model.wfm_configuration());
+	options_config.on_change = [this](size_t n, OptionsField::value_t) {
+		receiver_model.set_wfm_configuration(n);
+	};
+}
+
+
 /* SPECOptionsView *******************************************************/
 
 SPECOptionsView::SPECOptionsView(
@@ -346,6 +371,7 @@ void AnalogAudioView::on_show_options_modulation() {
 		break;
 	
 	case ReceiverModel::Mode::WidebandFMAudio:
+		widget = std::make_unique<WFMOptionsView>(options_view_rect, &style_options_group);
 		waterfall.show_audio_spectrum_view(true);
 		text_ctcss.hidden(true);
 		break;

firmware/application/apps/analog_audio_app.hpp

@@ -54,12 +54,7 @@ private:
 	OptionsField options_config {
 		{ 3 * 8, 0 * 16 },
 		5,
-		{
-			{ "DSB 9k ", 0 },
-			{ "DSB 6k ", 0 },
-			{ "USB+3k ", 0 },
-			{ "LSB-3k ", 0 },
-			{ "CW     ", 0 },
+		{		// using  common messages from freqman.cpp
 		}
 	};
 };
@@ -76,10 +71,7 @@ private:
 	OptionsField options_config {
 		{ 3 * 8, 0 * 16 },
 		4,
-		{
-			{ " 8k5", 0 },
-			{ "11k ", 0 },
-			{ "16k ", 0 },
+		{		// using  common messages from freqman.cpp
 		}
 	};
 	
@@ -96,6 +88,24 @@ private:
 	};
 };
 
+
+class WFMOptionsView : public View {
+public:
+	WFMOptionsView(const Rect parent_rect, const Style* const style);
+
+private:
+	Text label_config {
+		{ 0 * 8, 0 * 16, 2 * 8, 1 * 16 },
+		"BW",
+	};
+	OptionsField options_config {
+		{ 3 * 8, 0 * 16 },
+		4,
+		{		// using  common messages from freqman.cpp
+		}
+	};
+};
+
 class AnalogAudioView;
 
 class SPECOptionsView : public View {
@@ -117,6 +127,7 @@ private:
 			{ " 2m ", 2000000 },
 			{ " 1m ", 1000000 },
 			{ "500k", 500000 },
+			{ "100k", 100000 },
 		}
 	};
 	
@@ -221,7 +232,7 @@ private:
 
 	RecordView record_view {
 		{ 0 * 8, 2 * 16, 30 * 8, 1 * 16 },
-		u"AUD",
+		u"AUD", u"AUDIO",
 		RecordView::FileType::WAV, 
 		4096, 
 		4

firmware/application/apps/capture_app.hpp

@@ -29,6 +29,23 @@
 #include "ui_record_view.hpp"
 #include "ui_spectrum.hpp"
 
+#define BW_OPTIONS \
+			{ "  8k5", 8500 }, \
+			{ "  11k", 11000 }, \
+			{ "  16k", 16000 }, \
+			{ "  25k", 25000 }, \
+			{ "  50k", 50000 }, \
+			{ " 100k", 100000 }, \
+			{ " 250k", 250000 }, \
+			{ " 500k", 500000 },   /* Previous Limit bandwith Option with perfect micro SD write .C16 format operaton.*/  \
+			{ " 600k", 600000 },   /* That extended option is still possible to record with FW version Mayhem v1.41 (< 2,5MB/sec)  */  \
+ 			{ " 750k", 750000 },   /* From that BW onwards, the LCD is ok, but the recorded file is auto decimated,(not real file size) */  \
+			{ "1100k", 1100000 }, \
+			{ "1750k", 1750000 }, \
+			{ "2000k", 2000000 }, \
+			{ "2500k", 2500000 }, \
+			{ "2750k", 2750000 }    // That is our max Capture option , to keep using later / 8 decimation (22Mhz sampling  ADC)
+
 namespace ui {
 
 class CaptureAppView : public View {
@@ -88,27 +105,13 @@ private:
 		{ 5 * 8, 1 * 16 },
 		5,
 		{
-			{ "  8k5", 8500 },
-			{ " 11k ", 11000 },
-			{ " 16k ", 16000 },
-			{ " 25k ", 25000 },
-			{ " 50k ", 50000 },
-			{ "100k ", 100000 },
-			{ "250k ", 250000 },
-			{ "500k ", 500000 },   // Previous Limit bandwith Option with perfect micro SD write .C16 format operaton.
-			{ "600k ", 600000 },   // That extended option is still possible to record with FW version Mayhem v1.41 (< 2,5MB/sec)  
- 			{ "750k ", 750000 },   // From that BW onwards, the LCD is ok, but the recorded file is auto decimated,(not real file size) 
-			{ "1100k", 1100000 },
-	       	{ "1750k", 1750000 },
-			{ "2000k", 2000000 },
-			{ "2500k", 2500000 },
-			{ "2750k", 2750000 }    // That is our max Capture option , to keep using later / 8 decimation (22Mhz sampling  ADC)
+			BW_OPTIONS
 		}
 	};
 	
 	RecordView record_view {
 		{ 0 * 8, 2 * 16, 30 * 8, 1 * 16 },
-		u"BBD_????", RecordView::FileType::RawS16, 16384, 3
+		u"BBD_????.*", u"CAPTURES", RecordView::FileType::RawS16, 16384, 3
 	};
 
 	spectrum::WaterfallWidget waterfall { };

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 { };
@@ -130,7 +132,7 @@ ERTAppView::ERTAppView(NavigationView&) {
 
 	logger = std::make_unique<ERTLogger>();
 	if( logger ) {
-		logger->append(u"ert.txt");
+		logger->append( LOG_ROOT_DIR "/ERT.TXT" );
 	}
 }
 

firmware/application/apps/pocsag_app.cpp

@@ -131,7 +131,7 @@ POCSAGAppView::POCSAGAppView(NavigationView& nav) {
 
 	logger = std::make_unique<POCSAGLogger>();
 	if (logger)
-		logger->append("pocsag.txt");
+		logger->append(LOG_ROOT_DIR "/POCSAG.TXT");
 
 	audio::output::start();
 	audio::output::unmute();

firmware/application/apps/pocsag_app.hpp

@@ -64,8 +64,8 @@ private:
 	std::app_settings 		settings { }; 		
 	std::app_settings::AppSettings 	app_settings { };
 
-	bool logging { true };
-	bool ignore { true };
+	bool logging { false };
+	bool ignore { false };
 	uint32_t last_address = 0xFFFFFFFF;
 	pocsag::POCSAGState pocsag_state { };
 
@@ -91,13 +91,7 @@ private:
 	FrequencyField field_frequency {
 		{ 0 * 8, 0 * 8 },
 	};
-	Checkbox check_log {
-		{ 24 * 8, 21 },
-		3,
-		"LOG",
-		true
-	};
-	NumberField field_volume{
+	NumberField field_volume {
 		{ 28 * 8, 0 * 16 },
 		2,
 		{ 0, 99 },
@@ -106,16 +100,22 @@ private:
 	};
 	
 	Checkbox check_ignore {
-		{ 1 * 8, 21 },
-		12,
-		"Ignore addr:",
-		true
+		{ 0 * 8, 21 },
+		8,
+		"Ign addr",
+		false
 	};
 	SymField sym_ignore {
-		{ 16 * 8, 21 },
+		{ 13 * 8, 25 },
 		7,
 		SymField::SYMFIELD_DEC
 	};
+	Checkbox check_log {
+		{ 240 - 8 * 8, 21 },
+		3,
+		"LOG",
+		false
+	};
 
 	Console console {
 		{ 0, 3 * 16, 240, 256 }

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/soundboard_app.cpp

@@ -206,7 +206,7 @@ void SoundBoardView::refresh_list() {
 				file_list[n].string().substr(0, 30),
 				ui::Color::white(),
 				nullptr,
-				[this](){
+				[this](KeyEvent){
 					on_select_entry();
 				}
 			});

firmware/application/apps/tpms_app.cpp

@@ -35,6 +35,7 @@ namespace tpms {
 namespace format {
 
 static bool use_kpa = true;
+static bool use_celsius = true;
 
 std::string type(Reading::Type type) {
 	return to_string_dec_uint(toUType(type), 2);
@@ -45,15 +46,11 @@ std::string id(TransponderID id) {
 }
 
 std::string pressure(Pressure pressure) {
-	if(use_kpa){
-		return to_string_dec_int(pressure.kilopascal(), 3);
-	}
-	return to_string_dec_int(pressure.psi(), 3);
-	
+	return to_string_dec_int(use_kpa? pressure.kilopascal():pressure.psi(), 3);
 }
 
 std::string temperature(Temperature temperature) {
-	return to_string_dec_int(temperature.celsius(), 3);
+	return to_string_dec_int(use_celsius? temperature.celsius():temperature.fahrenheit(), 3);
 }
 
 std::string flags(Flags flags) {
@@ -111,15 +108,15 @@ void RecentEntriesTable<TPMSRecentEntries>::draw(
 	std::string line = tpms::format::type(entry.type) + " " + tpms::format::id(entry.id);
 
 	if( entry.last_pressure.is_valid() ) {
-		line += " " + tpms::format::pressure(entry.last_pressure.value());
+		line += "  " + tpms::format::pressure(entry.last_pressure.value());
 	} else {
-		line += " " "   ";
+		line += "  " "   ";
 	}
 
 	if( entry.last_temperature.is_valid() ) {
-		line += " " + tpms::format::temperature(entry.last_temperature.value());
+		line += "  " + tpms::format::temperature(entry.last_temperature.value());
 	} else {
-		line += " " "   ";
+		line += "  " "   ";
 	}
 
 	if( entry.received_count > 999 ) {
@@ -145,10 +142,12 @@ TPMSAppView::TPMSAppView(NavigationView&) {
 		&rssi,
 		&channel,
 		&options_band,
+		&options_pressure,
+		&options_temperature,	
 		&field_rf_amp,
 		&field_lna,
 		&field_vga,
-		&options_type,
+		&recent_entries_view
 	});
 
 	// load app settings
@@ -181,20 +180,23 @@ TPMSAppView::TPMSAppView(NavigationView&) {
 	};
 	options_band.set_by_value(target_frequency());
 
-	options_type.on_change = [this](size_t, int32_t i) {		
-		if (i == 0){
-			tpms::format::use_kpa = true;
-		} else if (i == 1){
-			tpms::format::use_kpa = false;
-		}	
-		update_type();
+	options_pressure.on_change = [this](size_t, int32_t i) {		
+		tpms::format::use_kpa = !i;
+		update_view();
 	};
 
-	options_type.set_selected_index(0, true);
+	options_pressure.set_selected_index(0, true);
+
+	options_temperature.on_change = [this](size_t, int32_t i) {		
+		tpms::format::use_celsius = !i;
+		update_view();
+	};
+
+	options_temperature.set_selected_index(0, true);
 
 	logger = std::make_unique<TPMSLogger>();
 	if( logger ) {
-		logger->append(u"tpms.txt");
+		logger->append( LOG_ROOT_DIR "/TPMS.TXT" );
 	}
 }
 
@@ -214,16 +216,8 @@ void TPMSAppView::focus() {
 	options_band.focus();
 }
 
-void TPMSAppView::update_type() {
-	if (tpms::format::use_kpa){
-		remove_child(&recent_entries_view_psi);
-		add_child(&recent_entries_view_kpa);
-		recent_entries_view_kpa.set_parent_rect(view_normal_rect);
-	} else {
-		remove_child(&recent_entries_view_kpa);
-		add_child(&recent_entries_view_psi);
-		recent_entries_view_psi.set_parent_rect(view_normal_rect);
-	}	
+void TPMSAppView::update_view() {
+	recent_entries_view.set_parent_rect(view_normal_rect);
 }
 
 void TPMSAppView::set_parent_rect(const Rect new_parent_rect) {
@@ -231,7 +225,7 @@ void TPMSAppView::set_parent_rect(const Rect new_parent_rect) {
 
 	view_normal_rect  = { 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height };
 
-	update_type();
+	update_view();
 }
 
 void TPMSAppView::on_packet(const tpms::Packet& packet) {
@@ -244,23 +238,13 @@ void TPMSAppView::on_packet(const tpms::Packet& packet) {
 		const auto reading = reading_opt.value();
 		auto& entry = ::on_packet(recent, TPMSRecentEntry::Key { reading.type(), reading.id() });
 		entry.update(reading);
-		
-		if(tpms::format::use_kpa){
-			recent_entries_view_kpa.set_dirty();
-		} else {
-			recent_entries_view_psi.set_dirty();
-		}
+		recent_entries_view.set_dirty();
 	}
 }
 
 void TPMSAppView::on_show_list() {
-	if(tpms::format::use_kpa){
-		recent_entries_view_kpa.hidden(false);
-		recent_entries_view_kpa.focus();
-	} else {
-		recent_entries_view_psi.hidden(false);
-		recent_entries_view_psi.focus();
-	}
+	recent_entries_view.hidden(false);
+	recent_entries_view.focus();
 }
 
 void TPMSAppView::on_band_changed(const uint32_t new_band_frequency) {

firmware/application/apps/tpms_app.hpp

@@ -144,7 +144,7 @@ private:
 		}
 	};
 
-	OptionsField options_type {
+	OptionsField options_pressure {
 		{ 5 * 8, 0 * 16 },
 		3,
 		{
@@ -153,6 +153,15 @@ private:
 		}
 	};
 
+	OptionsField options_temperature {
+		{ 9 * 8, 0 * 16 },
+		1,
+		{
+			{ "C", 0 },
+			{ "F", 1 }
+		}
+	};
+
 	RFAmpField field_rf_amp {
 		{ 13 * 8, 0 * 16 }
 	};
@@ -168,31 +177,21 @@ private:
 	TPMSRecentEntries recent { };
 	std::unique_ptr<TPMSLogger> logger { };
 
-	const RecentEntriesColumns columns_kpa { {
+	const RecentEntriesColumns columns { {
 		{ "Tp", 2 },
 		{ "ID", 8 },
-		{ "kPa", 3 },
-		{ "C", 3 },
+		{ "Pres", 4 },
+		{ "Temp", 4 },
 		{ "Cnt", 3 },
 		{ "Fl", 2 },
 	} };
-	TPMSRecentEntriesView recent_entries_view_kpa { columns_kpa, recent };
-
-	const RecentEntriesColumns columns_psi { {
-		{ "Tp", 2 },
-		{ "ID", 8 },
-		{ "PSI", 3 },
-		{ "C", 3 },
-		{ "Cnt", 3 },
-		{ "Fl", 2 },
-	} };
-	TPMSRecentEntriesView recent_entries_view_psi { columns_psi, recent };
+	TPMSRecentEntriesView recent_entries_view { columns, recent };
 
 	uint32_t target_frequency_ = initial_target_frequency;
 
 	void on_packet(const tpms::Packet& packet);
 	void on_show_list();
-	void update_type();
+	void update_view();
 
 	void on_band_changed(const uint32_t new_band_frequency);
 

firmware/application/apps/ui_adsb_rx.cpp

@@ -351,7 +351,7 @@ void ADSBRxView::sort_entries_by_state()
 }
 
 void ADSBRxView::on_frame(const ADSBFrameMessage * message) {
-	logger = std::make_unique<ADSBLogger>();
+   	logger = std::make_unique<ADSBLogger>();
 	rtc::RTC datetime;
 	std::string callsign;
 	std::string str_info;
@@ -422,6 +422,7 @@ void ADSBRxView::on_frame(const ADSBFrameMessage * message) {
 			} else if(msg_type == AIRBORNE_VEL && msg_sub >= VEL_GND_SUBSONIC && msg_sub <= VEL_AIR_SUPERSONIC){
 				entry.set_frame_velo(frame);
 				if (logger) {
+					logger->append( LOG_ROOT_DIR "/ADSB.TXT" );
 					logentry += "Type:" + to_string_dec_uint(msg_sub) +
 								" Hdg:" + to_string_dec_uint(entry.velo.heading) +
 								" Spd: "+ to_string_dec_int(entry.velo.speed);
@@ -432,7 +433,7 @@ void ADSBRxView::on_frame(const ADSBFrameMessage * message) {
 		} // frame.get_DF() == DF_ADSB
 
         if (logger) {
-                logger->append(u"adsb.txt");
+                logger->append( LOG_ROOT_DIR "/ADSB.TXT" );
                 // will log each frame in format:
                 // 20171103100227 8DADBEEFDEADBEEFDEADBEEFDEADBEEF ICAO:nnnnnn callsign Alt:nnnnnn Latnnn.nn Lonnnn.nn
 				logger->log_str(logentry);

firmware/application/apps/ui_afsk_rx.cpp

@@ -60,9 +60,9 @@ AFSKRxView::AFSKRxView(NavigationView& nav) {
 		&field_lna,
 		&field_vga,
 		&field_frequency,
+		&check_log,
 		&text_debug,
 		&button_modem_setup,
-		&record_view,
 		&console
 	});
 	
@@ -74,13 +74,6 @@ AFSKRxView::AFSKRxView(NavigationView& nav) {
 		field_rf_amp.set_value(app_settings.rx_amp);
 	}
 
-
-	// DEBUG
-	record_view.on_error = [&nav](std::string message) {
-		nav.display_modal("Error", message);
-	};
-	record_view.set_sampling_rate(24000);
-	
 	// Auto-configure modem for LCR RX (will be removed later)
 	update_freq(467225500);	// 462713300
 	auto def_bell202 = &modem_defs[0];
@@ -105,13 +98,18 @@ AFSKRxView::AFSKRxView(NavigationView& nav) {
 		};
 	};
 
+	check_log.set_value(logging);
+	check_log.on_select = [this](Checkbox&, bool v) {
+		logging = v;
+	};
+
 	button_modem_setup.on_select = [&nav](Button&) {
 		nav.push<ModemSetupView>();
 	};
 	
 	logger = std::make_unique<AFSKLogger>();
 	if (logger)
-		logger->append("AFSK_LOG.TXT");
+		logger->append(LOG_ROOT_DIR "/AFSK.TXT");
 	
 	// Auto-configure modem for LCR RX (will be removed later)
 	baseband::set_afsk(persistent_memory::modem_baudrate(), 8, 0, false);
@@ -153,22 +151,23 @@ void AFSKRxView::on_data(uint32_t value, bool is_data) {
 		
 		console.write(str_console);
 		
-		if (logger) str_log += str_byte;
+		if (logger && logging) str_log += str_byte;
 		
 		if ((value != 0x7F) && (prev_value == 0x7F)) {
 			// Message split
 			console.writeln("");
 			console_color++;
 			
-			if (logger) {
+			if (logger && logging) {
 				logger->log_raw_data(str_log);
 				str_log = "";
 			}
 		}
 		prev_value = value;
-	} else {
+	}
+	else {
 		// Baudrate estimation
-		text_debug.set("~" + to_string_dec_uint(value));
+		text_debug.set("Baudrate estimation: ~" + to_string_dec_uint(value));
 	}
 }
 

firmware/application/apps/ui_afsk_rx.hpp

@@ -64,6 +64,7 @@ private:
 	uint8_t console_color { 0 };
 	uint32_t prev_value { 0 };
 	std::string str_log { "" };
+	bool logging { false };
 
 	RFAmpField field_rf_amp {
 		{ 13 * 8, 0 * 16 }
@@ -85,23 +86,23 @@ private:
 		{ 0 * 8, 0 * 16 },
 	};
 	
+	Checkbox check_log {
+		{ 0 * 8, 1 * 16 },
+		3,
+		"LOG",
+		false
+	};
+
 	Text text_debug {
-		{ 0 * 8, 1 * 16, 10 * 8, 16 },
+		{ 0 * 8, 12 + 2 * 16, 240, 16 },
 		"DEBUG"
 	};
 	
-	
 	Button button_modem_setup {
-		{ 12 * 8, 1 * 16, 96, 24 },
+		{ 240 - 12 * 8, 1 * 16, 96, 24 },
 		"Modem setup"
 	};
 	
-	// DEBUG
-	RecordView record_view {
-		{ 0 * 8, 3 * 16, 30 * 8, 1 * 16 },
-		u"AFS_????", RecordView::FileType::WAV, 4096, 4
-	};
-	
 	Console console {
 		{ 0, 4 * 16, 240, 240 }
 	};

firmware/application/apps/ui_aprs_rx.cpp

@@ -143,7 +143,7 @@ APRSRxView::APRSRxView(NavigationView& nav, Rect parent_rect) : View(parent_rect
 	
 	logger = std::make_unique<APRSLogger>();
 	if (logger)
-		logger->append("APRS_RX_LOG.TXT");
+		logger->append(LOG_ROOT_DIR "/APRS.TXT");
 	
 	baseband::set_aprs(1200);
 	

firmware/application/apps/ui_aprs_rx.hpp

@@ -235,7 +235,7 @@ private:
 	// DEBUG
 	RecordView record_view {
 		{ 0 * 8, 1 * 16, 30 * 8, 1 * 16 },
-		u"AFS_????", RecordView::FileType::WAV, 4096, 4
+		u"AFS_????.WAV", u"APRS", RecordView::FileType::WAV, 4096, 4
 	};
 	
 	Console console {

firmware/application/apps/ui_btle_rx.cpp

@@ -54,9 +54,7 @@ BTLERxView::BTLERxView(NavigationView& nav) {
 		&field_lna,
 		&field_vga,
 		&field_frequency,
-		&text_debug,
 		&button_modem_setup,
-		&record_view,
 		&console
 	});
 	
@@ -68,13 +66,6 @@ BTLERxView::BTLERxView(NavigationView& nav) {
 		field_rf_amp.set_value(app_settings.rx_amp);
 	}
 
-
-	// DEBUG
-	record_view.on_error = [&nav](std::string message) {
-		nav.display_modal("Error", message);
-	};
-	record_view.set_sampling_rate(24000);
-	
 	// Auto-configure modem for LCR RX (will be removed later)
 	update_freq(2426000000);
 	auto def_bell202 = &modem_defs[0];
@@ -103,7 +94,6 @@ BTLERxView::BTLERxView(NavigationView& nav) {
 		nav.push<ModemSetupView>();
 	};
 	
-	
 	// Auto-configure modem for LCR RX (will be removed later)
 	baseband::set_btle(persistent_memory::modem_baudrate(), 8, 0, false);
 	

firmware/application/apps/ui_btle_rx.hpp

@@ -53,7 +53,6 @@ private:
 
 	uint8_t console_color { 0 };
 	uint32_t prev_value { 0 };
-	std::string str_log { "" };
 
 	RFAmpField field_rf_amp {
 		{ 13 * 8, 0 * 16 }
@@ -75,23 +74,11 @@ private:
 		{ 0 * 8, 0 * 16 },
 	};
 	
-	Text text_debug {
-		{ 0 * 8, 1 * 16, 10 * 8, 16 },
-		"DEBUG"
-	};
-	
-	
 	Button button_modem_setup {
-		{ 12 * 8, 1 * 16, 96, 24 },
+		{ 240 - 12 * 8, 1 * 16, 96, 24 },
 		"Modem setup"
 	};
 	
-	// DEBUG
-	RecordView record_view {
-		{ 0 * 8, 3 * 16, 30 * 8, 1 * 16 },
-		u"AFS_????", RecordView::FileType::WAV, 4096, 4
-	};
-	
 	Console console {
 		{ 0, 4 * 16, 240, 240 }
 	};

firmware/application/apps/ui_debug.cpp

@@ -266,7 +266,9 @@ bool ControlsSwitchesWidget::on_key(const KeyEvent key) {
 }
 
 void ControlsSwitchesWidget::paint(Painter& painter) {
-	const std::array<Rect, 7> button_rects { {
+	const auto pos = screen_pos();
+
+	const std::array<Rect, 8> button_rects { {
 		{ 64, 32, 16, 16 }, // Right
 		{  0, 32, 16, 16 }, // Left
 		{ 32, 64, 16, 16 }, // Down
@@ -274,27 +276,63 @@ void ControlsSwitchesWidget::paint(Painter& painter) {
 		{ 32, 32, 16, 16 }, // Select
 		{ 16, 96, 16, 16 }, // Encoder phase 0
 		{ 48, 96, 16, 16 }, // Encoder phase 1
+		{ 96,  0, 16, 16 }, // Dfu
 	} };
-	const auto pos = screen_pos();
-	auto switches_raw = control::debug::switches();
-	auto switches_debounced = get_switches_state().to_ulong();
-	auto switches_event = key_event_mask;
 
 	for(const auto r : button_rects) {
-		const auto c =
-			((switches_event & 1) ?
-				Color::red() :
-				((switches_debounced & 1) ?
-					Color::green() :
-					((switches_raw & 1) ?
-						Color::yellow() :
-						Color::blue()
-					)
-				)
-			);
-		painter.fill_rectangle(r + pos, c);
+		painter.fill_rectangle(r + pos, Color::blue());
+	}
+
+	const std::array<Rect, 8> raw_rects { {
+		{ 64 + 1, 32 + 1, 16 - 2, 16 - 2 }, // Right
+		{  0 + 1, 32 + 1, 16 - 2, 16 - 2 }, // Left
+		{ 32 + 1, 64 + 1, 16 - 2, 16 - 2 }, // Down
+		{ 32 + 1,  0 + 1, 16 - 2, 16 - 2 }, // Up
+		{ 32 + 1, 32 + 1, 16 - 2, 16 - 2 }, // Select
+		{ 16 + 1, 96 + 1, 16 - 2, 16 - 2 }, // Encoder phase 0
+		{ 48 + 1, 96 + 1, 16 - 2, 16 - 2 }, // Encoder phase 1
+		{ 96 + 1,  0 + 1, 16 - 2, 16 - 2 }, // Dfu
+	} };
+
+	auto switches_raw = control::debug::switches();
+	for(const auto r : raw_rects) {
+		if (switches_raw & 1)
+			painter.fill_rectangle(r + pos, Color::yellow());
+
 		switches_raw >>= 1;
+	}
+
+	const std::array<Rect, 6> debounced_rects { {
+		{ 64 + 2, 32 + 2, 16 - 4, 16 - 4 }, // Right
+		{  0 + 2, 32 + 2, 16 - 4, 16 - 4 }, // Left
+		{ 32 + 2, 64 + 2, 16 - 4, 16 - 4 }, // Down
+		{ 32 + 2,  0 + 2, 16 - 4, 16 - 4 }, // Up
+		{ 32 + 2, 32 + 2, 16 - 4, 16 - 4 }, // Select
+		{ 96 + 2,  0 + 2, 16 - 4, 16 - 4 }, // Dfu
+	} };
+
+	auto switches_debounced = get_switches_state().to_ulong();
+	for(const auto r : debounced_rects) {
+		if (switches_debounced & 1)
+			painter.fill_rectangle(r + pos, Color::green());
+
 		switches_debounced >>= 1;
+	}
+
+	const std::array<Rect, 6> events_rects { {
+		{ 64 + 3, 32 + 3, 16 - 6, 16 - 6 }, // Right
+		{  0 + 3, 32 + 3, 16 - 6, 16 - 6 }, // Left
+		{ 32 + 3, 64 + 3, 16 - 6, 16 - 6 }, // Down
+		{ 32 + 3,  0 + 3, 16 - 6, 16 - 6 }, // Up
+		{ 32 + 3, 32 + 3, 16 - 6, 16 - 6 }, // Select
+		{ 96 + 3,  0 + 3, 16 - 6, 16 - 6 }, // Dfu
+	} };
+
+	auto switches_event = key_event_mask;
+	for(const auto r : events_rects) {
+		if (switches_event & 1)
+			painter.fill_rectangle(r + pos, Color::red());
+
 		switches_event >>= 1;
 	}
 }

firmware/application/apps/ui_dfu_menu.cpp

@@ -0,0 +1,99 @@
+/*
+ * 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,
+		&text_info_line_8
+	});
+}
+
+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(shared_memory.m4_buffer_missed, 6));
+	text_info_line_8.set(to_string_dec_uint(chTimeNow()/1000, 6));
+
+	constexpr auto margin = 5;
+	constexpr auto lines = 8 + 2;
+
+	painter.fill_rectangle(
+		{
+			{6 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin},
+			{15 * CHARACTER_WIDTH + margin * 2, lines * LINE_HEIGHT + margin * 2}
+		},
+		ui::Color::black()
+	);
+
+	painter.fill_rectangle(
+		{
+			{5 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin},
+			{CHARACTER_WIDTH, lines * LINE_HEIGHT + margin * 2}
+		},
+		ui::Color::dark_cyan()
+	);
+
+	painter.fill_rectangle(
+		{
+			{21 * CHARACTER_WIDTH + margin, 3 * LINE_HEIGHT - margin},
+			{CHARACTER_WIDTH, lines * 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, (lines+3) * 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,73 @@
+/*
+ * 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 }, "M4 miss:", Color::dark_cyan() },
+		{ { 6 * CHARACTER_WIDTH,12 * 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 }, ""};
+	Text text_info_line_8 {{ 15 * CHARACTER_WIDTH,12 * LINE_HEIGHT, 5 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, ""};
+};
+
+} /* namespace ui */
+
+#endif/*__UI_DFU_MENU_H__*/

firmware/application/apps/ui_fileman.cpp

@@ -20,83 +20,199 @@
  * Boston, MA 02110-1301, USA.
  */
 
+/* TODO:
+ * - Paging menu items
+ */
+
+#include <algorithm>
 #include "ui_fileman.hpp"
 #include "string_format.hpp"
 #include "portapack.hpp"
 #include "event_m0.hpp"
 
 using namespace portapack;
+namespace fs = std::filesystem;
+
+namespace {
+using namespace ui;
+
+bool is_hidden_file(const fs::path& path) {
+	return !path.empty() && path.native()[0] == u'.';
+}
+
+// Gets a truncated name from a path for display.
+std::string truncate(const fs::path& path, size_t max_length) {
+	return ::truncate(path.string(), max_length);
+}
+
+// Gets a human readable file size string.
+std::string get_pretty_size(uint32_t file_size) {
+	static const std::string suffix[5] = { "B", "kB", "MB", "GB", "??" };
+	size_t suffix_index = 0;
+	
+	while (file_size >= 1024) {
+		file_size /= 1024;
+		suffix_index++;
+	}
+
+	if (suffix_index > 4)
+		suffix_index = 4;
+	
+	return to_string_dec_uint(file_size) + suffix[suffix_index];
+}
+
+// Case insensitive path equality on underlying "native" string.
+bool iequal(
+	const fs::path& lhs,
+	const fs::path& rhs
+) {
+	const auto& lhs_str = lhs.native();
+	const auto& rhs_str = rhs.native();
+
+	// NB: Not correct for Unicode/locales.
+	if (lhs_str.length() == rhs_str.length()) {
+		for (size_t i = 0; i < lhs_str.length(); ++i)
+			if (towupper(lhs_str[i]) != towupper(rhs_str[i]))
+				return false;
+
+		return true;
+	}
+
+	return false;
+}
+
+// Inserts the entry into the entry list sorted directories first then by file name.
+void insert_sorted(std::vector<fileman_entry>& entries, fileman_entry&& entry) {
+	auto it = std::lower_bound(std::begin(entries), std::end(entries), entry,
+		[](const fileman_entry& lhs, const fileman_entry& rhs) {
+			if (lhs.is_directory && !rhs.is_directory)
+				return true;
+			else if (!lhs.is_directory && rhs.is_directory)
+				return false;
+			else
+				return lhs.path < rhs.path;
+		});
+
+	entries.insert(it, std::move(entry));
+}
+
+// Returns the partner file path or an empty path if no partner is found.
+fs::path get_partner_file(fs::path path) {
+	if (fs::is_directory(path))
+		return { };
+
+	const fs::path txt_path{ u".TXT" };
+	const fs::path c16_path{ u".C16" };
+	auto ext = path.extension();
+
+	if (iequal(ext, txt_path))
+		ext = c16_path;
+	else if (iequal(ext, c16_path))
+		ext = txt_path;
+	else
+		return { };
+
+	path.replace_extension(ext);
+	return fs::file_exists(path) && !fs::is_directory(path) ? path : fs::path{ };
+}
+
+// Modal prompt to update the partner file if it exists.
+// Runs continuation on_partner_action to update the partner file.
+// Returns true is a partner is found, otherwise false.
+// Path must be the full path to the file.
+bool partner_file_prompt(
+	NavigationView& nav,
+	const fs::path& path,
+	std::string action_name,
+	std::function<void(const fs::path&, bool)> on_partner_action
+) {
+	auto partner = get_partner_file(path);
+
+	if (partner.empty())
+		return false;
+
+	nav.push_under_current<ModalMessageView>(
+		"Partner File",
+		partner.filename().string() + "\n" + action_name + " this file too?",
+		YESNO,
+		[&nav, partner, on_partner_action](bool choice) {
+			if (on_partner_action)
+				on_partner_action(partner, choice);
+		}
+	);
+
+	return true;
+}
+
+fs::path get_unique_filename(const fs::path& path, const fs::path& file) {
+	auto stem = file.stem();
+	auto ext = file.extension();
+	auto serial = 1;
+	fs::path new_path = file;
+
+	while (fs::file_exists(path / new_path)) {
+		new_path = stem;
+		new_path += fs::path{ u"_" };
+		new_path += to_string_dec_int(serial++);
+		new_path += ext;
+	}
+
+	return new_path;
+}
+
+}
 
 namespace ui {
 
-void FileManBaseView::load_directory_contents(const std::filesystem::path& dir_path) {
+/* FileManBaseView ***********************************************************/
+
+void FileManBaseView::load_directory_contents(const fs::path& dir_path) {
 	current_path = dir_path;
-	
-	text_current.set(dir_path.string().length()? dir_path.string().substr(0, 30 - 6):"(sd root)");
-
 	entry_list.clear();
-	
-	auto filtering = (bool)extension_filter.size();
-	
-	// List directories and files, put directories up top
-	if (dir_path.string().length())
-		entry_list.push_back({ u"..", 0, true });
+	auto filtering = !extension_filter.empty();
 
-	for (const auto& entry : std::filesystem::directory_iterator(dir_path, u"*")) {
+	text_current.set(dir_path.empty() ? "(sd root)" : truncate(dir_path, 24));
+	
+	for (const auto& entry : fs::directory_iterator(dir_path, u"*")) {
+		// Hide files starting with '.' (hidden / tmp).
+		if (is_hidden_file(entry.path()))
+			continue;
 
-		// do not display dir / files starting with '.' (hidden / tmp)
-		if (entry.path().string().length() && entry.path().filename().string()[0] != '.') {
-			if (std::filesystem::is_regular_file(entry.status())) {
-				bool matched = true;
-				if (filtering) {
-					auto entry_extension = entry.path().extension().string();
-				
-					for (auto &c: entry_extension)
-						c = toupper(c);
-					
-					if (entry_extension != extension_filter)
-						matched = false;
-				}
-				
-				if (matched)
-					entry_list.push_back({ entry.path(), (uint32_t)entry.size(), false });
-			} else if (std::filesystem::is_directory(entry.status())) {
-				entry_list.insert(entry_list.begin(), { entry.path(), 0, true });
-			}
+		if (fs::is_regular_file(entry.status())) {
+			if (!filtering || iequal(entry.path().extension(), extension_filter))
+				insert_sorted(entry_list, { entry.path(), (uint32_t)entry.size(), false });
+		} else if (fs::is_directory(entry.status())) {
+			insert_sorted(entry_list, { entry.path(), 0, true });
 		}
 	}
+
+	// Add "parent" directory if not at the root.
+	if (!dir_path.empty())
+		entry_list.insert(entry_list.begin(), { parent_dir_path, 0, true });
 }
 
-std::filesystem::path FileManBaseView::get_selected_path() {
-	auto selected_path_str = current_path.string();
-	auto entry_path = entry_list[menu_view.highlighted_index()].entry_path.string();
-	
-	if (entry_path == "..") {
-		selected_path_str = get_parent_dir().string();
-	} else {
-		if (selected_path_str.back() != '/')
-			selected_path_str += '/';
-		
-		selected_path_str += entry_path;
-	}
-	
-	return selected_path_str;
+fs::path FileManBaseView::get_selected_full_path() const {
+	if (get_selected_entry().path == parent_dir_path)
+		return current_path.parent_path();
+
+	return current_path / get_selected_entry().path;
 }
 
-std::filesystem::path FileManBaseView::get_parent_dir() {
-	auto current_path_str = current_path.string();
-	return current_path.string().substr(0, current_path_str.find_last_of('/'));
+const fileman_entry& FileManBaseView::get_selected_entry() const {
+	// TODO: return reference to an "empty" entry on OOB?
+	return entry_list[menu_view.highlighted_index()];
 }
 
 FileManBaseView::FileManBaseView(
 	NavigationView& nav,
 	std::string filter
-) : nav_ (nav),
-	extension_filter { filter }
+) : nav_{ nav },
+	extension_filter{ filter }
 {
 	add_children({
 		&labels,
 		&text_current,
+		&text_info,
 		&button_exit
 	});
 
@@ -105,121 +221,117 @@ FileManBaseView::FileManBaseView(
 	};
 
 	if (!sdcIsCardInserted(&SDCD1)) {
-		empty_root=true;
+		empty_ = EmptyReason::NoSDC;
 		text_current.set("NO SD CARD!");
+		return;
+	}
+	
+	load_directory_contents(current_path);
+
+	if (!entry_list.size()) {
+		empty_ = EmptyReason::NoFiles;
+		text_current.set("EMPTY SD CARD!");
 	} else {
-		load_directory_contents(current_path);
-		if (!entry_list.size())
-		{
-			empty_root = true;
-			text_current.set("EMPTY SD CARD!");
-		} else {
-			menu_view.on_left = [&nav, this]() {
-				load_directory_contents(get_parent_dir());
-				refresh_list();
-			};
-		}
+		menu_view.on_left = [this]() {
+			pop_dir();
+		};
 	}
 }
 
 void FileManBaseView::focus() {
-	if (empty_root) {
+	if (empty_ != EmptyReason::NotEmpty) {
 		button_exit.focus();
 	} else {
 		menu_view.focus();
 	}
 }
 
+void FileManBaseView::push_dir(const fs::path& path) {
+	if (path == parent_dir_path) {
+		pop_dir();
+	} else {
+		current_path /= path;
+		saved_index_stack.push_back(menu_view.highlighted_index());
+		menu_view.set_highlighted(0);
+		reload_current();
+	}
+}
+
+void FileManBaseView::pop_dir() {
+	if (saved_index_stack.empty())
+		return;
+
+	current_path = current_path.parent_path();
+	reload_current();
+	menu_view.set_highlighted(saved_index_stack.back());
+	saved_index_stack.pop_back();
+}
+
 void FileManBaseView::refresh_list() {
 	if (on_refresh_widgets)
 		on_refresh_widgets(false);
 
+	auto prev_highlight = menu_view.highlighted_index();
 	menu_view.clear();
 	
-	for (size_t n = 0; n < entry_list.size(); n++) {
-		auto entry = &entry_list[n];
-		auto entry_name = entry->entry_path.filename().string().substr(0, 20);
-		
-		if (entry->is_directory) {
-			
+	for (const auto& entry : entry_list) {
+		auto entry_name = truncate(entry.path, 20);
+	
+		if (entry.is_directory) {
 			menu_view.add_item({
 				entry_name,
 				ui::Color::yellow(),
 				&bitmap_icon_dir,
-				[this](){
+				[this](KeyEvent key) {
 					if (on_select_entry)
-						on_select_entry();
+						on_select_entry(key);
 				}
 			});
-			
+	
 		} else {
-			
-			auto file_size = entry->size;
-			size_t suffix_index = 0;
-			
-			while (file_size >= 1024) {
-				file_size /= 1024;
-				suffix_index++;
-			}
-			if (suffix_index > 4)
-				suffix_index = 4;
-			
-			std::string size_str = to_string_dec_uint(file_size) + suffix[suffix_index];
-			
-			auto entry_extension = entry->entry_path.extension().string();
-			for (auto &c: entry_extension)
-				c = toupper(c);
-			
-			// Associate extension to icon and color
-			size_t c;
-			for (c = 0; c < file_types.size() - 1; c++) {
-				if (entry_extension == file_types[c].extension)
-					break;
-			}
+			const auto& assoc = get_assoc(entry.path.extension());
+			auto size_str = get_pretty_size(entry.size);
 			
 			menu_view.add_item({
 				entry_name + std::string(21 - entry_name.length(), ' ') + size_str,
-				file_types[c].color,
-				file_types[c].icon,
-				[this](){
+				assoc.color,
+				assoc.icon,
+				[this](KeyEvent key) {
 					if (on_select_entry)
-						on_select_entry();
+						on_select_entry(key);
 				}
 			});
-			
 		}
+
+		// HACK: Should page menu items instead of limiting the number. 
+		if (menu_view.item_count() >= max_items_shown)
+			break;
 	}
-	
-	menu_view.set_highlighted(0);	// Refresh
+
+	text_info.set(menu_view.item_count() >= max_items_shown ? "Too many files!" : "");
+	menu_view.set_highlighted(prev_highlight);
 }
 
-/*void FileSaveView::on_save_name() {
-	text_prompt(nav_, &filename_buffer, 8, [this](std::string * buffer) {
-		nav_.pop();
-	});
+void FileManBaseView::reload_current() {
+	load_directory_contents(current_path);
+	refresh_list();
 }
-FileSaveView::FileSaveView(
-	NavigationView& nav
-) : FileManBaseView(nav)
+
+const FileManBaseView::file_assoc_t& FileManBaseView::get_assoc(
+	const fs::path& ext) const
 {
-	name_buffer.clear();
-	
-	add_children({
-		&text_save,
-		&button_save_name,
-		&live_timestamp
-	});
-	
-	button_save_name.on_select = [this, &nav](Button&) {
-		on_save_name();
-	};
-}*/
+	size_t index = 0;
 
-void FileLoadView::refresh_widgets(const bool v) {
-	(void)v; //avoid unused warning
-	set_dirty();
+	for (; index < file_types.size() - 1; ++index)
+		if (iequal(ext, file_types[index].extension))
+			return file_types[index];
+
+	// Default to last entry in the list.
+	return file_types[index];
 }
 
+/* FileLoadView **************************************************************/
+
 FileLoadView::FileLoadView(
 	NavigationView& nav,
 	std::string filter
@@ -238,104 +350,268 @@ FileLoadView::FileLoadView(
 	
 	refresh_list();
 	
-	on_select_entry = [&nav, this]() {
-		if (entry_list[menu_view.highlighted_index()].is_directory) {
-			load_directory_contents(get_selected_path());
-			refresh_list();
+	on_select_entry = [this](KeyEvent) {
+		if (get_selected_entry().is_directory) {
+			push_dir(get_selected_entry().path);
 		} else {
 			nav_.pop();
 			if (on_changed)
-				on_changed(current_path.string() + '/' + entry_list[menu_view.highlighted_index()].entry_path.string());
+				on_changed(get_selected_full_path());
 		}
 	};
 }
 
-void FileManagerView::on_rename(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);
-		load_directory_contents(current_path);
-		refresh_list();
+void FileLoadView::refresh_widgets(const bool) {
+	set_dirty();
+}
+
+/* FileSaveView **************************************************************/
+/*
+FileSaveView::FileSaveView(
+	NavigationView& nav,
+	const fs::path& path,
+	const fs::path& file
+) : nav_{ nav },
+	path_{ path },
+	file_{ file }
+{
+	add_children({
+		&labels,
+		&text_path,
+		&button_edit_path,
+		&text_name,
+		&button_edit_name,
+		&button_save,
+		&button_cancel,
 	});
+	
+	button_edit_path.on_select = [this](Button&) {
+		buffer_ = path_.string();
+		text_prompt(nav_, buffer_, max_filename_length,
+			[this](std::string&) {
+				path_ = buffer_;
+				refresh_widgets();
+			});
+	};
+
+	button_edit_name.on_select = [this](Button&) {
+		buffer_ = file_.string();
+		text_prompt(nav_, buffer_, max_filename_length,
+			[this](std::string&) {
+				file_ = buffer_;
+				refresh_widgets();
+			});
+	};
+
+	button_save.on_select = [this](Button&) {
+		if (on_save)
+			on_save(path_ / file_);
+		else
+			nav_.pop();
+	};
+
+	button_cancel.on_select = [this](Button&) {
+		nav_.pop();
+	};
+
+	refresh_widgets();
+}
+
+void FileSaveView::refresh_widgets() {
+	text_path.set(truncate(path_, 30));
+	text_name.set(truncate(file_, 30));
+	set_dirty();
+}
+*/
+/* FileManagerView ***********************************************************/
+
+void FileManagerView::on_rename() {
+	auto& entry = get_selected_entry();
+	name_buffer = entry.path.filename().string();
+	uint32_t cursor_pos = (uint32_t)name_buffer.length();
+
+	if (auto pos = name_buffer.find_last_of(".");
+		pos != name_buffer.npos && !entry.is_directory)
+		cursor_pos = pos;
+
+	text_prompt(nav_, name_buffer, cursor_pos, max_filename_length,
+		[this](std::string& renamed) {
+			auto renamed_path = fs::path{ renamed };
+			rename_file(get_selected_full_path(), current_path / renamed_path);
+
+			auto has_partner = partner_file_prompt(nav_, get_selected_full_path(), "Rename",
+				[this, renamed_path](const fs::path& partner, bool should_rename) mutable {
+					if (should_rename) {
+						auto new_name = renamed_path.replace_extension(partner.extension());
+						rename_file(partner, current_path / new_name);
+					}
+					reload_current();
+				}
+			);
+
+			if (!has_partner)
+				reload_current();
+		});
 }
 
 void FileManagerView::on_delete() {
-	delete_file(get_selected_path());
-	load_directory_contents(current_path);
-	refresh_list();
+	auto name = get_selected_entry().path.filename().string();
+	nav_.push<ModalMessageView>("Delete", "Delete " + name + "\nAre you sure?", YESNO,
+		[this](bool choice) {
+			if (choice) {
+				delete_file(get_selected_full_path());
+
+				auto has_partner = partner_file_prompt(
+					nav_, get_selected_full_path(), "Delete",
+					[this](const fs::path& partner, bool should_delete) {
+						if (should_delete)
+							delete_file(partner);
+						reload_current();
+					}
+				);
+
+				if (!has_partner)
+					reload_current();
+			}
+		}
+	);
+}
+
+void FileManagerView::on_new_dir() {
+	name_buffer = "";
+	text_prompt(nav_, name_buffer, max_filename_length, [this](std::string& dir_name) {
+		make_new_directory(current_path / dir_name);
+		reload_current();
+	});
+}
+
+void FileManagerView::on_new_file() {
+	name_buffer = "";
+	text_prompt(nav_, name_buffer, max_filename_length, [this](std::string& file_name) {
+		make_new_file(current_path / file_name);
+		reload_current();
+	});
+}
+
+void FileManagerView::on_paste() {
+	// TODO: handle partner file. Need to fix nav stack first.
+	auto new_name = get_unique_filename(current_path, clipboard_path.filename());
+	fs::filesystem_error result;
+
+	if (clipboard_mode == ClipboardMode::Cut)
+		result = rename_file(clipboard_path, current_path / new_name);
+
+	else if (clipboard_mode == ClipboardMode::Copy)
+		result = copy_file(clipboard_path, current_path / new_name);
+
+	if (result.code() != FR_OK)
+		nav_.display_modal("Paste Failed", result.what());
+	
+	clipboard_path = fs::path{ };
+	clipboard_mode = ClipboardMode::None;
+	menu_view.focus();
+	reload_current();
+}
+
+bool FileManagerView::selected_is_valid() const {
+	return !entry_list.empty() &&
+		get_selected_entry().path != parent_dir_path;
 }
 
 void FileManagerView::refresh_widgets(const bool v) {
 	button_rename.hidden(v);
-	button_new_dir.hidden(v);
 	button_delete.hidden(v);
-	set_dirty();
-}
+	button_cut.hidden(v);
+	button_copy.hidden(v);
+	button_paste.hidden(v);
+	button_new_dir.hidden(v);
+	button_new_file.hidden(v);
 
-FileManagerView::~FileManagerView() {
-	// Flush ?
+	set_dirty();
 }
 
 FileManagerView::FileManagerView(
 	NavigationView& nav
 ) : FileManBaseView(nav, "")
 {
-	if (!empty_root) {
-		on_refresh_widgets = [this](bool v) {
-			refresh_widgets(v);
-		};
-		
-		add_children({
-			&menu_view,
-			&labels,
-			&text_date,
-			&button_rename,
-			&button_new_dir,
-			&button_delete
-		});
-		
-		menu_view.on_highlight = [this]() {
-			text_date.set(to_string_FAT_timestamp(file_created_date(get_selected_path())));
-		};
-		
-		refresh_list();
-		
-		on_select_entry = [this]() {
-			if (entry_list[menu_view.highlighted_index()].is_directory) {
-				load_directory_contents(get_selected_path());
-				refresh_list();
-			} else
-				button_rename.focus();
-		};
-		
-		button_new_dir.on_select = [this, &nav](Button&) {
-			name_buffer.clear();
-			
-			text_prompt(nav, name_buffer, max_filename_length, [this](std::string& buffer) {
-				make_new_directory(current_path.string() + '/' + buffer);
-				load_directory_contents(current_path);
-				refresh_list();
-			});
-		};
-		
-		button_rename.on_select = [this, &nav](Button&) {
-			name_buffer = entry_list[menu_view.highlighted_index()].entry_path.filename().string().substr(0, max_filename_length);
-			on_rename(nav);
-		};
-		
-		button_delete.on_select = [this, &nav](Button&) {
-			// Use display_modal ?
-			nav.push<ModalMessageView>("Delete", "Delete " + entry_list[menu_view.highlighted_index()].entry_path.filename().string() + "\nAre you sure?", YESNO,
-				[this](bool choice) {
-					if (choice)
-						on_delete();
-				}
-			);
-		};
-	} 
+	// Don't bother with the UI in the case of no SDC.
+	if (empty_ == EmptyReason::NoSDC)
+		return;
+
+	on_refresh_widgets = [this](bool v) {
+		refresh_widgets(v);
+	};
+	
+	add_children({
+		&menu_view,
+		&labels,
+		&text_date,
+		&button_rename,
+		&button_delete,
+		&button_cut,
+		&button_copy,
+		&button_paste,
+		&button_new_dir,
+		&button_new_file
+	});
+	
+	menu_view.on_highlight = [this]() {
+	if (selected_is_valid())
+		text_date.set(to_string_FAT_timestamp(file_created_date(get_selected_full_path())));
+	else
+	text_date.set("");
+	};
+	
+	refresh_list();
+
+	on_select_entry = [this](KeyEvent key) {
+		if (key == KeyEvent::Select && get_selected_entry().is_directory) {
+			push_dir(get_selected_entry().path);
+		} else {
+			button_rename.focus();
+		}
+	};
+	
+	button_rename.on_select = [this]() {
+		if (selected_is_valid())
+			on_rename();
+	};
+
+	button_delete.on_select = [this]() {
+		if (selected_is_valid())
+			on_delete();
+	};
+
+	button_cut.on_select = [this]() {
+		if (selected_is_valid() && !get_selected_entry().is_directory) {
+			clipboard_path = get_selected_full_path();
+			clipboard_mode = ClipboardMode::Cut;
+		} else
+			nav_.display_modal("Cut", "Can't cut that.");
+	};
+
+	button_copy.on_select = [this]() {
+		if (selected_is_valid() && !get_selected_entry().is_directory) {
+			clipboard_path = get_selected_full_path();
+			clipboard_mode = ClipboardMode::Copy;
+		} else
+			nav_.display_modal("Copy", "Can't copy that.");
+	};
+
+	button_paste.on_select = [this]() {
+		if (clipboard_mode != ClipboardMode::None)
+			on_paste();
+		else
+			nav_.display_modal("Paste", "Cut or copy a file first.");
+	};
+
+	button_new_dir.on_select = [this]() {
+		on_new_dir();
+	};
+
+	button_new_file.on_select = [this]() {
+		on_new_file();
+	};
 }
 
 }

firmware/application/apps/ui_fileman.hpp

@@ -31,11 +31,23 @@
 namespace ui {
 
 struct fileman_entry {
-	std::filesystem::path entry_path { };
+	std::filesystem::path path { };
 	uint32_t size { };
 	bool is_directory { };
 };
 
+enum class EmptyReason : uint8_t {
+	NotEmpty,
+	NoFiles,
+	NoSDC
+};
+
+enum class ClipboardMode : uint8_t {
+	None,
+	Cut,
+	Copy
+};
+
 class FileManBaseView : public View {
 public:
 	FileManBaseView(
@@ -43,50 +55,58 @@ public:
 		std::string filter
 	);
 
-	void focus() override;
-	
-	void load_directory_contents(const std::filesystem::path& dir_path);
-	std::filesystem::path get_selected_path();
-	
+	virtual ~FileManBaseView() { }
+
+	void focus() override;	
 	std::string title() const override { return "Fileman"; };
+	void push_dir(const std::filesystem::path& path);
 	
 protected:
-	NavigationView& nav_;
-	
-	static constexpr size_t max_filename_length = 30 - 2;
-	
-	const std::string suffix[5] = { "B", "kB", "MB", "GB", "??" };
-	
+	static constexpr size_t max_filename_length = 64;
+	static constexpr size_t max_items_shown = 100;
+
 	struct file_assoc_t {
-		std::string extension;
+		std::filesystem::path extension;
 		const Bitmap* icon;
 		ui::Color color;
 	};
 	
 	const std::vector<file_assoc_t> file_types = {
-		{ ".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() },
-		{ ".WAV", &bitmap_icon_file_wav, ui::Color::dark_magenta() },
-		{ "", &bitmap_icon_file, ui::Color::light_grey() }
+		{ u".TXT", &bitmap_icon_file_text, ui::Color::white() },
+		{ u".PNG", &bitmap_icon_file_image, ui::Color::green() },
+		{ u".BMP", &bitmap_icon_file_image, ui::Color::green() },
+		{ u".C8",  &bitmap_icon_file_iq, ui::Color::dark_cyan() },
+		{ u".C16", &bitmap_icon_file_iq, ui::Color::dark_cyan() },
+		{ u".WAV", &bitmap_icon_file_wav, ui::Color::dark_magenta() },
+		{ u"", &bitmap_icon_file, ui::Color::light_grey() } // NB: Must be last.
 	};
-	
-	bool empty_root { false };
-	std::function<void(void)> on_select_entry { nullptr };
-	std::function<void(bool)> on_refresh_widgets { nullptr };
-	std::vector<fileman_entry> entry_list { };
-	std::filesystem::path current_path { u"" };
-	std::string extension_filter { "" };
-	
-	void change_category(int32_t category_id);
-	std::filesystem::path get_parent_dir();
+
+	std::filesystem::path get_selected_full_path() const;
+	const fileman_entry& get_selected_entry() const;
+
+	void pop_dir();
 	void refresh_list();
+	void reload_current();
+	void load_directory_contents(const std::filesystem::path& dir_path);
+	const file_assoc_t& get_assoc(const std::filesystem::path& ext) const;
+
+	NavigationView& nav_;
+
+	EmptyReason empty_ { EmptyReason::NotEmpty };
+	std::function<void(KeyEvent)> on_select_entry { nullptr };
+	std::function<void(bool)> on_refresh_widgets { nullptr };
+
+	const std::filesystem::path parent_dir_path { u".." };
+	std::filesystem::path current_path { u"" };
+	std::filesystem::path extension_filter { u"" };
+
+	std::vector<fileman_entry> entry_list { };
+	std::vector<uint32_t> saved_index_stack { };
 	
 	Labels labels {
 		{ { 0, 0 }, "Path:", Color::light_grey() }
 	};
+
 	Text text_current {
 		{ 6 * 8, 0 * 8, 24 * 8, 16 },
 		"",
@@ -96,57 +116,109 @@ protected:
 		{ 0, 2 * 8, 240, 26 * 8 },
 		true
 	};
+
+	// HACK: for item count limit.
+	Text text_info {
+		{ 1 * 8, 35 * 8, 15 * 8, 16 },
+		""
+	};
 	
 	Button button_exit {
-		{ 16 * 8, 34 * 8, 14 * 8, 32 },
+		{ 21 * 8, 34 * 8, 9 * 8, 32 },
 		"Exit"
 	};
 };
 
-/*class FileSaveView : public FileManBaseView {
-public:
-	FileSaveView(NavigationView& nav);
-	~FileSaveView();
-
-private:
-	std::string name_buffer { };
-	
-	void on_save_name();
-	
-	Text text_save {
-		{ 4 * 8, 15 * 8, 8 * 8, 16 },
-		"Save as:",
-	};
-	Button button_save_name {
-		{ 4 * 8, 18 * 8, 12 * 8, 32 },
-		"Name (set)"
-	};
-	LiveDateTime live_timestamp {
-		{ 17 * 8, 24 * 8, 11 * 8, 16 }
-	};
-};*/
-
 class FileLoadView : public FileManBaseView {
 public:
 	std::function<void(std::filesystem::path)> on_changed { };
 	
 	FileLoadView(NavigationView& nav, std::string filter);
+	virtual ~FileLoadView() { }
 
 private:
 	void refresh_widgets(const bool v);
 };
 
+/*
+// It would be nice to be able to launch FileLoadView
+// but it will OOM if launched from within FileManager.
+class FileSaveView : public View {
+public:
+	FileSaveView(
+		NavigationView& nav,
+		const std::filesystem::path& path,
+		const std::filesystem::path& file);
+
+	std::function<void(std::filesystem::path)> on_save { };
+
+private:
+	static constexpr size_t max_filename_length = 64;
+
+	void refresh_widgets();
+
+	NavigationView& nav_;
+	std::filesystem::path path_;
+	std::filesystem::path file_;
+	std::string buffer_ { };
+
+	Labels labels {
+		{ { 0 * 8, 1 * 16 }, "Path:", Color::light_grey() },
+		{ { 0 * 8, 6 * 16 }, "Filename:", Color::light_grey() },
+	};
+
+	Text text_path {
+		{ 0 * 8, 2 * 16, 30 * 8, 16 },
+		"",
+	};
+
+	Button button_edit_path {
+		{ 18 * 8, 3 * 16, 11 * 8, 32 },
+		"Edit Path"
+	};
+
+	Text text_name {
+		{ 0 * 8, 7 * 16, 30 * 8, 16 },
+		"",
+	};
+
+	Button button_edit_name {
+		{ 18 * 8, 8 * 16, 11 * 8, 32 },
+		"Edit Name"
+	};
+
+	Button button_save {
+		{ 10 * 8, 16 * 16, 9 * 8, 32 },
+		"Save"
+	};
+
+	Button button_cancel {
+		{ 20 * 8, 16 * 16, 9 * 8, 32 },
+		"Cancel"
+	};
+};
+*/
+
 class FileManagerView : public FileManBaseView {
 public:
 	FileManagerView(NavigationView& nav);
-	~FileManagerView();
+	virtual ~FileManagerView() { }
 
 private:
+	// Passed by ref to other views needing lifetime extension.
 	std::string name_buffer { };
+	std::filesystem::path clipboard_path { };
+	ClipboardMode clipboard_mode { ClipboardMode::None }; 
 	
 	void refresh_widgets(const bool v);
-	void on_rename(NavigationView& nav);
+	void on_rename();
 	void on_delete();
+	void on_paste();
+	void on_new_dir();
+	void on_new_file();
+
+	// True if the selected entry is a real file item.
+	bool selected_is_valid() const;
 	
 	Labels labels {
 		{ { 0, 26 * 8 }, "Created ", Color::light_grey() }
@@ -157,20 +229,54 @@ private:
 		""
 	};
 
-	Button button_rename {
-		{ 0 * 8, 29 * 8, 14 * 8, 32 },
-		"Rename"
+	NewButton button_rename {
+		{ 0 * 8, 29 * 8, 4 * 8, 32 },
+		{ },
+		&bitmap_icon_rename,
+		Color::dark_blue()
 	};
-	Button button_delete {
-		{ 16 * 8, 29 * 8, 14 * 8, 32 },
-		"Delete"
+
+	NewButton button_delete {
+		{ 4 * 8, 29 * 8, 4 * 8, 32 },
+		{ },
+		&bitmap_icon_trash,
+		Color::red()
 	};
-	
-	Button button_new_dir {
-		{ 0 * 8, 34 * 8, 14 * 8, 32 },
-		"New dir"
+
+	NewButton button_cut {
+		{ 9 * 8, 29 * 8, 4 * 8, 32 },
+		{ },
+		&bitmap_icon_cut,
+		Color::dark_grey()
+	};
+
+	NewButton button_copy {
+		{ 13 * 8, 29 * 8, 4 * 8, 32 },
+		{ },
+		&bitmap_icon_copy,
+		Color::dark_grey()
+	};
+
+	NewButton button_paste {
+		{ 17 * 8, 29 * 8, 4 * 8, 32 },
+		{ },
+		&bitmap_icon_paste,
+		Color::dark_grey()
+	};
+
+	NewButton button_new_dir {
+		{ 22 * 8, 29 * 8, 4 * 8, 32 },
+		{ },
+		&bitmap_icon_new_dir,
+		Color::green()
+	};
+
+	NewButton button_new_file {
+		{ 26 * 8, 29 * 8, 4 * 8, 32 },
+		{ },
+		&bitmap_icon_new_file,
+		Color::green()
 	};
-	
 };
 
 } /* namespace ui */

firmware/application/apps/ui_flash_utility.cpp

@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * 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_flash_utility.hpp"
+#include "portapack_shared_memory.hpp"
+
+namespace ui {
+
+Thread* FlashUtilityView::thread { nullptr };
+static constexpr size_t max_filename_length = 26;
+
+FlashUtilityView::FlashUtilityView(NavigationView& nav) : nav_ (nav) {
+	add_children({
+		&labels,
+		&menu_view
+	});
+
+	menu_view.set_parent_rect({ 0, 3 * 8, 240, 33 * 8 });
+
+	for (const auto& entry : std::filesystem::directory_iterator(u"FIRMWARE", u"*.bin")) {
+		auto filename = entry.path().filename();
+		auto path = entry.path().native();
+
+		menu_view.add_item({
+			filename.string().substr(0, max_filename_length),
+			ui::Color::red(),
+			&bitmap_icon_temperature,
+			[this, path](KeyEvent) {
+				this->firmware_selected(path);
+			}
+		});
+	}
+}
+
+void FlashUtilityView::firmware_selected(std::filesystem::path::string_type path) {
+	nav_.push<ModalMessageView>(
+		"Warning!",
+		"This will replace your\ncurrent firmware.\n\nIf things go wrong you are\nrequired to flash manually\nwith dfu.",
+		YESNO,
+		[this, path](bool choice) {
+			if (choice) {
+				std::u16string full_path = std::u16string(u"FIRMWARE/") + path;
+				this->flash_firmware(full_path);
+			}
+		}
+	);
+}
+
+void FlashUtilityView::flash_firmware(std::filesystem::path::string_type path) {
+	ui::Painter painter;
+		painter.fill_rectangle(
+		{ 0, 0, portapack::display.width(), portapack::display.height() },
+		ui::Color::black()
+	);
+
+	painter.draw_string({ 12, 24 }, this->nav_.style(), "This will take 15 seconds.");
+	painter.draw_string({ 12, 64 }, this->nav_.style(), "Please wait while LEDs RX");
+	painter.draw_string({ 12, 84 }, this->nav_.style(), "and TX are flashing.");
+	painter.draw_string({ 12, 124 }, this->nav_.style(), "Then restart the device.");
+
+	std::memcpy(&shared_memory.bb_data.data[0], path.c_str(), (path.length() + 1) * 2);
+	m4_init(portapack::spi_flash::image_tag_flash_utility, portapack::memory::map::m4_code, false);
+	m0_halt();
+}
+
+void FlashUtilityView::focus() {
+	menu_view.focus();
+}
+
+} /* namespace ui */

firmware/application/apps/ui_flash_utility.hpp

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * 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_FLSH_UITILTY_H__
+#define __UI_FLSH_UITILTY_H__
+
+#include "ui_widget.hpp"
+#include "ui_navigation.hpp"
+#include "string_format.hpp"
+#include "ff.h"
+#include "baseband_api.hpp"
+#include "core_control.hpp"
+
+#include <cstdint>
+
+namespace ui {
+
+class FlashUtilityView : public View {
+public:
+	FlashUtilityView(NavigationView& nav);
+
+	void focus() override;
+	
+	std::string title() const override { return "Flash Utility"; };	
+
+private:
+	NavigationView& nav_;
+	
+	bool confirmed = false;
+	static Thread* thread;
+
+	Labels labels {
+		{ { 4, 4 }, "Select firmware to flash:", Color::white() }
+	};
+
+	MenuView menu_view {
+		{ 0, 2 * 8, 240, 26 * 8 },
+		true
+	};
+
+	void firmware_selected(std::filesystem::path::string_type path);
+	void flash_firmware(std::filesystem::path::string_type path);
+};
+
+} /* namespace ui */
+
+#endif/*__UI_FLSH_UITILTY_H__*/

firmware/application/apps/ui_freqman.cpp

@@ -120,7 +120,7 @@ void FreqManBaseView::refresh_list() {
 				freqman_item_string(database[n], 30),
 				ui::Color::white(),
 				nullptr,
-				[this](){
+				[this](KeyEvent){
 					if (on_select_frequency)
 						on_select_frequency();
 				}

firmware/application/apps/ui_level.hpp

@@ -48,8 +48,6 @@ namespace ui {
 
 			void focus() override;
 
-			void big_display_freq( int64_t f );
-
 			const Style style_grey {		// level
 				.font = font::fixed_8x16,
 					.background = Color::black(),

firmware/application/apps/ui_looking_glass_app.cpp

@@ -26,10 +26,9 @@ using namespace portapack;
 
 namespace ui
 {
-
     void GlassView::focus()
     {
-        field_marker.focus();
+        button_marker.focus();
     }
 
     GlassView::~GlassView()
@@ -39,6 +38,24 @@ 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;
+    }
+
+    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;
+        if( span % width != 0 )
+        {
+            num_intervals++;
+        }
+        int64_t new_span = num_intervals * width;
+        int64_t delta_span = (new_span - span) / 2;
+        *f_min -= delta_span;
+        *f_max += delta_span;
+    }
+
     void GlassView::on_lna_changed(int32_t v_db)
     {
         receiver_model.set_lna(v_db);
@@ -49,12 +66,71 @@ namespace ui
         receiver_model.set_vga(v_db);
     }
 
-    void GlassView::add_spectrum_pixel(Color color)
+    void GlassView::reset_live_view( bool clear_screen )
     {
-        spectrum_row[pixel_index++] = color;
+        max_freq_hold = 0 ;
+        max_freq_power = -1000 ;
+        if( clear_screen )
+        {
+            // only clear screen in peak mode
+            if( live_frequency_view == 2 )
+            {
+                display.fill_rectangle( { { 0 , 108 + 16 } , { 240 , 320 - (108 + 16) } } , { 0 , 0 , 0 } );
+            }
+        }
+    }
+
+    void GlassView::add_spectrum_pixel( uint8_t power )
+    {
+        static int64_t last_max_freq = 0 ;
+
+        spectrum_row[pixel_index] = spectrum_rgb3_lut[power] ; // row of colors
+        spectrum_data[pixel_index] = ( live_frequency_integrate * spectrum_data[pixel_index] + power ) / (live_frequency_integrate + 1); // smoothing 
+        pixel_index ++ ;
+
         if (pixel_index == 240) // got an entire waterfall line
         {
-            display.draw_pixels({{0, display.scroll(1)}, {240, 1}}, spectrum_row); // new line at top, one less var, speedier
+            if( live_frequency_view > 0 )
+            {
+                constexpr int rssi_sample_range = 256;
+                constexpr float rssi_voltage_min = 0.4;
+                constexpr float rssi_voltage_max = 2.2;
+                constexpr float adc_voltage_max = 3.3;
+                constexpr int raw_min = rssi_sample_range * rssi_voltage_min / adc_voltage_max;
+                constexpr int raw_max = rssi_sample_range * rssi_voltage_max / adc_voltage_max;
+                constexpr int raw_delta = raw_max - raw_min;
+                const range_t<int> y_max_range { 0 , 320 - ( 108 + 16 ) };
+
+                //drawing and keeping track of max freq
+                for( uint16_t xpos = 0 ; xpos < 240 ; xpos ++ )
+                {
+                    // save max powerwull freq 
+                    if( spectrum_data[ xpos ] > max_freq_power )
+                    {
+                        max_freq_power = spectrum_data[ xpos ];
+                        max_freq_hold = f_min + ( (f_max - f_min) * xpos) / 240 ;
+                    }
+
+                    int16_t point = y_max_range.clip( ( ( spectrum_data[ xpos ] - raw_min ) * ( 320 - ( 108 + 16 ) ) ) / raw_delta );
+                    uint8_t color_gradient = (point * 255) / 212 ;
+                    // clear if not in peak view
+                    if( live_frequency_view != 2 )
+                    {
+                        display.fill_rectangle( { { xpos , 108 + 16 } , { 1 , 320 - point } } , { 0 , 0 , 0 } );
+                    }
+                    display.fill_rectangle( { { xpos , 320 - point } , { 1 , point } } , { color_gradient , 0 , uint8_t( 255 - color_gradient ) } );
+                } 
+                if( last_max_freq != max_freq_hold )
+                {
+                    last_max_freq = max_freq_hold ;
+                    freq_stats.set( "MAX HOLD: "+to_string_short_freq( max_freq_hold ) );
+                }
+                PlotMarker( marker );
+            }
+            else
+            {
+                display.draw_pixels({{0, display.scroll(1)}, {240, 1}}, spectrum_row); // new line at top, one less var, speedier
+            }
             pixel_index = 0;                                                       // Start New cascade line
         }
     }
@@ -63,53 +139,123 @@ namespace ui
     // Each having the radio signal power for it's corresponding frequency slot
     void GlassView::on_channel_spectrum(const ChannelSpectrum &spectrum)
     {
+        // default fast scan offset 
+        uint8_t offset = 2 ;
         baseband::spectrum_streaming_stop();
-
-        // 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
-        // All things said and done, we actually need 240 of those bins:
-        for (uint8_t bin = 0; bin < 240; bin++)
+        if( fast_scan || ( LOOKING_GLASS_SLICE_WIDTH < LOOKING_GLASS_SLICE_WIDTH_MAX ) )
         {
-            if (bin < 120)
+            // Convert bins of this spectrum slice into a representative max_power and when enough, into pixels
+            // Spectrum.db has 256 bins.
+            // All things said and done, we actually need 240 of those bins
+            for (uint8_t bin = 0; bin < 240; bin++)
             {
-                if (spectrum.db[134 + bin] > max_power) // 134
-                    max_power = spectrum.db[134 + bin];
-            }
-            else
-            {
-                if (spectrum.db[bin - 118] > max_power) // 118
-                    max_power = spectrum.db[bin - 118];
-            }
-
-            bins_Hz_size += each_bin_size; // add this bin Hz count into the "pixel fulfilled bag of Hz"
-
-            if (bins_Hz_size >= marker_pixel_step) // new pixel fullfilled
-            {
-                if (min_color_power < max_power)
-                    add_spectrum_pixel(spectrum_rgb3_lut[max_power]); // Pixel will represent max_power
-                else
-                    add_spectrum_pixel(0); // Filtered out, show black
-
-                max_power = 0;
-
-                if (!pixel_index) // Received indication that a waterfall line has been completed
+                // if the view is done in one pass, show it like in analog_audio_app
+                if( ( LOOKING_GLASS_SLICE_WIDTH < LOOKING_GLASS_SLICE_WIDTH_MAX ) )
                 {
-                    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
-                    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
-                    return;
+                    // Center 16 bins are ignored (DC spike is blanked)
+                    if (bin < 120)
+                    {
+                        if (spectrum.db[256 - 120 + bin] > max_power) // 134
+                            max_power = spectrum.db[256 - 120 + bin];
+                    }
+                    else
+                    {
+                        if (spectrum.db[ bin - 120] > max_power) // 118
+                            max_power = spectrum.db[bin - 120];
+                    }
+                }
+                else // view is made in multiple pass, use original bin picking
+                {
+                    // Center 12 bins are ignored (DC spike is blanked) Leftmost and rightmost 2 bins are ignored
+                    if (bin < 120)
+                    {
+                        if (spectrum.db[134 + bin] > max_power) // 134
+                            max_power = spectrum.db[134 + bin];
+                    }
+                    else
+                    {
+                        if (spectrum.db[bin - 118] > max_power) // 118
+                            max_power = spectrum.db[bin - 118];
+                    }
+                }
+                
+                if( bin == 120 )
+                {
+                    bins_Hz_size += 12 * each_bin_size; // add DC bin Hz count into the "pixel fulfilled bag of Hz"
+                }
+                else
+                {
+                    bins_Hz_size += each_bin_size; // add this bin Hz count into the "pixel fulfilled bag of Hz"
                 }
-                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
+                if (bins_Hz_size >= marker_pixel_step) // new pixel fullfilled
+                {
+                    if (min_color_power < max_power)
+                        add_spectrum_pixel(max_power); // Pixel will represent max_power
+                    else
+                        add_spectrum_pixel(0); // Filtered out, show black
+
+                    max_power = 0;
+
+                    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 - offset * 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
+                        return;
+                    }
+                    bins_Hz_size -= marker_pixel_step; // reset bins size, but carrying the eventual excess Hz into next pixel
+                }
+            }
+            f_center += ( 256 - ( 2 * offset ) ) * each_bin_size ; // Move into the next bandwidth slice NOTE: spectrum.sampling_rate = LOOKING_GLASS_SLICE_WIDTH
+                                                                   // lost bins are taken in account so next slice first ignored bins overlap previous kept ones
+        }
+        else //slow scan
+        { 
+            offset = 32 ;
+            uint8_t bin_length = 80 ;
+            for (uint8_t bin = offset ; bin < bin_length + offset ; bin++)
+            {
+                if (bin < 120)
+                {
+                    if (spectrum.db[134 + bin] > max_power) // 134
+                        max_power = spectrum.db[134 + bin];
+                }
+                else
+                {
+                    if (spectrum.db[bin - 118] > max_power) // 118
+                        max_power = spectrum.db[bin - 118];
+                }
+
+                bins_Hz_size += each_bin_size; // add this bin Hz count into the "pixel fulfilled bag of Hz"
+
+                if (bins_Hz_size >= marker_pixel_step) // new pixel fullfilled
+                {
+                    if (min_color_power < max_power)
+                        add_spectrum_pixel(max_power); // Pixel will represent max_power
+                    else
+                        add_spectrum_pixel(0); // Filtered out, show black
+
+                    max_power = 0;
+
+                    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 - offset * 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
+                        return;
+                    }
+                    bins_Hz_size -= marker_pixel_step; // reset bins size, but carrying the eventual excess Hz into next pixel
+                }
+            }
+            f_center +=  bin_length * 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
     }
 
@@ -127,50 +273,71 @@ namespace ui
 
     void GlassView::on_range_changed()
     {
+        reset_live_view( false );
         f_min = field_frequency_min.value();
         f_max = field_frequency_max.value();
         search_span = f_max - f_min;
-
-        field_marker.set_range(f_min, f_max);              // Move the marker between range
-        field_marker.set_value(f_min + (search_span / 2)); // Put MARKER AT MIDDLE RANGE
-        text_range.set(to_string_dec_uint(search_span));
+                                                           
+        if( locked_range )
+        {
+            button_range.set_text(">"+to_string_dec_uint(search_span)+"<");
+        }
+        else
+        {
+            button_range.set_text(" "+to_string_dec_uint(search_span)+" ");
+        }
 
         f_min = (f_min)*MHZ_DIV; // Transpose into full frequency realm
         f_max = (f_max)*MHZ_DIV;
-        search_span = search_span * MHZ_DIV;
+        adjust_range( &f_min , &f_max , 240 );
 
-        marker_pixel_step = search_span / 240;                                        // Each pixel value in Hz
-        text_marker_pm.set(to_string_dec_uint((marker_pixel_step / X2_MHZ_DIV) + 1)); // Give idea of +/- marker precision
+        marker_pixel_step = (f_max - f_min) / 240;                                        // Each pixel value in Hz
+        marker = f_min + (f_max - f_min) / 2 ;
+        button_marker.set_text( to_string_short_freq( marker ) );
+        PlotMarker( marker ); // Refresh marker on screen
 
-        int32_t marker_step = marker_pixel_step / MHZ_DIV;
-        if (!marker_step)
-            field_marker.set_step(1); // in case selected range is less than 240 (pixels)
-        else
-            field_marker.set_step(marker_step); // step needs to be a pixel wide.
-
-        f_center_ini = f_min + (LOOKING_GLASS_SLICE_WIDTH / 2); // Initial center frequency for sweep
-
-        PlotMarker(field_marker.value()); // Refresh marker on screen
-
-        f_center = f_center_ini; // Reset sweep into first slice
         pixel_index = 0;         // reset pixel counter
         max_power = 0;
         bins_Hz_size = 0; // reset amount of Hz filled up by pixels
+        if( (f_max - f_min) <= LOOKING_GLASS_SLICE_WIDTH_MAX )
+        {
+            LOOKING_GLASS_SLICE_WIDTH = (f_max - f_min) ;
+            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); 
+        }
+        if( next_mult_of( LOOKING_GLASS_SLICE_WIDTH , 256 ) > LOOKING_GLASS_SLICE_WIDTH_MAX )
+            LOOKING_GLASS_SLICE_WIDTH = LOOKING_GLASS_SLICE_WIDTH_MAX ;
+        else
+            LOOKING_GLASS_SLICE_WIDTH = next_mult_of( LOOKING_GLASS_SLICE_WIDTH , 256 );
 
+        receiver_model.set_squelch_level(0);
+        each_bin_size = LOOKING_GLASS_SLICE_WIDTH / 256 ; 
+        f_center_ini = f_min + (LOOKING_GLASS_SLICE_WIDTH / 2) ; // Initial center frequency for sweep
+        f_center = f_center_ini ; // Reset sweep into first slice
         baseband::set_spectrum(LOOKING_GLASS_SLICE_WIDTH, field_trigger.value());
         receiver_model.set_tuning_frequency(f_center_ini); // tune rx for this slice
     }
 
     void GlassView::PlotMarker(rf::Frequency pos)
     {
-        pos = pos * MHZ_DIV;
         pos -= f_min;
         pos = pos / marker_pixel_step; // Real pixel
-
-        portapack::display.fill_rectangle({0, 100, 240, 8}, Color::black());        // Clear old marker and whole marker rectangle btw
-        portapack::display.fill_rectangle({(int)pos - 2, 100, 5, 3}, Color::red()); // Red marker top
-        portapack::display.fill_rectangle({(int)pos - 1, 103, 3, 3}, Color::red()); // Red marker middle
-        portapack::display.fill_rectangle({(int)pos, 106, 1, 2}, Color::red());     // Red marker bottom
+        
+        uint8_t shift_y = 0 ;
+        if( live_frequency_view > 0 ) // plot one line down when in live view
+        {
+            shift_y = 16 ;
+        }
+        portapack::display.fill_rectangle({0, 100 + shift_y, 240, 8}, Color::black());        // Clear old marker and whole marker rectangle btw
+        portapack::display.fill_rectangle({(int)pos - 2, 100 + shift_y, 5, 3}, Color::red()); // Red marker top
+        portapack::display.fill_rectangle({(int)pos - 1, 103 + shift_y, 3, 3}, Color::red()); // Red marker middle
+        portapack::display.fill_rectangle({(int)pos, 106 + shift_y, 1, 2}, Color::red());     // Red marker bottom
     }
 
     GlassView::GlassView(
@@ -183,96 +350,116 @@ namespace ui
                       &field_frequency_max,
                       &field_lna,
                       &field_vga,
-                      &text_range,
+                      &button_range,
                       &steps_config,
+                      &scan_type,
+                      &view_config,
+                      &level_integration,
                       &filter_config,
                       &field_rf_amp,
                       &range_presets,
-                      &field_marker,
-                      &text_marker_pm,
-                      &field_trigger});
+                      &button_marker,
+                      &field_trigger,
+                      &button_jump,
+                      &button_rst,
+                      &freq_stats});
 
         load_Presets(); // Load available presets from TXT files (or default)
 
-        field_frequency_min.set_value(presets_db[0].min); // Defaults to first preset
-        field_frequency_min.set_step( steps );
         field_frequency_min.on_change = [this](int32_t v)
         {
-            int32_t steps_ = steps ;
-            if( steps_ < 24 )
-                steps_ = 24 ;
-            if( v > 7200 - steps_ )
+            reset_live_view( true );
+            int32_t min_size = steps ;
+            if( locked_range )
+                min_size = search_span ;
+            if( min_size < 2 )
+                min_size = 2 ;
+            if( v > 7200 - min_size )
             {
-                v = 7200 - steps_ ;
+                v = 7200 - min_size ;
                 field_frequency_min.set_value( v ); 
             }
-            if (v >= (field_frequency_max.value() - steps_ ) )
-                field_frequency_max.set_value( v + steps_ );
+            if (v > (field_frequency_max.value() - min_size ) )
+                field_frequency_max.set_value( v + min_size );
+            if( locked_range )
+                field_frequency_max.set_value( v + min_size );
             this->on_range_changed();
         };
+        field_frequency_min.set_value(presets_db[0].min); // Defaults to first preset
+        field_frequency_min.set_step( steps );
 
         field_frequency_min.on_select = [this, &nav](NumberField& field) {
             auto new_view = nav_.push<FrequencyKeypadView>(field_frequency_min.value()*1000000);
             new_view->on_changed = [this, &field](rf::Frequency f) {
                 int32_t freq = f / 1000000 ;
-                int32_t steps_ = steps ;
-                if( steps_ < 24 )
-                    steps_ = 24 ;
-                if( freq > (7200 - steps_ ) )
-                    freq= 7200 - steps_  ;
+                int32_t min_size = steps ;
+                if( locked_range )
+                    min_size = search_span ;
+                if( min_size < 2 )
+                    min_size = 2 ;
+                if( freq > (7200 - min_size ) )
+                    freq = 7200 - min_size  ;
                 field_frequency_min.set_value( freq );
-                if( field_frequency_max.value() < ( freq + steps_ ) )
-                    field_frequency_max.set_value( freq + steps_ );
+                if( field_frequency_max.value() < ( freq + min_size ) )
+                    field_frequency_max.set_value( freq + min_size );
                 this->on_range_changed();
             };
         };
 
-        field_frequency_max.set_value(presets_db[0].max); // Defaults to first preset
-        field_frequency_max.set_step( steps );
         field_frequency_max.on_change = [this](int32_t v)
         {          
-            int32_t steps_ = steps ;
-            if( steps_ < 24 )
-                steps_ = 24 ;
-            if( v < steps_ )
+            reset_live_view( true );
+            int32_t min_size = steps ;
+            if( locked_range )
+                min_size = search_span ;
+            if( min_size < 2 )
+                min_size = 2 ;
+            if( v < min_size )
             {
-                v = steps_ ;
+                v = min_size ;
                 field_frequency_max.set_value( v ); 
             }
-            if (v < (field_frequency_min.value() + steps_) )
-                field_frequency_min.set_value(v - steps_);
+            if (v < (field_frequency_min.value() + min_size) )
+                field_frequency_min.set_value(v - min_size);
+            if( locked_range )
+                field_frequency_min.set_value( v - min_size );
             this->on_range_changed();
         };
+        field_frequency_max.set_value(presets_db[0].max); // Defaults to first preset
+        field_frequency_max.set_step( steps );
 
         field_frequency_max.on_select = [this, &nav](NumberField& field) {
             auto new_view = nav_.push<FrequencyKeypadView>(field_frequency_max.value()*1000000);
             new_view->on_changed = [this, &field](rf::Frequency f) {
-                int32_t steps_ = steps ;
-                if( steps_ < 24 )
-                    steps_ = 24 ;
+                int32_t min_size = steps ;
+                if( locked_range )
+                    min_size = search_span ;
+                if( min_size < 2 )
+                    min_size = 2 ;
                 int32_t freq = f / 1000000 ;
-                if( freq < 24 )
-                    freq = 24 ;
+                if( freq < min_size )
+                    freq = min_size ;
                 field_frequency_max.set_value( freq );
-                if( field_frequency_min.value() > ( freq - steps) ) 
-                    field_frequency_min.set_value( freq - steps );
+                if( field_frequency_min.value() > ( freq - min_size) ) 
+                    field_frequency_min.set_value( freq - min_size );
                 this->on_range_changed();
             };
         };
 
-        field_lna.set_value(receiver_model.lna());
         field_lna.on_change = [this](int32_t v)
         {
+            reset_live_view( true );
             this->on_lna_changed(v);
         };
+        field_lna.set_value(receiver_model.lna());
 
-        field_vga.set_value(receiver_model.vga());
         field_vga.on_change = [this](int32_t v_db)
         {
+            reset_live_view( true );
             this->on_vga_changed(v_db);
         };
+        field_vga.set_value(receiver_model.vga());
 
-        steps_config.set_selected_index(3); //default of 250 Mhz steps
         steps_config.on_change = [this](size_t n, OptionsField::value_t v)
         {
             (void)n;
@@ -280,6 +467,67 @@ namespace ui
             field_frequency_max.set_step( v );
             steps = v ;
         };
+        steps_config.set_selected_index(0); //default of 1 Mhz steps
+                                            
+        scan_type.on_change = [this](size_t n, OptionsField::value_t v)
+        {
+            (void)n;
+            fast_scan = v ;
+        };
+        scan_type.set_selected_index(0); // default legacy fast scan
+
+        view_config.on_change = [this](size_t n, OptionsField::value_t v)
+        {
+            (void)n;
+            // clear between changes
+            reset_live_view( true );
+            if( v == 0 )
+            {
+                live_frequency_view = 0 ;
+                level_integration.hidden( true );
+                freq_stats.hidden( true );
+                button_jump.hidden( true );
+                button_rst.hidden( true );
+                display.scroll_set_area(109, 319); // Restart scroll on the correct coordinates
+            }
+            else if( v == 1 )
+            {
+                display.fill_rectangle( { { 0 , 108 } , { 240 , 24 } } , { 0 , 0 , 0 } );
+                live_frequency_view = 1 ;
+                display.scroll_disable();
+                level_integration.hidden( false );
+                freq_stats.hidden( false );
+                button_jump.hidden( false );
+                button_rst.hidden( false );
+            }
+            else if( v == 2 )
+            {
+                display.fill_rectangle( { { 0 , 108 } , { 240 , 24 } } , { 0 , 0 , 0 } );
+                live_frequency_view = 2 ;
+                display.scroll_disable();
+                level_integration.hidden( false );
+                freq_stats.hidden( false );
+                button_jump.hidden( false );
+                button_rst.hidden( false );
+            }
+            set_dirty();
+        };
+        view_config.set_selected_index(0); //default spectrum
+
+        level_integration.on_change = [this](size_t n, OptionsField::value_t v)
+        {
+            (void)n;
+            reset_live_view( true );
+            live_frequency_integrate = v ;
+        };
+        level_integration.set_selected_index(3); //default integration of ( 3 * old value + new_value ) / 4
+
+        filter_config.on_change = [this](size_t n, OptionsField::value_t v) {
+            (void)n;
+            reset_live_view( true );
+            min_color_power = v;
+        };
+        filter_config.set_selected_index(0);
 
         range_presets.on_change = [this](size_t n, OptionsField::value_t v)
         {
@@ -289,26 +537,57 @@ namespace ui
             this->on_range_changed();
         };
 
-        field_marker.on_change = [this](int32_t v)
+        button_marker.on_change = [this]()
         {
-            PlotMarker(v); // Refresh marker on screen
+            marker = marker + button_marker.get_encoder_delta() * marker_pixel_step ;
+            if( marker < f_min )
+                marker = f_min ;
+            if( marker > f_max )
+                marker = f_max ;
+            button_marker.set_text( to_string_short_freq( marker ) );
+			button_marker.set_encoder_delta( 0 );
+            PlotMarker( marker ); // Refresh marker on screen
         };
 
-        field_marker.on_select = [this](NumberField &)
+        button_marker.on_select = [this](ButtonWithEncoder &)
         {
-            f_center = field_marker.value();
-            f_center = f_center * MHZ_DIV;
-            receiver_model.set_tuning_frequency(f_center); // Center tune rx in marker freq.
+            receiver_model.set_tuning_frequency(marker); // Center tune rx in marker freq.
             receiver_model.set_frequency_step(MHZ_DIV);    // Preset a 1 MHz frequency step into RX -> AUDIO
             nav_.pop();
             nav_.push<AnalogAudioView>(); // Jump into audio view
         };
 
-        field_trigger.set_value(32); // Defaults to 32, as normal triggering resolution
         field_trigger.on_change = [this](int32_t v)
         {
             baseband::set_spectrum(LOOKING_GLASS_SLICE_WIDTH, v);
         };
+        field_trigger.set_value(32); // Defaults to 32, as normal triggering resolution
+                                     
+        button_range.on_select = [this](Button&) {
+            if( locked_range )
+            {
+                locked_range = false ;
+                button_range.set_style(&style_white);
+                button_range.set_text(" "+to_string_dec_uint(search_span)+" ");
+            }
+            else
+            {
+                locked_range = true ;
+                button_range.set_style(&style_red);
+                button_range.set_text(">"+to_string_dec_uint(search_span)+"<");
+            }
+        };
+
+        button_jump.on_select = [this](Button&) {
+            receiver_model.set_tuning_frequency(max_freq_hold); // Center tune rx in marker freq.
+            receiver_model.set_frequency_step(MHZ_DIV);    // Preset a 1 MHz frequency step into RX -> AUDIO
+            nav_.pop();
+            nav_.push<AnalogAudioView>(); // Jump into audio view
+        };
+
+        button_rst.on_select = [this](Button&) {
+            reset_live_view( true );
+        };
 
         display.scroll_set_area(109, 319);
         baseband::set_spectrum(LOOKING_GLASS_SLICE_WIDTH, field_trigger.value()); // trigger:

firmware/application/apps/ui_looking_glass_app.hpp

@@ -1,6 +1,7 @@
 /*
  * 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.
  *
@@ -36,13 +37,14 @@
 
 namespace ui
 {
-#define LOOKING_GLASS_SLICE_WIDTH	20000000 // Each slice bandwidth 20 MHz
+#define LOOKING_GLASS_SLICE_WIDTH_MAX 20000000
 #define MHZ_DIV	            1000000
 #define X2_MHZ_DIV	        2000000
 
     class GlassView : public View
     {
         public:
+			
             GlassView(NavigationView &nav);
 
             GlassView( const GlassView &);
@@ -64,15 +66,37 @@ namespace ui
                 rf::Frequency max{};
                 std::string label{};
             };
+            
+            const Style style_white {		// free range
+                .font = font::fixed_8x16,
+                .background = Color::black(),
+                .foreground = Color::white(),
+            };
+
+            const Style style_red {		// locked range
+                .font = font::fixed_8x16,
+                .background = Color::black(),
+                .foreground = Color::red(),
+            };
 
             std::vector<preset_entry> presets_db{};
+            
+            // Each slice bandwidth 20 MHz and a multiple of 256
+            // since we are using LOOKING_GLASS_SLICE_WIDTH/256 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 = 20000000;
+
+            // frequency rounding helpers
+            int64_t next_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();
             void on_lna_changed(int32_t v_db);
             void on_vga_changed(int32_t v_db);
-            void add_spectrum_pixel(Color color);
+            void reset_live_view( bool clear_screen );
+            void add_spectrum_pixel(uint8_t power);
             void PlotMarker(rf::Frequency pos);
             void load_Presets();
             void txtline_process(std::string& line);
@@ -83,22 +107,30 @@ namespace ui
             rf::Frequency search_span { 0 };
             rf::Frequency f_center { 0 };
             rf::Frequency f_center_ini { 0 };
+            rf::Frequency marker { 0 };
             rf::Frequency marker_pixel_step { 0 };
-            rf::Frequency each_bin_size { LOOKING_GLASS_SLICE_WIDTH  / 240 };
+            rf::Frequency each_bin_size { LOOKING_GLASS_SLICE_WIDTH  / 256 };
             rf::Frequency bins_Hz_size { 0 };
             uint8_t min_color_power { 0 };
             uint32_t pixel_index { 0 };
             std::array<Color, 240> spectrum_row = { 0 };
+            std::array<uint8_t, 240> spectrum_data = { 0 };
             ChannelSpectrumFIFO* fifo { nullptr }; 
             uint8_t max_power = 0;
-            int32_t steps = 250 ; // default of 250 Mhz steps
+            int32_t steps = 0 ;
+            uint8_t live_frequency_view = 0 ;
+            int16_t live_frequency_integrate = 3 ;
+            int64_t max_freq_hold = 0 ;
+            int16_t max_freq_power = -1000 ;
+            bool fast_scan = true ; // default to legacy fast scan
+            bool locked_range = false ; 
 
             Labels labels{
                 {{0, 0}, "MIN:     MAX:     LNA   VGA  ", Color::light_grey()},
-                    {{0, 1 * 16}, " RANGE:     FILTER:      AMP:", Color::light_grey()},
+                    {{0, 1 * 16}, "RANGE:       FILTER:      AMP:", Color::light_grey()},
                     {{0, 2 * 16}, "PRESET:", Color::light_grey()},
-                    {{0, 3 * 16}, "MARKER:     MHz +/-    MHz", Color::light_grey()},
-                    {{0, 4 * 16}, "RESOLUTION:     STEPS:", Color::light_grey()}
+                    {{0, 3 * 16}, "MARKER:            MHz", Color::light_grey()},
+                    {{0, 4 * 16}, "RES:    STEP:", Color::light_grey()}
             };
 
             NumberField field_frequency_min {
@@ -125,24 +157,12 @@ namespace ui
                 { 27 * 8, 0 * 16 }
             };
 
-            Text text_range{
+            Button  button_range{
                 {7 * 8, 1 * 16, 4 * 8, 16},
                     ""};
 
-            OptionsField steps_config{
-                { 22 * 8, 4 * 16},
-                    4,
-                    {
-                        {"1",    1},
-                        {"50",   50},
-                        {"100",  100},
-                        {"250",  250}, 
-                        {"500",  500},
-                        {"1000", 1000}, 
-                    }};
-
             OptionsField filter_config{
-                {19 * 8, 1 * 16},
+                {20 * 8, 1 * 16},
                     4,
                     {
                         {"OFF ", 0},
@@ -160,24 +180,80 @@ namespace ui
                         {" NONE (WIFI 2.4GHz)", 0},
                     }};
 
-            NumberField field_marker{
-                {7 * 8, 3 * 16},
-                    4,
-                    {0, 7200},
-                    25,
-                    ' '};
-
-            Text text_marker_pm{
-                {20 * 8, 3 * 16, 2 * 8, 16},
-                    ""};
+            ButtonWithEncoder button_marker{
+                {7 * 8, 3 * 16 , 10 * 8 , 16},
+                " "
+            };
 
             NumberField field_trigger{
-                {11 * 8, 4 * 16},
+                {4 * 8, 4 * 16},
                     3,
                     {2, 128},
                     2,
                     ' '};
 
+            OptionsField steps_config{
+                { 13 * 8, 4 * 16},
+                3,
+                {
+                    {"1",    1},
+                    {"25",   25},
+                    {"50",   50},
+                    {"100",  100},
+                    {"250",  250}, 
+                    {"500",  500},
+                }
+            };
+
+			OptionsField scan_type{
+                { 17 * 8, 4 * 16},
+                2,
+                {
+                    {"F-", true },
+                    {"S-", false },
+                }
+            };
+
+            OptionsField view_config{
+                { 19 * 8, 4 * 16},
+                7,
+                {
+                    {"SPCTR-V", 0 },
+                    {"LEVEL-V", 1 },
+                    {"PEAK-V" , 2 },
+                }
+            };
+
+            OptionsField level_integration{
+                { 27 * 8, 4 * 16},
+                2,
+                {
+                    {"x0", 0 },
+                    {"x1", 1 },
+                    {"x2", 2 },
+                    {"x3", 3 },
+                    {"x4", 4 },
+                    {"x5", 5 },
+                    {"x6", 6 },
+                    {"x7", 7 },
+                    {"x8", 8 },
+                    {"x9", 9 },
+                    }};
+
+            Button button_jump {
+                { 240 - 4 * 8 , 5 * 16 , 4 * 8, 16 },
+                "JMP"
+            };
+
+            Button button_rst {
+                { 240 - 9 * 8 , 5 * 16 , 4 * 8, 16 },
+                "RST"
+            };
+
+            Text freq_stats{
+                {0 * 8, 5 * 16 , 240 - 10 * 8 , 8 },
+                ""
+            };
 
             MessageHandlerRegistration message_handler_spectrum_config {
                 Message::ID::ChannelSpectrumConfig,

firmware/application/apps/ui_mictx.cpp

@@ -167,20 +167,23 @@ void MicTXView::rxaudio(bool is_on) {
 		}
 		else {    // We are in NFM/FM or WFM    (NFM BW:8k5 or 11k / FM BW 16k  / WFM  BW:200k) 
 			
-			if (enable_wfm) {     // WFM , BW 200Khz aprox ,
+			if (enable_wfm) {     // WFM , BW 200Khz aprox , or the two new addional BW filters (180k, 40k)
 				baseband::run_image(portapack::spi_flash::image_tag_wfm_audio);
 				receiver_model.set_modulation(ReceiverModel::Mode::WidebandFMAudio);
-				receiver_model.set_wfm_configuration(0);  // there are only  1  x config filters 200k WFM . (not like 8k5/11k/16k)
+				// receiver_model.set_wfm_configuration(n);  // it is called above  , depending user's selection (200k, 180k,40k). 
 			} else {     // NFM BW:8k5 or  11k / FM BW 16k 
 				baseband::run_image(portapack::spi_flash::image_tag_nfm_audio);
 				receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio); // 	
-				// receiver_model.set_nbfm_configuration(n); is called above  , depending 8k5, 11k, 16k  
+				// receiver_model.set_nbfm_configuration(n); is called above  , depending user's selection (8k5, 11k, 16k). 
 			}
 		} 
 		receiver_model.set_sampling_rate(3072000);
 		receiver_model.set_baseband_bandwidth(1750000);	
 //		receiver_model.set_tuning_frequency(field_frequency.value()); //probably this too can be commented out.
-		receiver_model.set_tuning_frequency(rx_frequency); // Now with seperate controls!
+	    if (bool_same_F_tx_rx_enabled) 								// when stop TX ,define to which freq RX we return 
+			    receiver_model.set_tuning_frequency(tx_frequency);  // Update freq also for RX = TX	
+		else 
+		        receiver_model.set_tuning_frequency(rx_frequency);  // Now with seperate freq controls!
 		receiver_model.set_lna(rx_lna);
 		receiver_model.set_vga(rx_vga);
 		receiver_model.set_rf_amp(rx_amp);
@@ -237,6 +240,7 @@ MicTXView::MicTXView(
 		&field_frequency,
 		&options_tone_key,
 		&check_rogerbeep,
+		&check_common_freq_tx_rx,	// added to handle common or separate freq- TX/RX
 		&check_rxactive,
 		&field_volume,
 		&field_rxbw,
@@ -266,6 +270,7 @@ MicTXView::MicTXView(
 		&field_frequency,
 		&options_tone_key,
 		&check_rogerbeep,
+		&check_common_freq_tx_rx,	// added to handle common or separate freq- TX/RX
 		&check_rxactive,
 		&field_volume,
 		&field_rxbw,
@@ -332,8 +337,12 @@ MicTXView::MicTXView(
 	field_frequency.set_step(receiver_model.frequency_step());
 	field_frequency.on_change = [this](rf::Frequency f) {
 		tx_frequency = f;
-		if(!rx_enabled)
+		if(!rx_enabled) {					// not activated receiver. just update freq TX
 			transmitter_model.set_tuning_frequency(f);
+	    } else {							// activated receiver.
+			if (bool_same_F_tx_rx_enabled)	// user selected common freq- TX = RX
+			    receiver_model.set_tuning_frequency(f); //Update common freq also for RX			
+		}	
 	};
 	field_frequency.on_edit = [this, &nav]() {
 		focused_ui = 0;
@@ -341,8 +350,12 @@ MicTXView::MicTXView(
 		auto new_view = nav.push<FrequencyKeypadView>(tx_frequency);
 		new_view->on_changed = [this](rf::Frequency f) {
 			tx_frequency = f;
-			if(!rx_enabled)
+			if(!rx_enabled) {
 				transmitter_model.set_tuning_frequency(f);
+		    } else {
+				if (bool_same_F_tx_rx_enabled)
+				  receiver_model.set_tuning_frequency(f); //Update freq also for RX
+			}	
 			this->field_frequency.set_value(f);
 			set_dirty();
 		};
@@ -410,10 +423,12 @@ MicTXView::MicTXView(
 				rxaudio(rx_enabled); 					//Update now if we have RX audio on
 				options_tone_key.hidden(0);				// we are in WFM mode , we should have active the Key-tones & CTCSS option.
 
-				rxbw.emplace_back("  200k-WFM ", 0);		// locked a fixed option , to display it .
+				rxbw.emplace_back("  200k-WFM ", 0);	// We allow the user selection of the 3 x WFM BW filters, (0) WFM-200K, (1) WFM-180K , (2) WFM-40K .
+				rxbw.emplace_back("  180k-WFM ", 1);
+				rxbw.emplace_back("   40k-WFM ", 2);
 				field_rxbw.set_options(rxbw);			// store that aux GUI option to the field_rxbw.
 
-				field_rxbw.hidden(0);					// we are in WFM mode,  we need to show to the user the selected BW WFM filer . 
+				field_rxbw.hidden(0);					// we are in WFM mode,  we need to show to the user the selected BW WFM filter . 
 				field_bw.hidden(0);						// we are in WFM mode, we need to allow WFM deviation parameter , in non FM mode.
 				break;
 			case 2:					 //{ "AM", 2 }
@@ -423,7 +438,7 @@ MicTXView::MicTXView(
 				set_dirty();							// Refresh display	
 				options_tone_key.hidden(1);				// we hide that Key-tones & CTCSS input selecction, (no meaning in AM/DSB/SSB).
 				
-				rxbw.emplace_back(" DSB1-9k   ", 0);		// we offer in AM DSB two audio BW 9k / 6k  .
+				rxbw.emplace_back(" DSB1-9k   ", 0);	// we offer in AM DSB two audio BW 9k / 6k  .
 				rxbw.emplace_back(" DSB2-6k   ", 1);		
 				field_rxbw.set_options(rxbw);			// store that aux GUI option to the field_rxbw.
 	
@@ -437,7 +452,7 @@ MicTXView::MicTXView(
 				check_rogerbeep.set_value(false);		// reset the possible activation of roger beep, because it is not compatible with SSB , by now. 
 				check_rogerbeep.hidden(1);				// hide that roger beep selection. 
 
-				rxbw.emplace_back("  USB+3k   ", 0);		// locked a fixed option , to display it .
+				rxbw.emplace_back("  USB+3k   ", 0);	// locked a fixed option , to display it .
 				field_rxbw.set_options(rxbw);			// store that aux GUI option to the field_rxbw.
 
 				set_dirty();							// Refresh display
@@ -448,7 +463,7 @@ MicTXView::MicTXView(
 				check_rogerbeep.set_value(false);		// reset the possible activation of roger beep, because it is not compatible with SSB , by now. 
 				check_rogerbeep.hidden(1);				// hide that roger beep selection. 
 				
-				rxbw.emplace_back("  LSB-3k   ", 0);		// locked a fixed option , to display it .
+				rxbw.emplace_back("  LSB-3k   ", 0);	// locked a fixed option , to display it .
 				field_rxbw.set_options(rxbw);			// store that aux GUI option to the field_rxbw.
 				
 				set_dirty();							// Refresh display
@@ -511,6 +526,13 @@ MicTXView::MicTXView(
 		rogerbeep_enabled = v;
 	};
 
+    check_common_freq_tx_rx.on_select = [this](Checkbox&, bool v) {
+		bool_same_F_tx_rx_enabled = v;
+		field_rxfrequency.hidden(v); 	//Hide or show separated freq RX field . (When no hide user can enter down indep. freq for RX)
+		set_dirty();					//Refresh GUI interface
+		receiver_model.set_tuning_frequency(v ? tx_frequency : rx_frequency);	// To go to the proper tuned freq. when toggling it
+	};
+
 	field_va_level.on_change = [this](int32_t v) {
 		va_level = v;
 		vumeter.set_mark(v);
@@ -545,12 +567,14 @@ MicTXView::MicTXView(
 		}
 		else {					// we are not in  NFM/FM mode  .(we could be in any of the rest : AM /USB/LSB/DSB-SC)
 			if (enable_am) { 	// we are in AM TX mode , we will allow both independent RX audio BW :  AM 9K (9K00AE3 / AM 6K (6K00AE3). (In AM option v can be 0 (9k) , 1 (6k) 
-				receiver_model.set_am_configuration(v );  // we are in AM TX mode , we need to  select proper AM full path config AM-9K filter. 0+0 =>AM-9K(0), 0+1=1 =>AM-6K(1),
+				receiver_model.set_am_configuration(v);  // we are in AM TX mode , we need to  select proper AM full path config AM-9K filter. 0+0 =>AM-9K(0), 0+1=1 =>AM-6K(1),
 			} 
-	
 			if (enable_dsb) { 	// we are in DSB-SC in TX mode , we will allow both independent RX SSB demodulation (USB / LSB side band). in that submenu, v is 0 (SSB1 USB) or 1 (SSB2 LSB)
 				receiver_model.set_am_configuration(v +2 );  // we are in DSB-SC TX mode , we need to  select proper SSB filter. 0+2 =>usb(2), 1+2=3 =>lsb(3),
 			} 
+			if (enable_wfm) {
+				receiver_model.set_wfm_configuration(v); // we are in  WFM case, we need to  select proper WFB RX BW filter , WFM BW 200K(0), WFM BW 180K(1) , WFM BW 40K(2)
+			}
 		}		 
 	};
 
@@ -563,12 +587,12 @@ MicTXView::MicTXView(
 	rx_frequency = receiver_model.tuning_frequency();
 	field_rxfrequency.set_value(rx_frequency);
 	field_rxfrequency.set_step(receiver_model.frequency_step());
-	field_rxfrequency.on_change = [this](rf::Frequency f) {
+	field_rxfrequency.on_change = [this](rf::Frequency f) {		// available when field rxfrequency not hidden => user selected separated freq RX/TX-
 		rx_frequency = f;
 		if(rx_enabled)
 			receiver_model.set_tuning_frequency(f);
 	};
-	field_rxfrequency.on_edit = [this, &nav]() {
+	field_rxfrequency.on_edit = [this, &nav]() {				// available when field rxfrequency not hidden => user selected separated freq RX/TX-
 		focused_ui = 1;
 		// TODO: Provide separate modal method/scheme?
 		auto new_view = nav.push<FrequencyKeypadView>(rx_frequency);

firmware/application/apps/ui_mictx.hpp

@@ -80,6 +80,7 @@ private:
 	bool va_enabled { false };
 	bool ptt_enabled { true };
 	bool rogerbeep_enabled { false };
+    bool bool_same_F_tx_rx_enabled { false };
 	bool rx_enabled { false };
 	uint32_t tone_key_index { };
 	float mic_gain { 1.0 };
@@ -123,9 +124,9 @@ private:
 		{ {20 * 8, 10 * 8 }, "DEC:", Color::light_grey() },
 		{ { 4 * 8, ( 13 * 8 ) - 2 }, "TONE KEY:", Color::light_grey() },
 		{ { 7 * 8, 23 * 8 }, "VOL:", Color::light_grey() },
-		{ {14 * 8, 23 * 8 }, "RXBW:", Color::light_grey() },				//we remove the label "FM" because we will display all MOD types RX_BW.
-		{ {17 * 8, 25 * 8 }, "SQ:", Color::light_grey() },
-		{ { 5 * 8, 25 * 8 }, "F:", Color::light_grey() },
+		{ {14 * 8, 23 * 8 }, "RXBW:", Color::light_grey() },		//we remove the label "FM" because we will display all MOD types RX_BW.
+		{ {20 * 8, 25 * 8 }, "SQ:", Color::light_grey() },
+		{ { 5 * 8, 25 * 8 }, "F_RX:", Color::light_grey() }, 			
 		{ { 5 * 8, 27 * 8 }, "LNA:", Color::light_grey()},
 		{ {12 * 8, 27 * 8 }, "VGA:", Color::light_grey()},
 		{ {19 * 8, 27 * 8 }, "AMP:", Color::light_grey()}
@@ -145,8 +146,8 @@ private:
 		{ { 4 * 8, ( 13 * 8 ) - 2 }, "TONE KEY:", Color::light_grey() },
 		{ { (6 * 8)+4, 23 * 8 }, "VOL:", Color::light_grey() },
 		{ {14 * 8, 23 * 8 }, "RXBW:", Color::light_grey() },			//we remove the label "FM" because we will display all MOD types RX_BW.
-		{ {17 * 8, 25 * 8 }, "SQ:", Color::light_grey() },
-		{ { 5 * 8, 25 * 8 }, "F:", Color::light_grey() },
+		{ {20 * 8, 25 * 8 }, "SQ:", Color::light_grey() },
+		{ { 5 * 8, 25 * 8 }, "F_RX:", Color::light_grey() },
 		{ { 5 * 8, 27 * 8 }, "LNA:", Color::light_grey()},
 		{ {12 * 8, 27 * 8 }, "VGA:", Color::light_grey()},
 		{ {19 * 8, 27 * 8 }, "AMP:", Color::light_grey()}
@@ -287,7 +288,7 @@ OptionsField options_wm8731_boost_mode {
 	};
 
 	Checkbox check_rogerbeep {
-		{ 3 * 8, ( 16 * 8 ) + 4 },
+		{ 3 * 8, ( 16 * 8 ) + 7 },
 		10,
 		"Roger beep",
 		false
@@ -295,11 +296,18 @@ OptionsField options_wm8731_boost_mode {
 
 	Checkbox check_rxactive {
 		{ 3 * 8, ( 21 * 8 ) - 4 },
-		8,
+		18,								// it was 8, but if it is string size should be 18
 		"RX audio listening",
 		false
 	};
 
+	Checkbox check_common_freq_tx_rx {
+		{ 18 * 8, ( 16* 8 ) + 7 },
+		8,
+		"F = F_RX",
+		false
+	};
+
 	NumberField field_volume {
 		{ 11* 8, 23 * 8 },
 		2,
@@ -319,7 +327,7 @@ OptionsField options_wm8731_boost_mode {
 	};
 	
 	NumberField field_squelch {
-		{ 20 * 8, 25 * 8 },
+		{ 23 * 8, 25 * 8 },
 		2,
 		{ 0, 99 },
 		1,
@@ -327,7 +335,7 @@ OptionsField options_wm8731_boost_mode {
 	};
 
 	FrequencyField field_rxfrequency {
-		{ 7 * 8, 25 * 8 },
+		{ 10 * 8, 25 * 8 },
 	};
 
 	NumberField field_rxlna {
@@ -347,7 +355,7 @@ OptionsField options_wm8731_boost_mode {
 	};
 
 	NumberField field_rxamp {
-		{ 23 * 8, 27 * 8 },
+		{ 24 * 8, 27 * 8 },
 		1,
 		{ 0, 1 },
 		1,

firmware/application/apps/ui_nrf_rx.cpp

@@ -54,9 +54,7 @@ NRFRxView::NRFRxView(NavigationView& nav) {
 		&field_lna,
 		&field_vga,
 		&field_frequency,
-		&text_debug,
 		&button_modem_setup,
-		&record_view,
 		&console
 	});
 	
@@ -68,12 +66,6 @@ NRFRxView::NRFRxView(NavigationView& nav) {
 		field_rf_amp.set_value(app_settings.rx_amp);
 	}
 
-	// DEBUG
-	record_view.on_error = [&nav](std::string message) {
-		nav.display_modal("Error", message);
-	};
-	record_view.set_sampling_rate(24000);
-	
 	// Auto-configure modem for LCR RX (will be removed later)
 	update_freq(2480000000);
 	auto def_bell202 = &modem_defs[0];

firmware/application/apps/ui_nrf_rx.hpp

@@ -52,7 +52,6 @@ private:
 
 	uint8_t console_color { 0 };
 	uint32_t prev_value { 0 };
-	std::string str_log { "" };
 
 	RFAmpField field_rf_amp {
 		{ 13 * 8, 0 * 16 }
@@ -74,23 +73,11 @@ private:
 		{ 0 * 8, 0 * 16 },
 	};
 	
-	Text text_debug {
-		{ 0 * 8, 1 * 16, 10 * 8, 16 },
-		"DEBUG"
-	};
-	
-	
 	Button button_modem_setup {
-		{ 12 * 8, 1 * 16, 96, 24 },
+		{ 240 - 12 * 8, 1 * 16, 96, 24 },
 		"Modem setup"
 	};
 	
-	// DEBUG
-	RecordView record_view {
-		{ 0 * 8, 3 * 16, 30 * 8, 1 * 16 },
-		u"AFS_????", RecordView::FileType::WAV, 4096, 4
-	};
-	
 	Console console {
 		{ 0, 4 * 16, 240, 240 }
 	};

firmware/application/apps/ui_recon.hpp

@@ -38,371 +38,322 @@
 #include "string_format.hpp"
 #include "file.hpp"
 #include "app_settings.hpp"
-
+#include "ui_recon_settings.hpp"
 
 namespace ui {
 
-    class ReconThread {
-        public:
-            ReconThread(freqman_db *database );
-            ~ReconThread();
+	class ReconView : public View {
+		public:
+			ReconView(NavigationView& nav);
+			~ReconView();
 
-            void set_recon(const bool v);
-            void set_freq_delete(const bool v);
-            bool is_recon();
+			void focus() override;
 
-            void set_lock_duration( const uint32_t v );
-            uint32_t get_lock_duration();
-            void set_lock_nb_match( const uint32_t v );
-            void set_match_mode( const uint32_t v );
-            uint32_t get_lock_nb_match();
+			const Style style_grey {		// recon
+				.font = font::fixed_8x16,
+					.background = Color::black(),
+					.foreground = Color::grey(),
+			};
 
-            void set_freq_lock(const uint32_t v);
-            uint32_t is_freq_lock();
-            int64_t get_current_freq();
+			const Style style_white {		// recon
+				.font = font::fixed_8x16,
+					.background = Color::black(),
+					.foreground = Color::white(),
+			};
 
-            void set_stepper(const int64_t v);
+			const Style style_yellow {		//Found signal
+				.font = font::fixed_8x16,
+					.background = Color::black(),
+					.foreground = Color::yellow(),
+			};
 
-            void change_recon_direction();
-            bool get_recon_direction();
-            void set_recon_direction( const bool v);
+			const Style style_green {		//Found signal
+				.font = font::fixed_8x16,
+					.background = Color::black(),
+					.foreground = Color::green(),
+			};
 
-            void set_continuous(const bool v);
+			const Style style_red {		//erasing freq
+				.font = font::fixed_8x16,
+					.background = Color::black(),
+					.foreground = Color::red(),
+			};
 
-            void set_default_modulation( freqman_index_t index );
-            freqman_index_t get_current_modulation();
-            void set_default_bandwidth( freqman_index_t index );
-            freqman_index_t get_current_bandwidth();
-            void set_default_step( freqman_index_t index );
-            void set_freq_index( int16_t index );
-            int16_t get_freq_index();
+			const Style style_blue {		// quick recon, wait == 0
+				.font = font::fixed_8x16,
+					.background = Color::black(),
+					.foreground = Color::blue(),
+			};
 
-            void run();
-            void stop();
+			std::string title() const override { return "Recon"; };
 
-            ReconThread(const ReconThread&) = delete;
-            ReconThread(ReconThread&&) = delete;
-            ReconThread& operator=(const ReconThread&) = delete;
-            ReconThread& operator=(ReconThread&&) = delete;
+			//void set_parent_rect(const Rect new_parent_rect) override;
 
-        private:
-            freqman_db &frequency_list_ ;
-            Thread* thread { nullptr };
-            int64_t freq = 0 ;
-            uint32_t step = 0 ;
-            freqman_index_t def_modulation  = 0 ;
-            freqman_index_t def_bandwidth = 0 ;
-            freqman_index_t def_step = 0 ;
-            tone_index tone = 0 ;
-            freqman_entry last_entry = { } ;
-            int16_t frequency_index = 0 ;
+		private:
+			NavigationView& nav_;
 
-            bool _recon { true };
-            bool _freq_delete { false };
-            bool _fwd { true };
-            bool _continuous { true };
-            int64_t _stepper { 0 };
-            int32_t _freq_lock { 0 };
-            uint32_t _lock_duration { 50 };
-            uint32_t _lock_nb_match { 10 };
-            static msg_t static_fn(void* arg);
-    };
+            void audio_output_start();
+			bool check_sd_card();
+			size_t change_mode( freqman_index_t mod_type);
+			void show_max( bool refresh_display = false );
+			void recon_pause();
+			void recon_resume();
+			void frequency_file_load( bool stop_all_before = false);
+			void on_statistics_update(const ChannelStatistics& statistics);
+			void on_headphone_volume_changed(int32_t v);
+			void on_index_delta(int32_t v);
+			void on_stepper_delta(int32_t v);
+			void recon_redraw();
+			void handle_retune();
+			void handle_coded_squelch(const uint32_t value);
 
-    class ReconView : public View {
-        public:
-            ReconView(NavigationView& nav);
-            ~ReconView();
+			jammer::jammer_range_t frequency_range { false, 0, MAX_UFREQ };  //perfect for manual recon task too...
+			int32_t squelch { 0 };
+			int32_t db { 0 };
+			int32_t timer { 0 };
+			int32_t wait { RECON_DEF_WAIT_DURATION };   // in msec. if > 0 wait duration after a lock, if < 0 duration is set to 'wait' unless there is no more activity
+			freqman_db frequency_list  = { };
+			int32_t current_index { 0 };
+			bool userpause { false };
+			bool continuous_lock { false };
+			std::string input_file = { "RECON" };
+			std::string output_file = { "RECON_RESULTS" };
+			bool autosave    = { true };
+			bool autostart   = { true };
+			bool continuous  = { true }; 
+			bool filedelete  = { true };
+			bool load_freqs  = { true };
+			bool load_ranges = { true };
+			bool load_hamradios = { true };
+			bool update_ranges = { true };
+			bool fwd = { true };
+            bool recon = true ;
+			uint32_t recon_lock_nb_match = { 3 };
+			uint32_t recon_lock_duration = { RECON_DEF_LOCK_DURATION };
+			uint32_t recon_match_mode = { RECON_MATCH_CONTINUOUS };
+			bool scanner_mode { false };
+			bool manual_mode { false };
+			bool sd_card_mounted = false ;
+			int32_t volume = 40 ;
+            int32_t stepper = 0 ;
+            int32_t index_stepper = 0 ;
+			int64_t freq = 0 ;
+			uint32_t step = 0 ;
+			freqman_index_t def_modulation  = 0 ;
+			freqman_index_t def_bandwidth = 0 ;
+			freqman_index_t def_step = 0 ;
+			tone_index tone = 0 ;
+			freqman_entry last_entry = { } ;
+			bool entry_has_changed = false ;
+			uint32_t freq_lock { 0 };
+            int64_t minfreq = 0 ;
+			int64_t maxfreq = 0 ;
+			bool has_looped = false ;
 
-            void focus() override;
+			Labels labels 
+			{ 
+				{ { 0  * 8 , 0  * 16      }, "LNA:   VGA:   AMP:  VOL:     ", Color::light_grey() },
+					{ { 0  * 8 , 1  * 16      }, "BW:      SQ:    W,L:     ,     ", Color::light_grey() },
+					{ { 3  * 8 , 10 * 16      }, "START       END     MANUAL", Color::light_grey() },
+					{ { 0  * 8 , (26 * 8) + 4 }, "MODE:", Color::light_grey() },
+					{ { 11 * 8 , (26 * 8) + 4 }, "STEP:", Color::light_grey() },
+			};
 
-            void big_display_freq( int64_t f );
+			LNAGainField field_lna {
+				{ 4 * 8, 0 * 16 }
+			};
 
-            const Style style_grey {		// recon
-                .font = font::fixed_8x16,
-                    .background = Color::black(),
-                    .foreground = Color::grey(),
-            };
+			VGAGainField field_vga {
+				{ 11 * 8, 0 * 16 }
+			};
 
-            const Style style_white {		// recon
-                .font = font::fixed_8x16,
-                    .background = Color::black(),
-                    .foreground = Color::white(),
-            };
+			RFAmpField field_rf_amp {
+				{ 18 * 8, 0 * 16 }
+			};
 
-            const Style style_yellow {		//Found signal
-                .font = font::fixed_8x16,
-                    .background = Color::black(),
-                    .foreground = Color::yellow(),
-            };
+			NumberField field_volume {
+				{ 24 * 8, 0 * 16 },
+					2,
+					{ 0, 99 },
+					1,
+					' ',
+			};
 
-            const Style style_green {		//Found signal
-                .font = font::fixed_8x16,
-                    .background = Color::black(),
-                    .foreground = Color::green(),
-            };
+			OptionsField field_bw {
+				{ 3 * 8, 1 * 16 },
+					6,
+					{ }
+			};		
 
-            const Style style_red {		//erasing freq
-                .font = font::fixed_8x16,
-                    .background = Color::black(),
-                    .foreground = Color::red(),
-            };
+			NumberField field_squelch {
+				{ 12 * 8, 1 * 16 },
+					3,
+					{ -90, 20 },
+					1,
+					' ',
+			};
 
-            const Style style_blue {		// quick recon, wait == 0
-                .font = font::fixed_8x16,
-                    .background = Color::black(),
-                    .foreground = Color::blue(),
-            };
+			NumberField field_wait {
+				{ 20 * 8, 1 * 16 },
+					5,
+					{ -(10000-STATS_UPDATE_INTERVAL) , (10000-STATS_UPDATE_INTERVAL) },
+					STATS_UPDATE_INTERVAL,
+					' ',
+			};
 
-            std::string title() const override { return "Recon"; };
+			NumberField field_lock_wait {
+				{ 26 * 8, 1 * 16 },
+					4,
+					{ RECON_DEF_LOCK_DURATION , (10000-RECON_DEF_LOCK_DURATION) },
+					RECON_DEF_LOCK_DURATION,
+					' ',
+			};
 
-            //void set_parent_rect(const Rect new_parent_rect) override;
+			RSSI rssi {
+				{ 0 * 16, 2 * 16, SCREEN_W - 8 * 8 + 4 , 16 },
+			}; 
 
-        private:
-            NavigationView& nav_;
+			ButtonWithEncoder text_cycle {
+				{ 0, 3 * 16, 4 * 8, 16 },  
+					""
+			};
 
-            void start_recon_thread();
-            size_t change_mode( freqman_index_t mod_type);
-            void show_max( bool refresh_display = false );
-            void recon_pause();
-            void recon_resume();
-            void user_pause();
-            void user_resume();
-            void frequency_file_load( bool stop_all_before = false);
-            void on_statistics_update(const ChannelStatistics& statistics);
-            void on_headphone_volume_changed(int32_t v);
-            void set_display_freq( int64_t freq );
-            void handle_retune( int64_t freq , uint32_t index );
-            bool check_sd_card();
+			Text text_max {
+				{ 4 * 8, 3 * 16, SCREEN_W - 7 * 8 - 4 * 8 , 16 },  
+			};
 
-            jammer::jammer_range_t frequency_range { false, 0, 0 };  //perfect for manual recon task too...
-            int32_t squelch { 0 };
-            int32_t db { 0 };
-            int32_t timer { 0 };
-            int32_t wait { 5000 };   // in msec. if > 0 wait duration after a lock, if < 0 duration is set to 'wait' unless there is no more activity
-            uint32_t lock_wait { 500 }; // in msec. Represent the maximum amount of time we will wait for a lock to complete before switching to next
-            int32_t def_step { 0 };
-            freqman_db frequency_list  = { };
-            uint32_t current_index { 0 };
-            bool userpause { false };
-            bool continuous_lock { false };
-            std::string input_file = { "RECON" };
-            std::string output_file = { "RECON_RESULTS" };
-            bool autosave    = { true };
-            bool autostart   = { true };
-            bool continuous  = { true }; 
-            bool filedelete  = { true };
-            bool load_freqs  = { true };
-            bool load_ranges = { true };
-            bool load_hamradios = { true };
-            bool update_ranges = { true };
-            bool fwd = { true };
-            // maximum usable freq
-            long long int MAX_UFREQ = { 7200000000 };
-            uint32_t recon_lock_nb_match = { 10 };
-            uint32_t recon_lock_duration = { 50 };
-            uint32_t recon_match_mode = { 0 };
-            bool scanner_mode { false };
-            bool manual_mode { false };
-            bool sd_card_mounted = false ;
-            int32_t volume = 40 ;
+			Text desc_cycle {
+				{0, 4 * 16, SCREEN_W , 16 },	   
+			};
 
-            Labels labels 
-            { 
-                { { 0  * 8 , 0  * 16      }, "LNA:   VGA:   AMP:  VOL:     ", Color::light_grey() },
-                    { { 0  * 8 , 1  * 16      }, "BW:      SQ:    W,L:     ,     ", Color::light_grey() },
-                    { { 3  * 8 , 10 * 16      }, "START       END     MANUAL", Color::light_grey() },
-                    { { 0  * 8 , (26 * 8) + 4 }, "MODE:", Color::light_grey() },
-                    { { 11 * 8 , (26 * 8) + 4 }, "STEP:", Color::light_grey() },
-            };
+			/* BigFrequency big_display {		//Show frequency in glamour
+			   { 4, 7 * 16 - 8 , 28 * 8, 52 },
+			   0
+			   }; */
 
-            LNAGainField field_lna {
-                { 4 * 8, 0 * 16 }
-            };
+			Text big_display {		//Show frequency in text mode
+				{ 0, 5 * 16 , 23 * 8, 16 },
+			};
 
-            VGAGainField field_vga {
-                { 11 * 8, 0 * 16 }
-            };
+			Text freq_stats {		//Show frequency stats in text mode
+				{ 0, 6 * 16 , 23 * 8, 16 },
+			};
 
-            RFAmpField field_rf_amp {
-                { 18 * 8, 0 * 16 }
-            };
+			// TIMER: 9999
+			Text text_timer {		//Show frequency stats in text mode
+				{ 0, 7 * 16 , 11 * 8, 16 },
+			};
 
-            NumberField field_volume {
-                { 24 * 8, 0 * 16 },
-                    2,
-                    { 0, 99 },
-                    1,
-                    ' ',
-            };
+			// T: Senn. 32.000k
+			Text text_ctcss {
+				{ 12 * 8 + 4, 7 * 16 , 14 * 8, 1 * 8 },
+					""
+			};
 
-            OptionsField field_bw {
-                { 3 * 8, 1 * 16 },
-                    6,
-                    { }
-            };		
+			Button button_recon_setup {
+				{ SCREEN_W - 7 * 8 , 2 * 16 , 7 * 8, 28 },
+					"CONFIG"
+			};
 
-            NumberField field_squelch {
-                { 12 * 8, 1 * 16 },
-                    3,
-                    { -90, 20 },
-                    1,
-                    ' ',
-            };
+			Button button_looking_glass {
+				{ SCREEN_W - 7 * 8 , 5 * 16 , 7 * 8, 28 },
+					"GLASS"
+			};
 
-            NumberField field_wait {
-                { 20 * 8, 1 * 16 },
-                    5,
-                    { -9000, 9000 },
-                    100,
-                    ' ',
-            };
+			// Button can be RECON or SCANNER
+			Button button_scanner_mode {
+				{ SCREEN_W - 7 * 8 , 8 * 16 , 7 * 8, 28 },
+					"RECON"
+			};
 
-            NumberField field_lock_wait {
-                { 26 * 8, 1 * 16 },
-                    4,
-                    { 100 , 9000 },
-                    100,
-                    ' ',
-            };
+			Text file_name {		//Show file used
+				{ 0 , 8 * 16 + 6 , SCREEN_W - 7 * 8, 16 },
+			};
 
-            RSSI rssi {
-                { 0 * 16, 2 * 16, 240 - 4 * 8 , 16 },
-            }; 
+			ButtonWithEncoder button_manual_start {
+				{ 0 * 8, 11 * 16, 11 * 8, 28 },
+					""
+			};
 
-            Text text_cycle {
-                { 0, 3 * 16, 3 * 8, 16 },  
-            };
+			ButtonWithEncoder button_manual_end {
+				{ 12 * 8 - 6, 11 * 16, 11 * 8, 28 },
+					""
+			};
 
-            Text text_max {
-                { 3 * 8, 3 * 16, 20 * 8 , 16 },  
-            };
+			Button button_manual_recon {
+				{ 23 * 8 - 3, 11 * 16, 7 * 8 , 28 },
+					"SEARCH"
+			};
 
-            Text desc_cycle {
-                {0, 4 * 16, 240 , 16 },	   
-            };
+			OptionsField field_mode {
+				{ 5 * 8, (26 * 8) + 4 },
+					6,
+					{
+					}
+			};
 
-            /* BigFrequency big_display {		//Show frequency in glamour
-               { 4, 7 * 16 - 8 , 28 * 8, 52 },
-               0
-               }; */
+			OptionsField step_mode {
+				{ 17 * 8, (26 * 8) + 4 },
+					12,
+					{
+					}
+			};
 
-            Text big_display {		//Show frequency in text mode
-                { 0, 5 * 16 , 21 * 8, 16 },
-            };
-
-            Text freq_stats {		//Show frequency stats in text mode
-                { 0, 6 * 16 , 21 * 8, 16 },
-            };
-
-            Text text_timer {		//Show frequency stats in text mode
-                { 0, 7 * 16 , 21 * 8, 16 },
-            };
-
-            Button button_recon_setup {
-                { 240 - 4 * 8 , 2 * 16 , 4 * 8, 28 },
-                    "OPT"
-            };
-
-            Button button_looking_glass {
-                { 240 - 5 * 8 , 6 * 16 - 4 , 5 * 8, 28 },
-                    "GLASS"
-            };
-
-            Button button_scanner_mode {
-                { 240 - 8 * 8 , 8 * 16 , 8 * 8, 28 },
-                    "RECON"
-            };
-
-            Text file_name {		//Show file used
-                { 0 , 8 * 16 + 6 , 21 * 8, 16 },
-            };
-
-            ButtonWithEncoder button_manual_start {
-                { 0 * 8, 11 * 16, 11 * 8, 28 },
-                    ""
-            };
-
-            ButtonWithEncoder button_manual_end {
-                { 12 * 8 - 6, 11 * 16, 11 * 8, 28 },
-                    ""
-            };
-
-            Button button_manual_recon {
-                { 23 * 8 - 3, 11 * 16, 7 * 8 , 28 },
-                    "SEARCH"
-            };
-
-            OptionsField field_mode {
-                { 5 * 8, (26 * 8) + 4 },
-                    6,
-                    {
-                    }
-            };
-
-            OptionsField step_mode {
-                { 17 * 8, (26 * 8) + 4 },
-                    12,
-                    {
-                    }
-            };
-
-            ButtonWithEncoder button_pause {
-                { 0, (15 * 16) - 4, 72, 28 },
-                    "PAUSE"
-            }; 
+			ButtonWithEncoder button_pause {
+				{ 0, (15 * 16) - 4, 72, 28 },
+					"PAUSE"
+			}; 
 
 
-            Button button_audio_app {
-                { 84, (15 * 16) - 4, 72, 28 },
-                    "AUDIO"
-            };
+			Button button_audio_app {
+				{ 84, (15 * 16) - 4, 72, 28 },
+					"AUDIO"
+			};
 
-            ButtonWithEncoder button_add {
-                { 168, (15 * 16) - 4, 72, 28 },
-                    "<STORE>"
-            };
+			ButtonWithEncoder button_add {
+				{ 168, (15 * 16) - 4, 72, 28 },
+					"<STORE>"
+			};
 
-            Button button_dir {
-                { 0,  (35 * 8) - 4, 34, 28 },
-                    "FW>"
-            };
+			Button button_dir {
+				{ 0,  (35 * 8) - 4, 34, 28 },
+					"FW>"
+			};
 
-            Button button_restart {
-                { 38, (35 * 8) - 4, 34, 28 },
-                    "RST"
-            };
+			Button button_restart {
+				{ 38, (35 * 8) - 4, 34, 28 },
+					"RST"
+			};
 
 
-            Button button_mic_app {
-                { 84,  (35 * 8) - 4, 72, 28 },
-                    "MIC TX"
-            };
+			Button button_mic_app {
+				{ 84,  (35 * 8) - 4, 72, 28 },
+					"MIC TX"
+			};
 
-            ButtonWithEncoder button_remove {
-                { 168, (35 * 8) - 4, 72, 28 },
-                    "<REMOVE>"
-            };
+			ButtonWithEncoder button_remove {
+				{ 168, (35 * 8) - 4, 72, 28 },
+					"<REMOVE>"
+			};
 
-            std::unique_ptr<ReconThread> recon_thread { };
+			MessageHandlerRegistration message_handler_coded_squelch {
+				Message::ID::CodedSquelch,
+					[this](const Message* const p) {
+						const auto message = *reinterpret_cast<const CodedSquelchMessage*>(p);
+						this->handle_coded_squelch(message.value);
+					}
+			};
 
-            MessageHandlerRegistration message_handler_retune {
-                Message::ID::Retune,
-                    [this](const Message* const p) {
-                        const auto message = *reinterpret_cast<const RetuneMessage*>(p);
-                        this->handle_retune(message.freq,message.range);
-                    }
-            };
-
-            MessageHandlerRegistration message_handler_stats {
-                Message::ID::ChannelStatistics,
-                    [this](const Message* const p) {
-                        this->on_statistics_update(static_cast<const ChannelStatisticsMessage*>(p)->statistics);
-                    }
-            };
-            // app save settings
-            std::app_settings settings { }; 		
-            std::app_settings::AppSettings app_settings { };
-    };
+			MessageHandlerRegistration message_handler_stats {
+				Message::ID::ChannelStatistics,
+					[this](const Message* const p) {
+						this->on_statistics_update(static_cast<const ChannelStatisticsMessage*>(p)->statistics);
+					}
+			};
+			// app save settings
+			std::app_settings settings { }; 		
+			std::app_settings::AppSettings app_settings { };
+	};
 
 } /* namespace ui */
 

firmware/application/apps/ui_recon_settings.cpp

@@ -34,268 +34,270 @@ using namespace portapack;
 
 namespace ui {
 
-    bool ReconSetupLoadStrings( std::string source, std::string &input_file , std::string &output_file , uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , int32_t &recon_squelch_level , uint32_t &recon_match_mode , int32_t &wait , uint32_t &lock_wait , int32_t &volume )
-    {
-        File settings_file;
-        size_t length, file_position = 0;
-        char * pos;
-        char * line_start;
-        char * line_end;
-        char file_data[257];
+	bool ReconSetupLoadStrings( std::string source, std::string &input_file , std::string &output_file , uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , int32_t &recon_squelch_level , uint32_t &recon_match_mode , int32_t &wait , int32_t &volume )
+	{
+		File settings_file;
+		size_t length, file_position = 0;
+		char * pos;
+		char * line_start;
+		char * line_end;
+		char file_data[257];
 
-        uint32_t it = 0 ;
-        uint32_t nb_params = 9 ;
-        std::string params[ 9 ];
+		uint32_t it = 0 ;
+		uint32_t nb_params = RECON_SETTINGS_NB_PARAMS ;
+		std::string params[ RECON_SETTINGS_NB_PARAMS ];
 
-        bool check_sd_card = (sd_card::status() == sd_card::Status::Mounted) ? true : false ;
+		bool check_sd_card = (sd_card::status() == sd_card::Status::Mounted) ? true : false ;
 
-        if( check_sd_card )
-        {
-            auto result = settings_file.open( source );
-            if( !result.is_valid() )
-            {
-                while( it < nb_params )
-                {
-                    // Read a 256 bytes block from file
-                    settings_file.seek(file_position);
-                    memset(file_data, 0, 257);
-                    auto read_size = settings_file.read(file_data, 256);
-                    if (read_size.is_error())
-                        break ;
-                    file_position += 256;
-                    // Reset line_start to beginning of buffer
-                    line_start = file_data;
-                    pos=line_start;
-                    while ((line_end = strstr(line_start, "\x0A"))) {
-                        length = line_end - line_start - 1 ;
-                        params[ it ]  = string( pos , length );
-                        it ++ ;	
-                        line_start = line_end + 1;
-                        pos=line_start ;
-                        if (line_start - file_data >= 256) 
-                            break;
-                        if( it >= nb_params )
-                            break ;
-                    }			
-                    if (read_size.value() != 256)
-                        break;	// End of file
+		if( check_sd_card )
+		{
+			auto result = settings_file.open( source );
+			if( !result.is_valid() )
+			{
+				while( it < nb_params )
+				{
+					// Read a 256 bytes block from file
+					settings_file.seek(file_position);
+					memset(file_data, 0, 257);
+					auto read_size = settings_file.read(file_data, 256);
+					if (read_size.is_error())
+						break ;
+					file_position += 256;
+					// Reset line_start to beginning of buffer
+					line_start = file_data;
+					pos=line_start;
+					while ((line_end = strstr(line_start, "\x0A"))) {
+						length = line_end - line_start - 1 ;
+						params[ it ]  = string( pos , length );
+						it ++ ;	
+						line_start = line_end + 1;
+						pos=line_start ;
+						if (line_start - file_data >= 256) 
+							break;
+						if( it >= nb_params )
+							break ;
+					}			
+					if (read_size.value() != 256)
+						break;	// End of file
 
-                    // Restart at beginning of last incomplete line
-                    file_position -= (file_data + 256 - line_start);
-                }
-            }
+					// Restart at beginning of last incomplete line
+					file_position -= (file_data + 256 - line_start);
+				}
+			}
+		}
 
-        }
+		if( it < nb_params )
+		{
+			/* bad number of params, signal defaults */
+			input_file  = "RECON" ;
+			output_file = "RECON_RESULTS" ;
+			recon_lock_duration = RECON_DEF_LOCK_DURATION ;
+			recon_lock_nb_match = RECON_DEF_NB_MATCH ;
+			recon_squelch_level = -14 ;
+			recon_match_mode = RECON_MATCH_CONTINUOUS ;
+			wait = RECON_DEF_WAIT_DURATION ;
+			volume = 40 ;
+			return false ;
+		}
 
-        if( it > 0 )
-            input_file = params[ 0 ];
-        else
-            input_file  = "RECON" ;
+		if( it > 0 )
+			input_file = params[ 0 ];
+		else
+			input_file  = "RECON" ;
 
-        if( it > 1 )
-            output_file= params[ 1 ];
-        else
-            output_file = "RECON_RESULTS" ;	
+		if( it > 1 )
+			output_file= params[ 1 ];
+		else
+			output_file = "RECON_RESULTS" ;	
 
-        if( it > 2 )
-            recon_lock_duration = strtoll( params[ 2 ].c_str() , nullptr , 10 );
-        else
-            recon_lock_duration = 50 ;
+		if( it > 2 )
+			recon_lock_duration = strtoll( params[ 2 ].c_str() , nullptr , 10 );
+		else
+			recon_lock_duration = RECON_DEF_LOCK_DURATION ;
 
-        if( it > 3 )
-            recon_lock_nb_match = strtoll( params[ 3 ].c_str() , nullptr , 10 );
-        else
-            recon_lock_nb_match = 10 ;
+		if( it > 3 )
+			recon_lock_nb_match = strtoll( params[ 3 ].c_str() , nullptr , 10 );
+		else
+			recon_lock_nb_match = RECON_DEF_NB_MATCH ;
 
-        if( it > 4 )
-            recon_squelch_level = strtoll( params[ 4 ].c_str() , nullptr , 10 );
-        else
-            recon_squelch_level = -14 ;
+		if( it > 4 )
+			recon_squelch_level = strtoll( params[ 4 ].c_str() , nullptr , 10 );
+		else
+			recon_squelch_level = -14 ;
 
-        if( it > 5 )
-            recon_match_mode    = strtoll( params[ 5 ].c_str() , nullptr , 10 );
-        else
-            recon_match_mode = 0 ;
+		if( it > 5 )
+			recon_match_mode    = strtoll( params[ 5 ].c_str() , nullptr , 10 );
+		else
+			recon_match_mode = RECON_MATCH_CONTINUOUS ;
 
-        if( it > 6 )
-            wait = strtoll( params[ 6 ].c_str() , nullptr , 10 );
-        else
-            wait = 5000 ;
+		if( it > 6 )
+			wait = strtoll( params[ 6 ].c_str() , nullptr , 10 );
+		else
+			wait = RECON_DEF_WAIT_DURATION ;
 
-        if( it > 7 )
-            lock_wait = strtoll( params[ 7 ].c_str() , nullptr , 10 );
-        else
-            lock_wait = 1000 ;
+		if( it > 8 )
+			volume = strtoll( params[ 8 ].c_str() , nullptr , 10 );
+		else
+			volume = 40 ;
 
-        if( it > 8 )
-            volume = strtoll( params[ 8 ].c_str() , nullptr , 10 );
-        else
-            volume = 40 ;
+		return true ;
+	}
 
-        if( it < nb_params )
-        {
-            /* bad number of params, signal defaults */
-            return false ;
-        }
-        return true ;
-    }
+	bool ReconSetupSaveStrings( std::string dest, std::string input_file , std::string output_file , uint32_t recon_lock_duration , uint32_t recon_lock_nb_match , int32_t recon_squelch_level , uint32_t recon_match_mode , int32_t wait , int32_t volume )
+	{
+		File settings_file;
 
-    bool ReconSetupSaveStrings( std::string dest, std::string input_file , std::string output_file , uint32_t recon_lock_duration , uint32_t recon_lock_nb_match , int32_t recon_squelch_level , uint32_t recon_match_mode , int32_t wait , uint32_t lock_wait , int32_t volume )
-    {
-        File settings_file;
+		auto result = settings_file.create( dest );
+		if( result.is_valid() )
+			return false ;
+		settings_file.write_line( input_file );
+		settings_file.write_line( output_file );
+		settings_file.write_line( to_string_dec_uint( recon_lock_duration ) );
+		settings_file.write_line( to_string_dec_uint( recon_lock_nb_match ) );
+		settings_file.write_line( to_string_dec_int( recon_squelch_level ) );
+		settings_file.write_line( to_string_dec_uint( recon_match_mode ) );
+		settings_file.write_line( to_string_dec_int( wait ) );
+		settings_file.write_line( to_string_dec_int( volume ) );
+		return true ;
+	}
 
-        auto result = settings_file.create( dest );
-        if( result.is_valid() )
-            return false ;
-        settings_file.write_line( input_file );
-        settings_file.write_line( output_file );
-        settings_file.write_line( to_string_dec_uint( recon_lock_duration ) );
-        settings_file.write_line( to_string_dec_uint( recon_lock_nb_match ) );
-        settings_file.write_line( to_string_dec_int( recon_squelch_level ) );
-        settings_file.write_line( to_string_dec_uint( recon_match_mode ) );
-        settings_file.write_line( to_string_dec_int( wait ) );
-        settings_file.write_line( to_string_dec_uint( lock_wait ) );
-        settings_file.write_line( to_string_dec_int( volume ) );
-        return true ;
-    }
+	ReconSetupViewMain::ReconSetupViewMain( NavigationView &nav , Rect parent_rect , std::string input_file , std::string output_file ) : View( parent_rect ) , _input_file { input_file } , _output_file { output_file } 
+	{
+		hidden(true);
+		add_children({
+				&button_load_freqs,
+				&text_input_file,
+				&button_save_freqs,
+				&button_output_file,
+				&checkbox_autosave_freqs,
+				&checkbox_autostart_recon,
+				&checkbox_continuous,
+				&checkbox_clear_output
+				});
 
-    ReconSetupViewMain::ReconSetupViewMain( NavigationView &nav , Rect parent_rect , std::string input_file , std::string output_file ) : View( parent_rect ) , _input_file { input_file } , _output_file { output_file } 
-    {
-        hidden(true);
-        add_children({
-                &button_load_freqs,
-                &text_input_file,
-                &button_save_freqs,
-                &button_output_file,
-                &checkbox_autosave_freqs,
-                &checkbox_autostart_recon,
-                &checkbox_continuous,
-                &checkbox_clear_output
-                });
+		checkbox_autosave_freqs.set_value( persistent_memory::recon_autosave_freqs() );
+		checkbox_autostart_recon.set_value( persistent_memory::recon_autostart_recon() );
+		checkbox_continuous.set_value( persistent_memory::recon_continuous() );
+		checkbox_clear_output.set_value( persistent_memory::recon_clear_output() );
 
-        checkbox_autosave_freqs.set_value( persistent_memory::recon_autosave_freqs() );
-        checkbox_autostart_recon.set_value( persistent_memory::recon_autostart_recon() );
-        checkbox_continuous.set_value( persistent_memory::recon_continuous() );
-        checkbox_clear_output.set_value( persistent_memory::recon_clear_output() );
+		text_input_file.set( _input_file );	
+		button_output_file.set_text( _output_file );	
 
-        text_input_file.set( _input_file );	
-        button_output_file.set_text( _output_file );	
+		button_load_freqs.on_select = [this, &nav](Button&) {
+			auto open_view = nav.push<FileLoadView>(".TXT");
+			open_view->on_changed = [this,&nav](std::filesystem::path new_file_path) {
+				std::string dir_filter = "FREQMAN/";
+				std::string str_file_path = new_file_path.string();
+				if (str_file_path.find(dir_filter) != string::npos) { // assert file from the FREQMAN folder
+																	  // get the filename without txt extension so we can use load_freqman_file fcn
+					_input_file = new_file_path.stem().string();
+					text_input_file.set( _input_file );
+				} else {
+					nav.display_modal("LOAD ERROR", "A valid file from\nFREQMAN directory is\nrequired.");
+				}
+			};
+		};
 
-        button_load_freqs.on_select = [this, &nav](Button&) {
-            auto open_view = nav.push<FileLoadView>(".TXT");
-            open_view->on_changed = [this,&nav](std::filesystem::path new_file_path) {
-                std::string dir_filter = "FREQMAN/";
-                std::string str_file_path = new_file_path.string();
-                if (str_file_path.find(dir_filter) != string::npos) { // assert file from the FREQMAN folder
-                                                                      // get the filename without txt extension so we can use load_freqman_file fcn
-                    _input_file = new_file_path.stem().string();
-                    text_input_file.set( _input_file );
-                } else {
-                    nav.display_modal("LOAD ERROR", "A valid file from\nFREQMAN directory is\nrequired.");
-                }
-            };
-        };
+		button_save_freqs.on_select = [this, &nav](Button&) {
+			auto open_view = nav.push<FileLoadView>(".TXT");
+			open_view->on_changed = [this,&nav](std::filesystem::path new_file_path) {
+				std::string dir_filter = "FREQMAN/";
+				std::string str_file_path = new_file_path.string();
+				if (str_file_path.find(dir_filter) != string::npos) { // assert file from the FREQMAN folder
+					_output_file = new_file_path.stem().string();
+					button_output_file.set_text( _output_file );	
+				} else {
+					nav.display_modal("LOAD ERROR", "A valid file from\nFREQMAN directory is\nrequired.");
+				}
+			};
+		};
 
-        button_save_freqs.on_select = [this, &nav](Button&) {
-            auto open_view = nav.push<FileLoadView>(".TXT");
-            open_view->on_changed = [this,&nav](std::filesystem::path new_file_path) {
-                std::string dir_filter = "FREQMAN/";
-                std::string str_file_path = new_file_path.string();
-                if (str_file_path.find(dir_filter) != string::npos) { // assert file from the FREQMAN folder
-                    _output_file = new_file_path.stem().string();
-                    button_output_file.set_text( _output_file );	
-                } else {
-                    nav.display_modal("LOAD ERROR", "A valid file from\nFREQMAN directory is\nrequired.");
-                }
-            };
-        };
+		button_output_file.on_select =[this, &nav](Button&) {
+			text_prompt( nav, _output_file , 28 ,
+					[this](std::string& buffer) {
+					_output_file = buffer ;
+					button_output_file.set_text( _output_file );
+					}   );
+		};
+	};
 
-        button_output_file.on_select =[this, &nav](Button&) {
-            text_prompt( nav, _output_file , 28 ,
-                    [this](std::string& buffer) {
-                    _output_file = buffer ;
-                    button_output_file.set_text( _output_file );
-                    }   );
-        };
-    };
+	void ReconSetupViewMain::Save( std::string &input_file , std::string &output_file ) {
+		persistent_memory::set_recon_autosave_freqs(checkbox_autosave_freqs.value());
+		persistent_memory::set_recon_autostart_recon(checkbox_autostart_recon.value());
+		persistent_memory::set_recon_continuous(checkbox_continuous.value()); 
+		persistent_memory::set_recon_clear_output(checkbox_clear_output.value()); 
+		input_file=_input_file ;
+		output_file=_output_file ;
+	};
+	void ReconSetupViewMore::Save( uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , uint32_t &recon_match_mode ) {
+		persistent_memory::set_recon_load_freqs(checkbox_load_freqs.value()); 
+		persistent_memory::set_recon_load_ranges(checkbox_load_ranges.value()); 
+		persistent_memory::set_recon_load_hamradios(checkbox_load_hamradios.value()); 
+		persistent_memory::set_recon_update_ranges_when_recon(checkbox_update_ranges_when_recon.value()); 
+		recon_lock_duration = field_recon_lock_duration.value();
+		recon_lock_nb_match = field_recon_lock_nb_match.value();
+		recon_match_mode    = field_recon_match_mode . selected_index_value() ;
+	};
 
-    void ReconSetupViewMain::Save( std::string &input_file , std::string &output_file ) {
-        persistent_memory::set_recon_autosave_freqs(checkbox_autosave_freqs.value());
-        persistent_memory::set_recon_autostart_recon(checkbox_autostart_recon.value());
-        persistent_memory::set_recon_continuous(checkbox_continuous.value()); 
-        persistent_memory::set_recon_clear_output(checkbox_clear_output.value()); 
-        input_file=_input_file ;
-        output_file=_output_file ;
-    };
-    void ReconSetupViewMore::Save( uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , uint32_t &recon_match_mode ) {
-        persistent_memory::set_recon_load_freqs(checkbox_load_freqs.value()); 
-        persistent_memory::set_recon_load_ranges(checkbox_load_ranges.value()); 
-        persistent_memory::set_recon_load_hamradios(checkbox_load_hamradios.value()); 
-        persistent_memory::set_recon_update_ranges_when_recon(checkbox_update_ranges_when_recon.value()); 
-        recon_lock_duration = field_recon_lock_duration.value();
-        recon_lock_nb_match = field_recon_lock_nb_match.value();
-        recon_match_mode    = field_recon_match_mode . selected_index_value() ;
-    };
+	void ReconSetupViewMain::focus() {
+		button_load_freqs.focus();
+	}
 
-    void ReconSetupViewMain::focus() {
-        button_load_freqs.focus();
-    }
+	ReconSetupViewMore::ReconSetupViewMore( NavigationView &nav , Rect parent_rect , uint32_t recon_lock_duration , uint32_t recon_lock_nb_match , uint32_t recon_match_mode ) : View( parent_rect ), _recon_lock_duration { recon_lock_duration } , _recon_lock_nb_match { recon_lock_nb_match } , _recon_match_mode { recon_match_mode } 
+	{
+		(void)nav;
+		hidden(true);
 
-    ReconSetupViewMore::ReconSetupViewMore( NavigationView &nav , Rect parent_rect , uint32_t recon_lock_duration , uint32_t recon_lock_nb_match , uint32_t recon_match_mode ) : View( parent_rect ), _recon_lock_duration { recon_lock_duration } , _recon_lock_nb_match { recon_lock_nb_match } , _recon_match_mode { recon_match_mode } 
-    {
-        (void)nav;
-        hidden(true);
+		add_children({
+				&checkbox_load_freqs,
+				&checkbox_load_ranges,
+				&checkbox_load_hamradios,
+				&checkbox_update_ranges_when_recon,
+				&text_recon_lock_duration,
+				&field_recon_lock_duration,
+				&text_recon_lock_nb,
+				&field_recon_lock_nb_match,
+				&field_recon_match_mode,
+				});
 
-        add_children({
-                &checkbox_load_freqs,
-                &checkbox_load_ranges,
-                &checkbox_load_hamradios,
-                &checkbox_update_ranges_when_recon,
-                &text_recon_lock_duration,
-                &field_recon_lock_duration,
-                &text_recon_lock_nb,
-                &field_recon_lock_nb_match,
-                &field_recon_match_mode,
-                });
+		checkbox_load_freqs.set_value( persistent_memory::recon_load_freqs() );
+		checkbox_load_ranges.set_value( persistent_memory::recon_load_ranges() );
+		checkbox_load_hamradios.set_value( persistent_memory::recon_load_hamradios() );
+		checkbox_update_ranges_when_recon.set_value( persistent_memory::recon_update_ranges_when_recon() );
+		field_recon_lock_duration.set_value( _recon_lock_duration ); 
+		field_recon_lock_nb_match.set_value( _recon_lock_nb_match ); 
+		field_recon_match_mode.set_by_value( _recon_match_mode ); 
+	};
 
-        checkbox_load_freqs.set_value( persistent_memory::recon_load_freqs() );
-        checkbox_load_ranges.set_value( persistent_memory::recon_load_ranges() );
-        checkbox_load_hamradios.set_value( persistent_memory::recon_load_hamradios() );
-        checkbox_update_ranges_when_recon.set_value( persistent_memory::recon_update_ranges_when_recon() );
-        field_recon_lock_duration.set_value( _recon_lock_duration ); 
-        field_recon_lock_nb_match.set_value( _recon_lock_nb_match ); 
-        field_recon_match_mode.set_by_value( _recon_match_mode ); 
-    };
+	void ReconSetupViewMore::focus() {
+		checkbox_load_freqs.focus();
+	}
 
-    void ReconSetupViewMore::focus() {
-        checkbox_load_freqs.focus();
-    }
+	void ReconSetupView::focus() {
+		viewMain.focus();
+	}
 
-    void ReconSetupView::focus() {
-        viewMain.focus();
-    }
+	ReconSetupView::ReconSetupView(
+			NavigationView& nav , std::string _input_file , std::string _output_file , uint32_t _recon_lock_duration , uint32_t _recon_lock_nb_match , uint32_t _recon_match_mode ) : nav_ { nav } , input_file { _input_file } , output_file { _output_file } , recon_lock_duration { _recon_lock_duration } , recon_lock_nb_match { _recon_lock_nb_match } , recon_match_mode { _recon_match_mode } 
+	{
+		add_children({
+				&tab_view,
+				&viewMain,
+				&viewMore,
+				&button_save
+				});
 
-    ReconSetupView::ReconSetupView(
-            NavigationView& nav , std::string _input_file , std::string _output_file , uint32_t _recon_lock_duration , uint32_t _recon_lock_nb_match , uint32_t _recon_match_mode ) : nav_ { nav } , input_file { _input_file } , output_file { _output_file } , recon_lock_duration { _recon_lock_duration } , recon_lock_nb_match { _recon_lock_nb_match } , recon_match_mode { _recon_match_mode } 
-    {
-        add_children({
-                &tab_view,
-                &viewMain,
-                &viewMore,
-                &button_save
-                });
-
-        button_save.on_select = [this,&nav](Button&) {
-            viewMain.Save( input_file , output_file );
-            viewMore.Save( recon_lock_duration , recon_lock_nb_match , recon_match_mode );
-            std::vector<std::string> messages ;
-            messages.push_back( input_file );
-            messages.push_back( output_file );
-            messages.push_back( to_string_dec_uint( recon_lock_duration ) );
-            messages.push_back( to_string_dec_uint( recon_lock_nb_match ) );
-            messages.push_back( to_string_dec_uint( recon_match_mode ) );
-            on_changed( messages );
-            nav.pop();
-        };
-    }
+		button_save.on_select = [this,&nav](Button&) {
+			viewMain.Save( input_file , output_file );
+			viewMore.Save( recon_lock_duration , recon_lock_nb_match , recon_match_mode );
+			std::vector<std::string> messages ;
+			messages.push_back( input_file );
+			messages.push_back( output_file );
+			messages.push_back( to_string_dec_uint( recon_lock_duration ) );
+			messages.push_back( to_string_dec_uint( recon_lock_nb_match ) );
+			messages.push_back( to_string_dec_uint( recon_match_mode ) );
+			on_changed( messages );
+			nav.pop();
+		};
+	}
 } /* namespace ui */

firmware/application/apps/ui_recon_settings.hpp

@@ -20,6 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifndef _UI_RECON_SETTINGS
+#define _UI_RECON_SETTINGS
+
 #include "serializer.hpp"
 #include "ui.hpp"
 #include "ui_widget.hpp"
@@ -27,168 +30,198 @@
 #include "ui_navigation.hpp"
 #include "string_format.hpp"
 
+// maximum usable freq
+#define MAX_UFREQ 7200000000
+
+// 1Mhz helper
+#ifdef OneMHz
+    #undef OneMHz
+#endif
+#define OneMHz 1000000
+
+// modes
+#define RECON_MATCH_CONTINUOUS 0
+#define RECON_MATCH_SPARSE 1
+
+// statistics update interval (change here if it's evolving) in ms
+#define STATS_UPDATE_INTERVAL 100
+
+// default number of match to have a lock
+#define RECON_DEF_NB_MATCH 3
+#define RECON_DEF_LOCK_DURATION 100  // have to be >= and a multiple of STATS_UPDATE_INTERVAL
+#define RECON_DEF_WAIT_DURATION 1000 // will be incremented/decremented by STATS_UPDATE_INTERVAL steps
+
+// screen size helper
+#define SCREEN_W 240
+//#define SCREEN_H 320
+
+// recon settings nb params
+#define RECON_SETTINGS_NB_PARAMS 8
+
 namespace ui {
 
-    bool ReconSetupLoadStrings( std::string source, std::string &input_file , std::string &output_file , uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , int32_t &recon_squelch_level , uint32_t &recon_match_mode , int32_t &wait , uint32_t &lock_wait , int32_t &volume );
-    bool ReconSetupSaveStrings( std::string dest, const std::string input_file , const std::string output_file , const uint32_t recon_lock_duration , const uint32_t recon_lock_nb_match , int32_t recon_squelch_level , uint32_t recon_match_mode , int32_t wait , uint32_t lock_wait , int32_t volume );
+	bool ReconSetupLoadStrings( std::string source, std::string &input_file , std::string &output_file , uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , int32_t &recon_squelch_level , uint32_t &recon_match_mode , int32_t &wait , int32_t &volume );
+	bool ReconSetupSaveStrings( std::string dest, const std::string input_file , const std::string output_file , const uint32_t recon_lock_duration , const uint32_t recon_lock_nb_match , int32_t recon_squelch_level , uint32_t recon_match_mode , int32_t wait , int32_t volume );
 
-    class ReconSetupViewMain : public View {
-        public:
-            ReconSetupViewMain( NavigationView& nav, Rect parent_rect , std::string input_file , std::string output_file );
-            void Save( std::string &input_file , std::string &output_file );
-            void focus() override;
+	class ReconSetupViewMain : public View {
+		public:
+			ReconSetupViewMain( NavigationView& nav, Rect parent_rect , std::string input_file , std::string output_file );
+			void Save( std::string &input_file , std::string &output_file );
+			void focus() override;
 
-        private:
-            std::string _input_file  = { "RECON" };
-            std::string _output_file = { "RECON_RESULTS" };
+		private:
+			std::string _input_file  = { "RECON" };
+			std::string _output_file = { "RECON_RESULTS" };
 
-            Button button_load_freqs {
-                { 1 * 8 , 12 , 18 * 8 , 22 },
-                    "select input file"
-            };
-            Text text_input_file {
-                { 1 * 8 , 4 + 2 * 16, 18 * 8, 22 },  
-                    "RECON"
-            };
+			Button button_load_freqs {
+				{ 1 * 8 , 12 , 18 * 8 , 22 },
+					"select input file"
+			};
+			Text text_input_file {
+				{ 1 * 8 , 4 + 2 * 16, 18 * 8, 22 },  
+					"RECON"
+			};
 
-            Button button_save_freqs {
-                { 1 * 8 , 4 * 16 - 8 , 18 * 8 , 22 },
-                    "select output file"
-            };
-            Button button_output_file {
-                { 1 * 8 , 5 * 16 - 2, 18 * 8, 22 },  
-                    "RECON_RESULTS"	
-            };
+			Button button_save_freqs {
+				{ 1 * 8 , 4 * 16 - 8 , 18 * 8 , 22 },
+					"select output file"
+			};
+			Button button_output_file {
+				{ 1 * 8 , 5 * 16 - 2, 18 * 8, 22 },  
+					"RECON_RESULTS"	
+			};
 
-            Checkbox checkbox_autosave_freqs {
-                { 1 * 8, 7 * 16 - 4 },
-                    3,
-                    "autosave freqs"
-            };
+			Checkbox checkbox_autosave_freqs {
+				{ 1 * 8, 7 * 16 - 4 },
+					3,
+					"autosave freqs"
+			};
 
-            Checkbox checkbox_autostart_recon {
-                { 1 * 8, 9 * 16 - 4 },
-                    3,
-                    "autostart recon"
-            };
+			Checkbox checkbox_autostart_recon {
+				{ 1 * 8, 9 * 16 - 4 },
+					3,
+					"autostart recon"
+			};
 
-            Checkbox checkbox_continuous {
-                { 1 * 8, 11 * 16 - 4 },
-                    3,
-                    "continuous"
-            };
-            Checkbox checkbox_clear_output {
-                { 1 * 8, 13 * 16 - 4 },
-                    3,
-                    "clear output at start"
-            };
-    };
+			Checkbox checkbox_continuous {
+				{ 1 * 8, 11 * 16 - 4 },
+					3,
+					"continuous"
+			};
+			Checkbox checkbox_clear_output {
+				{ 1 * 8, 13 * 16 - 4 },
+					3,
+					"clear output at start"
+			};
+	};
 
-    class ReconSetupViewMore : public View {
-        public:
-            ReconSetupViewMore( NavigationView& nav, Rect parent_rect , const uint32_t _recon_lock_duration , const uint32_t _recon_lock_nb_match , const uint32_t _recon_match_mode );
+	class ReconSetupViewMore : public View {
+		public:
+			ReconSetupViewMore( NavigationView& nav, Rect parent_rect , const uint32_t _recon_lock_duration , const uint32_t _recon_lock_nb_match , const uint32_t _recon_match_mode );
 
-            void Save( uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , uint32_t &recon_match_mode );
+			void Save( uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , uint32_t &recon_match_mode );
 
-            void focus() override;
+			void focus() override;
 
-        private:
+		private:
 
-            const uint32_t _recon_lock_duration = 50 ;
-            const uint32_t _recon_lock_nb_match = 10 ;
-            const uint32_t _recon_match_mode = 0 ;
+			const uint32_t _recon_lock_duration = STATS_UPDATE_INTERVAL ;
+			const uint32_t _recon_lock_nb_match = RECON_DEF_NB_MATCH ;
+			const uint32_t _recon_match_mode = RECON_MATCH_CONTINUOUS ;
 
-            Checkbox checkbox_load_freqs {
-                { 1 * 8, 12 },
-                    3,
-                    "input: load freqs"
-            };
+			Checkbox checkbox_load_freqs {
+				{ 1 * 8, 12 },
+					3,
+					"input: load freqs"
+			};
 
-            Checkbox checkbox_load_ranges {
-                { 1 * 8, 42 },
-                    3,
-                    "input: load ranges"
-            };
+			Checkbox checkbox_load_ranges {
+				{ 1 * 8, 42 },
+					3,
+					"input: load ranges"
+			};
 
-            Checkbox checkbox_load_hamradios {
-                { 1 * 8, 72 },
-                    3,
-                    "input: load hamradios"
-            };
+			Checkbox checkbox_load_hamradios {
+				{ 1 * 8, 72 },
+					3,
+					"input: load hamradios"
+			};
 
-            Checkbox checkbox_update_ranges_when_recon {
-                { 1 * 8, 102 },
-                    3,
-                    "auto update m-ranges"
-            };
-            Text text_recon_lock_duration {
-                { 1 * 8 , 132 , 22 * 8 , 22 },  
-                    "    ms (lock duration)"
-            };
-            NumberField field_recon_lock_duration {
-                { 1 * 8, 132 },             // position X , Y
-                    4,                      // number of displayed digits (even empty)
-                    { 50 , 990 },           // range of number
-                    10,                     // rotary encoder increment
-                    ' ',                    // filling character 
-                    false                   // can loop
-            };
-            Text text_recon_lock_nb {
-                { 1 * 8 , 162 , 25 * 8 , 22 },  
-                    "    x (nb lock to match freq)"
-            };
-            NumberField field_recon_lock_nb_match {
-                { 1 * 8, 162 },
-                    4,
-                    { 1, 99 },
-                    1,
-                    ' ',
-                    false
-            };
-            OptionsField field_recon_match_mode {
-                { 1 * 8, 192 },
-                    20,   // CONTINUOUS MATCH MODE / SPARSE TIMED MATCH MODE
-                    {
-                        { "SQL MATCH: CONTINOUS" , 0 },
-                        { "SQL MATCH: SPARSE" , 1 }
-                    }
-            };
-    };
+			Checkbox checkbox_update_ranges_when_recon {
+				{ 1 * 8, 102 },
+					3,
+					"auto update m-ranges"
+			};
+			Text text_recon_lock_duration {
+				{ 1 * 8 , 132 , 22 * 8 , 22 },  
+					"    ms (lock duration)"
+			};
+			NumberField field_recon_lock_duration {
+				{ 1 * 8, 132 },             // position X , Y
+					4,                      // number of displayed digits (even empty)
+					{ STATS_UPDATE_INTERVAL , 10000-STATS_UPDATE_INTERVAL },           // range of number
+					STATS_UPDATE_INTERVAL,                     // rotary encoder increment
+					' ',                    // filling character 
+					false                   // can loop
+			};
+			Text text_recon_lock_nb {
+				{ 1 * 8 , 162 , 25 * 8 , 22 },  
+					"    x (nb lock to match freq)"
+			};
+			NumberField field_recon_lock_nb_match {
+				{ 1 * 8, 162 },
+					4,
+					{ 1, 99 },
+					1,
+					' ',
+					false
+			};
+			OptionsField field_recon_match_mode {
+				{ 1 * 8, 192 },
+					20,   // CONTINUOUS MATCH MODE / SPARSE TIMED MATCH MODE
+					{
+						{ "SQL MATCH: CONTINOUS" , 0 },
+						{ "SQL MATCH: SPARSE" , 1 }
+					}
+			};
+	};
 
 
-    class ReconSetupView : public View {
-        public:
-            ReconSetupView( NavigationView& nav , std::string _input_file , std::string _output_file , const uint32_t _recon_lock_duration , const uint32_t _recon_lock_nb_match , const uint32_t _recon_match_mode );
+	class ReconSetupView : public View {
+		public:
+			ReconSetupView( NavigationView& nav , std::string _input_file , std::string _output_file , const uint32_t _recon_lock_duration , const uint32_t _recon_lock_nb_match , const uint32_t _recon_match_mode );
 
-            std::function<void( std::vector<std::string> messages )> on_changed { };
+			std::function<void( std::vector<std::string> messages )> on_changed { };
 
-            void focus() override;
+			void focus() override;
 
-            std::string title() const override { return "Recon setup"; };
+			std::string title() const override { return "Recon setup"; };
 
-        private:
+		private:
 
-            NavigationView& nav_ ;
+			NavigationView& nav_ ;
 
-            std::string input_file  = { "RECON" };
-            std::string output_file = { "RECON_RESULTS" };
-            uint32_t recon_lock_duration = 50 ;
-            uint32_t recon_lock_nb_match = 10 ;
-            uint32_t recon_match_mode = 0 ;
+			std::string input_file  = { "RECON" };
+			std::string output_file = { "RECON_RESULTS" };
+			uint32_t recon_lock_duration = STATS_UPDATE_INTERVAL ;
+			uint32_t recon_lock_nb_match = RECON_DEF_NB_MATCH ;
+			uint32_t recon_match_mode = RECON_MATCH_CONTINUOUS ;
 
-            Rect view_rect = { 0, 3 * 8, 240, 230 };
+			Rect view_rect = { 0, 3 * 8, SCREEN_W, 230 };
 
-            ReconSetupViewMain viewMain{ nav_ , view_rect , input_file , output_file };
-            ReconSetupViewMore viewMore{ nav_ , view_rect , recon_lock_duration , recon_lock_nb_match , recon_match_mode };
+			ReconSetupViewMain viewMain{ nav_ , view_rect , input_file , output_file };
+			ReconSetupViewMore viewMore{ nav_ , view_rect , recon_lock_duration , recon_lock_nb_match , recon_match_mode };
 
-            TabView tab_view {
-                { "Main", Color::cyan() , &viewMain },
-                    { "More", Color::green(), &viewMore }
-            };
-            Button button_save {
-                { 9 * 8, 255, 14 * 8 , 40 },
-                    "SAVE"
-            };
-    };
+			TabView tab_view {
+				{ "Main", Color::cyan() , &viewMain },
+					{ "More", Color::green(), &viewMore }
+			};
+			Button button_save {
+				{ 9 * 8, 255, 14 * 8 , 40 },
+					"SAVE"
+			};
+	};
 
 } /* namespace ui */
+
+#endif

firmware/application/apps/ui_scanner.hpp

@@ -88,8 +88,6 @@ public:
 	
 	void focus() override;
 
-	void big_display_freq(rf::Frequency f);
-
 	const Style style_grey {		// scanning
 		.font = font::fixed_8x16,
 		.background = Color::black(),

firmware/application/apps/ui_sd_over_usb.cpp

@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * 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_sd_over_usb.hpp"
+#include "portapack_shared_memory.hpp"
+
+namespace ui {
+
+SdOverUsbView::SdOverUsbView(NavigationView& nav) : nav_ (nav) {
+	add_children({
+		&labels,
+		&button_run
+	});
+
+	button_run.on_select = [this](Button&) {
+		ui::Painter painter;
+			painter.fill_rectangle(
+			{ 0, 0, portapack::display.width(), portapack::display.height() },
+			ui::Color::black()
+		);
+
+		painter.draw_bitmap(
+			{ portapack::display.width()/2-8, portapack::display.height()/2-8 },
+			bitmap_icon_hackrf,
+			ui::Color::yellow(),
+			ui::Color::black()
+		);
+
+		sdcDisconnect(&SDCD1);
+		sdcStop(&SDCD1);
+
+		portapack::shutdown(true);
+		m4_init(portapack::spi_flash::image_tag_usb_sd, portapack::memory::map::m4_code, false);
+		m0_halt();
+		/* will not return*/
+	};
+}
+
+void SdOverUsbView::focus() {
+	button_run.focus();
+}
+
+} /* namespace ui */

firmware/application/apps/ui_sd_over_usb.hpp

@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * 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_SD_OVER_USB_H__
+#define __UI_SD_OVER_USB_H__
+
+#include "ui_widget.hpp"
+#include "ui_navigation.hpp"
+#include "string_format.hpp"
+#include "ff.h"
+#include "baseband_api.hpp"
+#include "core_control.hpp"
+
+#include <cstdint>
+
+namespace ui {
+
+class SdOverUsbView : public View {
+public:
+	SdOverUsbView(NavigationView& nav);
+
+	void focus() override;
+
+	std::string title() const override { return "SD over USB"; };	
+
+private:
+	NavigationView& nav_;
+	
+	Labels labels {
+		{ { 3 * 8, 2 * 16 }, "Click Run to start the", Color::white() },
+		{ { 3 * 8, 3 * 16 }, "USB Mass Storage Mode.", Color::white() },
+		{ { 3 * 8, 5 * 16 }, "It can take up to 20s", Color::white() },
+		{ { 3 * 8, 6 * 16 }, "for the drive to be", Color::white() },
+		{ { 3 * 8, 7 * 16 }, "available.", Color::white() },
+	};
+
+	Button button_run {
+		{ 9 * 8, 15 * 16, 12 * 8, 3 * 16 },
+		"Run" 
+	};		
+};
+
+} /* namespace ui */
+
+#endif /*__UI_SD_OVER_USB_H__*/

firmware/application/apps/ui_settings.cpp

@@ -41,376 +41,539 @@ using namespace portapack;
 #include "freqman.hpp"
 
 namespace ui {
+	SetDateTimeView::SetDateTimeView(
+			NavigationView& nav
+			) {
+		button_save.on_select = [&nav, this](Button&){
+			const auto model = this->form_collect();
+			const rtc::RTC new_datetime {
+				model.year, model.month, model.day,
+					model.hour, model.minute, model.second
+			};
+			rtcSetTime(&RTCD1, &new_datetime);
+			nav.pop();
+		},
 
-SetDateTimeView::SetDateTimeView(
-	NavigationView& nav
-) {
-	button_save.on_select = [&nav, this](Button&){
-		const auto model = this->form_collect();
-		const rtc::RTC new_datetime {
-			model.year, model.month, model.day,
-			model.hour, model.minute, model.second
+			button_cancel.on_select = [&nav](Button&){
+				nav.pop();
+			},
+
+			add_children({
+					&labels,
+					&field_year,
+					&field_month,
+					&field_day,
+					&field_hour,
+					&field_minute,
+					&field_second,
+					&button_save,
+					&button_cancel,
+					});
+
+		rtc::RTC datetime;
+		rtcGetTime(&RTCD1, &datetime);
+		SetDateTimeModel model {
+			datetime.year(),
+				datetime.month(),
+				datetime.day(),
+				datetime.hour(),
+				datetime.minute(),
+				datetime.second()
 		};
-		rtcSetTime(&RTCD1, &new_datetime);
-		nav.pop();
-	},
 
-	button_cancel.on_select = [&nav](Button&){
-		nav.pop();
-	},
-
-	add_children({
-		&labels,
-		&field_year,
-		&field_month,
-		&field_day,
-		&field_hour,
-		&field_minute,
-		&field_second,
-		&button_save,
-		&button_cancel,
-	});
-
-	rtc::RTC datetime;
-	rtcGetTime(&RTCD1, &datetime);
-	SetDateTimeModel model {
-		datetime.year(),
-		datetime.month(),
-		datetime.day(),
-		datetime.hour(),
-		datetime.minute(),
-		datetime.second()
-	};
-
-	form_init(model);
-}
-
-void SetDateTimeView::focus() {
-	button_cancel.focus();
-}
-
-void SetDateTimeView::form_init(const SetDateTimeModel& model) {
-	field_year.set_value(model.year);
-	field_month.set_value(model.month);
-	field_day.set_value(model.day);
-	field_hour.set_value(model.hour);
-	field_minute.set_value(model.minute);
-	field_second.set_value(model.second);
-}
-
-SetDateTimeModel SetDateTimeView::form_collect() {
-	return {
-		.year = static_cast<uint16_t>(field_year.value()),
-		.month = static_cast<uint8_t>(field_month.value()),
-		.day = static_cast<uint8_t>(field_day.value()),
-		.hour = static_cast<uint8_t>(field_hour.value()),
-		.minute = static_cast<uint8_t>(field_minute.value()),
-		.second = static_cast<uint8_t>(field_second.value())
-	};
-}
-
-SetRadioView::SetRadioView(
-	NavigationView& nav
-) {
-	button_cancel.on_select = [&nav](Button&){
-		nav.pop();
-	};
-
-	const auto reference = portapack::clock_manager.get_reference();
-	
-	std::string source_name("---");
-	switch(reference.source) {
-	case ClockManager::ReferenceSource::Xtal:      source_name = "HackRF";    break;
-	case ClockManager::ReferenceSource::PortaPack: source_name = "PortaPack"; break;
-	case ClockManager::ReferenceSource::External:  source_name = "External";  break;
+		form_init(model);
 	}
 
-	value_source.set(source_name);
-	value_source_frequency.set(to_string_dec_uint(reference.frequency / 1000000, 2) + "." + to_string_dec_uint((reference.frequency % 1000000) / 100, 4, '0') + " MHz");
+	void SetDateTimeView::focus() {
+		button_cancel.focus();
+	}
 
-	label_source.set_style(&style_text);
-	value_source.set_style(&style_text);
-	value_source_frequency.set_style(&style_text);
+	void SetDateTimeView::form_init(const SetDateTimeModel& model) {
+		field_year.set_value(model.year);
+		field_month.set_value(model.month);
+		field_day.set_value(model.day);
+		field_hour.set_value(model.hour);
+		field_minute.set_value(model.minute);
+		field_second.set_value(model.second);
+	}
 
-	add_children({
-		&label_source,
-		&value_source,
-		&value_source_frequency,
-	});
+	SetDateTimeModel SetDateTimeView::form_collect() {
+		return {
+			.year = static_cast<uint16_t>(field_year.value()),
+				.month = static_cast<uint8_t>(field_month.value()),
+				.day = static_cast<uint8_t>(field_day.value()),
+				.hour = static_cast<uint8_t>(field_hour.value()),
+				.minute = static_cast<uint8_t>(field_minute.value()),
+				.second = static_cast<uint8_t>(field_second.value())
+		};
+	}
+
+	SetRadioView::SetRadioView(
+			NavigationView& nav
+			) {
+		button_cancel.on_select = [&nav](Button&){
+			nav.pop();
+		};
+
+		const auto reference = portapack::clock_manager.get_reference();
+
+		std::string source_name("---");
+		switch(reference.source) {
+			case ClockManager::ReferenceSource::Xtal:      source_name = "HackRF";    break;
+			case ClockManager::ReferenceSource::PortaPack: source_name = "PortaPack"; break;
+			case ClockManager::ReferenceSource::External:  source_name = "External";  break;
+		}
+
+		value_source.set(source_name);
+		value_source_frequency.set(to_string_dec_uint(reference.frequency / 1000000, 2) + "." + to_string_dec_uint((reference.frequency % 1000000) / 100, 4, '0') + " MHz");
+
+		label_source.set_style(&style_text);
+		value_source.set_style(&style_text);
+		value_source_frequency.set_style(&style_text);
 
-	if( reference.source == ClockManager::ReferenceSource::Xtal ) {
 		add_children({
-			&labels_correction,
-			&field_ppm,
-		});
+				&label_source,
+				&value_source,
+				&value_source_frequency,
+				});
+
+		if( reference.source == ClockManager::ReferenceSource::Xtal ) {
+			add_children({
+					&labels_correction,
+					&field_ppm,
+					});
+		}
+
+		add_children({
+				&check_clkout,
+				&field_clkout_freq,
+				&labels_clkout_khz,
+				&value_freq_step,
+				&labels_bias,
+				&check_bias,
+				&button_save,
+				&button_cancel
+				});
+
+		SetFrequencyCorrectionModel model {
+			static_cast<int8_t>(portapack::persistent_memory::correction_ppb() / 1000) , 0
+		};
+
+		form_init(model);
+
+		check_clkout.set_value(portapack::persistent_memory::clkout_enabled());
+		check_clkout.on_select = [this](Checkbox&, bool v) {
+			clock_manager.enable_clock_output(v);
+			portapack::persistent_memory::set_clkout_enabled(v);
+			StatusRefreshMessage message { };
+			EventDispatcher::send_message(message);
+		};
+
+		field_clkout_freq.set_value(portapack::persistent_memory::clkout_freq());
+		value_freq_step.set_style(&style_text);
+
+		field_clkout_freq.on_select = [this](NumberField&) {
+			freq_step_khz++;
+			if(freq_step_khz > 3) {
+				freq_step_khz = 0;
+			}
+			switch(freq_step_khz) {
+				case 0:
+					value_freq_step.set("   |");
+					break;
+				case 1:
+					value_freq_step.set("  | ");
+					break;
+				case 2:
+					value_freq_step.set(" |  ");
+					break;
+				case 3:
+					value_freq_step.set("|   ");
+					break;
+			}
+			field_clkout_freq.set_step(pow(10, freq_step_khz));
+		};
+
+		check_bias.set_value(portapack::get_antenna_bias());
+		check_bias.on_select = [this](Checkbox&, bool v) {
+			portapack::set_antenna_bias(v);
+			StatusRefreshMessage message { };
+			EventDispatcher::send_message(message);
+		};
+
+		button_save.on_select = [this, &nav](Button&){
+			const auto model = this->form_collect();
+			portapack::persistent_memory::set_correction_ppb(model.ppm * 1000);
+			portapack::persistent_memory::set_clkout_freq(model.freq);
+			clock_manager.enable_clock_output(portapack::persistent_memory::clkout_enabled());
+			nav.pop();
+		};
 	}
 
-	add_children({
-		&check_hamitup,
-		&button_hamitup_freq,
-		&check_clkout,
-		&field_clkout_freq,
-		&labels_clkout_khz,
-		&value_freq_step,
-		&labels_bias,
-		&check_bias,
-		&button_save,
-		&button_cancel
-	});
+	void SetRadioView::focus() {
+		button_save.focus();
+	}
 
-	SetFrequencyCorrectionModel model {
-		static_cast<int8_t>(portapack::persistent_memory::correction_ppb() / 1000) , 0
-	};
+	void SetRadioView::form_init(const SetFrequencyCorrectionModel& model) {
+		field_ppm.set_value(model.ppm);
+	}
 
-	form_init(model);
-
-	check_clkout.set_value(portapack::persistent_memory::clkout_enabled());
-	check_clkout.on_select = [this](Checkbox&, bool v) {
-		clock_manager.enable_clock_output(v);
-		portapack::persistent_memory::set_clkout_enabled(v);
-		StatusRefreshMessage message { };
-		EventDispatcher::send_message(message);
-	};
-
-    check_hamitup.set_value(portapack::persistent_memory::config_hamitup());
-	check_hamitup.on_select = [this](Checkbox&, bool v) {
-        portapack::persistent_memory::set_config_hamitup(v);
-        // Retune to take hamitup change in account
-	    receiver_model.set_tuning_frequency( portapack::persistent_memory::tuned_frequency() );	
-        //Refresh status bar with/out UP!
-        StatusRefreshMessage message { };				
-       	EventDispatcher::send_message(message);
-	};
-
-    button_hamitup_freq.set_text( to_string_short_freq( portapack::persistent_memory::config_hamitup_freq() ) + "MHz");
-
-    button_hamitup_freq.on_select = [this, &nav](Button& button) {
-            auto new_view = nav.push<FrequencyKeypadView>(portapack::persistent_memory::config_hamitup_freq() );
-            new_view->on_changed = [this, &button](rf::Frequency f) {
-                portapack::persistent_memory::set_config_hamitup_freq( f );
-                // Retune to take hamitup change in account
-        	    receiver_model.set_tuning_frequency( portapack::persistent_memory::tuned_frequency() );	
-                button_hamitup_freq.set_text( "<" + to_string_short_freq( f ) + " MHz>" );
-            };
-        };
-	
-	field_clkout_freq.set_value(portapack::persistent_memory::clkout_freq());
-	value_freq_step.set_style(&style_text);
-
-	field_clkout_freq.on_select = [this](NumberField&) {
-		freq_step_khz++;
-		if(freq_step_khz > 3) {
-			freq_step_khz = 0;
-		}
-		switch(freq_step_khz) {
-			case 0:
-				value_freq_step.set("   |");
-				break;
-			case 1:
-				value_freq_step.set("  | ");
-				break;
-			case 2:
-				value_freq_step.set(" |  ");
-				break;
-			case 3:
-				value_freq_step.set("|   ");
-				break;
-		}
-		field_clkout_freq.set_step(pow(10, freq_step_khz));
-	};
-
-	check_bias.set_value(portapack::get_antenna_bias());
-	check_bias.on_select = [this](Checkbox&, bool v) {
-		portapack::set_antenna_bias(v);
-		StatusRefreshMessage message { };
-		EventDispatcher::send_message(message);
-	};
-
-	button_save.on_select = [this, &nav](Button&){
-		const auto model = this->form_collect();
-		portapack::persistent_memory::set_correction_ppb(model.ppm * 1000);
-		portapack::persistent_memory::set_clkout_freq(model.freq);
-		clock_manager.enable_clock_output(portapack::persistent_memory::clkout_enabled());
-		nav.pop();
-	};
-}
-
-void SetRadioView::focus() {
-	button_save.focus();
-}
-
-void SetRadioView::form_init(const SetFrequencyCorrectionModel& model) {
-	field_ppm.set_value(model.ppm);
-}
-
-SetFrequencyCorrectionModel SetRadioView::form_collect() {
-	return {
-		.ppm = static_cast<int8_t>(field_ppm.value()),
-		.freq = static_cast<uint32_t>(field_clkout_freq.value()),
-	};
-}
-
-
-SetUIView::SetUIView(NavigationView& nav) {
-	add_children({
-		&checkbox_disable_touchscreen,
-		&checkbox_speaker,
-		&checkbox_bloff,
-		&options_bloff,
-		&checkbox_showsplash,
-		&checkbox_showclock,
-		&options_clockformat,
-		&checkbox_guireturnflag,
-		&button_save,
-		&button_cancel
-	});
-	
-	checkbox_disable_touchscreen.set_value(persistent_memory::disable_touchscreen());
-	checkbox_speaker.set_value(persistent_memory::config_speaker());
-	checkbox_showsplash.set_value(persistent_memory::config_splash());
-	checkbox_showclock.set_value(!persistent_memory::hide_clock());
-	checkbox_guireturnflag.set_value(persistent_memory::show_gui_return_icon());
-	
-	const auto backlight_config = persistent_memory::config_backlight_timer();
-	checkbox_bloff.set_value(backlight_config.timeout_enabled());
-	options_bloff.set_by_value(backlight_config.timeout_enum());
-
-	if (persistent_memory::clock_with_date()) {
-		options_clockformat.set_selected_index(1);
-	} else {
-		options_clockformat.set_selected_index(0);
+	SetFrequencyCorrectionModel SetRadioView::form_collect() {
+		return {
+			.ppm = static_cast<int8_t>(field_ppm.value()),
+				.freq = static_cast<uint32_t>(field_clkout_freq.value()),
+		};
 	}
 
 
-	button_save.on_select = [&nav, this](Button&) {
-		persistent_memory::set_config_backlight_timer({
-			(persistent_memory::backlight_timeout_t)options_bloff.selected_index_value(),
-			checkbox_bloff.value()
-		});
-				
-		if (checkbox_showclock.value()){
-		    if (options_clockformat.selected_index() == 1)
-			    persistent_memory::set_clock_with_date(true);    
-     		else
-			    persistent_memory::set_clock_with_date(false);		
+	SetUIView::SetUIView(NavigationView& nav) {
+		add_children({
+				&checkbox_disable_touchscreen,
+				&checkbox_speaker,
+				&checkbox_bloff,
+				&options_bloff,
+				&checkbox_showsplash,
+				&checkbox_showclock,
+				&options_clockformat,
+				&checkbox_guireturnflag,
+				&button_save,
+				&button_cancel
+				});
+
+		checkbox_disable_touchscreen.set_value(persistent_memory::disable_touchscreen());
+		checkbox_speaker.set_value(persistent_memory::config_speaker());
+		checkbox_showsplash.set_value(persistent_memory::config_splash());
+		checkbox_showclock.set_value(!persistent_memory::hide_clock());
+		checkbox_guireturnflag.set_value(persistent_memory::show_gui_return_icon());
+
+		const auto backlight_config = persistent_memory::config_backlight_timer();
+		checkbox_bloff.set_value(backlight_config.timeout_enabled());
+		options_bloff.set_by_value(backlight_config.timeout_enum());
+
+		if (persistent_memory::clock_with_date()) {
+			options_clockformat.set_selected_index(1);
+		} else {
+			options_clockformat.set_selected_index(0);
 		}
 
-		if (checkbox_speaker.value())  audio::output::speaker_mute();		//Just mute audio if speaker is disabled
-		persistent_memory::set_config_speaker(checkbox_speaker.value());	//Store Speaker status
-        	StatusRefreshMessage message { };					//Refresh status bar with/out speaker
-        	EventDispatcher::send_message(message);
-	
-		persistent_memory::set_config_splash(checkbox_showsplash.value());
-		persistent_memory::set_clock_hidden(!checkbox_showclock.value());
-		persistent_memory::set_gui_return_icon(checkbox_guireturnflag.value());
-		persistent_memory::set_disable_touchscreen(checkbox_disable_touchscreen.value());
-		nav.pop();
-	};
-	button_cancel.on_select = [&nav, this](Button&) {
-		nav.pop();
-	};
-}
 
-void SetUIView::focus() {
-	button_save.focus();
-}
+		button_save.on_select = [&nav, this](Button&) {
+			persistent_memory::set_config_backlight_timer({
+					(persistent_memory::backlight_timeout_t)options_bloff.selected_index_value(),
+					checkbox_bloff.value()
+					});
+
+			if (checkbox_showclock.value()){
+				if (options_clockformat.selected_index() == 1)
+					persistent_memory::set_clock_with_date(true);    
+				else
+					persistent_memory::set_clock_with_date(false);		
+			}
+
+			if (checkbox_speaker.value())  audio::output::speaker_mute();		//Just mute audio if speaker is disabled
+			persistent_memory::set_config_speaker(checkbox_speaker.value());	//Store Speaker status
+			StatusRefreshMessage message { };					//Refresh status bar with/out speaker
+			EventDispatcher::send_message(message);
+
+			persistent_memory::set_config_splash(checkbox_showsplash.value());
+			persistent_memory::set_clock_hidden(!checkbox_showclock.value());
+			persistent_memory::set_gui_return_icon(checkbox_guireturnflag.value());
+			persistent_memory::set_disable_touchscreen(checkbox_disable_touchscreen.value());
+			nav.pop();
+		};
+		button_cancel.on_select = [&nav, this](Button&) {
+			nav.pop();
+		};
+	}
+
+	void SetUIView::focus() {
+		button_save.focus();
+	}
 
 
-// ---------------------------------------------------------
-// Appl. Settings
-// ---------------------------------------------------------
-SetAppSettingsView::SetAppSettingsView(NavigationView& nav) {
-	add_children({
-		&checkbox_load_app_settings,
-		&checkbox_save_app_settings,
-		&button_save,
-		&button_cancel
-	});
-	
-	checkbox_load_app_settings.set_value(persistent_memory::load_app_settings());
-	checkbox_save_app_settings.set_value(persistent_memory::save_app_settings());
+	// ---------------------------------------------------------
+	// Appl. Settings
+	// ---------------------------------------------------------
+	SetAppSettingsView::SetAppSettingsView(NavigationView& nav) {
+		add_children({
+				&checkbox_load_app_settings,
+				&checkbox_save_app_settings,
+				&button_save,
+				&button_cancel
+				});
 
+		checkbox_load_app_settings.set_value(persistent_memory::load_app_settings());
+		checkbox_save_app_settings.set_value(persistent_memory::save_app_settings());
 
-	button_save.on_select = [&nav, this](Button&) {
-		persistent_memory::set_load_app_settings(checkbox_load_app_settings.value());
-		persistent_memory::set_save_app_settings(checkbox_save_app_settings.value());
-		nav.pop();
-	};
-	button_cancel.on_select = [&nav, this](Button&) {
-		nav.pop();
-	};
-}
+		button_save.on_select = [&nav, this](Button&) {
+			persistent_memory::set_load_app_settings(checkbox_load_app_settings.value());
+			persistent_memory::set_save_app_settings(checkbox_save_app_settings.value());
+			nav.pop();
+		};
+		button_cancel.on_select = [&nav, this](Button&) {
+			nav.pop();
+		};
+	}
 
-void SetAppSettingsView::focus() {
-	button_save.focus();
-}
+	void SetAppSettingsView::focus() {
+		button_save.focus();
+	}
 
-SetAudioView::SetAudioView(NavigationView& nav) {
-	add_children({
-		&labels,
-		&field_tone_mix,
-		&button_save,
-		&button_cancel
-	});
+	// ---------------------------------------------------------
+	// Converter Settings
+	// ---------------------------------------------------------
+	SetConverterSettingsView::SetConverterSettingsView(NavigationView& nav) {
+		add_children({
+				&check_show_converter,
+				&check_converter,
+				&converter_mode,
+				&button_converter_freq,
+				&button_save,
+				&button_cancel
+				});
 
-	field_tone_mix.set_value(persistent_memory::tone_mix());
-	
-	button_save.on_select = [&nav, this](Button&) {
-		persistent_memory::set_tone_mix(field_tone_mix.value());
-		nav.pop();
-	};
+		check_show_converter.set_value(!portapack::persistent_memory::config_hide_converter());
+		check_show_converter.on_select = [this](Checkbox&, bool v) {
+			portapack::persistent_memory::set_config_hide_converter(!v);
+			if( !v )
+			{
+				check_converter.set_value(false);
+			}
+			// Retune to take converter change in account
+			receiver_model.set_tuning_frequency( portapack::persistent_memory::tuned_frequency() );	
+			//Refresh status bar with/out converter
+			StatusRefreshMessage message { };				
+			EventDispatcher::send_message(message);
+		};
 
-	button_cancel.on_select = [&nav, this](Button&) {
-		nav.pop();
-	};
-}
+		check_converter.set_value(portapack::persistent_memory::config_converter());
+		check_converter.on_select = [this](Checkbox&, bool v) {
+			if( v )
+			{
+				check_show_converter.set_value(true);
+				portapack::persistent_memory::set_config_hide_converter(false);
+			}
+			portapack::persistent_memory::set_config_converter(v);
+			// Retune to take converter change in account
+			receiver_model.set_tuning_frequency( portapack::persistent_memory::tuned_frequency() );	
+			//Refresh status bar with/out converter
+			StatusRefreshMessage message { };				
+			EventDispatcher::send_message(message);
+		};
 
-void SetAudioView::focus() {
-	button_save.focus();
-}
+		converter_mode.set_by_value( portapack::persistent_memory::config_updown_converter() );
+		converter_mode.on_change = [this](size_t, OptionsField::value_t v) {
+			portapack::persistent_memory::set_config_updown_converter( v );
+			//Refresh status bar with icon up or down
+			StatusRefreshMessage message { };				
+			EventDispatcher::send_message(message);
+		};
 
-SetQRCodeView::SetQRCodeView(NavigationView& nav) {
-	add_children({
-		&checkbox_bigger_qr,
-		&button_save,
-		&button_cancel
-	});
+		button_converter_freq.set_text( to_string_short_freq( portapack::persistent_memory::config_converter_freq() ) + "MHz");
+		button_converter_freq.on_select = [this, &nav](Button& button) {
+			auto new_view = nav.push<FrequencyKeypadView>(portapack::persistent_memory::config_converter_freq() );
+			new_view->on_changed = [this, &button](rf::Frequency f) {
+				portapack::persistent_memory::set_config_converter_freq( f );
+				// Retune to take converter change in account
+				receiver_model.set_tuning_frequency( portapack::persistent_memory::tuned_frequency() );	
+				button_converter_freq.set_text( "<" + to_string_short_freq( f ) + " MHz>" );
+			};
+		};
 
-	checkbox_bigger_qr.set_value(persistent_memory::show_bigger_qr_code());
-	
-	button_save.on_select = [&nav, this](Button&) {
-		persistent_memory::set_show_bigger_qr_code(checkbox_bigger_qr.value());
-		nav.pop();
-	};
+		button_save.on_select = [&nav, this](Button&) {
+			nav.pop();
+		};
+		button_cancel.on_select = [&nav, this](Button&) {
+			nav.pop();
+		};
+	}
 
-	button_cancel.on_select = [&nav, this](Button&) {
-		nav.pop();
-	};
+	void SetConverterSettingsView::focus() {
+		button_save.focus();
+	}
 
-}
+	// ---------------------------------------------------------
+	// Persistent Memory Settings
+	// ---------------------------------------------------------
+	SetPersistentMemoryView::SetPersistentMemoryView(NavigationView& nav) {
+		add_children({
+				&text_pmem_about,
+				&text_pmem_informations,
+				&text_pmem_status,
+				&check_load_mem_at_startup,
+				&button_save_mem_to_file,
+				&button_load_mem_from_file,
+  				&button_load_mem_defaults,
+				&button_return
+				});
 
-void SetQRCodeView::focus() {
-	button_save.focus();
-}
+		bool load_mem_at_startup = false ;
+		File pmem_flag_file_handle ;
 
-// ---------------------------------------------------------
-// Settings main menu
-// ---------------------------------------------------------
-SettingsMenuView::SettingsMenuView(NavigationView& nav) {
-    if( portapack::persistent_memory::show_gui_return_icon() )
-    {
-        add_items( { { "..", 		ui::Color::light_grey(),&bitmap_icon_previous,	[&nav](){ nav.pop(); } } } );
-    }
-	add_items({
-		{ "Audio",          ui::Color::dark_cyan(), &bitmap_icon_speaker,          [&nav](){ nav.push<SetAudioView>(); } },
-		{ "Radio",          ui::Color::dark_cyan(), &bitmap_icon_options_radio,    [&nav](){ nav.push<SetRadioView>(); } },
-		{ "User Interface", ui::Color::dark_cyan(), &bitmap_icon_options_ui,       [&nav](){ nav.push<SetUIView>(); } },
-		{ "Date/Time",      ui::Color::dark_cyan(), &bitmap_icon_options_datetime, [&nav](){ nav.push<SetDateTimeView>(); } },
-		{ "Calibration",    ui::Color::dark_cyan(), &bitmap_icon_options_touch,    [&nav](){ nav.push<TouchCalibrationView>(); } },
-		{ "App Settings",   ui::Color::dark_cyan(), &bitmap_icon_setup,            [&nav](){ nav.push<SetAppSettingsView>(); } },
-		{ "QR Code",        ui::Color::dark_cyan(), &bitmap_icon_qr_code,          [&nav](){ nav.push<SetQRCodeView>(); } }
-	});
-	set_max_rows(2); // allow wider buttons
-}
+		std::string folder = "SETTINGS";
+		make_new_directory(folder);
+
+		std::string pmem_flag_file = "/SETTINGS/PMEM_FILEFLAG" ;
+		auto result = pmem_flag_file_handle.open(pmem_flag_file);	
+		if(!result.is_valid()) 
+		{
+			load_mem_at_startup = true ;
+		}
+		check_load_mem_at_startup.set_value(load_mem_at_startup);
+		check_load_mem_at_startup.on_select = [this](Checkbox&, bool v) {
+			File pmem_flag_file_handle ;
+			std::string pmem_flag_file = "/SETTINGS/PMEM_FILEFLAG" ;
+			if( v )
+			{
+				auto result = pmem_flag_file_handle.open(pmem_flag_file);	
+				if(result.is_valid()) 
+				{
+					auto result = pmem_flag_file_handle.create(pmem_flag_file); //third: create if it is not there
+					if( !result.is_valid() )
+					{
+						text_pmem_status.set("pmem flag file created");
+					}
+					else
+					{
+						text_pmem_status.set("!err. creating pmem flagfile!");
+					}
+				}
+				else
+				{
+					text_pmem_status.set("pmem flag already present");
+				}
+			}
+			else
+			{
+				auto result = delete_file( pmem_flag_file );
+				if( result.code() != FR_OK )
+				{
+					text_pmem_status.set("!err. deleting pmem flagfile!");
+				}
+				else
+				{
+					text_pmem_status.set("pmem flag file deleted");
+				}
+			}
+		};
+
+		button_save_mem_to_file.on_select = [&nav, this](Button&) {
+			if( !portapack::persistent_memory::save_persistent_settings_to_file("SETTINGS/pmem_settings") )
+			{
+				text_pmem_status.set("!problem saving settings!");
+			}
+			else
+			{
+				text_pmem_status.set("settings saved");
+			}
+		};
+
+		button_load_mem_from_file.on_select = [&nav, this](Button&) {
+			if( !portapack::persistent_memory::load_persistent_settings_from_file("SETTINGS/pmem_settings") )
+			{
+				text_pmem_status.set("!problem loading settings!");
+			}
+			else
+			{
+				text_pmem_status.set("settings loaded");
+				//Refresh status bar with icon up or down
+				StatusRefreshMessage message { };				
+				EventDispatcher::send_message(message);
+			}
+		};
+
+		button_load_mem_defaults.on_select = [&nav, this](Button&) {
+        	nav.push<ModalMessageView>(
+			"Warning!",
+			"This will reset the p.mem\nand set the default settings",
+			YESNO,
+			[this](bool choice) {
+				if (choice) {
+ 					portapack::persistent_memory::cache::defaults();
+				}
+			} );
+		};
+
+		button_return.on_select = [&nav, this](Button&) {
+			nav.pop();
+		};
+	}
+
+	void SetPersistentMemoryView::focus() {
+		button_return.focus();
+	}
+
+	//
+	// Audio settings
+	//
+	SetAudioView::SetAudioView(NavigationView& nav) {
+		add_children({
+				&labels,
+				&field_tone_mix,
+				&button_save,
+				&button_cancel
+				});
+
+		field_tone_mix.set_value(persistent_memory::tone_mix());
+
+		button_save.on_select = [&nav, this](Button&) {
+			persistent_memory::set_tone_mix(field_tone_mix.value());
+			nav.pop();
+		};
+
+		button_cancel.on_select = [&nav, this](Button&) {
+			nav.pop();
+		};
+	}
+
+	void SetAudioView::focus() {
+		button_save.focus();
+	}
+
+	SetQRCodeView::SetQRCodeView(NavigationView& nav) {
+		add_children({
+				&checkbox_bigger_qr,
+				&button_save,
+				&button_cancel
+				});
+
+		checkbox_bigger_qr.set_value(persistent_memory::show_bigger_qr_code());
+
+		button_save.on_select = [&nav, this](Button&) {
+			persistent_memory::set_show_bigger_qr_code(checkbox_bigger_qr.value());
+			nav.pop();
+		};
+
+		button_cancel.on_select = [&nav, this](Button&) {
+			nav.pop();
+		};
+
+	}
+
+	void SetQRCodeView::focus() {
+		button_save.focus();
+	}
+
+	// ---------------------------------------------------------
+	// Settings main menu
+	// ---------------------------------------------------------
+	SettingsMenuView::SettingsMenuView(NavigationView& nav) {
+		if( portapack::persistent_memory::show_gui_return_icon() )
+		{
+			add_items( { { "..", 		ui::Color::light_grey(),&bitmap_icon_previous,	[&nav](){ nav.pop(); } } } );
+		}
+		add_items({
+				{ "Audio",          ui::Color::dark_cyan(), &bitmap_icon_speaker,          [&nav](){ nav.push<SetAudioView>(); } },
+				{ "Radio",          ui::Color::dark_cyan(), &bitmap_icon_options_radio,    [&nav](){ nav.push<SetRadioView>(); } },
+				{ "User Interface", ui::Color::dark_cyan(), &bitmap_icon_options_ui,       [&nav](){ nav.push<SetUIView>(); } },
+				{ "Date/Time",      ui::Color::dark_cyan(), &bitmap_icon_options_datetime, [&nav](){ nav.push<SetDateTimeView>(); } },
+				{ "Calibration",    ui::Color::dark_cyan(), &bitmap_icon_options_touch,    [&nav](){ nav.push<TouchCalibrationView>(); } },
+				{ "App Settings",   ui::Color::dark_cyan(), &bitmap_icon_setup,            [&nav](){ nav.push<SetAppSettingsView>(); } },
+				{ "Converter",      ui::Color::dark_cyan(), &bitmap_icon_options_radio,    [&nav](){ nav.push<SetConverterSettingsView>(); } },
+				{ "QR Code",        ui::Color::dark_cyan(), &bitmap_icon_qr_code,          [&nav](){ nav.push<SetQRCodeView>(); } },
+				{ "P.Memory Mgmt",      ui::Color::dark_cyan(), &bitmap_icon_memory,       [&nav](){ nav.push<SetPersistentMemoryView>(); } },
+				});
+		set_max_rows(2); // allow wider buttons
+	}
 
 } /* namespace ui */

firmware/application/apps/ui_settings.hpp

@@ -198,16 +198,6 @@ private:
 		"Turn on bias voltage"
 	};
 
-    Checkbox check_hamitup {
-		{ 18, 14 * 16},
-		7,
-		"HamItUp"
-	};
-    Button button_hamitup_freq {
-		{ 240 - 15 * 8 , 14 * 16 , 15 * 8 , 24 },
-		"",
-	};
-
 	Button button_save {
 		{ 2 * 8, 16 * 16, 12 * 8, 32 },
 		"Save"
@@ -324,6 +314,53 @@ private:
 		25,
 		"Save app settings"
 	};
+
+	Button button_save {
+		{ 2 * 8, 16 * 16, 12 * 8, 32 },
+		"Save"
+	};
+	
+	Button button_cancel {
+		{ 16 * 8, 16 * 16, 12 * 8, 32 },
+		"Cancel",
+	};
+};
+
+class SetConverterSettingsView : public View {
+public:
+	SetConverterSettingsView(NavigationView& nav);
+	
+	void focus() override;
+	
+	std::string title() const override { return "Converter"; };
+	
+private:
+
+    Checkbox check_show_converter {
+		{ 18, 4 * 16},
+		19,
+		"show/hide converter"
+	};
+
+	Checkbox check_converter {
+		{ 18, 6 * 16},
+		7,
+		"enable/disable converter"
+	};
+
+	OptionsField converter_mode {
+		{ 18 , 8 * 16 + 4 },
+		0,
+		{
+			{" + ",0}, // up converter
+			{" - ",1}  // down converter
+		}
+	};		
+
+    Button button_converter_freq {
+		{ 18 + 4 * 8 , 8 * 16 , 16 * 8 , 24 },
+		"",
+	};
 	
 	Button button_save {
 		{ 2 * 8, 16 * 16, 12 * 8, 32 },
@@ -395,6 +432,59 @@ private:
 	};
 };
 
+class SetPersistentMemoryView : public View {
+public:
+	SetPersistentMemoryView(NavigationView& nav);
+	
+	void focus() override;
+	
+	std::string title() const override { return "P.Mem Mgmt"; };
+	
+private:
+
+	Text text_pmem_about {
+		{ 0, 1 * 16, 240 , 16 },
+		"PersistentMemory from/to SD"
+	};
+
+	Text text_pmem_informations {
+		{ 0, 2 * 16, 240 , 16 },
+		"use: when no/dead coin bat."
+	};
+
+	Text text_pmem_status {
+		{ 0, 3 * 16, 240 , 16 },
+		""
+	};
+
+    Checkbox check_load_mem_at_startup {
+		{ 18, 6 * 16},
+		19,
+		"load from sd at startup"
+	};
+
+	Button button_save_mem_to_file {
+		{ 0, 8 * 16, 240, 32 },
+		"save p.mem to sdcard"
+	};
+	
+	Button button_load_mem_from_file {
+		{ 0, 10 * 16 + 4 , 240, 32 },
+		"load p.mem from sdcard"
+	};
+
+    Button button_load_mem_defaults {
+		{ 0, 12 * 16 + 8 , 240, 32 },
+		"! reset p.mem, load defaults !"
+	};
+
+	Button button_return {
+		{ 16 * 8, 16 * 16, 12 * 8, 32 },
+		"Return",
+	};
+};
+
+
 class SettingsMenuView : public BtnGridView {
 public:
 	SettingsMenuView(NavigationView& nav);

firmware/application/apps/ui_siggen.hpp

@@ -49,26 +49,26 @@ private:
 	void on_tx_progress(const uint32_t progress, const bool done);
 	
 	const std::string shape_strings[7] = {
-		"CW",
-		"Sine",
-		"Triangle",
-		"Saw up",
-		"Saw down",
-		"Square",
-		"Noise"
+		"CW-just carrier",
+		"Sine signal    ",
+		"Triangle signal",
+		"Saw up signal  ",
+		"Saw down signal",
+		"Square signal  ",
+		"Noise signal   "	// using 16 bits LFSR register, 16 order polynomial feedback.
 	};
 	
 	bool auto_update { false };
 	
 	Labels labels {
-		{ { 6 * 8, 4 + 10 }, "Shape:", Color::light_grey() },
-		{ { 7 * 8, 7 * 8 }, "Tone:      Hz", Color::light_grey() },
+		{ { 3 * 8, 4 + 10 }, "Shape:", Color::light_grey() },
+		{ { 6 * 8, 7 * 8 }, "Tone:      Hz", Color::light_grey() },
 		{ { 22 * 8, 15 * 8 + 4 }, "s.", Color::light_grey() },
 		{ { 8 * 8, 20 * 8 }, "Modulation: FM", Color::light_grey() }
 	};
 	
 	ImageOptionsField options_shape {
-		{ 13 * 8, 4, 32, 32 },
+		{ 10 * 8, 4, 32, 32 },
 		Color::white(),
 		Color::black(),
 		{
@@ -83,7 +83,7 @@ private:
 	};
 	
 	Text text_shape {
-		{ 18 * 8, 4 + 10, 8 * 8, 16 },
+		{ 15 * 8, 4 + 10, 8 * 8, 16 },
 		""
 	};
 	
@@ -94,12 +94,12 @@ private:
 	};
 	
 	Button button_update {
-		{ 6 * 8, 10 * 8, 8 * 8, 3 * 8 },
+		{ 5 * 8, 10 * 8, 8 * 8, 3 * 8 },
 		"Update"
 	};
 	
 	Checkbox checkbox_auto {
-		{ 16 * 8, 10 * 8 },
+		{ 15 * 8, 10 * 8 },
 		4,
 		"Auto"
 	};

firmware/application/apps/ui_sonde.cpp

@@ -135,10 +135,9 @@ SondeView::SondeView(NavigationView& nav) {
 
 	logger = std::make_unique<SondeLogger>();
 	if (logger)
-		logger->append(u"sonde.txt");
+		logger->append( LOG_ROOT_DIR "/SONDE.TXT" );
 
 	// initialize audio:
-	
 	field_volume.set_value((receiver_model.headphone_volume() - audio::headphone::volume_range().max).decibel() + 99);
 	
 	field_volume.on_change = [this](int32_t v) {

firmware/application/apps/ui_spectrum_painter.cpp

@@ -0,0 +1,233 @@
+/*
+ * 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_spectrum_painter.hpp"
+#include "cpld_update.hpp"
+#include "bmp.hpp"
+#include "baseband_api.hpp"
+
+#include "ui_fileman.hpp"
+#include "io_file.hpp"
+#include "file.hpp"
+#include "portapack_persistent_memory.hpp"
+
+namespace ui {
+
+SpectrumPainterView::SpectrumPainterView(
+	NavigationView& nav
+) : nav_ (nav) {
+	baseband::run_image(portapack::spi_flash::image_tag_spectrum_painter);
+
+	add_children({
+		&labels,
+		&tab_view,
+		&input_image,
+		&input_text,
+		&progressbar,
+		&field_frequency,
+		&field_rfgain, 
+		&field_rfamp,
+		&check_loop,
+		&button_play,
+		&option_bandwidth,
+		&field_duration,
+		&field_pause,
+	});
+
+	Rect view_rect = { 0, 3 * 8, 240, 80 };
+	input_image.set_parent_rect(view_rect);
+	input_text.set_parent_rect(view_rect);
+
+	field_frequency.set_value(target_frequency());
+	field_frequency.set_step(5000);
+	field_frequency.on_change = [this](rf::Frequency f) {
+		this->on_target_frequency_changed(f);
+	};
+	field_frequency.on_edit = [this, &nav]() {
+		auto new_view = nav.push<FrequencyKeypadView>(this->target_frequency());
+		new_view->on_changed = [this](rf::Frequency f) {
+			this->on_target_frequency_changed(f);
+			this->field_frequency.set_value(f);
+		};
+	};
+
+	tx_gain = 10;
+	field_rfgain.set_value(tx_gain);  // Initial default  value (-12 dB's max ).
+    field_rfgain.on_change = [this](int32_t v) { // allow initial value change just after opened file.
+		tx_gain = v;
+		portapack::transmitter_model.set_tx_gain(tx_gain);
+	};
+
+	field_rfamp.set_value(rf_amp ? 14 : 0);  // Initial default value True. (TX RF amp on , +14dB's)
+	field_rfamp.on_change = [this](int32_t v) {	// allow initial value change just after opened file.	
+		rf_amp = (bool)v;
+		portapack::transmitter_model.set_rf_amp(rf_amp);
+	};
+
+	input_image.on_input_avaliable = [this]() {
+		image_input_avaliable = true;
+	};
+
+	button_play.on_select = [this](ImageButton&) {
+		if (tx_active == false) {
+			tx_mode = tab_view.selected();
+
+			if (tx_mode == 0 && image_input_avaliable == false)
+				return;
+
+			//Enable Bias Tee if selected
+			radio::set_antenna_bias(portapack::get_antenna_bias());
+
+			radio::enable({
+				portapack::receiver_model.tuning_frequency(),
+				3072000U,
+				1750000,
+				rf::Direction::Transmit,
+				rf_amp,
+				static_cast<int8_t>(portapack::receiver_model.lna()),
+				static_cast<int8_t>(portapack::receiver_model.vga())
+			});  
+
+			if (portapack::persistent_memory::stealth_mode()){
+				DisplaySleepMessage message;
+				EventDispatcher::send_message(message);
+			}
+
+			button_play.set_bitmap(&bitmap_stop);
+
+			if (tx_mode == 0) {
+				tx_current_max_lines = input_image.get_height();
+				tx_current_width = input_image.get_width();
+			}
+			else {
+				tx_current_max_lines = input_text.get_height();
+				tx_current_width = input_text.get_width();
+			}
+
+			progressbar.set_max(tx_current_max_lines);
+			progressbar.set_value(0);
+
+			baseband::set_spectrum_painter_config(tx_current_width, tx_current_max_lines, false, option_bandwidth.selected_index_value());
+		}
+		else {
+			stop_tx();
+		}
+	};
+
+	option_bandwidth.on_change = [this](size_t, ui::OptionsField::value_t value) {
+		baseband::set_spectrum_painter_config(tx_current_width, tx_current_max_lines, true, value);
+	};
+
+	field_duration.set_value(10);
+	field_pause.set_value(5);
+}
+
+void SpectrumPainterView::start_tx() {
+	tx_current_line = 0;
+	tx_active = true;
+	tx_timestamp_start = chTimeNow();
+}
+
+void SpectrumPainterView::stop_tx() {
+	button_play.set_bitmap(&bitmap_play);
+	portapack::transmitter_model.disable();
+	tx_active = false;
+	tx_current_line = 0;
+}
+
+void SpectrumPainterView::frame_sync() {
+	if (tx_active) {
+		if (fifo->is_empty()) {
+
+			int32_t sequence_duration = (field_duration.value() + ( check_loop.value() ? field_pause.value() : 0)) * 1000;
+			int32_t sequence_time = tx_time_elapsed() % sequence_duration;
+			bool is_pausing = sequence_time > field_duration.value() * 1000;
+
+			if (is_pausing) {
+				fifo->in(std::vector<uint8_t>(tx_current_width));
+			} else {
+				auto current_time_line = sequence_time * tx_current_max_lines / (field_duration.value() * 1000);
+				
+				if (tx_current_line > current_time_line && !check_loop.value()) {
+					fifo->in(std::vector<uint8_t>(tx_current_width));
+					stop_tx();
+					return;
+				}
+
+				tx_current_line = current_time_line;
+				progressbar.set_value(current_time_line);
+
+				if (tx_mode == 0) {
+					std::vector<uint8_t> line = input_image.get_line(current_time_line);
+					fifo->in(line);
+				}
+				else {
+					std::vector<uint8_t> line = input_text.get_line(current_time_line);
+					fifo->in(line);
+				}
+			}
+		}
+	}
+}
+
+SpectrumPainterView::~SpectrumPainterView() {
+	portapack::transmitter_model.disable();
+	hackrf::cpld::load_sram_no_verify();
+	baseband::shutdown();
+}
+
+void SpectrumPainterView::focus() {
+	tab_view.focus();
+}
+
+void SpectrumPainterView::on_target_frequency_changed(rf::Frequency f) {
+	set_target_frequency(f);
+}
+
+void SpectrumPainterView::set_target_frequency(const rf::Frequency new_value) {
+	portapack::persistent_memory::set_tuned_frequency(new_value);
+}
+
+rf::Frequency SpectrumPainterView::target_frequency() const {
+	return portapack::persistent_memory::tuned_frequency();
+}
+
+void SpectrumPainterView::paint(Painter& painter) {
+	View::paint(painter);
+
+	size_t c;
+	Point pos = { 0, screen_pos().y() + 8 + footer_location };
+	
+	for (c = 0; c < 20; c++) {
+		painter.draw_bitmap(
+			pos,
+			bitmap_stripes,
+			ui::Color(191, 191, 0),
+			ui::Color::black()
+		);
+		if (c != 9)
+			pos += { 24, 0 };
+		else
+			pos = { 0, screen_pos().y() + 8 + footer_location + 32 + 8 };
+	}
+}
+
+}

firmware/application/apps/ui_spectrum_painter.hpp

@@ -0,0 +1,177 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include "ui.hpp"
+#include "ui_widget.hpp"
+
+#include "ui_navigation.hpp"
+#include "ui_tabview.hpp"
+#include "capture_app.hpp"
+#include "baseband_api.hpp"
+
+#include "portapack.hpp"
+#include "message.hpp"
+
+#include "ui_spectrum_painter_image.hpp"
+#include "ui_spectrum_painter_text.hpp"
+
+namespace ui {
+
+class SpectrumPainterView : public View {
+public:
+	SpectrumPainterView(NavigationView& nav);
+	~SpectrumPainterView();
+
+	SpectrumPainterView(const SpectrumPainterView&) = delete;
+	SpectrumPainterView(SpectrumPainterView&&) = delete;
+	SpectrumPainterView& operator=(const SpectrumPainterView&) = delete;
+	SpectrumPainterView& operator=(SpectrumPainterView&&) = delete;
+
+	void focus() override;
+	void paint(Painter& painter) override;
+	
+	std::string title() const override { return "Spec.Painter"; };
+
+private:
+	void on_target_frequency_changed(rf::Frequency f);
+	void set_target_frequency(const rf::Frequency new_value);
+	rf::Frequency target_frequency() const;
+
+	NavigationView& nav_;
+	bool image_input_avaliable { false };
+	bool tx_active { false };
+	uint32_t tx_mode { 0 };
+	uint16_t tx_current_line { 0 };
+	uint16_t tx_current_max_lines { 0 };
+	uint16_t tx_current_width { 0 };
+	systime_t tx_timestamp_start { 0 };
+
+	inline uint32_t tx_time_elapsed() {
+		auto now = chTimeNow();
+		return now - tx_timestamp_start;
+	}
+
+	int32_t tx_gain { 47 };
+	bool rf_amp { false };
+
+	SpectrumInputImageView input_image { nav_ };
+	SpectrumInputTextView input_text { nav_ };
+	
+	std::array<View*, 2> input_views { { &input_image, &input_text } };
+
+	TabView tab_view {
+		{ "Image", Color::white(), input_views[0] },
+		{ "Text", Color::white(), input_views[1] }
+	};
+
+	static constexpr int32_t footer_location = 15 * 16 + 8;
+	ProgressBar progressbar {
+		{ 4, footer_location - 16, 240-8, 16 }
+	};
+
+	Labels labels {
+		{ { 10 * 8, footer_location + 1 * 16 }, "GAIN   A:", Color::light_grey() },
+		{ { 1 * 8, footer_location + 2 * 16 }, "BW:      Du:    P:", Color::light_grey() },
+	};
+
+	FrequencyField field_frequency {
+		{ 0 * 8, footer_location + 1 * 16 },
+	};
+	
+	NumberField field_rfgain {
+		{ 14 * 8, footer_location + 1 * 16 },
+		2,
+		{ 0, 47 },
+		1,
+		' '
+	};
+
+	NumberField field_rfamp {
+		{ 19 * 8, footer_location + 1 * 16 },
+		2,
+		{ 0, 14 },
+		14,
+		' '
+	};
+
+	Checkbox check_loop {
+		{ 21 * 8, footer_location + 1 * 16 },
+		4,
+		"Loop",
+		true
+	};
+
+	ImageButton button_play {
+		{ 28 * 8, footer_location + 1 * 16, 2 * 8, 1 * 16 },
+		&bitmap_play,
+		Color::green(),
+		Color::black()
+	};
+
+	OptionsField option_bandwidth {
+		{ 4 * 8, footer_location + 2 * 16 },
+		5,
+		{
+			BW_OPTIONS
+		}
+	};
+	
+	NumberField field_duration {
+		{ 13 * 8, footer_location + 2 * 16 },
+		3,
+		{ 1, 999 },
+		1,
+		' '
+	};
+
+	NumberField field_pause {
+		{ 19 * 8, footer_location + 2 * 16 },
+		2,
+		{ 0, 99 },
+		1,
+		' '
+	};
+
+	SpectrumPainterFIFO* fifo { nullptr };
+	void start_tx();
+	void frame_sync();
+	void stop_tx();
+
+	MessageHandlerRegistration message_handler_fifo_signal {
+		Message::ID::SpectrumPainterBufferResponseConfigure,
+		[this](const Message* const p) {
+			const auto message = static_cast<const SpectrumPainterBufferConfigureResponseMessage*>(p);
+			this->fifo = message->fifo;
+			this->start_tx();
+		}
+	};
+
+	MessageHandlerRegistration message_handler_sample {
+		Message::ID::DisplayFrameSync,
+		[this](const Message* const) {
+			this->frame_sync();
+		}
+	};
+};
+
+}

firmware/application/apps/ui_spectrum_painter_image.cpp

@@ -0,0 +1,265 @@
+/*
+ * 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_spectrum_painter_image.hpp"
+#include "cpld_update.hpp"
+#include "bmp.hpp"
+#include "baseband_api.hpp"
+
+#include "ui_fileman.hpp"
+#include "io_file.hpp"
+#include "file.hpp"
+#include "portapack_persistent_memory.hpp"
+
+namespace ui {
+
+SpectrumInputImageView::SpectrumInputImageView(NavigationView& nav) {
+	hidden(true);
+
+	add_children({
+		&button_load_image
+	});
+
+	button_load_image.on_select = [this, &nav](Button&) {
+		auto open_view = nav.push<FileLoadView>(".bmp");
+
+		constexpr auto data_directory = u"SPECTRUM";
+		if (std::filesystem::is_directory(data_directory) == false) {
+			if (make_new_directory(data_directory).ok())
+				open_view->push_dir(data_directory);
+		}
+		else
+			open_view->push_dir(data_directory);
+
+		open_view->on_changed = [this](std::filesystem::path new_file_path) {
+			this->file = new_file_path.string();
+			painted = false;
+			this->set_dirty();
+
+			this->on_input_avaliable();
+		};
+	};
+}
+
+SpectrumInputImageView::~SpectrumInputImageView() {
+}
+
+void SpectrumInputImageView::focus() {
+    button_load_image.focus();
+}
+
+bool SpectrumInputImageView::drawBMP_scaled(const ui::Rect r, const std::string file) {
+	File bmpimage;
+	size_t file_pos = 0;
+	uint16_t pointer = 0;
+	int16_t px = 0, py, zoom_factor = 0;
+	bmp_header_t bmp_header;
+	char buffer[257];
+	ui::Color line_buffer[240];
+
+	auto result = bmpimage.open(file);
+	if(result.is_valid())
+		return false;
+
+	bmpimage.seek(file_pos);
+	auto read_size = bmpimage.read(&bmp_header, sizeof(bmp_header));
+	if (!((bmp_header.signature == 0x4D42) && // "BM" Signature
+		(bmp_header.planes == 1) && // Seems always to be 1
+		(bmp_header.compression == 0 || bmp_header.compression == 3 ))) {	// No compression
+			return false;
+	}
+
+	switch(bmp_header.bpp) {
+		case 16:
+			file_pos = 0x36;
+			memset(buffer, 0, 16);
+			bmpimage.read(buffer, 16);
+			if(buffer[1] == 0x7C)
+				type = 3; // A1R5G5B5
+			else
+				type = 0; // R5G6B5
+			break;
+		case 24:
+			type = 1;
+			break;
+		case 32:
+		default:
+			type = 2;
+			break;
+	}
+
+	width = bmp_header.width;
+	height = bmp_header.height;
+
+	data_start = file_pos = bmp_header.image_data;
+
+	while (r.width() < (width >> zoom_factor) || r.height() < (height >> zoom_factor)) {
+		zoom_factor++;
+	}
+
+	py = height + 16;
+
+	while(1) {
+		while(px < width) {
+			bmpimage.seek(file_pos);
+			memset(buffer, 0, 257);
+			read_size = bmpimage.read(buffer, 256);
+			if (read_size.is_error())
+				return false;	// Read error
+
+			pointer = 0;
+			while(pointer < 256) {
+				if(pointer + 4 > 256)
+					break;
+				switch(type) {
+					case 0: // R5G6B5
+						if ((((1 << zoom_factor) - 1) & px) == 0x00)
+							line_buffer[px >> zoom_factor] = ui::Color(((uint16_t)buffer[pointer] & 0x1F) | ((uint16_t)buffer[pointer] & 0xE0) << 1 | ((uint16_t)buffer[pointer + 1] & 0x7F) << 9);
+
+						pointer += 2;
+						file_pos += 2;
+						break;
+
+					case 3: // A1R5G5B5
+						if ((((1 << zoom_factor) - 1) & px) == 0x00)
+							line_buffer[px >> zoom_factor] = ui::Color((uint16_t)buffer[pointer] | ((uint16_t)buffer[pointer + 1] << 8));
+
+						pointer += 2;
+						file_pos += 2;
+						break;
+
+					case 1: // 24
+					default:
+						if ((((1 << zoom_factor) - 1) & px) == 0x00)
+							line_buffer[px >> zoom_factor] = ui::Color(buffer[pointer + 2], buffer[pointer + 1], buffer[pointer]);
+						pointer += 3;
+						file_pos += 3;
+						break;
+						
+					case 2: // 32
+						if ((((1 << zoom_factor) - 1) & px) == 0x00)
+							line_buffer[px >> zoom_factor] = ui::Color(buffer[pointer + 2], buffer[pointer + 1], buffer[pointer]);
+						pointer += 4;
+						file_pos += 4;
+						break;
+				}
+
+				px++;
+				if(px >= width) {
+					break;
+				}
+			}
+
+			if(read_size.value() != 256)
+				break;
+		}
+
+		if ((((1 << zoom_factor) - 1) & py) == 0x00)
+			portapack::display.render_line({ r.left(), r.top() + (py >> zoom_factor) }, px >> zoom_factor, line_buffer);
+
+		px = 0;
+		py--;
+
+		if(read_size.value() < 256 || py < 0)
+			break;
+	}
+
+	return true;
+}
+
+uint16_t SpectrumInputImageView::get_width(){
+	return this->width;
+}
+
+uint16_t SpectrumInputImageView::get_height(){
+	return this->height;
+}
+
+std::vector<uint8_t> SpectrumInputImageView::get_line(uint16_t y) {
+	File bmpimage;
+	bmpimage.open(this->file);
+
+	//seek to line
+	uint32_t line_size = width * (type == 2 ? 4 : (type == 1 ? 3 : 2));
+	uint32_t line_offset = y * line_size;
+	bmpimage.seek(data_start + line_offset);
+
+	// allocate memory and read
+	auto buffer = new uint8_t[line_size];
+	auto bytes_read = bmpimage.read(buffer, line_size);
+
+	// greyscale
+	auto grey_buffer = new uint8_t[width];
+	int pointer = 0;
+	for (uint16_t px = 0; px < width; px++) {
+		ui::Color color;
+		switch(type) {
+		case 0: // R5G6B5
+			pointer = px * 2;
+			color = ui::Color(((uint16_t)buffer[pointer] & 0x1F) | ((uint16_t)buffer[pointer] & 0xE0) << 1 | ((uint16_t)buffer[pointer + 1] & 0x7F) << 9);
+			break;
+
+		case 3: // A1R5G5B5
+			pointer = px * 2;
+			color = ui::Color((uint16_t)buffer[pointer] | ((uint16_t)buffer[pointer + 1] << 8));
+			break;
+
+		case 1: // 24
+		default:
+			pointer = px * 3;
+			color = ui::Color(buffer[pointer + 2], buffer[pointer + 1], buffer[pointer]);
+			break;
+
+		case 2: // 32
+			pointer = px * 4;
+			color = ui::Color(buffer[pointer + 2], buffer[pointer + 1], buffer[pointer]);
+			break;
+		}
+
+		grey_buffer[px] = color.to_greyscale();
+	}
+
+	delete buffer;
+
+	std::vector<uint8_t> values(width);
+	for(int i = 0; i < width; i++) {
+		values[i] = grey_buffer[i];
+	}
+
+	delete grey_buffer;
+
+	return values;
+}
+
+void SpectrumInputImageView::paint(Painter& painter) {
+	painter.fill_rectangle(
+		{{0, 40}, {240, 204}},
+		style().background
+	);
+
+	if (!painted) {
+		// This is very slow for big pictures. Do only once.
+		this->drawBMP_scaled({{ 0, 40 }, {240, 160}}, this->file);
+		painted = true;
+	}
+}
+
+}

firmware/application/apps/ui_spectrum_painter_image.hpp

@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include "ui.hpp"
+#include "ui_widget.hpp"
+
+#include "ui_navigation.hpp"
+#include "ui_tabview.hpp"
+#include "ui_transmitter.hpp"
+#include "baseband_api.hpp"
+
+#include "portapack.hpp"
+#include "message.hpp"
+
+namespace ui {
+
+class SpectrumInputImageView : public View {
+public:
+	SpectrumInputImageView(NavigationView& nav);
+	~SpectrumInputImageView();
+
+	void focus() override;
+	void paint(Painter&) override;
+
+	uint16_t get_width();
+	uint16_t get_height();
+	std::vector<uint8_t> get_line(uint16_t);
+
+	std::function<void()> on_input_avaliable { };
+
+private:
+	bool painted {false};
+	std::string file {""};
+	uint16_t width {0};
+	uint16_t height {0};
+	uint8_t type {0};
+	uint32_t data_start {0};
+	
+	Button button_load_image {
+		{ 0 * 8, 11 * 16 - 4, 30 * 8, 28 },
+		"Load Image ..."
+	};
+	
+	bool drawBMP_scaled(const ui::Rect r, const std::string file);
+};
+
+}

firmware/application/apps/ui_spectrum_painter_text.cpp

@@ -0,0 +1,111 @@
+/*
+ * 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_spectrum_painter_text.hpp"
+#include "cpld_update.hpp"
+#include "bmp.hpp"
+#include "baseband_api.hpp"
+
+#include "ui_fileman.hpp"
+#include "io_file.hpp"
+#include "file.hpp"
+#include "portapack_persistent_memory.hpp"
+#include "ui_font_fixed_8x16.hpp"
+
+namespace ui {
+
+SpectrumInputTextView::SpectrumInputTextView(NavigationView& nav) {
+	hidden(true);
+
+	add_children({
+		&text_message_0,
+		&text_message_1,
+		&text_message_2,
+		&text_message_3,
+		&text_message_4,
+		&text_message_5,
+		&text_message_6,
+		&text_message_7,
+		&text_message_8,
+		&text_message_9,
+		&button_message
+	 });
+
+	button_message.on_select = [this, &nav](Button&) {
+		this->on_set_text(nav);
+	};
+}
+
+SpectrumInputTextView::~SpectrumInputTextView() {
+}
+
+void SpectrumInputTextView::on_set_text(NavigationView& nav) {
+	text_prompt(nav, buffer, 300);
+}
+
+void SpectrumInputTextView::focus() {
+    button_message.focus();
+}
+
+void SpectrumInputTextView::paint(Painter& painter) {
+	message = buffer;
+	for (uint32_t i = 0 ; i < text_message.size(); i++) {
+		if (message.length() > i * 30)
+			text_message[i]->set(message.substr(i * 30, 30));
+		else
+			text_message[i]->set("");
+	}
+
+	painter.fill_rectangle(
+		{{0, 40}, {240, 204}},
+		style().background
+	);
+}
+
+constexpr uint32_t pixel_repeat = 32;
+uint16_t SpectrumInputTextView::get_width(){
+	return 16 * pixel_repeat;
+}
+
+uint16_t SpectrumInputTextView::get_height(){
+	return this->message.length() * 8;
+}
+
+std::vector<uint8_t> SpectrumInputTextView::get_line(uint16_t y) {
+	auto character_position = y / 8;
+	auto character = this->message[character_position];
+	auto glyph_data = ui::font::fixed_8x16.glyph(character).pixels();
+	
+	auto line_in_character = y % 8;
+	std::vector<uint8_t> data(16 * pixel_repeat);
+
+	for (uint32_t index = 0; index < 16; index++) {
+		auto glyph_byte = index;
+		auto glyph_bit = line_in_character;
+		uint8_t glyph_pixel = (glyph_data[glyph_byte] & (1 << glyph_bit)) >> glyph_bit;
+
+		for (uint32_t j = 0; j < pixel_repeat; j++)
+			data[index*pixel_repeat + j] = glyph_pixel * 255;
+	}
+
+	return data;
+}
+}

firmware/application/apps/ui_spectrum_painter_text.hpp

@@ -0,0 +1,124 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include "ui.hpp"
+#include "ui_widget.hpp"
+
+#include "ui_navigation.hpp"
+#include "ui_tabview.hpp"
+#include "ui_transmitter.hpp"
+#include "baseband_api.hpp"
+
+#include "portapack.hpp"
+#include "message.hpp"
+
+namespace ui {
+
+class SpectrumInputTextView : public View {
+public:
+	SpectrumInputTextView(NavigationView& nav);
+	~SpectrumInputTextView();
+
+	void focus() override;
+	void paint(Painter&) override;
+	
+	uint16_t get_width();
+	uint16_t get_height();
+	std::vector<uint8_t> get_line(uint16_t);
+
+private:
+	std::string buffer { "PORTAPACK" };
+	std::string message { };
+	void on_set_text(NavigationView& nav);
+
+	Text text_message_0 {
+		{ 0 * 8, 0 * 16, 30 * 8, 16 },
+		""
+	};
+	
+	Text text_message_1 {
+		{ 0 * 8, 1 * 16, 30 * 8, 16 },
+		""
+	};
+	
+	Text text_message_2 {
+		{ 0 * 8, 2 * 16, 30 * 8, 16 },
+		""
+	};
+	
+	Text text_message_3 {
+		{ 0 * 8, 3 * 16, 30 * 8, 16 },
+		""
+	};
+	
+	Text text_message_4 {
+		{ 0 * 8, 4 * 16, 30 * 8, 16 },
+		""
+	};
+	
+	Text text_message_5 {
+		{ 0 * 8, 5 * 16, 30 * 8, 16 },
+		""
+	};
+	
+	Text text_message_6 {
+		{ 0 * 8, 6 * 16, 30 * 8, 16 },
+		""
+	};
+	
+	Text text_message_7 {
+		{ 0 * 8, 7 * 16, 30 * 8, 16 },
+		""
+	};
+	
+	Text text_message_8 {
+		{ 0 * 8, 8 * 16, 30 * 8, 16 },
+		""
+	};
+	
+	Text text_message_9 {
+		{ 0 * 8, 9 * 16, 30 * 8, 16 },
+		""
+	};
+
+	std::array<Text*, 10> text_message { { 
+		&text_message_0,
+		&text_message_1,
+		&text_message_2,
+		&text_message_3,
+		&text_message_4,
+		&text_message_5,
+		&text_message_6,
+		&text_message_7,
+		&text_message_8,
+		&text_message_9,
+	} };
+
+	Button button_message {
+		{ 0 * 8, 11 * 16 - 4, 30 * 8, 28 },
+		"Set message"
+	};
+
+};
+
+}

firmware/application/apps/ui_test.cpp

@@ -79,7 +79,6 @@ TestView::TestView(NavigationView& nav) {
 		cal_value = raw_alt - 0x80;
 	};
 	
-
 	logger = std::make_unique<TestLogger>();
 	if (logger)
 		logger->append("saucepan.txt");

firmware/application/baseband_api.cpp

@@ -73,8 +73,8 @@ void NBFMConfig::apply(const uint8_t squelch_level) const {
 
 void WFMConfig::apply() const {
 	const WFMConfigureMessage message {
-		taps_200k_wfm_decim_0,
-		taps_200k_wfm_decim_1,
+		decim_0,		// 	taps_200k_decim_0 , 	taps_180k_wfm_decim_0, taps_40k_wfm_decim_0
+		decim_1,		// 	taps_200k_decim_1 or 	taps_180k_wfm_decim_1, taps_40k_wfm_decim_1
 		taps_64_lp_156_198,
 		75000,
 		audio_48k_hpf_30hz_config,
@@ -84,6 +84,7 @@ void WFMConfig::apply() const {
 	audio::set_rate(audio::Rate::Hz_48000);
 }
 
+
 void set_tone(const uint32_t index, const uint32_t delta, const uint32_t duration) {
 	shared_memory.bb_data.tones_data.tone_defs[index].delta = delta;
 	shared_memory.bb_data.tones_data.tone_defs[index].duration = duration;
@@ -298,6 +299,11 @@ void set_siggen_config(const uint32_t bw, const uint32_t shape, const uint32_t d
 	send_message(&message);
 }
 
+void set_spectrum_painter_config(const uint16_t width, const uint16_t height, bool update, int32_t bw){
+	SpectrumPainterBufferConfigureRequestMessage message { width, height, update, bw };
+	send_message(&message);
+}
+
 static bool baseband_image_running = false;
 
 void run_image(const portapack::spi_flash::image_tag_t image_tag) {

firmware/application/baseband_api.hpp

@@ -53,6 +53,9 @@ struct NBFMConfig {
 };
 
 struct WFMConfig {
+	const fir_taps_real<24> decim_0;	// To handle both WFM filters , 200k and 40K for NOAA APT
+	const fir_taps_real<16> decim_1;
+
 	void apply() const;
 };
 
@@ -88,6 +91,7 @@ void set_rds_data(const uint16_t message_length);
 void set_spectrum(const size_t sampling_rate, const size_t trigger);
 void set_siggen_tone(const uint32_t tone);
 void set_siggen_config(const uint32_t bw, const uint32_t shape, const uint32_t duration);
+void set_spectrum_painter_config(const uint16_t width, const uint16_t height, bool update, int32_t bw);
 void request_beep();
 
 void run_image(const portapack::spi_flash::image_tag_t image_tag);

firmware/application/bitmap.hpp

@@ -197,6 +197,28 @@ static constexpr Bitmap bitmap_icon_debug {
 	{ 16, 16 }, bitmap_icon_debug_data
 };
 
+static constexpr uint8_t bitmap_icon_downconvert_data[] = {
+	0x00, 0x00, 
+	0x77, 0x77, 
+	0x51, 0x51, 
+	0x33, 0x53, 
+	0x51, 0x51, 
+	0x51, 0x77, 
+	0x00, 0x80, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0xF8, 0x1F, 
+	0xF0, 0x0F, 
+	0xE0, 0x07, 
+	0xC0, 0x03, 
+	0x80, 0x01, 
+};
+static constexpr Bitmap bitmap_icon_downconvert {
+	{ 16, 16 }, bitmap_icon_downconvert_data
+};
+
 static constexpr uint8_t bitmap_more_data[] = {
 	0x10, 
 	0x10, 
@@ -825,28 +847,6 @@ static constexpr Bitmap bitmap_icon_rename {
 	{ 16, 16 }, bitmap_icon_rename_data
 };
 
-static constexpr uint8_t bitmap_icon_hamitup_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x22, 0x47, 
-	0x22, 0x49, 
-	0x22, 0x49, 
-	0x22, 0x47, 
-	0x22, 0x01, 
-	0x22, 0x01, 
-	0x1C, 0x41, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_hamitup {
-	{ 16, 16 }, bitmap_icon_hamitup_data
-};
-
 static constexpr uint8_t bitmap_icon_lora_data[] = {
 	0xC0, 0x03, 
 	0x30, 0x0C, 
@@ -1023,6 +1023,28 @@ static constexpr Bitmap bitmap_icon_dmr {
 	{ 16, 16 }, bitmap_icon_dmr_data
 };
 
+static constexpr uint8_t bitmap_icon_upconvert_data[] = {
+	0x80, 0x01, 
+	0xC0, 0x03, 
+	0xE0, 0x07, 
+	0xF0, 0x0F, 
+	0xF8, 0x1F, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x00, 0x00, 
+	0x77, 0x77, 
+	0x51, 0x51, 
+	0x33, 0x53, 
+	0x51, 0x51, 
+	0x51, 0x77, 
+	0x00, 0x80, 
+};
+static constexpr Bitmap bitmap_icon_upconvert {
+	{ 16, 16 }, bitmap_icon_upconvert_data
+};
+
 static constexpr uint8_t bitmap_icon_clk_int_data[] = {
 	0x00, 
 	0x00, 
@@ -2521,6 +2543,137 @@ static constexpr Bitmap bitmap_target {
 	{ 16, 16 }, bitmap_target_data
 };
 
+static constexpr uint8_t bitmap_icon_trash_data[] = {
+	0x00, 0x00, 
+	0xC0, 0x01, 
+	0x20, 0x02, 
+	0xFC, 0x1F, 
+	0x00, 0x00, 
+	0xA8, 0x0A, 
+	0xA8, 0x0A, 
+	0xA8, 0x0A, 
+	0xA8, 0x0A, 
+	0xA8, 0x0A, 
+	0xA8, 0x0A, 
+	0xA8, 0x0A, 
+	0xA8, 0x0A, 
+	0x08, 0x08, 
+	0xF0, 0x07, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_trash {
+	{ 16, 16 }, bitmap_icon_trash_data
+};
+
+static constexpr uint8_t bitmap_icon_copy_data[] = {
+	0x00, 0x00, 
+	0xFC, 0x00, 
+	0x84, 0x01, 
+	0xC4, 0x0F, 
+	0x74, 0x18, 
+	0x44, 0x38, 
+	0x44, 0x78, 
+	0x74, 0x40, 
+	0x44, 0x44, 
+	0x44, 0x44, 
+	0x74, 0x5F, 
+	0x44, 0x44, 
+	0x44, 0x44, 
+	0x7C, 0x40, 
+	0xC0, 0x7F, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_copy {
+	{ 16, 16 }, bitmap_icon_copy_data
+};
+
+static constexpr uint8_t bitmap_icon_cut_data[] = {
+	0x00, 0x00, 
+	0x10, 0x10, 
+	0x30, 0x18, 
+	0x20, 0x08, 
+	0x60, 0x0C, 
+	0x40, 0x04, 
+	0xC0, 0x06, 
+	0x80, 0x00, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0xC0, 0x03, 
+	0x78, 0x1E, 
+	0x44, 0x22, 
+	0x44, 0x22, 
+	0x44, 0x22, 
+	0x38, 0x1C, 
+};
+static constexpr Bitmap bitmap_icon_cut {
+	{ 16, 16 }, bitmap_icon_cut_data
+};
+
+static constexpr uint8_t bitmap_icon_paste_data[] = {
+	0x00, 0x00, 
+	0xE0, 0x00, 
+	0x18, 0x03, 
+	0xE4, 0x04, 
+	0x04, 0x04, 
+	0x04, 0x04, 
+	0x84, 0x3F, 
+	0x84, 0x20, 
+	0x84, 0x2E, 
+	0x84, 0x20, 
+	0x84, 0x2E, 
+	0x84, 0x20, 
+	0x84, 0x2E, 
+	0xF8, 0x20, 
+	0x80, 0x3F, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_paste {
+	{ 16, 16 }, bitmap_icon_paste_data
+};
+
+static constexpr uint8_t bitmap_icon_new_dir_data[] = {
+	0x00, 0x00, 
+	0x1E, 0x00, 
+	0x21, 0x00, 
+	0xE1, 0x7F, 
+	0x01, 0xC0, 
+	0x81, 0x81, 
+	0x81, 0x81, 
+	0x81, 0x81, 
+	0xF1, 0x8F, 
+	0xF1, 0x8F, 
+	0x81, 0x81, 
+	0x81, 0x81, 
+	0x81, 0x81, 
+	0x03, 0xC0, 
+	0xFE, 0x7F, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_new_dir {
+	{ 16, 16 }, bitmap_icon_new_dir_data
+};
+
+static constexpr uint8_t bitmap_icon_new_file_data[] = {
+	0x00, 0x00, 
+	0xFC, 0x07, 
+	0x04, 0x0C, 
+	0x04, 0x1C, 
+	0x04, 0x3C, 
+	0x84, 0x21, 
+	0x84, 0x21, 
+	0x84, 0x21, 
+	0xF4, 0x2F, 
+	0xF4, 0x2F, 
+	0x84, 0x21, 
+	0x84, 0x21, 
+	0x84, 0x21, 
+	0x04, 0x20, 
+	0xFC, 0x3F, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_new_file {
+	{ 16, 16 }, bitmap_icon_new_file_data
+};
 
 } /* namespace ui */
 

firmware/application/core_control.cpp

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2023 Bernd Herzog
  *
  * This file is part of PortaPack.
  *
@@ -28,22 +29,20 @@ using namespace lpc43xx;
 
 #include "message.hpp"
 #include "baseband_api.hpp"
+#include "lz4.h"
 
 #include <cstring>
 
-/* TODO: OK, this is cool, but how do I put the M4 to sleep so I can switch to
- * a different image? Other than asking the old image to sleep while the M0
- * makes changes?
- *
- * I suppose I could force M4MEMMAP to an invalid memory reason which would
- * cause an exception and effectively halt the M4. But that feels gross.
- */
 void m4_init(const portapack::spi_flash::image_tag_t image_tag, const portapack::memory::region_t to, const bool full_reset) {
 	const portapack::spi_flash::chunk_t* chunk = reinterpret_cast<const portapack::spi_flash::chunk_t*>(portapack::spi_flash::images.base());
 	while(chunk->tag) {
-		if( chunk->tag == image_tag ) {
-			/* Initialize M4 code RAM */
-			std::memcpy(reinterpret_cast<void*>(to.base()), &chunk->data[0], chunk->length);
+		if(chunk->tag == image_tag) {
+
+			const void *src = &chunk->data[0];
+			void *dst = reinterpret_cast<void*>(to.base());
+
+			/* extract and initialize M4 code RAM */
+			unlz4_len(src, dst, chunk->compressed_data_size);
 
 			/* M4 core is assumed to be sleeping with interrupts off, so we can mess
 			 * with its address space and RAM without concern.

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/file.cpp

@@ -124,50 +124,85 @@ Optional<File::Error> File::sync() {
 	}
 }
 
-static std::filesystem::path find_last_file_matching_pattern(const std::filesystem::path& pattern) {
-	std::filesystem::path last_match;
-	for(const auto& entry : std::filesystem::directory_iterator(u"", pattern)) {
-		if( std::filesystem::is_regular_file(entry.status()) ) {
+/* Range used for filename matching.
+ * Start and end are inclusive positions of "???" */
+struct pattern_range {
+	size_t start;
+	size_t end;
+};
+
+/* Finds the last file matching the specified pattern that
+ * can be automatically incremented (digits in pattern).
+ * NB: assumes a patten with contiguous '?' like "FOO_???.txt". */
+static std::filesystem::path find_last_ordinal_match(
+	const std::filesystem::path& folder,
+	const std::filesystem::path& pattern,
+	pattern_range range
+) {
+	auto last_match = std::filesystem::path();
+	auto can_increment = [range](const auto& path) {
+		for (auto i = range.start; i <= range.end; ++i)
+			if (!isdigit(path.native()[i]))
+				return false;
+
+		return true;
+	};
+
+	for (const auto& entry : std::filesystem::directory_iterator(folder, pattern)) {
+		if (std::filesystem::is_regular_file(entry.status()) && can_increment(entry.path())) {
 			const auto& match = entry.path();
 			if( match > last_match ) {
 				last_match = match;
 			}
 		}
 	}
+
 	return last_match;
 }
 
-static std::filesystem::path increment_filename_stem_ordinal(std::filesystem::path path) {
-	auto t = path.replace_extension().native();
-	auto it = t.rbegin();
+/* Given a file path like "FOO_0001.txt" increment it to "FOO_0002.txt". */
+static std::filesystem::path increment_filename_ordinal(
+	const std::filesystem::path& path, pattern_range range
+) {
+	auto name = path.filename().native();
 
-	// Increment decimal number before the extension.
-	for(; it != t.rend(); ++it) {
-		const auto c = *it;
-		if( c < '0' ) {
+	for (auto i = range.end; i >= range.start; --i) {
+		auto& c = name[i];
+
+		// Not a digit or would overflow the counter.
+		if (c < u'0' || c > u'9' || (c == u'9' && i == range.start))
 			return { };
-		} else if( c < '9' ) {
-			*it += 1;
+
+		if (c == u'9')
+			c = '0';
+		else {
+			c++;
 			break;
-		} else if( c == '9' ) {
-			*it = '0';
-		} else {
-			return { };
 		}
 	}
 
-	return t;
+	return { name };
 }
 
-std::filesystem::path next_filename_stem_matching_pattern(std::filesystem::path filename_pattern) {
-	const auto next_filename = find_last_file_matching_pattern(filename_pattern.replace_extension(u".*"));
-	if( next_filename.empty() ) {
-		auto pattern_s = filename_pattern.replace_extension().native();
-		std::replace(std::begin(pattern_s), std::end(pattern_s), '?', '0');
-		return pattern_s;
-	} else {
-		return increment_filename_stem_ordinal(next_filename);
+std::filesystem::path next_filename_matching_pattern(const std::filesystem::path& filename_pattern) {
+	auto path = filename_pattern.parent_path();
+	auto pattern = filename_pattern.filename();
+	auto range = pattern_range {
+		pattern.native().find_first_of(u'?'),
+		pattern.native().find_last_of(u'?')
+	};
+
+	const auto match = find_last_ordinal_match(path, pattern, range);
+
+	if (match.empty()) {
+		auto pattern_str = pattern.native();
+		for (auto i = range.start; i <= range.end; ++i)
+			pattern_str[i] = u'0';
+		return path / pattern_str;
 	}
+
+	auto next_name = increment_filename_ordinal(match, range);
+	return next_name.empty() ? next_name : path / next_name;
 }
 
 std::vector<std::filesystem::path> scan_root_files(const std::filesystem::path& directory,
@@ -197,12 +232,44 @@ std::vector<std::filesystem::path> scan_root_directories(const std::filesystem::
 	return directory_list;
 }
 
-uint32_t delete_file(const std::filesystem::path& file_path) {
-	return f_unlink(reinterpret_cast<const TCHAR*>(file_path.c_str()));
+std::filesystem::filesystem_error delete_file(const std::filesystem::path& file_path) {
+	return { f_unlink(reinterpret_cast<const TCHAR*>(file_path.c_str())) };
 }
 
-uint32_t rename_file(const std::filesystem::path& file_path, const std::filesystem::path& new_name) {
-	return f_rename(reinterpret_cast<const TCHAR*>(file_path.c_str()), reinterpret_cast<const TCHAR*>(new_name.c_str()));
+std::filesystem::filesystem_error rename_file(
+	const std::filesystem::path& file_path,
+	const std::filesystem::path& new_name
+) {
+	return { f_rename(reinterpret_cast<const TCHAR*>(file_path.c_str()), reinterpret_cast<const TCHAR*>(new_name.c_str())) };
+}
+
+std::filesystem::filesystem_error copy_file(
+	const std::filesystem::path& file_path,
+	const std::filesystem::path& dest_path
+) {
+	File src;
+	File dst;
+	constexpr size_t buffer_size = 128;
+	uint8_t buffer[buffer_size];
+
+	auto error = src.open(file_path);
+	if (error.is_valid()) return error.value();
+
+	error = dst.create(dest_path);
+	if (error.is_valid()) return error.value();
+
+	while (true) {
+		auto result = src.read(buffer, buffer_size);
+		if (result.is_error()) return result.error();
+
+		result = dst.write(buffer, result.value());
+		if (result.is_error()) return result.error();
+
+		if (result.value() < buffer_size)
+			break;
+	}
+
+	return { };
 }
 
 FATTimestamp file_created_date(const std::filesystem::path& file_path) {
@@ -213,8 +280,33 @@ FATTimestamp file_created_date(const std::filesystem::path& file_path) {
 	return { filinfo.fdate, filinfo.ftime };
 }
 
-uint32_t make_new_directory(const std::filesystem::path& dir_path) {
-	return f_mkdir(reinterpret_cast<const TCHAR*>(dir_path.c_str()));
+std::filesystem::filesystem_error make_new_file(
+	const std::filesystem::path& file_path
+) {
+	File f;
+	auto result = f.create(file_path);
+	return result.is_valid()
+		? result.value()
+		: std::filesystem::filesystem_error{ };
+}
+
+std::filesystem::filesystem_error make_new_directory(
+	const std::filesystem::path& dir_path
+) {
+	return { f_mkdir(reinterpret_cast<const TCHAR*>(dir_path.c_str())) };
+}
+
+std::filesystem::filesystem_error ensure_directory(
+	const std::filesystem::path& dir_path
+) {
+	if (dir_path.empty() || std::filesystem::file_exists(dir_path))
+		return { };
+
+	auto result = ensure_directory(dir_path.parent_path());
+	if (result.code())
+		return result;
+
+	return make_new_directory(dir_path);
 }
 
 namespace std {
@@ -250,6 +342,15 @@ std::string filesystem_error::what() const {
 	}
 }
 
+path path::parent_path() const {
+	const auto index = _s.find_last_of(preferred_separator);
+	if( index == _s.npos ) {
+		return { }; // NB: Deviation from STL.
+	} else {
+		return _s.substr(0, index);
+	}
+}
+
 path path::extension() const {
 	const auto t = filename().native();
 	const auto index = t.find_last_of(u'.');
@@ -296,6 +397,14 @@ path& path::replace_extension(const path& replacement) {
 	return *this;
 }
 
+bool operator==(const path& lhs, const path& rhs) {
+	return lhs.native() == rhs.native();
+}
+
+bool operator!=(const path& lhs, const path& rhs) {
+	return !(lhs == rhs);
+}
+
 bool operator<(const path& lhs, const path& rhs) {
 	return lhs.native() < rhs.native();
 }
@@ -304,14 +413,28 @@ bool operator>(const path& lhs, const path& rhs) {
 	return lhs.native() > rhs.native();
 }
 
+path operator+(const path& lhs, const path& rhs) {
+	path result = lhs;
+	result += rhs;
+	return result;
+}
+
+path operator/(const path& lhs, const path& rhs) {
+	path result = lhs;
+	result /= rhs;
+	return result;
+}
+
 directory_iterator::directory_iterator(
 	std::filesystem::path path,
 	std::filesystem::path wild
 ) : pattern { wild }
 {
 	impl = std::make_shared<Impl>();
-	const auto result = f_findfirst(&impl->dir, &impl->filinfo, reinterpret_cast<const TCHAR*>(path.c_str()), reinterpret_cast<const TCHAR*>(pattern.c_str()));
-	if( result != FR_OK ) {
+	const auto result = f_findfirst(&impl->dir, &impl->filinfo,
+		reinterpret_cast<const TCHAR*>(path.c_str()),
+		reinterpret_cast<const TCHAR*>(pattern.c_str()));
+	if (result != FR_OK || impl->filinfo.fname[0] == (TCHAR)'\0') {
 		impl.reset();
 		// TODO: Throw exception if/when I enable exceptions...
 	}
@@ -333,6 +456,20 @@ bool is_regular_file(const file_status s) {
 	return !(s & AM_DIR);
 }
 
+bool file_exists(const path& file_path) {
+	FILINFO filinfo;
+	auto fr = f_stat(reinterpret_cast<const TCHAR*>(file_path.c_str()), &filinfo);
+	
+	return fr == FR_OK;
+}
+
+bool is_directory(const path& file_path) {
+	FILINFO filinfo;
+	auto fr = f_stat(reinterpret_cast<const TCHAR*>(file_path.c_str()), &filinfo);
+	
+	return fr == FR_OK && is_directory(static_cast<file_status>(filinfo.fattrib));
+}
+
 space_info space(const path& p) {
 	DWORD free_clusters { 0 };
 	FATFS* fs;

firmware/application/file.hpp

@@ -59,6 +59,10 @@ struct filesystem_error {
 	
 	std::string what() const;
 
+	bool ok() const {
+		return err == FR_OK;
+	}
+
 private:
 	uint32_t err { FR_OK };
 };
@@ -123,6 +127,7 @@ struct path {
 		return *this;
 	}
 
+	path parent_path() const;
 	path extension() const;
 	path filename() const;
 	path stem() const;
@@ -151,14 +156,25 @@ struct path {
 		return *this;
 	}
 
+	path& operator/=(const path& p) {
+		if (_s.back() != preferred_separator)
+			_s += preferred_separator;
+		_s += p._s;
+		return *this;
+	}
+
 	path& replace_extension(const path& replacement = path());
 
 private:
 	string_type _s;
 };
 
+bool operator==(const path& lhs, const path& rhs);
+bool operator!=(const path& lhs, const path& rhs);
 bool operator<(const path& lhs, const path& rhs);
 bool operator>(const path& lhs, const path& rhs);
+path operator+(const path& lhs, const path& rhs);
+path operator/(const path& lhs, const path& rhs);
 
 using file_status = BYTE;
 
@@ -227,6 +243,8 @@ inline bool operator!=(const directory_iterator& lhs, const directory_iterator&
 
 bool is_directory(const file_status s);
 bool is_regular_file(const file_status s);
+bool file_exists(const path& file_path);
+bool is_directory(const path& file_path);
 
 space_info space(const path& p);
 
@@ -238,14 +256,23 @@ struct FATTimestamp {
 	uint16_t FAT_time;
 };
 
-uint32_t delete_file(const std::filesystem::path& file_path);
-uint32_t rename_file(const std::filesystem::path& file_path, const std::filesystem::path& new_name);
+std::filesystem::filesystem_error delete_file(const std::filesystem::path& file_path);
+std::filesystem::filesystem_error rename_file(const std::filesystem::path& file_path, const std::filesystem::path& new_name);
+std::filesystem::filesystem_error copy_file(const std::filesystem::path& file_path, const std::filesystem::path& dest_path);
 FATTimestamp file_created_date(const std::filesystem::path& file_path);
-uint32_t make_new_directory(const std::filesystem::path& dir_path);
+std::filesystem::filesystem_error make_new_file(const std::filesystem::path& file_path);
+std::filesystem::filesystem_error make_new_directory(const std::filesystem::path& dir_path);
+std::filesystem::filesystem_error ensure_directory(const std::filesystem::path& dir_path);
 
 std::vector<std::filesystem::path> scan_root_files(const std::filesystem::path& directory, const std::filesystem::path& extension);
 std::vector<std::filesystem::path> scan_root_directories(const std::filesystem::path& directory);
-std::filesystem::path next_filename_stem_matching_pattern(std::filesystem::path filename_stem_pattern);
+
+/* Gets an auto incrementing filename stem.
+ * Pattern should be like "FOO_???.txt" where ??? will be replaced by digits.
+ * Pattern may also contain a folder path like "LOGS/FOO_???.txt".
+ * Pattern '?' must be contiguous (bad: "FOO?_??")
+ * Returns empty path if a filename could not be created. */
+std::filesystem::path next_filename_matching_pattern(const std::filesystem::path& pattern);
 
 /* Values added to FatFs FRESULT enum, values outside the FRESULT data type */
 static_assert(sizeof(FIL::err) == 1, "FatFs FIL::err size not expected.");

firmware/application/freqman.cpp

@@ -47,44 +47,46 @@ options_t freqman_entry_bandwidths[ 4 ] = {
     },
     { //WFM
         { "200k" , 0 },
+        { "180k" , 1 },
+        { "40k"  , 2 },
     }
 };
 
 options_t freqman_entry_steps = {
-    { "0.1KHz      " , 100 },
-    { "1KHz        " , 1000 },
-    { "5KHz (SA AM)" , 5000 },
-    { "6.25KHz(NFM)" , 6250 },
-    { "8.33KHz(AIR)" , 8330 },
-    { "9KHz (EU AM)" , 9000 },
-    { "10KHz(US AM)" , 10000 },
-    { "12.5KHz(NFM)" , 12500 },
-    { "15KHz  (HFM)" , 15000 },
-    { "25KHz   (N1)" , 25000 },
-    { "30KHz (OIRT)" , 30000 },
-    { "50KHz  (FM1)" , 50000 },
-    { "100KHz (FM2)" , 100000 },
-    { "250KHz  (N2)" , 250000 },
-    { "500KHz (WFM)" , 500000 },
+    { "0.1kHz      " , 100 },
+    { "1kHz        " , 1000 },
+    { "5kHz (SA AM)" , 5000 },
+    { "6.25kHz(NFM)" , 6250 },
+    { "8.33kHz(AIR)" , 8330 },
+    { "9kHz (EU AM)" , 9000 },
+    { "10kHz(US AM)" , 10000 },
+    { "12.5kHz(NFM)" , 12500 },
+    { "15kHz  (HFM)" , 15000 },
+    { "25kHz   (N1)" , 25000 },
+    { "30kHz (OIRT)" , 30000 },
+    { "50kHz  (FM1)" , 50000 },
+    { "100kHz (FM2)" , 100000 },
+    { "250kHz  (N2)" , 250000 },
+    { "500kHz (WFM)" , 500000 },
     { "1MHz        " , 1000000 }
 };
 
 options_t freqman_entry_steps_short = {
-    { "0.1KHz"  , 100 },
-    { "1KHz"    , 1000 },
-    { "5KHz"    , 5000 },
-    { "6.25KHz" , 6250 },
-    { "8.33KHz" , 8330 },
-    { "9KHz"    , 9000 },
-    { "10KHz"   , 10000 },
-    { "12.5KHz" , 12500 },
-    { "15KHz"   , 15000 },
-    { "25KHz"   , 25000 },
-    { "30KHz"   , 30000 },
-    { "50KHz"   , 50000 },
-    { "100KHz"  , 100000 },
-    { "250KHz"  , 250000 },
-    { "500KHz"  , 500000 },
+    { "0.1kHz"  , 100 },
+    { "1kHz"    , 1000 },
+    { "5kHz"    , 5000 },
+    { "6.25kHz" , 6250 },
+    { "8.33kHz" , 8330 },
+    { "9kHz"    , 9000 },
+    { "10kHz"   , 10000 },
+    { "12.5kHz" , 12500 },
+    { "15kHz"   , 15000 },
+    { "25kHz"   , 25000 },
+    { "30kHz"   , 30000 },
+    { "50kHz"   , 50000 },
+    { "100kHz"  , 100000 },
+    { "250kHz"  , 250000 },
+    { "500kHz"  , 500000 },
     { "1MHz"    , 1000000 }
 };
 
@@ -144,17 +146,15 @@ bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freq
         // Reset line_start to beginning of buffer
         line_start = file_data;
 
-        if (!strstr(file_data, "f=") && !strstr(file_data, "a=") && !strstr(file_data, "r=") )
-            break;
-
         // Look for complete lines in buffer
         while ((line_end = strstr(line_start, "\x0A"))) {
 
+            *line_end = 0;      // Stop strstr() searches below at EOL
             modulation = -1 ;
             bandwidth = -1 ;
             step = -1 ;
             tone = -1 ;
-            type=SINGLE ;
+            type = ERROR_TYPE;
 
             frequency_a = frequency_b = 0;
             // Read frequency
@@ -162,6 +162,7 @@ bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freq
             if(pos) {
                 pos += 2;
                 frequency_a = strtoll(pos, nullptr, 10);
+                type = SINGLE;
             } else {
                 // ...or range
                 pos = strstr(line_start, "a=");
@@ -229,7 +230,7 @@ bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freq
             {
                 db.push_back({ frequency_a, frequency_b, description, type , modulation , bandwidth , step , tone });
                 n++;
-                if (n >= FREQMAN_MAX_PER_FILE) return true;
+                if (n > FREQMAN_MAX_PER_FILE) return true;
             }
 
             line_start = line_end + 1;

firmware/application/freqman.hpp

@@ -31,9 +31,10 @@
 #include "string_format.hpp"
 #include "ui_widget.hpp"
 
-#define FREQMAN_DESC_MAX_LEN 30
-#define FREQMAN_MAX_PER_FILE 500        /* MAX PER FILES */
-#define FREQMAN_MAX_PER_FILE_STR "500"  /*STRING OF FREQMAN_MAX_PER_FILE */
+#define FREQMAN_DESC_MAX_LEN 24         // This is the number of characters that can be drawn in front of "R: TEXT..." before taking a full screen line
+#define FREQMAN_MAX_PER_FILE 115        // Maximum of entries we can read. This is a hardware limit
+                                        // It was tested and lowered to leave a bit of space to the caller
+#define FREQMAN_MAX_PER_FILE_STR "115"  // STRING OF FREQMAN_MAX_PER_FILE
 
 using namespace ui;
 using namespace std;
@@ -86,7 +87,7 @@ struct freqman_entry {
 	freqman_entry_type type { };     // SINGLE,RANGE,HAMRADIO
 	freqman_index_t modulation { };    // AM,NFM,WFM
 	freqman_index_t bandwidth { };     // AM_DSB, ...
-	freqman_index_t step { };          // 5Khz (SA AM,...
+	freqman_index_t step { };          // 5khz (SA AM,...
 	tone_index tone { };               // 0XZ, 11 1ZB,...
 };
 

firmware/application/irq_controls.cpp

@@ -42,7 +42,7 @@ using namespace hackrf::one;
 
 static Thread* thread_controls_event = NULL;
 
-static std::array<Debounce, 7> switch_debounce;
+static std::array<Debounce, 8> switch_debounce;
 
 static Encoder encoder;
 
@@ -193,11 +193,13 @@ void controls_init() {
 
 SwitchesState get_switches_state() {
 	SwitchesState result;
-	for(size_t i=0; i<result.size(); i++) {
+	for(size_t i=0; i<result.size()-1; i++) {
  		// TODO: Ignore multiple keys at the same time?
  		result[i] = switch_debounce[i].state();
 	}
 
+	result[result.size()-1] = switch_debounce[switch_debounce.size()-1].state();
+
 	return result;
 }
 

firmware/application/irq_controls.hpp

@@ -33,9 +33,10 @@ enum class Switch {
 	Down = 2,
 	Up = 3,
 	Sel = 4,
+	Dfu = 5,
 };
 
-using SwitchesState = std::bitset<5>;
+using SwitchesState = std::bitset<6>;
 
 using EncoderPosition = uint32_t;
 

firmware/application/log_file.hpp

@@ -27,11 +27,18 @@
 #include "file.hpp"
 
 #include "lpc43xx_cpp.hpp"
+
 using namespace lpc43xx;
 
+#define LOG_ROOT_DIR "LOGS"
+
 class LogFile {
 public:
 	Optional<File::Error> append(const std::filesystem::path& filename) {
+		auto result = ensure_directory(filename.parent_path());
+		if (result.code())
+			return { result };
+		
 		return file.append(filename);
 	}
 

firmware/application/lz4.S

@@ -0,0 +1,70 @@
+/* source: https://community.arm.com/arm-community-blogs/b/architectures-and-processors-blog/posts/lz4-decompression-routine-for-cortex-m0-and-later */
+
+                    .syntax             unified
+                    .cpu                cortex-m0
+                    .thumb
+
+/* License: Public Domain - I cannot be held responsible for what it does or does not do if you use it, whether it's modified or not. */
+/* Entry point = unlz4. On entry: r0 = source, r1 = destination. The first two bytes of the source must contain the length of the compressed data. */
+
+                    .func               unlz4
+                    .global             unlz4,unlz4_len
+                    .type               unlz4,%function
+                    .type               unlz4_len,%function
+
+                    .thumb_func
+unlz4:              ldrh                r2,[r0]             /* get length of compressed data */
+                    adds                r0,r0,#2            /* advance source pointer */
+
+                    .thumb_func
+unlz4_len:          push                {r4-r6,lr}          /* save r4, r5, r6 and return-address */
+                    adds                r5,r2,r0            /* point r5 to end of compressed data */
+
+getToken:           ldrb                r6,[r0]             /* get token */
+                    adds                r0,r0,#1            /* advance source pointer */
+                    lsrs                r4,r6,#4            /* get literal length, keep token in r6 */
+                    beq                 getOffset           /* jump forward if there are no literals */
+                    bl                  getLength           /* get length of literals */
+                    movs                r2,r0               /* point r2 to literals */
+                    bl                  copyData            /* copy literals (r2=src, r1=dst, r4=len) */
+                    movs                r0,r2               /* update source pointer */
+
+getOffset:          ldrb                r3,[r0,#0]          /* get match offset's low byte */
+                    subs                r2,r1,r3            /* subtract from destination; this will become the match position */
+                    ldrb                r3,[r0,#1]          /* get match offset's high byte */
+                    lsls                r3,r3,#8            /* shift to high byte */
+                    subs                r2,r2,r3            /* subtract from match position */
+                    adds                r0,r0,#2            /* advance source pointer */
+                    lsls                r4,r6,#28           /* get rid of token's high 28 bits */
+                    lsrs                r4,r4,#28           /* move the 4 low bits back where they were */
+                    bl                  getLength           /* get length of match data */
+                    adds                r4,r4,#4            /* minimum match length is 4 bytes */
+                    bl                  copyData            /* copy match data (r2=src, r1=dst, r4=len) */
+                    cmp                 r0,r5               /* check if we've reached the end of the compressed data */
+                    blt                 getToken            /* if not, go get the next token */
+                    pop                 {r4-r6,pc}          /* restore r4, r5 and r6, then return */
+
+                    .thumb_func
+getLength:          cmp                 r4,#0x0f            /* if length is 15, then more length info follows */
+                    bne                 gotLength           /* jump forward if we have the complete length */
+
+getLengthLoop:      ldrb                r3,[r0]             /* read another byte */
+                    adds                r0,r0,#1            /* advance source pointer */
+                    adds                r4,r4,r3            /* add byte to length */
+                    cmp                 r3,#0xff            /* check if end reached */
+                    beq                 getLengthLoop       /* if not, go round loop */
+gotLength:          bx                  lr                  /* return */
+
+                    .thumb_func
+copyData:           rsbs                r4,r4,#0            /* index = -length */
+                    subs                r2,r2,r4            /* point to end of source */
+                    subs                r1,r1,r4            /* point to end of destination */
+                    
+copyDataLoop:       ldrb                r3,[r2,r4]          /* read byte from source_end[-index] */
+                    strb                r3,[r1,r4]          /* store byte in destination_end[-index] */
+                    adds                r4,r4,#1            /* increment index */
+                    bne                 copyDataLoop        /* keep going until index wraps to 0 */
+                    bx                  lr                  /* return */
+                    .size               unlz4,.-unlz4
+                    .endfunc
+/* 42 narrow instructions = 84 bytes */

firmware/application/lz4.h

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * 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 __LZ4_H__
+#define __LZ4_H__
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+    extern void unlz4_len(const void *aSource, void *aDestination, uint32_t aLength);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__LZ4_H__*/

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/portapack.cpp

@@ -61,7 +61,7 @@ portapack::IO io {
 	portapack::gpio_io_stbx,
 	portapack::gpio_addr,
 	portapack::gpio_lcd_te,
-	portapack::gpio_unused,
+	portapack::gpio_dfu,
 };
 
 portapack::BacklightCAT4004 backlight_cat4004;
@@ -489,10 +489,13 @@ bool init() {
 	
 	chThdSleepMilliseconds(10);
 
-	if( !portapack::cpld::update_if_necessary(portapack_cpld_config()) ) {
+	portapack::cpld::CpldUpdateStatus result = portapack::cpld::update_if_necessary(portapack_cpld_config());
+	if ( result == portapack::cpld::CpldUpdateStatus::Program_failed ) {
+
 		chThdSleepMilliseconds(10);
-		// If using a "2021/12 QFP100", press and hold the left button while booting. Should only need to do once.
-		if (load_config() != 3 && load_config() != 4){
+		// Mode left (R1) and right (R2,H2,H2+) bypass going into hackrf mode after failing CPLD update
+		// Mode center (autodetect), up (R1) and down (R2,H2,H2+) will go into hackrf mode after failing CPLD update
+		if (load_config() != 3 /* left */ && load_config() != 4 /* right */){
 			shutdown_base();
 			return false;
 		}
@@ -515,11 +518,13 @@ bool init() {
 	return true;
 }
 
-void shutdown() {
+void shutdown(const bool leave_screen_on) {
 	gpdma::controller.disable();
 
-	backlight()->off();
-	display.shutdown();
+	if (!leave_screen_on) {
+		backlight()->off();
+		display.shutdown();
+	}
 	
 	radio::disable();
 	audio::shutdown();

firmware/application/portapack.hpp

@@ -63,7 +63,7 @@ void set_antenna_bias(const bool v);
 bool get_antenna_bias();
 
 bool init();
-void shutdown();
+void shutdown(const bool leave_screen_on = false);
 
 Backlight* backlight();
 

firmware/application/radio.cpp

@@ -170,8 +170,17 @@ void set_direction(const rf::Direction new_direction) {
 
 bool set_tuning_frequency(const rf::Frequency frequency) {
 	rf::Frequency final_frequency = frequency ;
-	if( portapack::persistent_memory::config_hamitup() ) {
-		final_frequency = frequency + portapack::persistent_memory::config_hamitup_freq();
+	// if feature is enabled
+	if( portapack::persistent_memory::config_converter() ) {
+		//downconvert
+		if( portapack::persistent_memory::config_updown_converter() )
+		{
+			final_frequency = frequency - portapack::persistent_memory::config_converter_freq();
+		}
+		else //upconvert
+		{
+			final_frequency = frequency + portapack::persistent_memory::config_converter_freq();
+		}
 	}
 	const auto tuning_config = tuning::config::create(final_frequency);
 	if( tuning_config.is_valid() ) {

firmware/application/receiver_model.cpp

@@ -52,8 +52,10 @@ static constexpr std::array<baseband::NBFMConfig, 3> nbfm_configs { {
 	{ taps_16k0_decim_0, taps_16k0_decim_1, taps_16k0_channel, 5000 },
 } };
 
-static constexpr std::array<baseband::WFMConfig, 1> wfm_configs { {
-	{ },
+static constexpr std::array<baseband::WFMConfig, 3> wfm_configs { {
+	{taps_200k_wfm_decim_0, taps_200k_wfm_decim_1 },
+    {taps_180k_wfm_decim_0,  taps_180k_wfm_decim_1  },
+    {taps_40k_wfm_decim_0,  taps_40k_wfm_decim_1  },
 } };
 
 } /* namespace */

firmware/application/string_format.cpp

@@ -256,8 +256,17 @@ double get_decimals(double num, int16_t mult, bool round) {
 	return intnum;
 }
 
-std::string trimr(std::string str)
-{
+std::string trim(const std::string& str) {
+	auto first = str.find_first_not_of(' ');
+	auto last = str.find_last_not_of(' ');
+	return str.substr(first, last - first);
+}
+
+std::string trimr(std::string str) {
 	size_t last = str.find_last_not_of(' ');
 	return (last!=std::string::npos) ? str.substr(0, last+1) : ""; // Remove the trailing spaces
+}
+
+std::string truncate(const std::string& str, size_t length) {
+	return str.length() <= length ? str : str.substr(0, length);
 }

firmware/application/string_format.hpp

@@ -59,6 +59,8 @@ std::string to_string_FAT_timestamp(const FATTimestamp& timestamp);
 std::string unit_auto_scale(double n, const uint32_t base_nano, uint32_t precision);
 double get_decimals(double num, int16_t mult,  bool round = false); //euquiq added
 
+std::string trim(const std::string& str); // Remove whitespace at ends.
 std::string trimr(std::string str); // Remove trailing spaces
+std::string truncate(const std::string& str, size_t length);
 
 #endif/*__STRING_FORMAT_H__*/

firmware/application/tone_key.cpp

@@ -38,12 +38,12 @@ const tone_key_t tone_keys = {
 	{ "8 YB", 88.500 },
 	{ "9 ZZ", 91.500 },
 	{ "10 ZA", 94.800 },
-	{ "11 1ZB", 97.400 },
-	{ "12 21Z", 100.000 },
+	{ "11 ZB", 97.400 },
+	{ "12 1Z", 100.000 },
 	{ "13 1A", 103.500 },
 	{ "14 1B", 107.200 },
 	{ "15 2Z", 110.900 },
-	{ "16 2Z", 114.800 },
+	{ "16 2A", 114.800 },
 	{ "17 2B", 118.800 },
 	{ "18 3Z", 123.000 },
 	{ "19 3A", 127.300 },

firmware/application/touch.cpp

@@ -81,16 +81,21 @@ void Manager::feed(const Frame& frame) {
 	const auto touch_raw = frame.touch;
 	//const auto touch_stable = touch_debounce.state();
 	const auto touch_stable = frame.touch;
-	bool touch_pressure = false;
+	bool touch_down_pressure = false;
+	bool touch_up_pressure = false;
 
 	// Only feed coordinate averaging if there's a touch.
 	// TODO: Separate threshold to gate coordinates for filtering?
 	if( touch_raw ) {
 		const auto metrics = calculate_metrics(frame);
 
-		// TODO: Add touch pressure hysteresis?
-		touch_pressure = (metrics.r < r_touch_threshold);
-		if( touch_pressure ) {
+		constexpr float r_touch_down_threshold = 3200.0f;
+		constexpr float r_touch_up_threshold = r_touch_down_threshold * 2.0f;
+
+		touch_down_pressure = (metrics.r < r_touch_down_threshold);
+		touch_up_pressure = (metrics.r < r_touch_up_threshold);
+
+		if( touch_down_pressure ) {
 			filter_x.feed(metrics.x * 1024);
 			filter_y.feed(metrics.y * 1024);
 		}
@@ -101,7 +106,7 @@ void Manager::feed(const Frame& frame) {
 
 	switch(state) {
 	case State::NoTouch:
-		if( touch_stable && touch_pressure && !persistent_memory::disable_touchscreen()) {
+		if( touch_stable && touch_down_pressure && !persistent_memory::disable_touchscreen()) {
 			if( point_stable() ) {
 				state = State::TouchDetected;
 				touch_started();
@@ -110,7 +115,7 @@ void Manager::feed(const Frame& frame) {
 		break;
 
 	case State::TouchDetected:
-		if( touch_stable && touch_pressure ) {
+		if( touch_stable && touch_up_pressure ) {
 			touch_moved();
 		} else {
 			state = State::NoTouch;

firmware/application/touch.hpp

@@ -219,7 +219,6 @@ private:
 		TouchDetected,
 	};
 
-	static constexpr float r_touch_threshold = 640;
 	static constexpr size_t touch_count_threshold { 3 };
 	static constexpr uint32_t touch_stable_bound { 8 };
 

firmware/application/ui/ui_alphanum.cpp

@@ -30,10 +30,6 @@
 
 namespace ui {
 
-void AlphanumView::paint(Painter&) {
-	draw_cursor();
-}
-
 AlphanumView::AlphanumView(
 	NavigationView& nav,
 	std::string& str,
@@ -41,7 +37,7 @@ AlphanumView::AlphanumView(
 ) : TextEntryView(nav, str, max_length)
 {
 	size_t n;
-	
+
 	add_children({
 		&button_mode,
 		&text_raw,
@@ -77,16 +73,7 @@ AlphanumView::AlphanumView(
 	field_raw.set_value('0');
 	field_raw.on_select = [this](NumberField&) {
 		char_add(field_raw.value());
-		update_text();
 	};
-
-	button_ok.on_select = [this, &nav](Button&) {
-		if (on_changed)
-			on_changed(_str);
-		nav.pop();
-	};
-
-	update_text();
 }
 
 void AlphanumView::set_mode(const uint32_t new_mode) {
@@ -120,8 +107,6 @@ void AlphanumView::on_button(Button& button) {
 		char_delete();
 	else
 		char_add(c);
-	
-	update_text();
 }
 
 bool AlphanumView::on_encoder(const EncoderEvent delta) {

firmware/application/ui/ui_alphanum.hpp

@@ -40,7 +40,6 @@ public:
 	AlphanumView& operator=(const AlphanumView&) = delete;
 	AlphanumView& operator=(AlphanumView&&) = delete;
 
-	void paint(Painter& painter) override;
 	bool on_encoder(const EncoderEvent delta) override;
 
 private:

firmware/application/ui/ui_btngrid.cpp

@@ -136,14 +136,22 @@ void BtnGridView::update_items() {
 		more = false;
 
 	for (NewButton* item : menu_item_views) {
-		if (i >= menu_items.size()) break;
-
-		// Assign item data to NewButtons according to offset
-		item->set_text(menu_items[i + offset].text);
-		item->set_bitmap(menu_items[i + offset].bitmap);
-		item->set_color(menu_items[i + offset].color);
-		item->on_select = menu_items[i + offset].on_select;
-		item->set_dirty();
+		if ((i + offset) >= menu_items.size()) {
+			item->hidden(true);
+			item->set_text(" ");
+			item->set_bitmap(nullptr);
+			item->on_select = [](){};
+			item->set_dirty();
+		}
+		else {
+			// Assign item data to NewButtons according to offset
+			item->hidden(false);
+			item->set_text(menu_items[i + offset].text);
+			item->set_bitmap(menu_items[i + offset].bitmap);
+			item->set_color(menu_items[i + offset].color);
+			item->on_select = menu_items[i + offset].on_select;
+			item->set_dirty();
+		}
 
 		i++;
 	}
@@ -167,18 +175,21 @@ bool BtnGridView::set_highlighted(int32_t new_value) {
 		highlighted_item = new_value;
 		offset = new_value - displayed_max + rows_;
 		update_items();
+		set_dirty();
 	} else if ((uint32_t)new_value < offset) {
 		// Shift BtnGridView down
 		highlighted_item = new_value;
 		offset = (new_value / rows_) * rows_;
 		update_items();
+		set_dirty();
 	} else {
 		// Just update highlight
 		highlighted_item = new_value;
-		if (visible())
-		  item_view(highlighted_item - offset)->focus();
 	}
 
+	if (visible())
+		item_view(highlighted_item - offset)->focus();
+
 	return true;
 }
 

firmware/application/ui/ui_menu.cpp

@@ -163,6 +163,12 @@ void MenuView::clear() {
 	}
 	
 	menu_items.clear();
+	highlighted_item = 0;
+	offset = 0;
+}
+
+size_t MenuView::item_count() const {
+	return menu_items.size();
 }
 
 void MenuView::add_item(MenuItem new_item) {
@@ -209,7 +215,7 @@ MenuItemView* MenuView::item_view(size_t index) const {
 bool MenuView::set_highlighted(int32_t new_value) {
 	int32_t item_count = (int32_t)menu_items.size();
 	
-	if (new_value < 0)
+	if (new_value < 0 || item_count == 0)
 		return false;
 	
 	if (new_value >= item_count)
@@ -238,7 +244,7 @@ bool MenuView::set_highlighted(int32_t new_value) {
 	return true;
 }
 
-uint32_t MenuView::highlighted_index() {
+uint32_t MenuView::highlighted_index() const {
 	return highlighted_item;
 }
 
@@ -262,7 +268,7 @@ bool MenuView::on_key(const KeyEvent key) {
 	case KeyEvent::Select:
 	case KeyEvent::Right:
 		if( menu_items[highlighted_item].on_select ) {
-			menu_items[highlighted_item].on_select();
+			menu_items[highlighted_item].on_select(key);
 		}
 		return true;
 

firmware/application/ui/ui_menu.hpp

@@ -39,7 +39,7 @@ struct MenuItem {
 	std::string text;
 	ui::Color color;
 	const Bitmap* bitmap;
-	std::function<void(void)> on_select;
+	std::function<void(KeyEvent)> on_select;
 
 	// TODO: Prevent default-constructed MenuItems.
 	// I managed to construct a menu with three extra, unspecified menu items
@@ -83,11 +83,12 @@ public:
 	void add_item(MenuItem new_item);
 	void add_items(std::initializer_list<MenuItem> new_items);
 	void clear();
+	size_t item_count() const;
 	
 	MenuItemView* item_view(size_t index) const;
 
 	bool set_highlighted(int32_t new_value);
-	uint32_t highlighted_index();
+	uint32_t highlighted_index() const;
 
 	void set_parent_rect(const Rect new_parent_rect) override;
 	void on_focus() override;

firmware/application/ui/ui_receiver.cpp

@@ -87,7 +87,22 @@ bool FrequencyField::on_key(const ui::KeyEvent event) {
 }
 
 bool FrequencyField::on_encoder(const EncoderEvent delta) {
-	set_value(value() + (delta * step));
+	if (step == 0) { // 'Auto' mode.'
+		auto ms = RTT2MS(halGetCounterValue());
+		auto delta_ms = last_ms_ <= ms ? ms - last_ms_ : ms;
+		last_ms_ = ms;
+
+		// The goal is to map 'scale' to a range of about 10 to 10M.
+		// The faster the encoder is rotated, the larger the step.
+		// Linear doesn't feel right. Hyperbolic felt better.
+		// To get these magic numbers, I graphed the function until the
+		// curve shape seemed about right then tested on device.
+		delta_ms = std::min(145ull, delta_ms) + 5; // Prevent DIV/0
+		int64_t scale = 200'000'000 / (0.001'55 * pow(delta_ms, 5.45)) + 8;
+		set_value(value() + (delta * scale));
+	} else {
+		set_value(value() + (delta * step));
+	}
 	return true;
 }
 

firmware/application/ui/ui_receiver.hpp

@@ -63,6 +63,7 @@ private:
 	const range_t range;
 	rf::Frequency value_ { 0 };
 	rf::Frequency step { 25000 };
+	uint64_t last_ms_ { 0 };
 
 	rf::Frequency clamp_value(rf::Frequency value);
 };
@@ -247,6 +248,7 @@ public:
 			parent_pos,
 			5,
 			{
+				{ " Auto",        0 },  /* Faster == larger step. */
 				{ "   10",       10 },  /* Fine tuning SSB voice pitch,in HF and QO-100 sat #669 */
 				{ "   50",       50 },	/* added 50Hz/10Hz,but we do not increase GUI digit decimal */
 				{ "  100",      100 },

firmware/application/ui/ui_rssi.cpp

@@ -102,7 +102,7 @@ namespace ui {
             // show green peak value 
             if( peak_enabled )
             {
-                const Rect r5 { r.left() + peak - 1 , r.top() , 3 , r.height() };
+                const Rect r5 { r.left() + peak - 3 , r.top() , 3 , r.height() };
                 painter.fill_rectangle(
                         r5,
                         Color::green()
@@ -160,7 +160,7 @@ namespace ui {
             // show green peak value if enabled
             if( peak_enabled )
             {
-                const Rect r5 { r.left(), r.bottom() - peak - 1 , r.width() , 3 };
+                const Rect r5 { r.left(), r.bottom() - peak - 3 , r.width() , 3 };
                 painter.fill_rectangle(
                         r5,
                         Color::green()
@@ -434,6 +434,23 @@ namespace ui {
     void RSSIGraph::set_nb_columns( int16_t nb )
     {
         nb_columns = nb ;
+        while( graph_list.size() >  nb_columns )
+        {
+            graph_list.erase( graph_list.begin() );
+        }
+    }
+
+    void RSSIGraph::on_hide() {
+        nb_columns_before_hide = nb_columns ;
+        nb_columns = 1 ;
+        while( graph_list.size() >  nb_columns )
+        {
+            graph_list.erase( graph_list.begin() );
+        }
+    }
+
+    void RSSIGraph::on_show() {
+        nb_columns = nb_columns_before_hide ;
     }
 
     void RSSI::on_focus() {

firmware/application/ui/ui_rssi.hpp

@@ -115,8 +115,12 @@ namespace ui {
             void paint(Painter& painter) override;
             void add_values(int16_t rssi_min, int16_t rssi_avg, int16_t rssi_max, int16_t db );
             void set_nb_columns( int16_t nb );
+            
+            void on_hide() override ;
+            void on_show() override ;
 
         private:
+            uint16_t nb_columns_before_hide = 16 ;
             uint16_t nb_columns = 16 ;
             RSSIGraphList graph_list { } ;
     };