Update version.txt

Update past_version.txt
Merge pull request #768 from rusty-labs/sin_function_180_fix
2026-08-09 09:23:47 +00:00 · 2022-12-29 15:35:54 +13:00 · 2022-12-29 15:35:45 +13:00 · 2022-12-28 16:34:38 +01:00 · 2022-12-28 01:13:42 -05:00 · 2022-12-17 16:02:54 +01:00
156 changed files with 7045 additions and 1304 deletions
@@ -1,12 +1,18 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a report to help us improve the software
 title: ''
 labels: bug
 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)
+
+----
+
 **Describe the bug**
 A clear and concise description of what the bug is. 

@@ -21,9 +27,9 @@ A clear and concise description of what you expected to happen.

 **Affected versions**
 Please write any difference related with the Expected behavior, on the following versions:
-* Latest Stable Release
-* Previous one (if any) that did not presented the issue
-* Old versions available here: https://github.com/eried/Research/tree/master/HackRF/PortaPack/old_legacy_firmware
+* Latest Stable release:
+* Latest Nightly release:
+* Previous working release:

 **Additional**
 If the bug is difficult to explain, additionally to the text please include images and videos.
@@ -1,18 +1,39 @@
 ---
-name: Problem upgrading the firmware
-about: Deal with the firmware upgrade problems
-title: Problem upgrading the firmware
-labels: ''
+name: Problem upgrading the firmware or booting
+about: If you are having firmware upgrade or booting problems
+title: ''
+labels: 'firmware'
 assignees: ''

 ---

-**What is happening?**
-Describe here why you are unable to upgrade the firmware. Before describing your problems, **do the following**: 
+----
+Before creating this issue, **do the following**: 
+* Read the Wiki on booting: https://github.com/eried/portapack-mayhem/wiki/Won't-boot
 * Read: https://github.com/eried/portapack-havoc/wiki/Update-firmware
 * Watch carefully: https://www.youtube.com/watch?v=_zx4ZvurgOs
 * (if you are not in Windows) also check: https://www.youtube.com/watch?v=kjFB58Y1TAo

+----
+
+**Describe the issue**
+A clear and concise description of what the issue you are facing is. 
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Tap on '....'
+
+
+**My Hardware**
+Please specify what PortaPack hardware version you are using. 
+You can find the list of versions here: https://github.com/eried/portapack-mayhem/wiki/PortaPack-Versions
+
+**Affected versions**
+Please tell us what version you are running. 
+Also please 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?**
 Things might be confusing the first time, please check the video available on the link above.

@@ -20,4 +41,4 @@ Things might be confusing the first time, please check the video available on th
 If is possible, swap hardware and try again. Also, try different USB cables, even if the one you are using works fine for other purposes.

 **Additional**
-Add photos and videos of your procedure.
+If the issue is difficult to explain, additionally to the text please include images and videos.
@@ -51,7 +51,7 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
-          tag_name: v1.5.1
+          tag_name: ${{ steps.version.outputs.version }}
          release_name: Mayhem firmware ${{ steps.version.outputs.version }}
          body: |
            **Stable release - ${{ steps.version.outputs.version }}**
@@ -1 +1 @@
-v1.5.0
+v1.5.4
@@ -1 +1 @@
-v1.5.1
+v1.6.0
@@ -27,7 +27,6 @@
 # Compiled Dynamic libraries
 *.so
 *.dylib
-*.dll

 # Fortran module files
 *.mod
@@ -1,6 +1,6 @@
 # PortaPack Mayhem

-[![Build Status](https://travis-ci.com/eried/portapack-mayhem.svg?branch=master)](https://travis-ci.com/eried/portapack-mayhem) [![CodeScene Code Health](https://codescene.io/projects/8381/status-badges/code-health)](https://codescene.io/projects/8381) [![GitHub All Releases](https://img.shields.io/github/downloads/eried/portapack-mayhem/total)](https://github.com/eried/portapack-mayhem/releases) [![GitHub Releases](https://img.shields.io/github/downloads/eried/portapack-mayhem/latest/total)](https://github.com/eried/portapack-mayhem/releases/latest) [![Docker Hub Pulls](https://img.shields.io/docker/pulls/eried/portapack.svg)](https://hub.docker.com/r/eried/portapack) [![Discord Chat](https://img.shields.io/discord/719669764804444213.svg)](https://discord.gg/tuwVMv3)  [![Check bounties!](https://img.shields.io/bountysource/team/portapack-mayhem/activity?color=%2333ccff&label=bountysource%20%28USD%29&style=plastic)](https://www.bountysource.com/teams/portapack-mayhem/issues)
+[![Build Status](https://travis-ci.com/eried/portapack-mayhem.svg?branch=master)](https://travis-ci.com/eried/portapack-mayhem) [![Nightly Release](https://github.com/eried/portapack-mayhem/actions/workflows/create_nightly_release.yml/badge.svg?branch=next)](https://github.com/eried/portapack-mayhem/actions/workflows/create_nightly_release.yml) [![CodeScene Code Health](https://codescene.io/projects/8381/status-badges/code-health)](https://codescene.io/projects/8381) [![GitHub All Releases](https://img.shields.io/github/downloads/eried/portapack-mayhem/total)](https://github.com/eried/portapack-mayhem/releases) [![GitHub Releases](https://img.shields.io/github/downloads/eried/portapack-mayhem/latest/total)](https://github.com/eried/portapack-mayhem/releases/latest) [![Docker Hub Pulls](https://img.shields.io/docker/pulls/eried/portapack.svg)](https://hub.docker.com/r/eried/portapack) [![Discord Chat](https://img.shields.io/discord/719669764804444213.svg)](https://discord.gg/tuwVMv3)  [![Check bounties!](https://img.shields.io/bountysource/team/portapack-mayhem/activity?color=%2333ccff&label=bountysource%20%28USD%29&style=plastic)](https://www.bountysource.com/teams/portapack-mayhem/issues)

 This is a fork of the [Havoc](https://github.com/furrtek/portapack-havoc/) firmware, which itself was a fork of the [PortaPack](https://github.com/sharebrained/portapack-hackrf) firmware, an add-on for the [HackRF](http://greatscottgadgets.com/hackrf/). A fork is a derivate, in this case one that has extra features and fixes when compared to the older versions.

@@ -49,6 +49,8 @@ You can write [documentation](https://github.com/eried/portapack-mayhem/wiki), f

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

+[![Contributors](https://contrib.rocks/image?repo=eried/portapack-mayhem)](https://github.com/eried/portapack-mayhem/graphs/contributors)
+
 As a last option, if you want to send money directly to me for getting more boards, antennas and such:

 [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=CBPQA4HRRPJQ6&source=url)
@@ -1,6 +1,6 @@
 #Download base image.
-#The ubuntu:latest tag points to the "latest LTS"
-FROM ubuntu:latest
+#The ubuntu:20.04 tag points to the "20.04 LTS"
+FROM ubuntu:20.04

 #Set location to download ARM toolkit from.
 # This will need to be changed over time or replaced with a static link to the latest release.
@@ -14,16 +14,18 @@ COPY ./ /havocsrc

 #Fetch dependencies from APT
 RUN apt-get update && \
-	apt-get install -y tar wget dfu-util cmake python bzip2 curl && \
-	apt-get -qy autoremove
+        apt-get install -y tar wget dfu-util cmake python bzip2 curl python3 python3-yaml && \
+        apt-get -qy autoremove

 #Install current pip from PyPa
 RUN curl https://bootstrap.pypa.io/pip/3.4/get-pip.py -o get-pip.py && \
-	python get-pip.py
+        python get-pip.py

 #Fetch additional dependencies from Python 2.x pip
 RUN pip install pyyaml
-RUN ln -s /usr/bin/python3 /usr/bin/python && \
+RUN rm -rf /usr/bin/python && \
+    rm -rf /usr/bin/pip && \
+    ln -s /usr/bin/python3 /usr/bin/python && \
    ln -s /usr/bin/pip3 /usr/bin/pip

 ENV LANG C.UTF-8
@@ -32,9 +34,9 @@ ENV LC_ALL C.UTF-8
 #Grab the GNU ARM toolchain from arm.com
 #Then extract contents to /opt/build/armbin/
 RUN mkdir /opt/build && cd /opt/build && \
-	wget -O gcc-arm-none-eabi $ARMBINURL && \
-	mkdir armbin && \
-	tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin
+        wget -O gcc-arm-none-eabi $ARMBINURL && \
+        mkdir armbin && \
+        tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin
    
 #Set environment variable so compiler knows where the toolchain lives
 ENV PATH=$PATH:/opt/build/armbin/bin
@@ -43,3 +45,4 @@ CMD cd /havocsrc && \
    mkdir build && cd build && \ 
    cmake .. && make firmware && \
    cp /portapack-havoc/firmware/portapack-h1-havoc.bin /havocbin
+
@@ -154,6 +154,7 @@ set(CPPSRC
 	${COMMON}/ui_widget.cpp
 	${COMMON}/utility.cpp
 	${COMMON}/wm8731.cpp
+	app_settings.cpp
 	audio.cpp
 	baseband_api.cpp
 	capture_thread.cpp
@@ -266,8 +267,12 @@ set(CPPSRC
 	apps/lge_app.cpp
 	apps/pocsag_app.cpp
 	apps/replay_app.cpp
+	apps/ui_playlist.cpp
 	apps/gps_sim_app.cpp
 	apps/soundboard_app.cpp
+	apps/ui_recon.cpp  
+	apps/ui_recon_settings.cpp
+	apps/tpms_app.cpp
 	apps/tpms_app.cpp
 	protocols/aprs.cpp
 	protocols/ax25.cpp
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
+ * Copyright (C) 2022 Arjan Onwezen
+ *
+ * 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 "app_settings.hpp"
+
+#include "file.hpp"
+#include "portapack.hpp"
+#include "portapack_persistent_memory.hpp"
+#include <cstring>
+#include <algorithm>
+
+namespace std {
+
+int app_settings::load(std::string application, AppSettings* settings) {
+
+	if (portapack::persistent_memory::load_app_settings()) {
+		file_path = folder+"/"+application+".ini";
+
+		auto error = settings_file.open(file_path);
+		if (!error.is_valid()) {
+			auto error = settings_file.read(file_content, std::min((int)settings_file.size(), MAX_FILE_CONTENT_SIZE));
+
+			settings->baseband_bandwidth=std::app_settings::read_long_long(file_content, "baseband_bandwidth=");
+			settings->channel_bandwidth=std::app_settings::read_long_long(file_content, "channel_bandwidth=");
+			settings->lna=std::app_settings::read_long_long(file_content, "lna=");
+			settings->modulation=std::app_settings::read_long_long(file_content, "modulation=");
+			settings->rx_amp=std::app_settings::read_long_long(file_content, "rx_amp=");
+			settings->rx_frequency=std::app_settings::read_long_long(file_content, "rx_frequency=");
+			settings->sampling_rate=std::app_settings::read_long_long(file_content, "sampling_rate=");
+			settings->vga=std::app_settings::read_long_long(file_content, "vga=");
+			settings->tx_amp=std::app_settings::read_long_long(file_content, "tx_amp=");
+			settings->tx_frequency=std::app_settings::read_long_long(file_content, "tx_frequency=");
+			settings->tx_gain=std::app_settings::read_long_long(file_content, "tx_gain=");
+			rc = SETTINGS_OK;
+		}
+		else rc = SETTINGS_UNABLE_TO_LOAD;
+	}
+	else rc = SETTINGS_DISABLED;
+	return(rc);
+}
+
+int app_settings::save(std::string application, AppSettings* settings) {
+
+	if (portapack::persistent_memory::save_app_settings()) {        
+		file_path = folder+"/"+application+".ini";
+		make_new_directory(folder);
+
+		auto error = settings_file.create(file_path);
+		if (!error.is_valid()) {
+			// Save common setting
+			settings_file.write_line("baseband_bandwidth="+to_string_dec_uint(portapack::receiver_model.baseband_bandwidth()));
+			settings_file.write_line("channel_bandwidth="+to_string_dec_uint(portapack::transmitter_model.channel_bandwidth()));
+			settings_file.write_line("lna="+to_string_dec_uint(portapack::receiver_model.lna()));
+			settings_file.write_line("rx_amp="+to_string_dec_uint(portapack::receiver_model.rf_amp()));
+			settings_file.write_line("sampling_rate="+to_string_dec_uint(portapack::receiver_model.sampling_rate()));
+			settings_file.write_line("tx_amp="+to_string_dec_uint(portapack::transmitter_model.rf_amp()));
+			settings_file.write_line("tx_gain="+to_string_dec_uint(portapack::transmitter_model.tx_gain()));
+			settings_file.write_line("vga="+to_string_dec_uint(portapack::receiver_model.vga()));
+			// Save other settings from struct
+			settings_file.write_line("rx_frequency="+to_string_dec_uint(settings->rx_frequency));
+			settings_file.write_line("tx_frequency="+to_string_dec_uint(settings->tx_frequency));
+
+			rc = SETTINGS_OK;
+		}
+		else rc = SETTINGS_UNABLE_TO_SAVE;
+	}
+	else rc = SETTINGS_DISABLED;
+	return(rc);
+}
+
+
+long long int app_settings::read_long_long(char* file_content, const char* setting_text) {
+	auto position = strstr(file_content, (char *)setting_text);
+	if (position) {
+		position += strlen((char *)setting_text);
+		setting_value = strtoll(position, nullptr, 10);
+	}
+	return(setting_value);
+}
+
+
+} /* namespace std */
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
+ * Copyright (C) 2022 Arjan Onwezen
+ *
+ * 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 __APP_SETTINGS_H__
+#define __APP_SETTINGS_H__
+
+
+#include <cstddef>
+#include <cstdint>
+#include <string>
+
+#include "file.hpp"
+#include "string_format.hpp"
+
+
+namespace std {
+class app_settings {
+
+
+
+public:
+
+#define SETTINGS_OK	 	 	0		// settings found
+#define SETTINGS_UNABLE_TO_LOAD		-1		// settings (file) not found
+#define SETTINGS_UNABLE_TO_SAVE		-2		// unable to save settings
+#define SETTINGS_DISABLED		-3		// load/save settings disabled in settings
+
+
+
+	struct AppSettings {
+		uint32_t 	baseband_bandwidth;
+		uint32_t 	channel_bandwidth;
+		uint8_t 	lna;
+		uint8_t		modulation;
+		uint8_t 	rx_amp;
+		uint32_t 	rx_frequency;
+		uint32_t 	sampling_rate;
+		uint8_t 	tx_amp;
+		uint32_t 	tx_frequency;
+		uint8_t 	tx_gain;
+		uint8_t 	vga;
+	};
+
+	int load(std::string application, AppSettings* settings);
+	int save(std::string application, AppSettings* settings);
+
+
+private:
+
+#define MAX_FILE_CONTENT_SIZE 1000
+
+	char 		file_content[MAX_FILE_CONTENT_SIZE] = {};	
+	std::string 	file_path = "";
+	std::string 	folder = "SETTINGS";
+	int		rc = SETTINGS_OK;
+	File 		settings_file { };
+	long long int	setting_value {} ;	
+
+	long long int read_long_long(char* file_content, const char* setting_text);
+
+
+}; // class app_settings
+} // namespace std
+
+
+
+#endif/*__APP_SETTINGS_H__*/
@@ -76,12 +76,18 @@ static std::string mid(
 	mid_code = to_string_dec_uint(mmsi, 9, ' ').substr(0, 3);
 	return_code = db.retrieve_mid_record(&mid_record, mid_code);
 	switch(return_code) {
-		case DATABASE_RECORD_FOUND: 	return mid_record.country;	
+		case DATABASE_RECORD_FOUND: 	return mid_record.country;
 		case DATABASE_NOT_FOUND: 	return "No mids.db file";
 		default:			return "";
 	}
 }

+static std::string text(const std::string &text) {
+	size_t end = text.find_last_not_of("@");
+    return (end == std::string::npos) ? "" : text.substr(0, end + 1);
+
+}
+
 static std::string navigational_status(const unsigned int value) {
 	switch(value) {
 		case 0: return "under way w/engine";
@@ -164,7 +170,7 @@ void AISLogger::on_packet(const ais::Packet& packet) {
 	}

 	log_file.write_entry(packet.received_at(), entry);
-}	
+}

 void AISRecentEntry::update(const ais::Packet& packet) {
 	received_count++;
@@ -195,6 +201,15 @@ void AISRecentEntry::update(const ais::Packet& packet) {
 		destination = packet.text(302, 20);
 		break;

+	case 18:
+	    last_position.timestamp = packet.received_at();
+		last_position.speed_over_ground = packet.read(46, 10);
+		last_position.latitude = packet.latitude(85);
+		last_position.longitude = packet.longitude(57);
+		last_position.course_over_ground = packet.read(112, 12);
+		last_position.true_heading = packet.read(124, 9);
+	    break;
+
 	case 21:
 		name = packet.text(43, 20);
 		last_position.timestamp = packet.received_at();
@@ -202,6 +217,23 @@ void AISRecentEntry::update(const ais::Packet& packet) {
 		last_position.longitude = packet.longitude(164);
 		break;

+	case 24:
+		switch (packet.read(38, 2))
+		{
+		case 0:
+			name = packet.text(40, 20);
+			break;
+
+		case 1:
+			call_sign = packet.text(90, 7);
+			break;
+
+		default:
+			break;
+		}
+
+		break;
+
 	default:
 		break;
 	}
@@ -218,9 +250,9 @@ void RecentEntriesTable<AISRecentEntries>::draw(
 ) {
 	std::string line = ais::format::mmsi(entry.mmsi) + " ";
 	if( !entry.name.empty() ) {
-		line += entry.name;
+		line += ais::format::text(entry.name);
 	} else {
-		line += entry.call_sign;
+		line += ais::format::text(entry.call_sign);
 	}

 	line.resize(target_rect.width() / 8, ' ');
@@ -241,7 +273,7 @@ AISRecentEntryDetailView::AISRecentEntryDetailView(NavigationView& nav) {

 	button_see_map.on_select = [this, &nav](Button&) {
 		geomap_view = nav.push<GeoMapView>(
-			entry_.name,
+			ais::format::text(entry_.name),
 			0,
 			GeoPos::alt_unit::METERS,
 			ais::format::latlon_float(entry_.last_position.latitude.normalized()),
@@ -252,10 +284,20 @@ AISRecentEntryDetailView::AISRecentEntryDetailView(NavigationView& nav) {
 			});
 			send_updates = true;

-		
+
 	};
-	
-	
+}
+
+
+AISRecentEntryDetailView::AISRecentEntryDetailView(const AISRecentEntryDetailView&Entry) : View()
+{
+    (void)Entry;
+}
+
+AISRecentEntryDetailView & AISRecentEntryDetailView::operator=(const AISRecentEntryDetailView&Entry)
+{
+    (void)Entry;
+    return *this;
 }

 void AISRecentEntryDetailView::update_position() {
@@ -292,9 +334,9 @@ void AISRecentEntryDetailView::paint(Painter& painter) {

 	field_rect = draw_field(painter, field_rect, s, "MMSI", ais::format::mmsi(entry_.mmsi));
 	field_rect = draw_field(painter, field_rect, s, "Ctry", ais::format::mid(entry_.mmsi));
-	field_rect = draw_field(painter, field_rect, s, "Name", entry_.name);
-	field_rect = draw_field(painter, field_rect, s, "Call", entry_.call_sign);
-	field_rect = draw_field(painter, field_rect, s, "Dest", entry_.destination);
+	field_rect = draw_field(painter, field_rect, s, "Name", ais::format::text(entry_.name));
+	field_rect = draw_field(painter, field_rect, s, "Call", ais::format::text(entry_.call_sign));
+	field_rect = draw_field(painter, field_rect, s, "Dest", ais::format::text(entry_.destination));
 	field_rect = draw_field(painter, field_rect, s, "Last", to_string_datetime(entry_.last_position.timestamp));
 	field_rect = draw_field(painter, field_rect, s, "Pos ", ais::format::latlon(entry_.last_position.latitude, entry_.last_position.longitude));
 	field_rect = draw_field(painter, field_rect, s, "Stat", ais::format::navigational_status(entry_.navigational_status));
@@ -325,25 +367,24 @@ AISAppView::AISAppView(NavigationView& nav) : nav_ { nav } {
 		&recent_entry_detail_view,
 	});

+
+	// load app settings
+	auto rc = settings.load("rx_ais", &app_settings);
+	if(rc == SETTINGS_OK) {
+		field_lna.set_value(app_settings.lna);
+		field_vga.set_value(app_settings.vga);
+		field_rf_amp.set_value(app_settings.rx_amp);
+		target_frequency_ = app_settings.rx_frequency;
+	}
+	else target_frequency_ = initial_target_frequency;
+
 	recent_entry_detail_view.hidden(true);

-	target_frequency_ = initial_target_frequency;
-  
-    receiver_model.set_tuning_frequency(tuning_frequency());
-    receiver_model.set_sampling_rate(sampling_rate);
-    receiver_model.set_baseband_bandwidth(baseband_bandwidth);
-    receiver_model.enable();  // Before using radio::enable(), but not updating Ant.DC-Bias.
+    	receiver_model.set_tuning_frequency(tuning_frequency());
+    	receiver_model.set_sampling_rate(sampling_rate);
+    	receiver_model.set_baseband_bandwidth(baseband_bandwidth);
+    	receiver_model.enable();  // Before using radio::enable(), but not updating Ant.DC-Bias.

-/*  radio::enable({     //  this can be removed, previous version,no DC-bias control.
-		tuning_frequency(),
-		sampling_rate,
-		baseband_bandwidth,
-		rf::Direction::Receive,
-		receiver_model.rf_amp(),
-		static_cast<int8_t>(receiver_model.lna()),
-		static_cast<int8_t>(receiver_model.vga()),
-	}); */
-	
 	options_channel.on_change = [this](size_t, OptionsField::value_t v) {
 		this->on_frequency_changed(v);
 	};
@@ -363,7 +404,11 @@ AISAppView::AISAppView(NavigationView& nav) : nav_ { nav } {
 }

 AISAppView::~AISAppView() {
-/*	radio::disable();  */
+
+	// save app settings
+	app_settings.rx_frequency = target_frequency_;
+	settings.save("rx_ais", &app_settings);
+
 	receiver_model.disable();   // to switch off all, including DC bias.

 	baseband::shutdown();
@@ -33,7 +33,7 @@
 #include "event_m0.hpp"

 #include "log_file.hpp"
-
+#include "app_settings.hpp"
 #include "ais_packet.hpp"

 #include "lpc43xx_cpp.hpp"
@@ -127,6 +127,9 @@ public:
 	void focus() override;
 	void paint(Painter&) override;

+    AISRecentEntryDetailView(const AISRecentEntryDetailView&Entry);
+    AISRecentEntryDetailView &operator=(const AISRecentEntryDetailView&Entry);
+
 private:
 	AISRecentEntry entry_ { };

@@ -163,13 +166,18 @@ public:

 	void focus() override;

-	std::string title() const override { return "AIS"; };
+	std::string title() const override { return "AIS Boats RX"; };

 private:
 	static constexpr uint32_t initial_target_frequency = 162025000;
 	static constexpr uint32_t sampling_rate = 2457600;
 	static constexpr uint32_t baseband_bandwidth = 1750000;

+
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
 	NavigationView& nav_;

 	AISRecentEntries recent { };
@@ -129,10 +129,19 @@ AnalogAudioView::AnalogAudioView(
 		&waterfall
 	});

+	// load app settings
+	auto rc = settings.load("rx_audio", &app_settings);
+	if(rc == SETTINGS_OK) {
+		field_lna.set_value(app_settings.lna);
+		field_vga.set_value(app_settings.vga);
+		receiver_model.set_rf_amp(app_settings.rx_amp);
+		field_frequency.set_value(app_settings.rx_frequency);
+	}
+	else field_frequency.set_value(receiver_model.tuning_frequency());
+	
 	//Filename Datetime and Frequency
 	record_view.set_filename_date_frequency(true);

-	field_frequency.set_value(receiver_model.tuning_frequency());
 	field_frequency.set_step(receiver_model.frequency_step());
 	field_frequency.on_change = [this](rf::Frequency f) {
 		this->on_tuning_frequency_changed(f);
@@ -160,6 +169,7 @@ AnalogAudioView::AnalogAudioView(

 	const auto modulation = receiver_model.modulation();
 	options_modulation.set_by_value(toUType(modulation));
+
 	options_modulation.on_change = [this](size_t, OptionsField::value_t v) {
 		this->on_modulation_changed(static_cast<ReceiverModel::Mode>(v));
 	};
@@ -183,7 +193,7 @@ AnalogAudioView::AnalogAudioView(
 	audio::output::start();

 	update_modulation(static_cast<ReceiverModel::Mode>(modulation));
-    on_modulation_changed(static_cast<ReceiverModel::Mode>(modulation));
+    	on_modulation_changed(static_cast<ReceiverModel::Mode>(modulation));
 }

 size_t AnalogAudioView::get_spec_bw_index() {
@@ -210,6 +220,11 @@ void AnalogAudioView::set_spec_trigger(uint16_t trigger) {
 }

 AnalogAudioView::~AnalogAudioView() {
+
+	// save app settings
+	app_settings.rx_frequency = field_frequency.value();
+	settings.save("rx_audio", &app_settings);
+
 	// TODO: Manipulating audio codec here, and in ui_receiver.cpp. Good to do
 	// both?
 	audio::output::stop();
@@ -397,9 +412,6 @@ void AnalogAudioView::update_modulation(const ReceiverModel::Mode modulation) {
 	}
 }

-/*void AnalogAudioView::squelched() {
-	if (exit_on_squelch) nav_.pop();
-}*/

 void AnalogAudioView::handle_coded_squelch(const uint32_t value) {
 	float diff, min_diff = value;
@@ -29,7 +29,7 @@
 #include "ui_spectrum.hpp"
 #include "ui_record_view.hpp"
 #include "ui_font_fixed_8x16.hpp"
-
+#include "app_settings.hpp"
 #include "tone_key.hpp"


@@ -53,12 +53,13 @@ private:

 	OptionsField options_config {
 		{ 3 * 8, 0 * 16 },
-		4,
+		5,
 		{
-			{ "DSB ", 0 },
-			{ "USB ", 0 },
-			{ "LSB ", 0 },
-			{ "CW  ", 0 },
+			{ "DSB 9k ", 0 },
+			{ "DSB 6k ", 0 },
+			{ "USB+3k ", 0 },
+			{ "LSB-3k ", 0 },
+			{ "CW     ", 0 },
 		}
 	};
 };
@@ -143,7 +144,7 @@ public:

 	void focus() override;

-	std::string title() const override { return "Analog audio"; };
+	std::string title() const override { return "Audio RX"; };

 	size_t get_spec_bw_index();
 	void set_spec_bw(size_t index, uint32_t bw);
@@ -154,6 +155,10 @@ public:
 private:
 	static constexpr ui::Dim header_height = 3 * 16;

+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
 	const Rect options_view_rect { 0 * 8, 1 * 16, 30 * 8, 1 * 16 };
 	const Rect nbfm_view_rect { 0 * 8, 1 * 16, 18 * 8, 1 * 16 };

@@ -57,7 +57,18 @@ AnalogTvView::AnalogTvView(
 		&tv
 	});

-	field_frequency.set_value(receiver_model.tuning_frequency());
+
+	// load app settings
+	auto rc = settings.load("rx_tv", &app_settings);
+	if(rc == SETTINGS_OK) {
+		field_lna.set_value(app_settings.lna);
+		field_vga.set_value(app_settings.vga);
+		receiver_model.set_rf_amp(app_settings.rx_amp);
+		field_frequency.set_value(app_settings.rx_frequency);
+	}
+	else field_frequency.set_value(receiver_model.tuning_frequency());
+
+
 	field_frequency.set_step(receiver_model.frequency_step());
 	field_frequency.on_change = [this](rf::Frequency f) {
 		this->on_tuning_frequency_changed(f);
@@ -106,12 +117,15 @@ AnalogTvView::AnalogTvView(
 }

 AnalogTvView::~AnalogTvView() {
+
+	// save app settings
+	app_settings.rx_frequency = field_frequency.value();
+	settings.save("rx_tv", &app_settings);
+
 	// TODO: Manipulating audio codec here, and in ui_receiver.cpp. Good to do
 	// both?
 	audio::output::stop();
-
 	receiver_model.disable();
-
 	baseband::shutdown();
 }

@@ -29,7 +29,7 @@
 #include "ui_receiver.hpp"
 #include "ui_tv.hpp"
 #include "ui_record_view.hpp"
-
+#include "app_settings.hpp"
 #include "ui_font_fixed_8x16.hpp"

 #include "tone_key.hpp"
@@ -53,11 +53,15 @@ public:

 	void focus() override;

-	std::string title() const override { return "Analog TV"; };
+	std::string title() const override { return "Analog TV RX"; };
 	
 private:
 	static constexpr ui::Dim header_height = 3 * 16;

+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
 	const Rect options_view_rect { 0 * 8, 1 * 16, 30 * 8, 1 * 16 };
 	const Rect nbfm_view_rect { 0 * 8, 1 * 16, 18 * 8, 1 * 16 };

@@ -105,7 +105,20 @@ ERTAppView::ERTAppView(NavigationView&) {
 		&recent_entries_view,
 	});

-	radio::enable({
+	// load app settings
+	auto rc = settings.load("rx_ert", &app_settings);
+	if(rc == SETTINGS_OK) {
+		field_lna.set_value(app_settings.lna);
+		field_vga.set_value(app_settings.vga);
+		field_rf_amp.set_value(app_settings.rx_amp);
+	}
+
+	receiver_model.set_tuning_frequency(initial_target_frequency);
+	receiver_model.set_sampling_rate(sampling_rate);
+	receiver_model.set_baseband_bandwidth(baseband_bandwidth);
+	receiver_model.enable();  // Before using radio::enable(), but not updating Ant.DC-Bias.
+
+/*	radio::enable({
 		initial_target_frequency,
 		sampling_rate,
 		baseband_bandwidth,
@@ -113,7 +126,7 @@ ERTAppView::ERTAppView(NavigationView&) {
 		receiver_model.rf_amp(),
 		static_cast<int8_t>(receiver_model.lna()),
 		static_cast<int8_t>(receiver_model.vga()),
-	});
+	}); */

 	logger = std::make_unique<ERTLogger>();
 	if( logger ) {
@@ -122,7 +135,11 @@ ERTAppView::ERTAppView(NavigationView&) {
 }

 ERTAppView::~ERTAppView() {
-	radio::disable();
+
+	// save app settings
+	settings.save("rx_ert", &app_settings);
+
+	receiver_model.disable(); // to switch off all, including DC bias and change flag enabled_

 	baseband::shutdown();
 }
@@ -28,7 +28,7 @@
 #include "ui_channel.hpp"

 #include "event_m0.hpp"
-
+#include "app_settings.hpp"
 #include "log_file.hpp"

 #include "ert_packet.hpp"
@@ -125,12 +125,17 @@ public:

 	void focus() override;

-	std::string title() const override { return "ERT"; };
+	std::string title() const override { return "ERT Meter RX"; };

 private:
 	ERTRecentEntries recent { };
 	std::unique_ptr<ERTLogger> logger { };

+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
+
 	const RecentEntriesColumns columns { {
 		{ "ID", 10 },
 		{ "Tp", 2 },
@@ -29,6 +29,7 @@

 #include "baseband_api.hpp"
 #include "portapack.hpp"
+#include "cpld_update.hpp"
 #include "portapack_persistent_memory.hpp"

 using namespace portapack;
@@ -242,7 +243,8 @@ GpsSimAppView::GpsSimAppView(

 GpsSimAppView::~GpsSimAppView() {
 	radio::disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }

 void GpsSimAppView::on_hide() {
@@ -44,7 +44,7 @@ public:
 	void set_parent_rect(const Rect new_parent_rect) override;
 	void focus() override;

-	std::string title() const override { return "GPS Simulator"; };
+	std::string title() const override { return "GPS Sim TX"; };
 	
 private:
 	NavigationView& nav_;
@@ -27,6 +27,7 @@
 #include "lge_app.hpp"

 #include "baseband_api.hpp"
+#include "cpld_update.hpp"
 #include "ui_textentry.hpp"

 #include "string_format.hpp"
@@ -39,12 +40,17 @@ using namespace portapack;
 namespace ui {

 void LGEView::focus() {
-	options_trame.focus();
+	options_frame.focus();
 }

 LGEView::~LGEView() {
+	// save app settings
+	app_settings.tx_frequency = transmitter_model.tuning_frequency();	
+	settings.save("tx_lge", &app_settings);
+
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown();// better this function at the end, not load_sram() that sometimes produces hang up.
 }

 void LGEView::generate_lge_frame(const uint8_t command, const uint16_t address_a, const uint16_t address_b, std::vector<uint8_t>& data) {
@@ -70,10 +76,10 @@ void LGEView::generate_frame_touche() {
 	std::vector<uint8_t> data { 0x46, 0x28, 0x01, 0x45, 0x27, 0x01, 0x44, 0x23 };
 	
 	console.write("\n\x1B\x07Touche:\x1B\x10");
-	generate_lge_frame(0x96, (field_joueur.value() << 8) | field_salle.value(), 0x0001, data);
+	generate_lge_frame(0x96, (field_player.value() << 8) | field_room.value(), 0x0001, data);
 }

-void LGEView::generate_frame_pseudo() {
+void LGEView::generate_frame_nickname() {
 	// 0040.48s:
 	// 30 02 1A 00 19 00 FF 00 02 19 42 52 45 42 49 53 20 00 00 00 00 00 00 00 00 00
 	// 04 01 B0 04 7F 1F 11 33 40 1F 22 01 07 00 00 01 07 00 00 63 05 00 00 99 A2 
@@ -90,15 +96,15 @@ void LGEView::generate_frame_pseudo() {
 	};
 	uint32_t c;
 	
-	//data_header[2] = field_salle.value();	// ?
-	//data_footer[0] = field_salle.value();	// ?
+	//data_header[2] = field_room.value();	// ?
+	//data_footer[0] = field_room.value();	// ?
 	
 	data.insert(data.begin(), data_header.begin(), data_header.end());
 	
-	data.push_back(field_joueur.value());
+	data.push_back(field_player.value());
 	
 	c = 0;
-	for (auto &ch : pseudo) {
+	for (auto &ch : nickname) {
 		data.push_back(ch);
 		c++;
 	}
@@ -108,16 +114,16 @@ void LGEView::generate_frame_pseudo() {
 	while (++c < 16)
 		data.push_back(0x00);
 	
-	data.push_back(field_equipe.value());
+	data.push_back(field_team.value());
 	
 	data.insert(data.end(), data_footer.begin(), data_footer.end());
 	
-	console.write("\n\x1B\x0ESet pseudo:\x1B\x10");
+	console.write("\n\x1B\x0ESet nickname:\x1B\x10");
 	
-	generate_lge_frame(0x02, 0x001A, field_joueur.value(), data);
+	generate_lge_frame(0x02, 0x001A, field_player.value(), data);
 }

-void LGEView::generate_frame_equipe() {
+void LGEView::generate_frame_team() {
 	// 0041.83s:
 	// 3D 03 FF FF FF FF 02 03 01 52 4F 55 47 45 00 00 00 00 00 00 00 00 00 00 00 00
 	// 02 56 45 52 54 45 00 00 00 00 00 00 00 00 00 00 00 01 03 42 4C 45 55 45 00 00
@@ -129,10 +135,10 @@ void LGEView::generate_frame_equipe() {

 	data.insert(data.begin(), data_header.begin(), data_header.end());
 	
-	data.push_back(field_equipe.value());
+	data.push_back(field_team.value());
 	
 	c = 0;
-	for (auto &ch : pseudo) {
+	for (auto &ch : nickname) {
 		data.push_back(ch);
 		c++;
 	}
@@ -140,14 +146,14 @@ void LGEView::generate_frame_equipe() {
 	while (c++ < 16)
 		data.push_back(0x00);
 	
-	data.push_back(field_equipe.value() - 1);	// Color ?
+	data.push_back(field_team.value() - 1);	// Color ?
 	
-	console.write("\n\x1B\x0ASet equipe:\x1B\x10");
+	console.write("\n\x1B\x0ASet team:\x1B\x10");
 	
 	generate_lge_frame(0x03, data);
 }

-void LGEView::generate_frame_broadcast_pseudo() {
+void LGEView::generate_frame_broadcast_nickname() {
 	// 0043.86s:
 	// 3D 04 FF FF FF FF 02 03 19 42 52 45 42 49 53 20 00 00 00 00 00 00 00 00 00 04
 	// 07 50 4F 4E 45 59 20 00 00 00 00 00 00 00 00 00 00 05 1B 41 42 42 59 20 00 00
@@ -159,10 +165,10 @@ void LGEView::generate_frame_broadcast_pseudo() {

 	data.insert(data.begin(), data_header.begin(), data_header.end());
 	
-	data.push_back(field_joueur.value());
+	data.push_back(field_player.value());
 	
 	c = 0;
-	for (auto &ch : pseudo) {
+	for (auto &ch : nickname) {
 		data.push_back(ch);
 		c++;
 	}
@@ -172,9 +178,9 @@ void LGEView::generate_frame_broadcast_pseudo() {
 	while (++c < 16)
 		data.push_back(0x00);
 	
-	data.push_back(field_equipe.value());
+	data.push_back(field_team.value());
 	
-	console.write("\n\x1B\x09" "Broadcast pseudo:\x1B\x10");
+	console.write("\n\x1B\x09" "Broadcast nickname:\x1B\x10");
 	
 	generate_lge_frame(0x04, data);
 }
@@ -184,14 +190,14 @@ void LGEView::generate_frame_start() {
 	// 0A 05 FF FF FF FF 02 EC FF FF FF A3 35
 	std::vector<uint8_t> data { 0x02, 0xEC, 0xFF, 0xFF, 0xFF };
 	
-	//data[0] = field_salle.value();	// ?
+	//data[0] = field_room.value();	// ?
 	
 	console.write("\n\x1B\x0DStart:\x1B\x10");
 	generate_lge_frame(0x05, data);
 }

 void LGEView::generate_frame_gameover() {
-	std::vector<uint8_t> data { (uint8_t)field_salle.value() };
+	std::vector<uint8_t> data { (uint8_t)field_room.value() };
 	
 	console.write("\n\x1B\x0CGameover:\x1B\x10");
 	generate_lge_frame(0x0D, data);
@@ -203,7 +209,7 @@ void LGEView::generate_frame_collier() {
 	// Custom
 	// 0C 00 13 37 13 37 id flags channel playerid zapduty zaptime checksum CRC CRC
 	// channel: field_channel
-	// playerid: field_joueur
+	// playerid: field_player
 	// zapduty: field_power
 	// zaptime: field_duration
 	
@@ -218,8 +224,8 @@ void LGEView::generate_frame_collier() {
 	std::vector<uint8_t> data {
 		id,
 		flags,
-		(uint8_t)field_salle.value(),
-		(uint8_t)field_joueur.value(),
+		(uint8_t)field_room.value(),
+		(uint8_t)field_player.value(),
 		(uint8_t)field_power.value(),
 		(uint8_t)(field_duration.value() * 10)
 	};
@@ -285,11 +291,11 @@ LGEView::LGEView(NavigationView& nav) {
 	
 	add_children({
 		&labels,
-		&options_trame,
-		&field_salle,
-		&button_texte,
-		&field_equipe,
-		&field_joueur,
+		&options_frame,
+		&field_room,
+		&button_text,
+		&field_team,
+		&field_player,
 		&field_id,
 		&field_power,
 		&field_duration,
@@ -300,20 +306,29 @@ LGEView::LGEView(NavigationView& nav) {
 		&tx_view
 	});
 	
-	field_salle.set_value(1);
-	field_equipe.set_value(1);
-	field_joueur.set_value(1);
+	// load app settings
+	auto rc = settings.load("tx_lge", &app_settings);
+	if(rc == SETTINGS_OK) {
+		transmitter_model.set_rf_amp(app_settings.tx_amp);
+		transmitter_model.set_channel_bandwidth(app_settings.channel_bandwidth);
+		transmitter_model.set_tuning_frequency(app_settings.tx_frequency);
+		transmitter_model.set_tx_gain(app_settings.tx_gain);		
+	}
+
+	field_room.set_value(1);
+	field_team.set_value(1);
+	field_player.set_value(1);
 	field_id.set_value(1);
 	field_power.set_value(1);
 	field_duration.set_value(2);
 	
-	button_texte.on_select = [this, &nav](Button&) {
+	button_text.on_select = [this, &nav](Button&) {
 		text_prompt(
 			nav,
-			pseudo,
+			nickname,
 			15,
 			[this](std::string& buffer) {
-				button_texte.set_text(buffer);
+				button_text.set_text(buffer);
 			});
 	};
 	
@@ -326,15 +341,15 @@ LGEView::LGEView(NavigationView& nav) {
 	
 	tx_view.on_start = [this]() {
 		if (tx_mode == IDLE) {
-			auto i = options_trame.selected_index_value();
+			auto i = options_frame.selected_index_value();
 			if (i == 0)
 				generate_frame_touche();
 			else if (i == 1)
-				generate_frame_pseudo();
+				generate_frame_nickname();
 			else if (i == 2)
-				generate_frame_equipe();
+				generate_frame_team();
 			else if (i == 3)
-				generate_frame_broadcast_pseudo();
+				generate_frame_broadcast_nickname();
 			else if (i == 4)
 				generate_frame_start();
 			else if (i == 5)
@@ -30,6 +30,7 @@
 #include "message.hpp"
 #include "transmitter_model.hpp"
 #include "portapack.hpp"
+#include "app_settings.hpp"

 namespace ui {

@@ -40,7 +41,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "LGE tool"; };
+	std::string title() const override { return "LGE tool TX"; };

 private:
 	enum tx_modes {
@@ -48,15 +49,19 @@ private:
 		SINGLE,
 		ALL
 	};
+
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
 	
 	tx_modes tx_mode = IDLE;
 	
-    RFM69 rfm69 { 5, 0x2DD4, true, true };
+    	RFM69 rfm69 { 5, 0x2DD4, true, true };
    
 	uint32_t frame_size { 0 };
 	uint32_t repeats { 0 };
 	uint32_t channel_index { 0 };
-	std::string pseudo { "ABCDEF" };
+	std::string nickname { "ABCDEF" };
 	
 	rf::Frequency channels[3] = { 868067000, 868183000, 868295000 };

@@ -68,9 +73,9 @@ private:
 	}
 	void generate_lge_frame(const uint8_t command, const uint16_t address_a, const uint16_t address_b, std::vector<uint8_t>& data);
 	void generate_frame_touche();
-	void generate_frame_pseudo();
-	void generate_frame_equipe();
-	void generate_frame_broadcast_pseudo();
+	void generate_frame_nickname();
+	void generate_frame_team();
+	void generate_frame_broadcast_nickname();
 	void generate_frame_start();
 	void generate_frame_gameover();
 	void generate_frame_collier();
@@ -79,28 +84,28 @@ private:
 	
 	Labels labels {
 		//{ { 7 * 8, 1 * 8 }, "NO FUN ALLOWED !", Color::red() },
-		{ { 1 * 8, 1 * 8 }, "Trame:", Color::light_grey() },
-		{ { 1 * 8, 3 * 8 }, "Salle:", Color::light_grey() },
-		{ { 14 * 8, 3 * 8 }, "Texte:", Color::light_grey() },
-		{ { 0 * 8, 5 * 8 }, "Equipe:", Color::light_grey() },
-		{ { 0 * 8, 7 * 8 }, "Joueur:", Color::light_grey() },
-		{ { 0 * 8, 10 * 8 }, "Collier:", Color::light_grey() },
+		{ { 1 * 8, 1 * 8 }, "Frame:", Color::light_grey() },
+		{ { 2 * 8, 3 * 8 }, "Room:", Color::light_grey() },
+		{ { 14 * 8, 3 * 8 }, "Text:", Color::light_grey() },
+		{ { 2 * 8, 5 * 8 }, "Team:", Color::light_grey() },
+		{ { 0 * 8, 7 * 8 }, "Player:", Color::light_grey() },
+		{ { 0 * 8, 10 * 8 }, "Vest:", Color::light_grey() },
 		{ { 4 * 8, 12 * 8 }, "ID:", Color::light_grey() },
 		{ { 3 * 8, 14 * 8 }, "Pow:  /10", Color::light_grey() },
-		{ { 1 * 8, 16 * 8 }, "Duree:  x100ms", Color::light_grey() }
+		{ { 2 * 8, 16 * 8 }, "Time:  x100ms", Color::light_grey() }
 	};
 	
-	OptionsField options_trame {
+	OptionsField options_frame {
 		{ 7 * 8, 1 * 8 },
 		13,
 		{
-			{ "Touche", 0 },
-			{ "Set pseudo", 1 },
-			{ "Set equipe", 2 },
-			{ "Brdcst pseudo", 3 },
+			{ "Key", 0 },
+			{ "Set nickname", 1 },
+			{ "Set team", 2 },
+			{ "Brdcst nick", 3 },
 			{ "Start", 4 },
 			{ "Game over", 5 },
-			{ "Set collier", 6 }
+			{ "Set vest", 6 }
 		}
 	};
 	
@@ -111,7 +116,7 @@ private:
 		true
 	};
 	
-	NumberField field_salle {
+	NumberField field_room {
 		{ 7 * 8, 3 * 8 },
 		1,
 		{ 1, 2 },
@@ -119,12 +124,12 @@ private:
 		'0'
 	};
 	
-	Button button_texte {
+	Button button_text {
 		{ 14 * 8, 5 * 8, 16 * 8, 3 * 8 },
 		"ABCDEF"
 	};
 	
-	NumberField field_equipe {
+	NumberField field_team {
 		{ 7 * 8, 5 * 8 },
 		1,
 		{ 1, 6 },
@@ -132,7 +137,7 @@ private:
 		'0'
 	};
 	
-	NumberField field_joueur {
+	NumberField field_player {
 		{ 7 * 8, 7 * 8 },
 		2,
 		{ 1, 50 },
@@ -77,11 +77,22 @@ POCSAGAppView::POCSAGAppView(NavigationView& nav) {
 		&console
 	});
 	
+	// load app settings
+	auto rc = settings.load("rx_pocsag", &app_settings);
+	if(rc == SETTINGS_OK) {
+		field_lna.set_value(app_settings.lna);
+		field_vga.set_value(app_settings.vga);
+		field_rf_amp.set_value(app_settings.rx_amp);
+		field_frequency.set_value(app_settings.rx_frequency);
+	}
+	else field_frequency.set_value(receiver_model.tuning_frequency());
+
+	receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio);
+
 	receiver_model.set_sampling_rate(3072000);
 	receiver_model.set_baseband_bandwidth(1750000);
 	receiver_model.enable();
 	
-	field_frequency.set_value(receiver_model.tuning_frequency());
 	field_frequency.set_step(receiver_model.frequency_step());
 	field_frequency.on_change = [this](rf::Frequency f) {
 		update_freq(f);
@@ -127,6 +138,11 @@ POCSAGAppView::POCSAGAppView(NavigationView& nav) {
 }

 POCSAGAppView::~POCSAGAppView() {	
+
+	// save app settings
+	app_settings.rx_frequency = field_frequency.value();
+	settings.save("rx_pocsag", &app_settings);
+
 	audio::output::stop();

 	// Save ignored address
@@ -28,7 +28,7 @@
 #include "ui_rssi.hpp"

 #include "log_file.hpp"
-
+#include "app_settings.hpp"
 #include "pocsag.hpp"
 #include "pocsag_packet.hpp"

@@ -60,6 +60,10 @@ public:
 private:
 	static constexpr uint32_t initial_target_frequency = 466175000;

+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
 	bool logging { true };
 	bool ignore { true };
 	uint32_t last_address = 0xFFFFFFFF;
@@ -26,7 +26,7 @@

 #include "ui_fileman.hpp"
 #include "io_file.hpp"
-
+#include "cpld_update.hpp"
 #include "baseband_api.hpp"
 #include "portapack.hpp"
 #include "portapack_persistent_memory.hpp"
@@ -201,6 +201,16 @@ ReplayAppView::ReplayAppView(
 	tx_gain = 35;field_rfgain.set_value(tx_gain);  // Initial default  value (-12 dB's max ).
 	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;
+	};
+	field_rfamp.set_value(rf_amp ? 14 : 0);
+
+    field_rfgain.on_change = [this](int32_t v) { // allow initial value change just after opened file.
+		tx_gain = v;
+	};  
+	field_rfgain.set_value(tx_gain);
+
 	baseband::run_image(portapack::spi_flash::image_tag_replay);

 	add_children({
@@ -248,7 +258,12 @@ ReplayAppView::ReplayAppView(

 ReplayAppView::~ReplayAppView() {
 	radio::disable();
-	baseband::shutdown();
+ 
+ 	display.fill_rectangle({ 0,0,240, 320 },Color::black()); //Solving sometimes visible bottom waterfall artifacts, clearing all LCD  pixels. 
+	chThdSleepMilliseconds(40);	// (that happened sometimes if we interrupt the waterfall play at the beggining of the play  around 25% and exit )  
+	hackrf::cpld::load_sram_no_verify();  // to leave all  RX reception ok, without "ghost interference signal problem" at the exit .
+
+	baseband::shutdown(); // better this function at the end, after load_sram(). If not , sometimes produced hang up (now not , it is ok).
 }

 void ReplayAppView::on_hide() {
@@ -25,6 +25,7 @@
 #include "soundboard_app.hpp"
 #include "string_format.hpp"
 #include "tonesets.hpp"
+#include "cpld_update.hpp"

 using namespace tonekey;
 using namespace portapack;
@@ -110,6 +111,7 @@ void SoundBoardView::start_tx(const uint32_t id) {
 		1536000 / 20,		// Update vu-meter at 20Hz
 		transmitter_model.channel_bandwidth(),
 		0,	// Gain is unused
+		8,	// shift_bits_s16, default 8 bits, but  also unused
 		TONES_F2D(tone_key_frequency(tone_key_index), 1536000),
 		0, //AM
 		0, //DSB
@@ -240,6 +242,15 @@ SoundBoardView::SoundBoardView(
 		&button_next_page,
 		&tx_view
 	});
+
+	// load app settings
+	auto rc = settings.load("tx_soundboard", &app_settings);
+	if(rc == SETTINGS_OK) {
+		transmitter_model.set_rf_amp(app_settings.tx_amp);
+		transmitter_model.set_channel_bandwidth(app_settings.channel_bandwidth);
+		transmitter_model.set_tuning_frequency(app_settings.tx_frequency);
+		transmitter_model.set_tx_gain(app_settings.tx_gain);		
+	}
 	
 	refresh_list();

@@ -280,9 +291,14 @@ SoundBoardView::SoundBoardView(
 }

 SoundBoardView::~SoundBoardView() {
+	// save app settings
+	app_settings.tx_frequency = transmitter_model.tuning_frequency();	
+	settings.save("tx_soundboard", &app_settings);
+
 	stop();
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit.
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }

 }
@@ -30,6 +30,7 @@
 #include "lfsr_random.hpp"
 #include "io_wave.hpp"
 #include "tone_key.hpp"
+#include "app_settings.hpp"

 namespace ui {

@@ -45,10 +46,14 @@ public:

 	void focus() override;
 	
-	std::string title() const override { return "Soundboard"; };
+	std::string title() const override { return "Soundboard TX"; };
 	
 private:
 	NavigationView& nav_;
+
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
 	
 	enum tx_modes {
 		NORMAL = 0,
@@ -151,7 +151,22 @@ TPMSAppView::TPMSAppView(NavigationView&) {
 		&options_type,
 	});

-	radio::enable({
+	// load app settings
+	auto rc = settings.load("rx_tpms", &app_settings);
+	if(rc == SETTINGS_OK) {
+		field_lna.set_value(app_settings.lna);
+		field_vga.set_value(app_settings.vga);
+		field_rf_amp.set_value(app_settings.rx_amp);
+		options_band.set_by_value(app_settings.rx_frequency);
+	}
+	else options_band.set_by_value(receiver_model.tuning_frequency());
+
+    receiver_model.set_tuning_frequency(tuning_frequency());
+    receiver_model.set_sampling_rate(sampling_rate);
+    receiver_model.set_baseband_bandwidth(baseband_bandwidth);
+    receiver_model.enable();  // Before using radio::enable(), but not updating Ant.DC-Bias.
+	
+/*	radio::enable({
 		tuning_frequency(),
 		sampling_rate,
 		baseband_bandwidth,
@@ -159,7 +174,7 @@ TPMSAppView::TPMSAppView(NavigationView&) {
 		receiver_model.rf_amp(),
 		static_cast<int8_t>(receiver_model.lna()),
 		static_cast<int8_t>(receiver_model.vga()),
-	});
+	}); */

 	options_band.on_change = [this](size_t, OptionsField::value_t v) {
 		this->on_band_changed(v);
@@ -184,7 +199,13 @@ TPMSAppView::TPMSAppView(NavigationView&) {
 }

 TPMSAppView::~TPMSAppView() {
-	radio::disable();
+
+
+	// save app settings
+	app_settings.rx_frequency = target_frequency_;
+	settings.save("rx_tpms", &app_settings);
+
+	receiver_model.disable(); // to switch off all, including DC bias and change flag enabled_

 	baseband::shutdown();
 }
@@ -27,7 +27,7 @@
 #include "ui_receiver.hpp"
 #include "ui_rssi.hpp"
 #include "ui_channel.hpp"
-
+#include "app_settings.hpp"
 #include "event_m0.hpp"

 #include "log_file.hpp"
@@ -103,13 +103,17 @@ public:

 	void focus() override;

-	std::string title() const override { return "TPMS"; };
+	std::string title() const override { return "TPMS Cars RX"; };

 private:
 	static constexpr uint32_t initial_target_frequency = 315000000;
 	static constexpr uint32_t sampling_rate = 2457600;
 	static constexpr uint32_t baseband_bandwidth = 1750000;

+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
 	MessageHandlerRegistration message_handler_packet {
 		Message::ID::TPMSPacket,
 		[this](Message* const p) {
@@ -309,8 +309,12 @@ void ADSBRxView::focus() {
 }

 ADSBRxView::~ADSBRxView() {
-	receiver_model.set_tuning_frequency(prevFreq);

+	// save app settings
+	settings.save("rx_adsb", &app_settings);
+
+	//TODO: once all apps keep there own settin previous frequency logic can be removed
+	receiver_model.set_tuning_frequency(prevFreq);
 	rtc_time::signal_tick_second -= signal_token_tick_second;
 	receiver_model.disable();
 	baseband::shutdown();
@@ -458,6 +462,21 @@ ADSBRxView::ADSBRxView(NavigationView& nav) {
 		&recent_entries_view
 	});
 	
+
+	// load app settings
+	auto rc = settings.load("rx_adsb", &app_settings);
+	if(rc == SETTINGS_OK) {
+		field_lna.set_value(app_settings.lna);
+		field_vga.set_value(app_settings.vga);
+		field_rf_amp.set_value(app_settings.rx_amp);
+	}
+	else
+	{
+		field_lna.set_value(40);
+		field_vga.set_value(40);
+	}
+
+
 	recent_entries_view.set_parent_rect({ 0, 16, 240, 272 });
 	recent_entries_view.on_select = [this, &nav](const AircraftRecentEntry& entry) {
 		detailed_entry_key = entry.key();
@@ -478,8 +497,6 @@ ADSBRxView::ADSBRxView(NavigationView& nav) {
 	baseband::set_adsb();
 	
 	receiver_model.set_tuning_frequency(1090000000);
-	field_lna.set_value(40);
-	field_vga.set_value(40);
 	receiver_model.set_modulation(ReceiverModel::Mode::SpectrumAnalysis);
 	receiver_model.set_sampling_rate(2000000);
 	receiver_model.set_baseband_bandwidth(2500000);
@@ -32,7 +32,7 @@
 #include "log_file.hpp"
 #include "adsb.hpp"
 #include "message.hpp"
-
+#include "app_settings.hpp"
 #include "crc.hpp"

 using namespace adsb;
@@ -184,7 +184,7 @@ private:
 	AircraftRecentEntry 		entry_copy { 0 };
 	std::function<void(void)> 	on_close_ { };
 	bool 				send_updates { false };
-	std::database 			db;
+	std::database 			db = { };
 	std::string 			icao_code = "";
 	int 				return_code = 0;

@@ -279,7 +279,7 @@ private:
 	GeoMapView* 			geomap_view { nullptr };
 	ADSBRxAircraftDetailsView* 	aircraft_details_view { nullptr };
 	bool 				send_updates { false };
-	std::database 			db;	
+	std::database 			db = { };	
 	std::string 			airline_code = "";
 	int 				return_code = 0;
 	
@@ -361,17 +361,20 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "ADS-B receive"; };
+	std::string title() const override { return "ADS-B RX"; };

 	void replace_entry(AircraftRecentEntry & entry);
 	AircraftRecentEntry find_or_create_entry(uint32_t ICAO_address);
 	void sort_entries_by_state();

 private:
-	rf::Frequency prevFreq;
+	rf::Frequency prevFreq = { 0 };
 	std::unique_ptr<ADSBLogger> logger { };
 	void on_frame(const ADSBFrameMessage * message);
 	void on_tick_second();
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
 	
 	const RecentEntriesColumns columns { {
 #if false
@@ -26,6 +26,7 @@
 #include "manchester.hpp"
 #include "string_format.hpp"
 #include "portapack.hpp"
+#include "cpld_update.hpp"
 #include "baseband_api.hpp"

 #include <cstring>
@@ -284,9 +285,15 @@ void ADSBTxView::focus() {
 }

 ADSBTxView::~ADSBTxView() {
+
+	// save app settings
+	app_settings.tx_frequency = transmitter_model.tuning_frequency();	
+	settings.save("tx_adsb", &app_settings);
+
 	transmitter_model.disable();
-	baseband::shutdown();
-}
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, withouth ghost signal problem at the exit .
+	baseband::shutdown();				  // better this function at the end, not load_sram() that sometimes produces hang up.
+	}

 void ADSBTxView::generate_frames() {
 	const uint32_t ICAO_address = sym_icao.value_hex_u64();
@@ -334,8 +341,16 @@ ADSBTxView::ADSBTxView(
 		&view_squawk,
 		&text_frame,
 		&tx_view
-	});
-	
+	});	
+
+	// load app settings
+	auto rc = settings.load("tx_adsb", &app_settings);
+	if(rc == SETTINGS_OK) {
+		transmitter_model.set_tuning_frequency(app_settings.tx_frequency);
+		transmitter_model.set_rf_amp(app_settings.tx_amp);
+		transmitter_model.set_tx_gain(app_settings.tx_gain);		
+	}
+
 	tx_view.on_edit_frequency = [this, &nav]() {
 		auto new_view = nav.push<FrequencyKeypadView>(receiver_model.tuning_frequency());
 		new_view->on_changed = [this](rf::Frequency f) {
@@ -28,6 +28,7 @@
 #include "ui_transmitter.hpp"
 #include "message.hpp"
 #include "transmitter_model.hpp"
+#include "app_settings.hpp"
 #include "portapack.hpp"

 using namespace adsb;
@@ -152,7 +153,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "ADS-B transmit"; };
+	std::string title() const override { return "ADS-B TX"; };

 private:
 	/*enum tx_modes {
@@ -189,6 +190,10 @@ private:
 		-1,
 		-1
 	};*/
+
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
 	
 	//tx_modes tx_mode = IDLE;
 	NavigationView& nav_;
@@ -66,6 +66,15 @@ AFSKRxView::AFSKRxView(NavigationView& nav) {
 		&console
 	});
 	
+	// load app settings
+	auto rc = settings.load("rx_afsk", &app_settings);
+	if(rc == SETTINGS_OK) {
+		field_lna.set_value(app_settings.lna);
+		field_vga.set_value(app_settings.vga);
+		field_rf_amp.set_value(app_settings.rx_amp);
+	}
+
+
 	// DEBUG
 	record_view.on_error = [&nav](std::string message) {
 		nav.display_modal("Error", message);
@@ -164,6 +173,11 @@ void AFSKRxView::on_data(uint32_t value, bool is_data) {
 }

 AFSKRxView::~AFSKRxView() {
+
+	// save app settings
+	app_settings.rx_frequency = field_frequency.value();
+	settings.save("rx_afsk", &app_settings);
+
 	audio::output::stop();
 	receiver_model.disable();
 	baseband::shutdown();
@@ -27,7 +27,7 @@
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
 #include "ui_record_view.hpp"	// DEBUG
-
+#include "app_settings.hpp"
 #include "log_file.hpp"
 #include "utility.hpp"

@@ -57,6 +57,10 @@ public:
 private:
 	void on_data(uint32_t value, bool is_data);
 	
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
 	uint8_t console_color { 0 };
 	uint32_t prev_value { 0 };
 	std::string str_log { "" };
@@ -98,6 +98,15 @@ APRSRxView::APRSRxView(NavigationView& nav, Rect parent_rect) : View(parent_rect
 		&console
 	});
 	
+	// load app settings
+	auto rc = settings.load("rx_aprs", &app_settings);
+	if(rc == SETTINGS_OK) {
+		field_lna.set_value(app_settings.lna);
+		field_vga.set_value(app_settings.vga);
+		field_rf_amp.set_value(app_settings.rx_amp);
+	}
+
+
 	// DEBUG
 	record_view.on_error = [&nav](std::string message) {
 		nav.display_modal("Error", message);
@@ -211,6 +220,10 @@ void APRSRxView::on_show(){
 }

 APRSRxView::~APRSRxView() {
+
+	// save app settings
+	settings.save("rx_aprs", &app_settings);
+
 	audio::output::stop();
 	receiver_model.disable();
 	baseband::shutdown();
@@ -28,7 +28,7 @@
 #include "ui_receiver.hpp"
 #include "ui_record_view.hpp"	// DEBUG
 #include "ui_geomap.hpp"
-
+#include "app_settings.hpp"
 #include "recent_entries.hpp"
 #include "ui_tabview.hpp"

@@ -57,12 +57,12 @@ struct APRSRecentEntry {
 	uint16_t hits { 0 };
 	uint32_t age { 0 };	
 	
-	uint64_t source;
+	uint64_t source { 0 };
 	std::string source_formatted { "        " };
 	std::string time_string { "" };
 	std::string info_string { "" };
 	
-	aprs::aprs_pos pos;
+	aprs::aprs_pos pos { 0 , 0 , 0 , 0 };
 	bool has_position = false;
 	APRSRecentEntry(uint64_t src)
 	{
@@ -131,6 +131,7 @@ private:
 	GeoMapView* geomap_view { nullptr };
 	bool send_updates { false };
 	
+
 	Console console {
 		{ 0, 0 * 16, 240, 224 }		
 	};
@@ -192,6 +193,11 @@ private:
 	void on_data(uint32_t value, bool is_data);
 	bool reset_console = false;
 	
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
+
 	uint8_t console_color { 0 };
 	std::string str_log { "" };

@@ -26,6 +26,7 @@
 #include "aprs.hpp"
 #include "string_format.hpp"
 #include "portapack.hpp"
+#include "cpld_update.hpp"
 #include "baseband_api.hpp"
 #include "portapack_shared_memory.hpp"
 #include "portapack_persistent_memory.hpp"
@@ -43,8 +44,13 @@ void APRSTXView::focus() {
 }

 APRSTXView::~APRSTXView() {
+	// save app settings
+	app_settings.tx_frequency = transmitter_model.tuning_frequency();	
+	settings.save("tx_aprs", &app_settings);
+
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit.
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }

 void APRSTXView::start_tx() {
@@ -66,7 +72,7 @@ void APRSTXView::start_tx() {
 		1200,
 		2200,
 		1,
-		10000,	//transmitter_model.channel_bandwidth(),
+		10000,	//APRS uses fixed 10k bandwidth
 		8
 	);
 }
@@ -95,6 +101,15 @@ APRSTXView::APRSTXView(NavigationView& nav) {
 		&tx_view
 	});
 	
+
+	// load app settings
+	auto rc = settings.load("tx_aprs", &app_settings);
+	if(rc == SETTINGS_OK) {
+		transmitter_model.set_rf_amp(app_settings.tx_amp);
+		transmitter_model.set_tuning_frequency(app_settings.tx_frequency);
+		transmitter_model.set_tx_gain(app_settings.tx_gain);		
+	}
+
 	button_set.on_select = [this, &nav](Button&) {
 		text_prompt(
 			nav,
@@ -29,6 +29,7 @@

 #include "message.hpp"
 #include "transmitter_model.hpp"
+#include "app_settings.hpp"
 #include "portapack.hpp"

 namespace ui {
@@ -40,17 +41,14 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "APRS TX (beta)"; };
+	std::string title() const override { return "APRS TX"; };

 private:
-	/*enum tx_modes {
-		IDLE = 0,
-		SINGLE,
-		SEQUENCE
-	};
-	
-	tx_modes tx_mode = IDLE;*/
 	
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
 	std::string payload { "" };
 	
 	void start_tx();
@@ -103,7 +101,7 @@ private:
 	TransmitterView tx_view {
 		16 * 16,
 		5000,
-		10
+		0 // disable setting bandwith, since APRS used fixed 10k bandwidth
 	};
 	
 	MessageHandlerRegistration message_handler_tx_progress {
@@ -24,6 +24,7 @@
 #include "string_format.hpp"

 #include "baseband_api.hpp"
+#include "cpld_update.hpp"
 #include "portapack_persistent_memory.hpp"

 using namespace portapack;
@@ -96,9 +97,9 @@ void BHTView::on_tx_progress(const uint32_t progress, const bool done) {
 	if (target_system == XYLOS) {
 		if (done) {
 			if (tx_mode == SINGLE) {
-				if (checkbox_cligno.value()) {
+				if (checkbox_flashing.value()) {
 					// TODO: Thread !
-					chThdSleepMilliseconds(field_tempo.value() * 1000);	// Dirty :(
+					chThdSleepMilliseconds(field_speed.value() * 1000);	// Dirty :(
 					view_xylos.flip_relays();
 					start_tx();
 				} else
@@ -120,9 +121,9 @@ void BHTView::on_tx_progress(const uint32_t progress, const bool done) {
 			} else {
 				view_EPAR.half = false;
 				if (tx_mode == SINGLE) {
-					if (checkbox_cligno.value()) {
+					if (checkbox_flashing.value()) {
 						// TODO: Thread !
-						chThdSleepMilliseconds(field_tempo.value() * 1000);	// Dirty :(
+						chThdSleepMilliseconds(field_speed.value() * 1000);	// Dirty :(
 						view_EPAR.flip_relays();
 						start_tx();
 					} else
@@ -140,7 +141,13 @@ void BHTView::on_tx_progress(const uint32_t progress, const bool done) {
 }

 BHTView::~BHTView() {
+	// save app settings
+	app_settings.tx_frequency = transmitter_model.tuning_frequency();	
+	settings.save("tx_bht", &app_settings);
+
 	transmitter_model.disable();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }

 BHTView::BHTView(NavigationView& nav) {
@@ -150,13 +157,22 @@ BHTView::BHTView(NavigationView& nav) {
 		&view_xylos,
 		&view_EPAR,
 		&checkbox_scan,
-		&checkbox_cligno,
-		&field_tempo,
+		&checkbox_flashing,
+		&field_speed,
 		&progressbar,
 		&tx_view
 	});
 	
-	field_tempo.set_value(1);
+	// load app settings
+	auto rc = settings.load("tx_bht", &app_settings);
+	if(rc == SETTINGS_OK) {
+		transmitter_model.set_rf_amp(app_settings.tx_amp);
+		transmitter_model.set_channel_bandwidth(app_settings.channel_bandwidth);
+		transmitter_model.set_tuning_frequency(app_settings.tx_frequency);
+		transmitter_model.set_tx_gain(app_settings.tx_gain);		
+	}
+
+	field_speed.set_value(1);
 	
 	tx_view.on_edit_frequency = [this, &nav]() {
 		auto new_view = nav.push<FrequencyKeypadView>(receiver_model.tuning_frequency());
@@ -32,6 +32,7 @@
 #include "message.hpp"
 #include "transmitter_model.hpp"
 #include "encoders.hpp"
+#include "app_settings.hpp"
 #include "portapack.hpp"

 namespace ui {
@@ -50,11 +51,11 @@ public:
 private:
 	Labels labels {
 		{ { 8 * 8, 1 * 8 }, "Header:", Color::light_grey() },
-		{ { 4 * 8, 3 * 8 }, "Code ville:", Color::light_grey() },
-		{ { 7 * 8, 5 * 8 }, "Famille:", Color::light_grey() },
-		{ { 2 * 8, 7 * 8 + 2 }, "Sous-famille:", Color::light_grey() },
-		{ { 2 * 8, 11 * 8 }, "ID recepteur:", Color::light_grey() },
-		{ { 2 * 8, 14 * 8 }, "Relais:", Color::light_grey() }
+		{ { 4 * 8, 3 * 8 }, "City code:", Color::light_grey() },
+		{ { 7 * 8, 5 * 8 }, "Family:", Color::light_grey() },
+		{ { 2 * 8, 7 * 8 + 2 }, "Subfamily:", Color::light_grey() },
+		{ { 2 * 8, 11 * 8 }, "Receiver ID:", Color::light_grey() },
+		{ { 2 * 8, 14 * 8 }, "Relay:", Color::light_grey() }
 	};
 	
 	NumberField field_header_a {
@@ -98,8 +99,8 @@ private:
 	
 	Checkbox checkbox_wcsubfamily {
 		{ 20 * 8, 6 * 8 + 6 },
-		6,
-		"Toutes"
+		3,
+		"All"
 	};
 	
 	NumberField field_receiver {
@@ -111,8 +112,8 @@ private:
 	};
 	Checkbox checkbox_wcid {
 		{ 20 * 8, 10 * 8 + 4 },
-		4,
-		"Tous"
+		3,
+		"All"
 	};
 	
 	std::array<ImageOptionsField, 4> relay_states { };
@@ -139,9 +140,9 @@ public:
 	
 private:
 	Labels labels {
-		{ { 4 * 8, 1 * 8 }, "Code ville:", Color::light_grey() },
-		{ { 8 * 8, 3 * 8 }, "Groupe:", Color::light_grey() },
-		{ { 8 * 8, 7 * 8 }, "Relais:", Color::light_grey() }
+		{ { 4 * 8, 1 * 8 }, "City code:", Color::light_grey() },
+		{ { 8 * 8, 3 * 8 }, "Group:", Color::light_grey() },
+		{ { 8 * 8, 7 * 8 }, "Relay:", Color::light_grey() }
 	};
 	
 	NumberField field_city {
@@ -178,9 +179,13 @@ public:

 	void focus() override;
 	
-	std::string title() const override { return "BHT transmit"; };
+	std::string title() const override { return "BHT Xy/EP TX"; };

 private:
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
 	void on_tx_progress(const uint32_t progress, const bool done);
 	void start_tx();
 	void stop_tx();
@@ -220,12 +225,12 @@ private:
 		"Scan"
 	};
 	
-	Checkbox checkbox_cligno {
+	Checkbox checkbox_flashing {
 		{ 16 * 8, 25 * 8 },
-		6,
-		"Cligno"
+		8,
+		"Flashing"
 	};
-	NumberField field_tempo {
+	NumberField field_speed {
 		{ 26 * 8, 25 * 8 + 4 },
 		2,
 		{ 1, 99 },
@@ -60,6 +60,15 @@ BTLERxView::BTLERxView(NavigationView& nav) {
 		&console
 	});
 	
+	// load app settings
+	auto rc = settings.load("rx_btle", &app_settings);
+	if(rc == SETTINGS_OK) {
+		field_lna.set_value(app_settings.lna);
+		field_vga.set_value(app_settings.vga);
+		field_rf_amp.set_value(app_settings.rx_amp);
+	}
+
+
 	// DEBUG
 	record_view.on_error = [&nav](std::string message) {
 		nav.display_modal("Error", message);
@@ -152,6 +161,11 @@ void BTLERxView::on_data(uint32_t value, bool is_data) {
 }

 BTLERxView::~BTLERxView() {
+
+	// save app settings
+	app_settings.rx_frequency = field_frequency.value();
+	settings.save("rx_btle", &app_settings);
+
 	audio::output::stop();
 	receiver_model.disable();
 	baseband::shutdown();
@@ -27,6 +27,7 @@
 #include "ui.hpp"
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
+#include "app_settings.hpp"
 #include "ui_record_view.hpp"	// DEBUG

 #include "utility.hpp"
@@ -45,6 +46,11 @@ public:
 private:
 	void on_data(uint32_t value, bool is_data);
 	
+
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
 	uint8_t console_color { 0 };
 	uint32_t prev_value { 0 };
 	std::string str_log { "" };
@@ -23,6 +23,7 @@
 #include "ui_coasterp.hpp"

 #include "baseband_api.hpp"
+#include "cpld_update.hpp"
 #include "portapack_persistent_memory.hpp"

 #include <cstring>
@@ -37,8 +38,13 @@ void CoasterPagerView::focus() {
 }

 CoasterPagerView::~CoasterPagerView() {
+	// save app settings
+	app_settings.tx_frequency = transmitter_model.tuning_frequency();	
+	settings.save("tx_coaster", &app_settings);
+
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }

 void CoasterPagerView::generate_frame() {
@@ -119,6 +125,15 @@ CoasterPagerView::CoasterPagerView(NavigationView& nav) {
 		&tx_view
 	});
 	
+	// load app settings
+	auto rc = settings.load("tx_coaster", &app_settings);
+	if(rc == SETTINGS_OK) {
+		transmitter_model.set_rf_amp(app_settings.tx_amp);
+		transmitter_model.set_channel_bandwidth(app_settings.channel_bandwidth);
+		transmitter_model.set_tuning_frequency(app_settings.tx_frequency);
+		transmitter_model.set_tx_gain(app_settings.tx_gain);		
+	}
+
 	// Bytes to nibbles
 	for (c = 0; c < 16; c++)
 		sym_data.set_sym(c, (data_init[c >> 1] >> ((c & 1) ? 0 : 4)) & 0x0F);
@@ -28,6 +28,7 @@

 #include "message.hpp"
 #include "transmitter_model.hpp"
+#include "app_settings.hpp"
 #include "portapack.hpp"

 namespace ui {
@@ -39,7 +40,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "Si44xx TX"; };
+	std::string title() const override { return "BurgerPgr TX"; };

 private:
 	enum tx_modes {
@@ -50,6 +51,10 @@ private:
 	
 	tx_modes tx_mode = IDLE;
 	
+	// app save settings
+	std::app_settings 		settings { };
+	std::app_settings::AppSettings 	app_settings { };
+
 	void start_tx();
 	void generate_frame();
 	void on_tx_progress(const uint32_t progress, const bool done);
@@ -31,6 +31,7 @@
 #include "ui_sd_card_debug.hpp"

 #include "portapack.hpp"
+#include "portapack_persistent_memory.hpp"
 using namespace portapack;

 #include "irq_controls.hpp"
@@ -345,14 +346,17 @@ DebugPeripheralsMenuView::DebugPeripheralsMenuView(NavigationView& nav) {
 /* DebugMenuView *********************************************************/

 DebugMenuView::DebugMenuView(NavigationView& nav) {
+    if( portapack::persistent_memory::show_gui_return_icon() )
+    {
+        add_items( { { "..", 		ui::Color::light_grey(),&bitmap_icon_previous,	[&nav](){ nav.pop(); } } } );
+    }
 	add_items({
-		//{ "..",				ui::Color::light_grey(),&bitmap_icon_previous,	[&nav](){ nav.pop(); } },
 		{ "Memory", 		ui::Color::dark_cyan(),	&bitmap_icon_memory,	[&nav](){ nav.push<DebugMemoryView>(); } },
 		//{ "Radio State",	ui::Color::white(),	nullptr,	[&nav](){ nav.push<NotImplementedView>(); } },
 		{ "SD Card",		ui::Color::dark_cyan(),	&bitmap_icon_sdcard,	[&nav](){ nav.push<SDCardDebugView>(); } },
 		{ "Peripherals",	ui::Color::dark_cyan(),	&bitmap_icon_peripherals,	[&nav](){ nav.push<DebugPeripheralsMenuView>(); } },
 		{ "Temperature",	ui::Color::dark_cyan(),	&bitmap_icon_temperature,	[&nav](){ nav.push<TemperatureView>(); } },
-		{ "Buttons test",	ui::Color::dark_cyan(),	&bitmap_icon_controls,	[&nav](){ nav.push<DebugControlsView>(); } },
+		{ "Buttons Test",	ui::Color::dark_cyan(),	&bitmap_icon_controls,	[&nav](){ nav.push<DebugControlsView>(); } },
 	});
 	set_max_rows(2); // allow wider buttons
 }
@@ -43,6 +43,8 @@ public:

 	void focus() override;

+	std::string title() const override { return "Memory"; };
+
 private:
 	Text text_title {
 		{ 96, 96, 48, 16 },
@@ -113,6 +115,8 @@ public:

 	void focus() override;

+	std::string title() const override { return "Temperature"; };
+
 private:
 	Text text_title {
 		{ 76, 16, 240, 16 },
@@ -252,6 +256,8 @@ public:

 	void focus() override;

+	std::string title() const override { return "Buttons Test"; };
+
 private:
 	Text text_title {
 		{ 64, 16, 184, 16 },
@@ -24,6 +24,7 @@

 #include "baseband_api.hpp"
 #include "string_format.hpp"
+#include "cpld_update.hpp"

 using namespace portapack;

@@ -35,18 +36,21 @@ EncodersConfigView::EncodersConfigView(
 	using option_t = std::pair<std::string, int32_t>;
 	std::vector<option_t> enc_options;
 	size_t i;
-	
+
 	set_parent_rect(parent_rect);
 	hidden(true);
-	
+
 	// Default encoder def
 	encoder_def = &encoder_defs[0];
-	
+
 	add_children({
 		&labels,
 		&options_enctype,
+		&field_repeat_min,
 		&field_clk,
+		&field_clk_step,
 		&field_frameduration,
+		&field_frameduration_step,
 		&symfield_word,
 		&text_format,
 		&waveform
@@ -55,18 +59,18 @@ EncodersConfigView::EncodersConfigView(
 	// Load encoder types in option field
 	for (i = 0; i < ENC_TYPES_COUNT; i++)
 		enc_options.emplace_back(std::make_pair(encoder_defs[i].name, i));
-	
+
 	options_enctype.on_change = [this](size_t index, int32_t) {
 		on_type_change(index);
 	};
-	
+
 	options_enctype.set_options(enc_options);
 	options_enctype.set_selected_index(0);
-	
+
 	symfield_word.on_change = [this]() {
 		generate_frame();
 	};
-	
+
 	// Selecting input clock changes symbol and word duration
 	field_clk.on_change = [this](int32_t value) {
 		// value is in kHz, new_value is in us
@@ -74,7 +78,11 @@ EncodersConfigView::EncodersConfigView(
 		if (new_value != field_frameduration.value())
 			field_frameduration.set_value(new_value * encoder_def->word_length, false);
 	};
-	
+
+	field_clk_step.on_change = [this](size_t, int32_t value) {
+		field_clk.set_step(value);
+	};
+
 	// Selecting word duration changes input clock and symbol duration
 	field_frameduration.on_change = [this](int32_t value) {
 		// value is in us, new_value is in kHz
@@ -82,6 +90,10 @@ EncodersConfigView::EncodersConfigView(
 		if (new_value != field_clk.value())
 			field_clk.set_value(1000000 / new_value, false);
 	};
+
+	field_frameduration_step.on_change = [this](size_t, int32_t value) {
+		field_frameduration.set_step(value);
+	};
 }

 void EncodersConfigView::focus() {
@@ -96,7 +108,8 @@ void EncodersConfigView::on_type_change(size_t index) {
 	encoder_def = &encoder_defs[index];

 	field_clk.set_value(encoder_def->default_speed / 1000);
-	
+	field_repeat_min.set_value(encoder_def->repeat_min);
+
 	// SymField setup
 	word_length = encoder_def->word_length;
 	symfield_word.set_length(word_length);
@@ -111,10 +124,10 @@ void EncodersConfigView::on_type_change(size_t index) {
 			format_string += 'D';
 		}
 	}
-	
+
 	// Ugly :( Pad to erase
 	format_string.append(24 - format_string.size(), ' ');
-	
+
 	text_format.set(format_string);

 	generate_frame();
@@ -130,28 +143,28 @@ void EncodersConfigView::draw_waveform() {

 	for (size_t n = 0; n < length; n++)
 		waveform_buffer[n] = (frame_fragments[n] == '0') ? 0 : 1;
-	
+
 	waveform.set_length(length);
 	waveform.set_dirty();
 }

 void EncodersConfigView::generate_frame() {
 	size_t i = 0;
-	
+
 	frame_fragments.clear();
-	
+
 	for (auto c : encoder_def->word_format) {
 		if (c == 'S')
 			frame_fragments += encoder_def->sync;
 		else
 			frame_fragments += encoder_def->bit_format[symfield_word.get_sym(i++)];
 	}
-	
+
 	draw_waveform();
 }

 uint8_t EncodersConfigView::repeat_min() {
-	return encoder_def->repeat_min;
+	return field_repeat_min.value();
 }

 uint32_t EncodersConfigView::samples_per_bit() {
@@ -163,7 +176,7 @@ uint32_t EncodersConfigView::pause_symbols() {
 }

 void EncodersScanView::focus() {
-	field_debug.focus();
+	field_length.focus();
 }

 EncodersScanView::EncodersScanView(
@@ -171,31 +184,17 @@ EncodersScanView::EncodersScanView(
 ) {
 	set_parent_rect(parent_rect);
 	hidden(true);
-	
+
 	add_children({
 		&labels,
-		&field_debug,
-		&text_debug,
-		&text_length
+		&field_length,
+		&bit_length_10,
+		&bit_length
 	});
-	
-	// DEBUG
-	field_debug.on_change = [this](int32_t value) {
-		uint32_t l;
-		size_t length;
-		
-		de_bruijn debruijn_seq;
-		length = debruijn_seq.init(value);
-		
-		l = 1;
-		l <<= value;
-		l--;
-		if (l > 25)
-			l = 25;
-		text_debug.set(to_string_bin(debruijn_seq.compute(l), 25));
-		
-		text_length.set(to_string_dec_uint(length));
-	};
+
+	field_length.set_value(8);
+	bit_length_10.set_value(40);
+	bit_length.set_value(0);
 }

 void EncodersView::focus() {
@@ -203,30 +202,22 @@ void EncodersView::focus() {
 }

 EncodersView::~EncodersView() {
+	// save app settings
+	app_settings.tx_frequency = transmitter_model.tuning_frequency();
+	settings.save("tx_ook", &app_settings);
+
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify(); // ghost signal c/m to the problem at the exit .
+	baseband::shutdown(); // better this function after load_sram()
 }

 void EncodersView::update_progress() {
 	std::string str_buffer;
-	
-	// text_status.set("            ");
-	
-	if (tx_mode == SINGLE) {
+
+	if (tx_mode == SINGLE || tx_mode == SCAN) {
 		str_buffer = to_string_dec_uint(repeat_index) + "/" + to_string_dec_uint(repeat_min);
 		text_status.set(str_buffer);
 		progressbar.set_value(repeat_index);
-		
-	/*} else if (tx_mode == SCAN) {
-		strcpy(str, to_string_dec_uint(repeat_index).c_str());
-		strcat(str, "/");
-		strcat(str, to_string_dec_uint(portapack::persistent_memory::afsk_repeats()).c_str());
-		strcat(str, " ");
-		strcat(str, to_string_dec_uint(scan_index + 1).c_str());
-		strcat(str, "/");
-		strcat(str, to_string_dec_uint(scan_count).c_str());
-		text_status.set(str);
-		progress.set_value(scan_progress);*/
 	} else {
 		text_status.set("Ready");
 		progressbar.set_value(0);
@@ -234,89 +225,58 @@ void EncodersView::update_progress() {
 }

 void EncodersView::on_tx_progress(const uint32_t progress, const bool done) {
-	//char str[16];
-	
 	if (!done) {
 		// Repeating...
 		repeat_index = progress + 1;
-		
-		/*if (tx_mode == SCAN) {
-			scan_progress++;
-			update_progress();
-		} else {*/
-			update_progress();
-		//}
+		update_progress();
 	} else {
+		// make sure all samples are transmitted before disabling radio
+		chThdSleepMilliseconds(10);
+
 		// Done transmitting
-		/*if ((tx_mode == SCAN) && (scan_index < (scan_count - 1))) {
-			transmitter_model.disable();
-			if (abort_scan) {
-				// Kill scan process
-				strcpy(str, "Abort @");
-				strcat(str, rgsb);
-				text_status.set(str);
-				progress.set_value(0);
-				tx_mode = IDLE;
-				abort_scan = false;
-				button_scan.set_style(&style_val);
-				button_scan.set_text("SCAN");
-			} else {
-				// Next address
-				scan_index++;
-				strcpy(rgsb, &scan_list[options_scanlist.selected_index()].addresses[scan_index * 5]);
-				scan_progress++;
-				repeat_index = 1;
-				update_progress();
-				start_tx(true);
-			}
-		} else {*/
-			transmitter_model.disable();
-			tx_mode = IDLE;
-			text_status.set("Done");
-			progressbar.set_value(0);
-			tx_view.set_transmitting(false);
-		//}
+		transmitter_model.disable();
+		tx_mode = IDLE;
+		text_status.set("Done");
+		progressbar.set_value(0);
+		tx_view.set_transmitting(false);
 	}
 }

 void EncodersView::start_tx(const bool scan) {
-	(void)scan;
 	size_t bitstream_length = 0;
-	
-	repeat_min = view_config.repeat_min();
-	
-	/*if (scan) {
-		if (tx_mode != SCAN) {
-			scan_index = 0;
-			scan_count = scan_list[options_scanlist.selected_index()].count;
-			scan_progress = 1;
-			repeat_index = 1;
-			tx_mode = SCAN;
-			strcpy(rgsb, &scan_list[options_scanlist.selected_index()].addresses[0]);
-			progress.set_max(scan_count * afsk_repeats);
-			update_progress();
-		}
-	} else {*/
+	int scan_width = 0;
+	uint32_t samples_per_bit;
+
+	if (scan) {
+		tx_mode = SCAN;
+		scan_width = view_scan.field_length.value();
+		samples_per_bit =
+			((view_scan.bit_length_10.value() * 10 + view_scan.bit_length.value()) * OOK_SAMPLERATE) / 1000000UL;
+		const uint32_t seq_len = ((1 << (scan_width - 1)) * 2) * ((uint64_t) samples_per_bit) / 2048UL;
+		progressbar.set_max(seq_len);
+		repeat_min = seq_len;
+	} else {
 		tx_mode = SINGLE;
-		repeat_index = 1;
+		samples_per_bit = view_config.samples_per_bit();
+		view_config.generate_frame();
+		bitstream_length = make_bitstream(view_config.frame_fragments);
 		progressbar.set_max(repeat_min);
-		update_progress();
-	//}
-	
-	view_config.generate_frame();
-	
-	bitstream_length = make_bitstream(view_config.frame_fragments);
+		repeat_min = view_config.repeat_min();
+	}
+
+	repeat_index = 1;
+	update_progress();

 	transmitter_model.set_sampling_rate(OOK_SAMPLERATE);
-	transmitter_model.set_rf_amp(true);
 	transmitter_model.set_baseband_bandwidth(1750000);
 	transmitter_model.enable();
-	
+
 	baseband::set_ook_data(
 		bitstream_length,
-		view_config.samples_per_bit(),
+		samples_per_bit,
 		repeat_min,
-		view_config.pause_symbols()
+		view_config.pause_symbols(),
+		scan_width
 	);
 }

@@ -334,21 +294,32 @@ EncodersView::EncodersView(
 		&progressbar,
 		&tx_view
 	});
-	
+
+	// load app settings
+	auto rc = settings.load("tx_ook", &app_settings);
+	if (rc == SETTINGS_OK) {
+		transmitter_model.set_rf_amp(app_settings.tx_amp);
+		transmitter_model.set_channel_bandwidth(app_settings.channel_bandwidth);
+		transmitter_model.set_tuning_frequency(app_settings.tx_frequency);
+		transmitter_model.set_tx_gain(app_settings.tx_gain);
+	}
+
 	tx_view.on_edit_frequency = [this, &nav]() {
 		auto new_view = nav.push<FrequencyKeypadView>(transmitter_model.tuning_frequency());
 		new_view->on_changed = [this](rf::Frequency f) {
 			transmitter_model.set_tuning_frequency(f);
 		};
 	};
-	
+
 	tx_view.on_start = [this]() {
 		tx_view.set_transmitting(true);
-		start_tx(false);
+		start_tx(tab_view.selected());
 	};
-	
+
 	tx_view.on_stop = [this]() {
 		tx_view.set_transmitting(false);
+		baseband::kill_ook();
+		transmitter_model.disable();
 	};
 }

@@ -26,6 +26,7 @@
 #include "transmitter_model.hpp"
 #include "encoders.hpp"
 #include "de_bruijn.hpp"
+#include "app_settings.hpp"

 using namespace encoders;

@@ -34,43 +35,41 @@ namespace ui {
 class EncodersConfigView : public View {
 public:
 	EncodersConfigView(NavigationView& nav, Rect parent_rect);
-	
+
 	EncodersConfigView(const EncodersConfigView&) = delete;
 	EncodersConfigView(EncodersConfigView&&) = delete;
 	EncodersConfigView& operator=(const EncodersConfigView&) = delete;
 	EncodersConfigView& operator=(EncodersConfigView&&) = delete;
-	
+
 	void focus() override;
 	void on_show() override;
-	
+
 	uint8_t repeat_min();
 	uint32_t samples_per_bit();
 	uint32_t pause_symbols();
 	void generate_frame();
-	
+
 	std::string frame_fragments = "0";

 private:
-	//bool abort_scan = false;
-	//uint8_t scan_count;
-	//double scan_progress;
-	//unsigned int scan_index;
 	int16_t waveform_buffer[550];
 	const encoder_def_t * encoder_def { };
-	//uint8_t enc_type = 0;

 	void draw_waveform();
 	void on_bitfield();
 	void on_type_change(size_t index);
-	
+
 	Labels labels {
 		{ { 1 * 8, 0 }, "Type:", Color::light_grey() },
-		{ { 16 * 8, 0 }, "Clk:", Color::light_grey() },
-		{ { 24 * 8, 0 }, "kHz", Color::light_grey() },
-		{ { 14 * 8, 2 * 8 }, "Frame:", Color::light_grey() },
-		{ { 26 * 8, 2 * 8 }, "us", Color::light_grey() },
-		{ { 2 * 8, 4 * 8 }, "Symbols:", Color::light_grey() },
-		{ { 1 * 8, 11 * 8 }, "Waveform:", Color::light_grey() }
+		{ { 17 * 8, 0 }, "Repeat:", Color::light_grey() },
+		{ { 1 * 8, 2 * 8 }, "Clk:", Color::light_grey() },
+		{ { 10 * 8, 2 * 8 }, "kHz", Color::light_grey() },
+		{ { 17 * 8, 2 * 8 }, "Step:", Color::light_grey() },
+		{ { 1 * 8, 4 * 8 }, "Frame:", Color::light_grey() },
+		{ { 13 * 8, 4 * 8 }, "us", Color::light_grey() },
+		{ { 17 * 8, 4 * 8 }, "Step:", Color::light_grey() },
+		{ { 2 * 8, 7 * 8 }, "Symbols:", Color::light_grey() },
+		{ { 1 * 8, 14 * 8 }, "Waveform:", Color::light_grey() }
 	};

 	OptionsField options_enctype {		// Options are loaded at runtime
@@ -81,34 +80,63 @@ private:
 	};

 	NumberField field_clk {
-		{ 21 * 8, 0 },
-		3,
-		{ 1, 500 },
+		{ 5 * 8, 2 * 8 },
+		4,
+		{ 1, 1000 },
 		1,
 		' '
 	};

+	NumberField field_repeat_min {
+		{ 24 * 8, 0 },
+		2,
+		{ 1, 99 },
+		1,
+		' '
+	};
+
+	OptionsField field_clk_step {
+		{ 22 * 8, 2 * 8 },
+		7,
+		{
+			{ "1", 1 },
+			{ "10", 10 },
+			{ "100", 100 }
+		}
+	};
+
 	NumberField field_frameduration {
-		{ 21 * 8, 2 * 8 },
+		{ 7 * 8, 4 * 8 },
 		5,
 		{ 300, 99999 },
 		100,
 		' '
 	};
-	
+
+	OptionsField field_frameduration_step {
+		{ 22 * 8, 4 * 8 },
+		7,
+		{
+			{ "1", 1 },
+			{ "10", 10 },
+			{ "100", 100 },
+			{ "1000", 1000 }
+		}
+	};
+
 	SymField symfield_word {
-		{ 2 * 8, 6 * 8 },
+		{ 2 * 8, 9 * 8 },
 		20,
 		SymField::SYMFIELD_DEF
 	};
-	
+
 	Text text_format {
-		{ 2 * 8, 8 * 8, 24 * 8, 16 },
+		{ 2 * 8, 11 * 8, 24 * 8, 16 },
 		""
 	};
-	
+
 	Waveform waveform {
-		{ 0, 14 * 8, 240, 32 },
+		{ 0, 17 * 8, 240, 32 },
 		waveform_buffer,
 		0,
 		0,
@@ -121,33 +149,38 @@ private:
 class EncodersScanView : public View {
 public:
 	EncodersScanView(NavigationView& nav, Rect parent_rect);
-	
+
+	NumberField field_length {
+		{ 8 * 8, 0 },
+		2,
+		{ 3, 24 },
+		1,
+		' '
+	};
+
+	NumberField bit_length_10 {
+		{ 12 * 8, 2 * 8 },
+		2,
+		{ 1, 88 },
+		1,
+		' '
+	};
+
+	NumberField bit_length {
+		{ 14 * 8, 2 * 8 },
+		1,
+		{ 0, 9 },
+		1,
+		' '
+	};
+
 	void focus() override;

 private:
 	Labels labels {
-		{ { 1 * 8, 1 * 8 }, "Coming soon...", Color::light_grey() }
-	};
-	
-	// DEBUG
-	NumberField field_debug {
-		{ 1 * 8, 6 * 8 },
-		2,
-		{ 3, 16 },
-		1,
-		' '
-	};
-	
-	// DEBUG
-	Text text_debug {
-		{ 1 * 8, 8 * 8, 24 * 8, 16 },
-		""
-	};
-	
-	// DEBUG
-	Text text_length {
-		{ 1 * 8, 10 * 8, 24 * 8, 16 },
-		""
+		{ { 1 * 8, 0 * 8 }, "Length:", Color::light_grey() },
+		{ { 1 * 8, 2 * 8 }, "Bit length:", Color::light_grey() },
+		{ { 16 * 8, 2 * 8 }, "us", Color::light_grey() },
 	};
 };

@@ -155,10 +188,10 @@ class EncodersView : public View {
 public:
 	EncodersView(NavigationView& nav);
 	~EncodersView();
-	
+
 	void focus() override;
-	
-	std::string title() const override { return "OOK transmit"; };
+
+	std::string title() const override { return "OOK TX"; };

 private:
 	NavigationView& nav_;
@@ -168,15 +201,19 @@ private:
 		SINGLE,
 		SCAN
 	};
-	
+
+	// app save settings
+	std::app_settings 		settings { };
+	std::app_settings::AppSettings 	app_settings { };
+
 	tx_modes tx_mode = IDLE;
-	uint8_t repeat_index { 0 };
-	uint8_t repeat_min { 0 };
-	
+	uint32_t repeat_index { 0 };
+	uint32_t repeat_min { 0 };
+
 	void update_progress();
 	void start_tx(const bool scan);
 	void on_tx_progress(const uint32_t progress, const bool done);
-	
+
 	/*const Style style_address {
 		.font = font::fixed_8x16,
 		.background = Color::black(),
@@ -187,32 +224,32 @@ private:
 		.background = Color::black(),
 		.foreground = Color::blue(),
 	};*/
-	
+
 	Rect view_rect = { 0, 4 * 8, 240, 168 };
-	
+
 	EncodersConfigView view_config { nav_, view_rect };
 	EncodersScanView view_scan { nav_, view_rect };
-	
+
 	TabView tab_view {
 		{ "Config", Color::cyan(), &view_config },
-		{ "Scan", Color::green(), &view_scan },
+		{ "de Bruijn", Color::green(), &view_scan },
 	};

 	Text text_status {
 		{ 2 * 8, 13 * 16, 128, 16 },
 		"Ready"
 	};
-	
+
 	ProgressBar progressbar {
 		{ 2 * 8, 13 * 16 + 20, 208, 16 }
 	};
-	
+
 	TransmitterView tx_view {
 		16 * 16,
 		50000,
 		9
 	};
-	
+
 	MessageHandlerRegistration message_handler_tx_progress {
 		Message::ID::TXProgress,
 		[this](const Message* const p) {
@@ -25,6 +25,7 @@
 #include "ui_freqman.hpp"

 #include "baseband_api.hpp"
+#include "cpld_update.hpp"
 #include "string_format.hpp"

 using namespace portapack;
@@ -183,7 +184,8 @@ void JammerView::focus() {

 JammerView::~JammerView() {
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }

 void JammerView::on_retune(const rf::Frequency freq, const uint32_t range) {
@@ -268,9 +270,9 @@ void JammerView::start_tx() {
 		button_transmit.set_text("STOP");
 		
 		transmitter_model.set_sampling_rate(3072000U);
-		transmitter_model.set_rf_amp(true);
+		transmitter_model.set_rf_amp(field_amp.value());
 		transmitter_model.set_baseband_bandwidth(3500000U);
-		transmitter_model.set_tx_gain(47);
+		transmitter_model.set_tx_gain(field_gain.value());
 		transmitter_model.enable();

 		baseband::set_jammer(true, (JammerType)options_type.selected_index(), options_speed.selected_index_value());
@@ -366,6 +368,8 @@ JammerView::JammerView(
 		&field_timetx,
 		&field_timepause,
 		&field_jitter,
+		&field_gain,
+		&field_amp,
 		&button_transmit
 	});
 	
@@ -380,6 +384,8 @@ JammerView::JammerView(

 	field_timetx.set_value(30);
 	field_timepause.set_value(1);
+	field_gain.set_value(transmitter_model.tx_gain());
+	field_amp.set_value(transmitter_model.rf_amp());

 	button_transmit.on_select = [this](Button&) {
 		if (jamming || cooling)
@@ -106,7 +106,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "Jammer"; };
+	std::string title() const override { return "Jammer TX"; };
 	
 private:
 	NavigationView& nav_;
@@ -156,7 +156,9 @@ private:
 		{ { 0 * 8, 33 * 8 }, "Jitter:", Color::light_grey() },	//Maybe the repository curator can keep the "mystype" for some versions. 
 		{ { 11 * 8, 29 * 8 }, "Secs.", Color::light_grey() }, 
 		{ { 11 * 8, 31 * 8 }, "Secs.", Color::light_grey() },
-		{ { 11 * 8, 33 * 8 }, "/60", Color::light_grey() }
+		{ { 11 * 8, 33 * 8 }, "/60", Color::light_grey() },
+		{ { 2 * 8, 35 * 8 }, "Gain:", Color::light_grey() },
+		{ { 11 * 8, 35 * 8 }, "A:", Color::light_grey() }
 	};
 	
 	OptionsField options_type {
@@ -229,8 +231,24 @@ private:
 		' ',
 	};

+	NumberField field_gain {
+		{ 8 * 8, 35 * 8 },
+		2,
+		{ 0, 47 },
+		1,
+		' ',
+	};
+
+	NumberField field_amp {
+		{ 13 * 8, 35 * 8 },
+		1,
+		{ 0, 1 },
+		1,
+		' ',
+	};
+
 	Button button_transmit {
-		{ 148, 212, 80, 80},
+		{ 148, 216, 80, 80},
 		"START"
 	};
 	
@@ -23,6 +23,7 @@
 #include "ui_keyfob.hpp"

 #include "baseband_api.hpp"
+#include "cpld_update.hpp"
 #include "string_format.hpp"

 using namespace portapack;
@@ -136,8 +137,12 @@ void KeyfobView::focus() {
 }

 KeyfobView::~KeyfobView() {
+	// save app settings
+	settings.save("tx_keyfob", &app_settings);
+
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }

 void KeyfobView::update_progress(const uint32_t progress) {
@@ -214,6 +219,13 @@ KeyfobView::KeyfobView(
 		&tx_view
 	});
 	
+	// load app settings
+	auto rc = settings.load("tx_keyfob", &app_settings);
+	if(rc == SETTINGS_OK) {
+		transmitter_model.set_rf_amp(app_settings.tx_amp);
+		transmitter_model.set_tx_gain(app_settings.tx_gain);		
+	}
+
 	frame[0] = 0x55;
 	update_symfields();
 	
@@ -23,6 +23,7 @@
 #include "ui.hpp"
 #include "ui_transmitter.hpp"
 #include "transmitter_model.hpp"
+#include "app_settings.hpp"
 #include "encoders.hpp"

 using namespace encoders;
@@ -36,11 +37,15 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "Keyfob (BETA)"; };
+	std::string title() const override { return "Key fob TX"; };

 private:
 	NavigationView& nav_;
 	
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
 	// 1013210ns / bit
 	static constexpr uint32_t subaru_samples_per_bit = (OOK_SAMPLERATE * 0.00101321);
 	static constexpr uint32_t repeats = 4;
@@ -27,6 +27,7 @@
 #include "modems.hpp"
 #include "baseband_api.hpp"
 #include "string_format.hpp"
+#include "cpld_update.hpp"

 #include "serializer.hpp"

@@ -39,8 +40,13 @@ void LCRView::focus() {
 }

 LCRView::~LCRView() {
+	// save app settings
+	app_settings.tx_frequency = transmitter_model.tuning_frequency();	
+	settings.save("tx_lcr", &app_settings);
+
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit.
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }

 /*
@@ -173,6 +179,15 @@ LCRView::LCRView(NavigationView& nav) {
 		&tx_view
 	});
 	
+	// load app settings
+	auto rc = settings.load("tx_lcr", &app_settings);
+	if(rc == SETTINGS_OK) {
+		transmitter_model.set_rf_amp(app_settings.tx_amp);
+		transmitter_model.set_channel_bandwidth(app_settings.channel_bandwidth);
+		transmitter_model.set_tuning_frequency(app_settings.tx_frequency);
+		transmitter_model.set_tx_gain(app_settings.tx_gain);		
+	}
+
 	options_scanlist.set_selected_index(0);
 	
 	const auto button_set_am_fn = [this, &nav](Button& button) {
@@ -27,6 +27,7 @@

 #include "message.hpp"
 #include "transmitter_model.hpp"
+#include "app_settings.hpp"

 namespace ui {
 	
@@ -39,7 +40,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "LCR transmit"; };
+	std::string title() const override { return "TEDI/LCR TX"; };
 	
 private:
 	struct scan_list_t {
@@ -81,6 +82,10 @@ private:
 		SCAN
 	};
 	
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
 	tx_modes tx_mode = IDLE;
 	uint8_t scan_count { 0 }, scan_index { 0 };
 	uint32_t scan_progress { 0 };
@@ -30,6 +30,7 @@ using wolfson::wm8731::WM8731;

 #include "tonesets.hpp"
 #include "portapack_hal.hpp"
+#include "cpld_update.hpp"
 #include "string_format.hpp"
 #include "irq_controls.hpp"

@@ -73,6 +74,7 @@ void MicTXView::configure_baseband() {
 		sampling_rate / 20,		// Update vu-meter at 20Hz
 		transmitting ? transmitter_model.channel_bandwidth() : 0,
 		mic_gain,
+		shift_bits_s16,			// to be used in dsp_modulate
 		TONES_F2D(tone_key_frequency(tone_key_index), sampling_rate),
 		enable_am,
 		enable_dsb,
@@ -157,19 +159,24 @@ void MicTXView::rxaudio(bool is_on) {
 		audio::input::stop();
 		baseband::shutdown();
 		
-		if (enable_am || enable_usb || enable_lsb || enable_dsb) {
+		if (enable_am || enable_usb || enable_lsb || enable_dsb) {		// "NFM/FM",0 ," WFM  ",1 ,  "  AM  ",2, " USB  ", 3, " LSB  ",4, " DSB-SC", 5
 			baseband::run_image(portapack::spi_flash::image_tag_am_audio);
-			receiver_model.set_modulation(ReceiverModel::Mode::AMAudio);	
-			if (options_mode.selected_index() < 4)
-				receiver_model.set_am_configuration(options_mode.selected_index() - 1);
-			else
-				receiver_model.set_am_configuration(0);
+			receiver_model.set_modulation(ReceiverModel::Mode::AMAudio);	// that AM demodulation engine is common to all Amplitude mod : AM/USB/LSB/DSB (2,3,4,5)	
+			if (options_mode.selected_index() < 5)       // We will be called here with 2,3,4,5 . We treat here demod. filter 2,3,4; (excluding DSB-C case (5) it is treated more down).  
+				receiver_model.set_am_configuration(options_mode.selected_index() - 1);  // selecting proper filter(2,3,4). 2-1=1=>6k-AM(1) , 3-1=2=>+3k-USB(2), 4-1=3=>-3K-LSB(3),
 		}
-		else {
-			baseband::run_image(portapack::spi_flash::image_tag_nfm_audio);
-			receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio);
+		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 ,
+				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)
+			} 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_sampling_rate(3072000);
 		receiver_model.set_baseband_bandwidth(1750000);	
 //		receiver_model.set_tuning_frequency(field_frequency.value()); //probably this too can be commented out.
@@ -178,6 +185,7 @@ void MicTXView::rxaudio(bool is_on) {
 		receiver_model.set_vga(rx_vga);
 		receiver_model.set_rf_amp(rx_amp);
 		receiver_model.enable();
+		hackrf::cpld::load_sram_no_verify();  // to have a good RX without any ghost inside Mic App
 		audio::output::start();
 	} else {	//These incredibly convoluted steps are required for the vumeter to reappear when stopping RX.
 		receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio); //This fixes something with AM RX...
@@ -186,7 +194,7 @@ void MicTXView::rxaudio(bool is_on) {

 		baseband::run_image(portapack::spi_flash::image_tag_mic_tx);
 		audio::output::stop();
-		audio::input::start(ak4951_alc_GUI_selected);	// set up audio input =  mic config of any audio coded AK4951/WM8731, (in WM8731 parameter will be ignored)
+		audio::input::start(ak4951_alc_and_wm8731_boost_GUI);	// When detected AK4951 => set up ALC mode; when detected WM8731 => set up mic_boost ON/OFF.
 		portapack::pin_i2s0_rx_sda.mode(3);
 		configure_baseband();
 	}
@@ -211,12 +219,12 @@ MicTXView::MicTXView(
 	
 	baseband::run_image(portapack::spi_flash::image_tag_mic_tx);
 	
-	
-	if ( audio_codec_wm8731.detected() ) {
+	if (audio::debug::codec_name() =="WM8731" ) {
 	add_children({		
 		&labels_WM8731,		// we have audio codec WM8731, same MIC menu  as original.
 		&vumeter,
 		&options_gain,		// MIC GAIN float factor on the GUI.
+		&options_wm8731_boost_mode,
 //		&check_va,
 		&field_va,
 		&field_va_level,
@@ -281,13 +289,43 @@ MicTXView::MicTXView(
 		mic_gain = v / 10.0;
 		configure_baseband();
 	};
-	options_gain.set_selected_index(1);		// x1.0
+	options_gain.set_selected_index(1);		// x1.0  preselected default.
+
+ 	if (audio::debug::codec_name() =="WM8731") {
+		options_wm8731_boost_mode.on_change = [this](size_t, int8_t v) {
+
+			switch(v) {
+			case 0: 	                // +12 dB’s respect reference level orig fw 1.5.x fw FM : when +20dB's boost ON) and shift bits (>>8), 
+				shift_bits_s16 = 6; 	//  now mic-boost on (+20dBs) and shift bits (>>6), +20+12=32 dB’s (orig fw +20 dBs+ 0dBs)=> +12dB's respect ref.
+				break;					
+			case 1: 	                // +06 dB’s reference level , (when +20dB's boost ON) 
+				shift_bits_s16 = 7; 	// now mic-boost on (+20dBs) and shift bits (>>7), +20+06=26 dB’s (orig fw +20 dBs+ 0dBs) => +06dB's respect ref.	 
+				break;					
+			case 2: 	                
+				shift_bits_s16 = 4; 	// +04 dB’s respect ref level , (when +20dB's boost OFF) 
+				break;					// now mic-boost off (+00dBs) shift bits (4) (+0+24dB's)=24 dBs => +04dB's respect ref.	 
+			case 3:
+				shift_bits_s16 = 5;		// -02 dB’s respect ref level , (when +20dB's boost OFF) 
+				break;					// now mic-boost off (+00dBs) shift bits (5) (+0+18dB's)=18 dBs => -02dB's respect ref.	 
+			case 4:
+				shift_bits_s16 = 6;     // -08 dB’s respect ref level , (when +20dB's boost OFF) 
+				break;					// now mic-boost off (+00dBs) shift bits (6) (+0+12dB's)=12 dBs => -08dB's respect ref.	
+			}
+			ak4951_alc_and_wm8731_boost_GUI   = v;	//  0,..4 WM8731_boost dB's options, (combination boost on/off , and effective gain in captured data >>x) 
+			audio::input::start(ak4951_alc_and_wm8731_boost_GUI);  // Detected (WM8731) , set up the proper wm_boost on/off , 0..4 (0,1) boost_on , (2,3,4) boost_0ff
+			configure_baseband(); 					// to update in real timme,sending msg ,  var-parameters >>shift_bits FM msg ,to audio_tx from M0 to M4 Proc -
+		};
+		options_wm8731_boost_mode.set_selected_index(3);	// preset GUI index 3 as default WM -> -02 dB's .	
+	} else {
+	   	shift_bits_s16 = 8;         	// Initialized default fixed >>8_FM for FM tx mod ,  shift audio data for AK4951  ,using top 8 bits s16 data (>>8)
+	  	options_ak4951_alc_mode.on_change = [this](size_t, int8_t v) {
+	    	ak4951_alc_and_wm8731_boost_GUI   = v;   				// 0,..11,  AK4951 Mic -Automatic volume Level Control  options, 
+			audio::input::start(ak4951_alc_and_wm8731_boost_GUI);  	// Detected (AK4951) ==> Set up proper ALC mode from 0..11 options
+			configure_baseband(); 									// sending fixed >>8_FM , var-parameters msg ,  to audiotx from this M0 to M4 process.
+		};
+	}
 	
-	options_ak4951_alc_mode.on_change = [this](size_t, int8_t v) {
-	      ak4951_alc_GUI_selected  = v;
-		  audio::input::start(ak4951_alc_GUI_selected);
-	};
-	// options_ak4951_alc_mode.set_selected_index(0);
+   	// options_ak4951_alc_mode.set_selected_index(0);
 	 
 	tx_frequency = transmitter_model.tuning_frequency();
 	field_frequency.set_value(transmitter_model.tuning_frequency());
@@ -313,7 +351,8 @@ MicTXView::MicTXView(
 	field_bw.on_change = [this](uint32_t v) {
 		transmitter_model.set_channel_bandwidth(v * 1000);
 	};
-	field_bw.set_value(10);
+	field_bw.set_value(10);	// pre-default first time, TX  deviation FM for NFM / FM
+	
 	
 	tx_gain = transmitter_model.tx_gain();
 	field_rfgain.on_change = [this](int32_t v) {
@@ -328,36 +367,102 @@ MicTXView::MicTXView(
 	};
 	field_rfamp.set_value(rf_amp ? 14 : 0);
 	
-	options_mode.on_change = [this](size_t, int32_t v) {
-		enable_am = false;
+	options_mode.on_change = [this](size_t, int32_t v) {   //{ "NFM/FM", 0 }, { " WFM  ", 1 },{ "AM", 2 },{ "USB", 3 },{ "LSB", 4 },{ "DSB", 5 }
+		enable_am  = false;
 		enable_usb = false;
 		enable_lsb = false;
 		enable_dsb = false;
+		enable_wfm = false;
+
+		using option_t = std::pair<std::string, int32_t>;
+		using options_t = std::vector<option_t>;
+		options_t rxbw;				// Aux structure to change dynamically  field_rxbw contents,  
+		
 		switch(v) {
-			case 0:
-				enable_am = false;
+			case 0:					 //{ "FM", 0 }
+				enable_am  = false;
 				enable_usb = false;
 				enable_lsb = false;
 				enable_dsb = false;
-				field_bw.set_value(transmitter_model.channel_bandwidth() / 1000);
+				field_bw.set_value(10);	// pre-default deviation FM for WFM
+				// field_bw.set_value(transmitter_model.channel_bandwidth() / 1000);
 				//if (rx_enabled)
-				rxaudio(rx_enabled); //Update now if we have RX audio on
+				rxaudio(rx_enabled); 					//Update now if we have RX audio on
+				options_tone_key.hidden(0);				// we are in FM mode , we should have active the Key-tones & CTCSS option.
+				
+				rxbw.emplace_back(" NFM1:8k5  ", 0); 		// restore the original dynamic field_rxbw value.
+				rxbw.emplace_back(" NFM2:11k  ", 1);
+				rxbw.emplace_back(" FM  :16k  ", 2);			
+				field_rxbw.set_options(rxbw);			// store that aux GUI option to the field_rxbw.
+							
+				field_rxbw.hidden(0);					// we are in FM mode,  we need to allow the user set up of the RX NFM BW selection (8K5, 11K, 16K) 
+				field_bw.hidden(0);						// we are in FM mode, we need to allow FM deviation parameter , in non FM mode.
 				break;
-			case 1:
+			case 1:					 //{ "WFM", 1 }
+				enable_am  = false;
+				enable_usb = false;
+				enable_lsb = false;
+				enable_dsb = false;
+				enable_wfm = true;
+				field_bw.set_value(75);	// pre-default deviation FM for WFM
+				// field_bw.set_value(transmitter_model.channel_bandwidth() / 1000);
+				//if (rx_enabled)
+				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 .
+				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_bw.hidden(0);						// we are in WFM mode, we need to allow WFM deviation parameter , in non FM mode.
+				break;
+			case 2:					 //{ "AM", 2 }
 				enable_am = true;
-				rxaudio(rx_enabled); //Update now if we have RX audio on
+				rxaudio(rx_enabled); 					//Update now if we have RX audio on
+				options_tone_key.set_selected_index(0);	// we are NOT in FM mode ,  we reset the possible previous key-tones &CTCSS selection.
+				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(" DSB2-6k   ", 1);		
+				field_rxbw.set_options(rxbw);			// store that aux GUI option to the field_rxbw.
+	
+				field_rxbw.hidden(0);					// we show fixed RX  AM BW 6Khz 
+				field_bw.hidden(1);						// we hide the FM TX deviation parameter , in non FM mode.
+				check_rogerbeep.hidden(0);				// make visible again the "rogerbeep" selection.					
 				break;
-			case 2:
+			case 3:					 //{ "USB", 3 }
 				enable_usb = true;
-				rxaudio(rx_enabled); //Update now if we have RX audio on
+				rxaudio(rx_enabled); 					//Update now if we have RX audio on
+				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 .
+				field_rxbw.set_options(rxbw);			// store that aux GUI option to the field_rxbw.
+
+				set_dirty();							// Refresh display
 				break;
-			case 3:
+			case 4:					 //{ "LSB", 4 }
 				enable_lsb = true;
-				rxaudio(rx_enabled); //Update now if we have RX audio on
+				rxaudio(rx_enabled); 					//Update now if we have RX audio on
+				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 .
+				field_rxbw.set_options(rxbw);			// store that aux GUI option to the field_rxbw.
+				
+				set_dirty();							// Refresh display
 				break;
-			case 4:
+			case 5:				 	//{ "DSB-SC", 5 }
 				enable_dsb = true;
-				rxaudio(rx_enabled); //Update now if we have RX audio on
+				rxaudio(rx_enabled); 					//Update now if we have RX audio on
+				check_rogerbeep.hidden(0);				// make visible again the "rogerbeep" selection.
+			
+				rxbw.emplace_back("SSB1:USB+3k", 0); 	// added dynamically two options (index 0,1) to that DSB-C case to the  field_rxbw value.
+				rxbw.emplace_back("SSB2:LSB-3k", 1);
+		
+				field_rxbw.set_options(rxbw);			// store that aux GUI option to the field_rxbw.
+
 				break;
 		}
 		//configure_baseband();
@@ -434,19 +539,20 @@ MicTXView::MicTXView(
 	field_volume.on_change = [this](int32_t v) { this->on_headphone_volume_changed(v);	};

 	field_rxbw.on_change = [this](size_t, int32_t v) {
-		switch(v) {
-			case 0:
-				receiver_model.set_nbfm_configuration(0);
-				break;
-			case 1:
-				receiver_model.set_nbfm_configuration(1);
-				break;
-			case 2:
-				receiver_model.set_nbfm_configuration(2);
-				break;
+		if (!(enable_am || enable_usb || enable_lsb || enable_dsb || enable_wfm )) { 
+				// In Previous fw versions, that nbfm_configuration(n)  was done in any mode (FM/AM/SSB/DSB)...strictly speaking only need it in (NFM/FM) 
+				receiver_model.set_nbfm_configuration(v ); // we are in  NFM/FM case, we need to  select proper NFM/FM RX channel filter , NFM BW 8K5(0), NFM BW 11K(1) , FM BW 16K (2)
 		}
+		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),
+			} 
+	
+			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),
+			} 
+		}		 
 	};
-	field_rxbw.set_selected_index(2);

 	field_squelch.on_change = [this](int32_t v) { 
 		receiver_model.set_squelch_level(100 - v);	
@@ -523,9 +629,9 @@ MicTXView::MicTXView(
 	transmitter_model.set_baseband_bandwidth(1750000);
 	
 	set_tx(false);
-	
-	audio::set_rate(audio::Rate::Hz_24000);
-	audio::input::start(ak4951_alc_GUI_selected);		// originally , audio::input::start();  (we added parameter)
+
+  	audio::set_rate(audio::Rate::Hz_24000);
+	audio::input::start(ak4951_alc_and_wm8731_boost_GUI);	// When detected AK4951 => set up ALC mode; when detected WM8731 => set up mic_boost ON/OFF.	
 }

 MicTXView::~MicTXView() {
@@ -534,7 +640,8 @@ MicTXView::~MicTXView() {
 	transmitter_model.disable();
 	if (rx_enabled) //Also turn off audio rx if enabled
 		rxaudio(false);
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  //  to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }

 }
@@ -58,7 +58,7 @@ public:
 	};
 	*/

-	std::string title() const override { return "Mic TX RX"; };
+	std::string title() const override { return "Microphone"; };

 private:
 	static constexpr uint32_t sampling_rate = 1536000U;
@@ -83,7 +83,7 @@ private:
 	bool rx_enabled { false };
 	uint32_t tone_key_index { };
 	float mic_gain { 1.0 };
-    uint8_t  ak4951_alc_GUI_selected { 0 }; 
+    uint8_t  ak4951_alc_and_wm8731_boost_GUI  { 0 }; 
 	uint32_t audio_level { 0 };
 	uint32_t va_level { };
 	uint32_t attack_ms { };
@@ -99,18 +99,21 @@ private:
 	rf::Frequency rx_frequency { 0 };
 	int32_t focused_ui { 2 };
 	bool button_touch { false };
+	uint8_t shift_bits_s16 {4} ; // shift bits factor to the captured ADC S16 audio sample.

 	//AM TX Stuff
 	bool enable_am { false };
 	bool enable_dsb { false };
 	bool enable_usb { false };
 	bool enable_lsb { false };
+	bool enable_wfm { false };	// added to distinguish in the FM mode ,  RX BW : NFM (8K5, 11K), FM (16K), WFM(200K)

 	
 	Labels labels_WM8731 {		
 		{ { 3 * 8, 1 * 8 }, "MIC-GAIN:", Color::light_grey() },
+		{ { 17 * 8, 1 * 8 }, "Boost", Color::light_grey() },
 		{ { 3 * 8, 3 * 8 }, "F:", Color::light_grey() },
-		{ { 15 * 8, 3 * 8 }, "BW:   FM kHz", Color::light_grey() },
+		{ { 15 * 8, 3 * 8 }, "FM TXBW:    kHz", Color::light_grey() },		// to be more symetric and consistent to the below FM RXBW
 		{ { 3 * 8, 5 * 8 }, "GAIN:", Color::light_grey() },
 		{ {11 * 8, 5 * 8 }, "Amp:", Color::light_grey() },
 		{ { 18 * 8, (5 * 8) }, "Mode:", Color::light_grey() },
@@ -120,7 +123,7 @@ 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() },
-		{ {15 * 8, 23 * 8 }, "FM RXBW:", 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() },
 		{ { 5 * 8, 27 * 8 }, "LNA:", Color::light_grey()},
@@ -131,7 +134,7 @@ private:
 		{ { 3 * 8, 1 * 8 }, "MIC-GAIN:", Color::light_grey() },
 		{ { 17 * 8, 1 * 8 }, "ALC", Color::light_grey() },
 		{ { 3 * 8, 3 * 8 }, "F:", Color::light_grey() },
-		{ { 15 * 8, 3 * 8 }, "BW:   FM kHz", Color::light_grey() },
+		{ { 15 * 8, 3 * 8 }, "FM TXBW:    kHz", Color::light_grey() },
 		{ { 3 * 8, 5 * 8 }, "GAIN:", Color::light_grey() },
 		{ {11 * 8, 5 * 8 }, "Amp:", Color::light_grey() },
 		{ { 18 * 8, (5 * 8) }, "Mode:", Color::light_grey() },
@@ -140,8 +143,8 @@ private:
 		{ {12 * 8, 10 * 8 }, "ATT:", Color::light_grey() },
 		{ {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() },
-		{ {15 * 8, 23 * 8 }, "FM RXBW:", 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() },
 		{ { 5 * 8, 27 * 8 }, "LNA:", Color::light_grey()},
@@ -171,7 +174,7 @@ private:
 		{ 20 * 8, 1 * 8 },				// Coordinates are: int:x (px), int:y (px)				
 		11,
 		{
-			{ " OFF-20kHz", 0 },	// Nothing changed from ORIGINAL,keeping ALL programm. AK4951 Dig. block->OFF)
+			{ " OFF-12kHz", 0 },	// Nothing changed from ORIGINAL,keeping ALL programmable  AK4951 Digital Block->OFF, sampling 24Khz)
 			{ "+12dB-6kHz", 1 },	// ALC-> on, (+12dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz + Pre-amp Mic (+21dB=original)
 			{ "+09dB-6kHz", 2 },	// ALC-> on, (+09dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz + Pre-amp Mic (+21dB=original)
 			{ "+06dB-6kHz", 3 },	// ALC-> on, (+06dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz + Pre-amp Mic (+21dB=original)
@@ -186,11 +189,23 @@ private:
 		}
 	};

+OptionsField options_wm8731_boost_mode {
+		{ 22 * 8, 1 * 8 },				// Coordinates are: int:x (px), int:y (px)				
+		5,
+		{
+			{ "ON +12dB", 0 },	// WM8731 Mic Boost ON ,original+12dBs condition, easy to saturate ADC sat in high voice  ,relative G = +12 dB's respect ref level
+			{ "ON +06dB", 1 },	// WM8731 Mic Boost ON ,original+6 dBs condition, easy to saturate ADC sat in high voice  ,relative G = +06 dB's respect ref level
+			{ "OFF+04dB", 2 },	// WM8731 Mic Boost OFF to avoid ADC sat in high voice  ,relative  G =  +04 dB's (respect ref level) , always effective sampling 24khz 
+			{ "OFF-02dB", 3 },	// WM8731 Mic Boost OFF to avoid ADC sat in high voice  ,relative  G =  -02 dB's (respect ref level) 
+			{ "OFF-08dB", 4 },	// WM8731 Mic Boost OFF to avoid ADC sat in high voice  ,relative  G =  -12 dB's (respect ref level) 
+		}
+	};
+
 	FrequencyField field_frequency {
 		{ 5 * 8, 3 * 8 },
 	};
 	NumberField field_bw {
-		{ 18 * 8, 3 * 8 },
+		{ 23 * 8, 3 * 8 },
 		3,
 		{ 0, 150 },
 		1,
@@ -214,13 +229,14 @@ private:
 	
 	OptionsField options_mode {
 		{ 24 * 8, 5 * 8 },
-		3,
+		4,
 		{
-			{ "FM", 0 },
-			{ "AM", 1 },
-			{ "USB", 2 },
-			{ "LSB", 3 },
-			{ "DSB", 4 }
+			{ "NFM/FM", 0 },
+			{ " WFM  ", 1 },
+			{ "  AM  ", 2 },			// in fact that TX mode = AM -DSB with carrier .
+			{ " USB  ", 3 },
+			{ " LSB  ", 4 },
+			{ "DSB-SC", 5 }				// We are TX Double Side AM Band with suppressed carrier, and allowing in RX both indep SSB lateral band (USB/LSB).  
 		}
 	};
 	/*
@@ -293,13 +309,13 @@ private:
 	};
 	
 	OptionsField field_rxbw {
-	       { 23* 8, 23 * 8},
+	       { 19* 8, 23 * 8},
 	       3,
 	       {
-	       		{"8k5", 0},
-	       		{"11k", 1},
-	       		{"16k", 2}
-	       	}
+	       		{" NFM1:8k5  ", 0},
+	       		{" NFM2:11k  ", 1},
+	       		{" FM  :16k  ", 2},
+		   	}
 	};
 	
 	NumberField field_squelch {
@@ -26,6 +26,7 @@
 #include "baseband_api.hpp"
 #include "hackrf_gpio.hpp"
 #include "portapack_shared_memory.hpp"
+#include "cpld_update.hpp"
 #include "ui_textentry.hpp"
 #include "string_format.hpp"

@@ -97,8 +98,13 @@ void MorseView::focus() {
 }

 MorseView::~MorseView() {
+	// save app settings
+	app_settings.tx_frequency = transmitter_model.tuning_frequency();	
+	settings.save("tx_morse", &app_settings);
+
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }

 void MorseView::paint(Painter&) {
@@ -203,6 +209,15 @@ MorseView::MorseView(
 		&tx_view
 	});
 	
+	// load app settings
+	auto rc = settings.load("tx_morse", &app_settings);
+	if(rc == SETTINGS_OK) {
+		transmitter_model.set_rf_amp(app_settings.tx_amp);
+		transmitter_model.set_channel_bandwidth(app_settings.channel_bandwidth);
+		transmitter_model.set_tuning_frequency(app_settings.tx_frequency);
+		transmitter_model.set_tx_gain(app_settings.tx_gain);		
+	}
+
 	// Default settings
 	field_speed.set_value(15);					// 15wps
 	field_tone.set_value(700);					// 700Hz FM tone
@@ -27,7 +27,7 @@
 #include "ui_widget.hpp"
 #include "ui_navigation.hpp"
 #include "ui_transmitter.hpp"
-
+#include "app_settings.hpp"
 #include "portapack.hpp"
 #include "message.hpp"
 #include "volume.hpp"
@@ -67,6 +67,10 @@ private:
 	std::string message { };
 	uint32_t time_units { 0 };
 	
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
 	enum modulation_t {
 		CW = 0,
 		FM = 1
@@ -60,6 +60,14 @@ NRFRxView::NRFRxView(NavigationView& nav) {
 		&console
 	});
 	
+	// load app settings
+	auto rc = settings.load("rx_nrf", &app_settings);
+	if(rc == SETTINGS_OK) {
+		field_lna.set_value(app_settings.lna);
+		field_vga.set_value(app_settings.vga);
+		field_rf_amp.set_value(app_settings.rx_amp);
+	}
+
 	// DEBUG
 	record_view.on_error = [&nav](std::string message) {
 		nav.display_modal("Error", message);
@@ -157,6 +165,11 @@ void NRFRxView::on_data(uint32_t value, bool is_data) {
 }

 NRFRxView::~NRFRxView() {
+
+	// save app settings
+	app_settings.rx_frequency = field_frequency.value();
+	settings.save("rx_nrf", &app_settings);
+
 	audio::output::stop();
 	receiver_model.disable();
 	baseband::shutdown();
@@ -27,6 +27,7 @@
 #include "ui.hpp"
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
+#include "app_settings.hpp"
 #include "ui_record_view.hpp"	// DEBUG

 #include "utility.hpp"
@@ -45,6 +46,10 @@ public:
 private:
 	void on_data(uint32_t value, bool is_data);
 	
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
 	uint8_t console_color { 0 };
 	uint32_t prev_value { 0 };
 	std::string str_log { "" };
@@ -0,0 +1,328 @@
+/*
+ * Copyright (C) 2016 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
+ * Copyleft  (ↄ) 2022 NotPike
+ *
+ * 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_playlist.hpp"
+#include "string_format.hpp"
+
+#include "ui_fileman.hpp"
+#include "io_file.hpp"
+
+#include "baseband_api.hpp"
+#include "portapack.hpp"
+#include "portapack_persistent_memory.hpp"
+#include <unistd.h>
+
+using namespace portapack;
+
+namespace ui {
+
+void PlaylistView::set_ready() {
+	ready_signal = true;
+}
+
+
+	void PlaylistView::load_file(std::filesystem::path playlist_path) {
+		File playlist_file;
+		
+		auto error = playlist_file.open(playlist_path.string());
+		if (!error.is_valid()) {
+			std::string line;
+			char one_char[1];
+			for (size_t pointer =0 ; pointer < playlist_file.size(); pointer++) {
+				playlist_file.seek(pointer);
+				playlist_file.read(one_char, 1);
+				if ((int) one_char[0] >= ' ') {
+					line += one_char[0];
+				} else if (one_char[0] == '\n') {
+					txtline_process(line); 
+					line.clear();
+				}
+			}
+			if (line.length() > 0) {
+				txtline_process(line); 
+			}
+		}
+		playlist_masterdb = playlist_db;
+		return ;
+		}
+
+
+	void PlaylistView::txtline_process(std::string &line) {
+		playlist_entry new_item;
+				rf::Frequency f;
+				size_t previous = 0;
+				size_t current = line.find(',');
+				std::string freqs = line.substr(0, current);
+				previous = current +1;
+				current = line.find(',', previous);
+				std::string file = line.substr(previous, current - previous);
+				previous = current +1;
+				current = line.find(',', previous);
+				uint32_t sample_rate = strtoll(line.substr(previous).c_str(), nullptr,  10);
+
+				f = strtoll(freqs.c_str(), nullptr, 0);
+				new_item.replay_frequency = f;
+				new_item.replay_file = "/" + file;
+				new_item.sample_rate = sample_rate;
+				new_item.next_delay = 0;
+
+					playlist_db.push_back(std::move(new_item));
+	}
+
+void PlaylistView::on_file_changed(std::filesystem::path new_file_path, rf::Frequency replay_frequency, uint32_t replay_sample_rate) {
+	File data_file;	
+	// Get file size
+	auto data_open_error = data_file.open("/" + new_file_path.string());
+	if (data_open_error.is_valid()) {
+		file_error();
+		return;
+	}
+	
+	file_path = new_file_path;
+	field_frequency.set_value(replay_frequency);
+	
+	sample_rate = replay_sample_rate;
+	
+	text_sample_rate.set(unit_auto_scale(sample_rate, 3, 0) + "Hz");
+	
+	auto file_size = data_file.size();
+	auto duration = (file_size * 1000) / (2 * 2 * sample_rate);
+	
+	progressbar.set_max(file_size);
+	text_filename.set(file_path.filename().string().substr(0, 12));
+	text_duration.set(to_string_time_ms(duration));
+	
+	button_play.focus();
+}
+
+void PlaylistView::on_tx_progress(const uint32_t progress) {
+	progressbar.set_value(progress);
+}
+
+void PlaylistView::focus() {
+	button_open.focus();
+}
+
+void PlaylistView::file_error() {
+	nav_.display_modal("Error", "File "+file_path.string() +" read error. " +file_path.string());
+}
+
+bool PlaylistView::is_active() const {
+	return (bool)replay_thread;
+}
+
+bool PlaylistView::loop() const {
+	return (bool) playlist_db.size();
+}
+
+void PlaylistView::toggle() {
+	if( is_active() ) {
+		stop(false);
+	} else {
+
+		start();
+	}
+}
+
+void PlaylistView::start() {
+	stop(false);
+
+		playlist_entry item = playlist_db.front();
+		playlist_db.pop_front();
+	//		playlist_entry item = playlist_db[0];
+//	for (playlist_entry item : playlist_db) {
+	//	file_path = item.replay_file;
+	//	rf::Frequency replay_frequency = strtoll(item.replay_frequency.c_str(),nullptr,10);
+		on_file_changed(item.replay_file, item.replay_frequency, item.sample_rate);
+		on_target_frequency_changed(item.replay_frequency);
+
+		std::unique_ptr<stream::Reader> reader;
+		
+		auto p = std::make_unique<FileReader>();
+		auto open_error = p->open(file_path);
+		if( open_error.is_valid() ) {
+			file_error();
+			return;                               // Fixes TX bug if there's a file error
+		} else {
+			reader = std::move(p);
+		}
+
+		if( reader ) {
+			button_play.set_bitmap(&bitmap_stop);
+			baseband::set_sample_rate(sample_rate * 8);
+			
+			replay_thread = std::make_unique<ReplayThread>(
+				std::move(reader),
+				read_size, buffer_count,
+				&ready_signal,
+				[](uint32_t return_code) {
+					ReplayThreadDoneMessage message { return_code };
+					EventDispatcher::send_message(message);
+				}
+			);
+		}
+		field_rfgain.on_change = [this](int32_t v) {
+			tx_gain = v;
+		};  
+		field_rfgain.set_value(tx_gain);
+		receiver_model.set_tx_gain(tx_gain); 
+		
+
+		field_rfamp.on_change = [this](int32_t v) {
+			rf_amp = (bool)v;
+		};
+		field_rfamp.set_value(rf_amp ? 14 : 0);
+
+		//Enable Bias Tee if selected
+		radio::set_antenna_bias(portapack::get_antenna_bias());
+			
+		radio::enable({
+			receiver_model.tuning_frequency(),
+			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  
+			static_cast<int8_t>(receiver_model.lna()),
+			static_cast<int8_t>(receiver_model.vga())
+		});  
+
+//	}
+} 
+
+void PlaylistView::stop(const bool do_loop) {
+	if( is_active() ) {
+		replay_thread.reset();
+	}
+	if (do_loop) {
+		if (playlist_db.size() > 0 ) {
+			start();
+		} else {
+			playlist_db = playlist_masterdb;
+			start();
+		}
+	} else {
+		radio::set_antenna_bias(false);    //Turn off Bias Tee
+		radio::disable();
+		button_play.set_bitmap(&bitmap_play);
+	}
+	
+	ready_signal = false;
+}
+
+void PlaylistView::handle_replay_thread_done(const uint32_t return_code) {
+	if (return_code == ReplayThread::END_OF_FILE) {
+			stop(true);
+	} else if (return_code == ReplayThread::READ_ERROR) {
+		stop(false);
+		file_error();
+	}
+	
+	progressbar.set_value(0);
+}
+
+PlaylistView::PlaylistView(
+	NavigationView& nav
+) : nav_ (nav)
+{
+
+	tx_gain = 35;field_rfgain.set_value(tx_gain);  // Initial default  value (-12 dB's max ).
+	field_rfamp.set_value(rf_amp ? 14 : 0);  // Initial default value True. (TX RF amp on , +14dB's)
+
+	baseband::run_image(portapack::spi_flash::image_tag_replay);
+
+	add_children({
+		&labels,
+		&button_open,
+		&text_filename,
+		&text_sample_rate,
+		&text_duration,
+		&progressbar,
+		&field_frequency,
+		&field_rfgain, 
+		&field_rfamp,       // let's not use common rf_amp
+		&check_loop,
+		&button_play,
+		&waterfall,
+	});
+	
+	field_frequency.set_value(target_frequency());
+	field_frequency.set_step(receiver_model.frequency_step());
+	field_frequency.on_change = [this](rf::Frequency f) {
+		this->on_target_frequency_changed(f);
+	};
+	field_frequency.on_edit = [this, &nav]() {
+		// TODO: Provide separate modal method/scheme?
+		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);
+		};
+	};
+
+	field_frequency.set_step(5000);
+	
+	button_play.on_select = [this](ImageButton&) {
+		this->toggle();
+	};
+	
+	button_open.on_select = [this, &nav](Button&) {
+		auto open_view = nav.push<FileLoadView>(".TXT");
+		open_view->on_changed = [this](std::filesystem::path new_file_path) {
+			load_file(new_file_path);
+		};
+	};
+}
+
+PlaylistView::~PlaylistView() {
+	radio::disable();
+	baseband::shutdown();
+}
+
+void PlaylistView::on_hide() {
+	stop(false);
+	// TODO: Terrible kludge because widget system doesn't notify Waterfall that
+	// it's being shown or hidden.
+	waterfall.on_hide();
+	View::on_hide();
+}
+
+void PlaylistView::set_parent_rect(const Rect new_parent_rect) {
+	View::set_parent_rect(new_parent_rect);
+
+	const ui::Rect waterfall_rect { 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height };
+	waterfall.set_parent_rect(waterfall_rect);
+}
+
+void PlaylistView::on_target_frequency_changed(rf::Frequency f) {
+	set_target_frequency(f);
+}
+
+void PlaylistView::set_target_frequency(const rf::Frequency new_value) {
+	persistent_memory::set_tuned_frequency(new_value);;
+}
+
+rf::Frequency PlaylistView::target_frequency() const {
+	return persistent_memory::tuned_frequency();
+}
+
+} /* namespace ui */
@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2016 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
+ *
+ * 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_widget.hpp"
+#include "ui_navigation.hpp"
+#include "ui_receiver.hpp"
+#include "replay_thread.hpp"
+#include "ui_spectrum.hpp"
+
+#include <string>
+#include <memory>
+#include <deque>
+
+namespace ui {
+
+class PlaylistView : public View {
+public:
+	PlaylistView(NavigationView& nav);
+	~PlaylistView();
+
+	void on_hide() override;
+	void set_parent_rect(const Rect new_parent_rect) override;
+	void focus() override;
+
+	std::string title() const override { return "Playlist"; };
+	
+private:
+	NavigationView& nav_;
+	
+	static constexpr ui::Dim header_height = 3 * 16;
+	
+	struct playlist_entry {
+		rf::Frequency replay_frequency { 0 };
+		std::string replay_file{};
+		uint32_t sample_rate{};
+		uint32_t next_delay{};
+	};
+	std::deque<playlist_entry> playlist_db{};
+	std::deque<playlist_entry> playlist_masterdb{};
+	uint32_t sample_rate = 0;
+	int32_t tx_gain { 47 };
+	bool rf_amp { true }; // aux private var to store temporal, Replay App rf_amp user selection.
+	static constexpr uint32_t baseband_bandwidth = 2500000;
+	const size_t read_size { 16384 };
+	const size_t buffer_count { 3 };
+	void load_file(std::filesystem::path playlist_path);
+	void txtline_process(std::string &);
+	void on_file_changed(std::filesystem::path new_file_path, rf::Frequency replay_frequency, uint32_t replay_sample_rate);
+	void on_target_frequency_changed(rf::Frequency f);
+	void on_tx_progress(const uint32_t progress);
+	
+	void set_target_frequency(const rf::Frequency new_value);
+	rf::Frequency target_frequency() const;
+
+	void toggle();
+	void start();
+	void stop(const bool do_loop);
+	bool is_active() const;
+	bool loop() const;
+	void set_ready();
+	void handle_replay_thread_done(const uint32_t return_code);
+	void file_error();
+
+	std::filesystem::path file_path { };
+	std::unique_ptr<ReplayThread> replay_thread { };
+	bool ready_signal { false };
+
+	Labels labels {
+		{ { 10 * 8, 2 * 16 }, "GAIN   A:", Color::light_grey() }
+	};
+	
+	Button button_open {
+		{ 0 * 8, 0 * 16, 10 * 8, 2 * 16 },
+		"Open file"
+	};
+
+	
+	Text text_filename {
+		{ 11 * 8, 0 * 16, 12 * 8, 16 },
+		"-"
+	};
+	Text text_sample_rate {
+		{ 24 * 8, 0 * 16, 6 * 8, 16 },
+		"-"
+	};
+	
+	Text text_duration {
+		{ 11 * 8, 1 * 16, 6 * 8, 16 },
+		"-"
+	};
+	ProgressBar progressbar {
+		{ 18 * 8, 1 * 16, 12 * 8, 16 }
+	};
+	
+	FrequencyField field_frequency {
+		{ 0 * 8, 2 * 16 },
+	};
+	
+	NumberField field_rfgain {
+		{ 14 * 8, 2 * 16 },
+		2,
+		{ 0, 47 },
+		1,
+		' '	
+	};
+	NumberField field_rfamp {     // previously  I was using "RFAmpField field_rf_amp" but that is general Receiver amp setting.
+		{ 19 * 8, 2 * 16 },
+		2,
+		{ 0, 14 },                // this time we will display GUI , 0 or 14 dBs same as Mic App
+		14,
+		' '
+	};
+	Checkbox check_loop {
+		{ 21 * 8, 2 * 16 },
+		4,
+		"Loop",
+		true
+	};
+	ImageButton button_play {
+		{ 28 * 8, 2 * 16, 2 * 8, 1 * 16 },
+		&bitmap_play,
+		Color::green(),
+		Color::black()
+	};
+
+	spectrum::WaterfallWidget waterfall { };
+
+	MessageHandlerRegistration message_handler_replay_thread_error {
+		Message::ID::ReplayThreadDone,
+		[this](const Message* const p) {
+			const auto message = *reinterpret_cast<const ReplayThreadDoneMessage*>(p);
+			this->handle_replay_thread_done(message.return_code);
+		}
+	};
+	
+	MessageHandlerRegistration message_handler_fifo_signal {
+		Message::ID::RequestSignal,
+		[this](const Message* const p) {
+			const auto message = static_cast<const RequestSignalMessage*>(p);
+			if (message->signal == RequestSignalMessage::Signal::FillRequest) {
+				this->set_ready();
+			}
+		}
+	};
+	
+	MessageHandlerRegistration message_handler_tx_progress {
+		Message::ID::TXProgress,
+		[this](const Message* const p) {
+			const auto message = *reinterpret_cast<const TXProgressMessage*>(p);
+			this->on_tx_progress(message.progress);
+		}
+	};
+};
+
+} /* namespace ui */
@@ -23,6 +23,7 @@
 #include "ui_pocsag_tx.hpp"

 #include "baseband_api.hpp"
+#include "cpld_update.hpp"
 #include "string_format.hpp"
 #include "ui_textentry.hpp"

@@ -38,8 +39,13 @@ void POCSAGTXView::focus() {
 }

 POCSAGTXView::~POCSAGTXView() {
+	// save app settings
+	app_settings.tx_frequency = transmitter_model.tuning_frequency();	
+	settings.save("tx_pocsag", &app_settings);
+
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify(); // to leave all RX ok, without ghost signal problem at the exit 
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }

 void POCSAGTXView::on_tx_progress(const uint32_t progress, const bool done) {
@@ -141,6 +147,15 @@ POCSAGTXView::POCSAGTXView(
 		&tx_view
 	});

+	// load app settings
+	auto rc = settings.load("tx_pocsag", &app_settings);
+	if(rc == SETTINGS_OK) {
+		transmitter_model.set_rf_amp(app_settings.tx_amp);
+		transmitter_model.set_channel_bandwidth(app_settings.channel_bandwidth);
+		transmitter_model.set_tuning_frequency(app_settings.tx_frequency);
+		transmitter_model.set_tx_gain(app_settings.tx_gain);		
+	}
+
 	options_bitrate.set_selected_index(1);	// 1200bps
 	options_type.set_selected_index(0);		// Address only
 	
@@ -31,6 +31,7 @@
 #include "bch_code.hpp"
 #include "message.hpp"
 #include "transmitter_model.hpp"
+#include "app_settings.hpp"
 #include "pocsag.hpp"

 using namespace pocsag;
@@ -62,6 +63,10 @@ private:
 		5, 31, 21, 2
 	};
 	
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
 	void on_set_text(NavigationView& nav);
 	void on_tx_progress(const uint32_t progress, const bool done);
 	bool start_tx();
@@ -24,6 +24,7 @@

 #include "portapack.hpp"
 #include "baseband_api.hpp"
+#include "cpld_update.hpp"
 #include "portapack_shared_memory.hpp"

 #include <cstring>
@@ -175,8 +176,13 @@ void RDSView::focus() {
 }

 RDSView::~RDSView() {
+	// save app settings
+	app_settings.tx_frequency = transmitter_model.tuning_frequency();	
+	settings.save("tx_rds", &app_settings);
+
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit.
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }

 void RDSView::start_tx() {
@@ -226,11 +232,17 @@ RDSView::RDSView(
 		&view_radiotext,
 		&view_datetime,
 		&view_audio,
-		//&options_countrycode,
-		//&options_coverage,
 		&tx_view,
 	});
-	
+
+	// load app settings
+	auto rc = settings.load("tx_rds", &app_settings);
+	if(rc == SETTINGS_OK) {
+		transmitter_model.set_rf_amp(app_settings.tx_amp);
+		transmitter_model.set_channel_bandwidth(app_settings.channel_bandwidth);
+		transmitter_model.set_tuning_frequency(app_settings.tx_frequency);
+		transmitter_model.set_tx_gain(app_settings.tx_gain);		
+	}	
 	check_TP.set_value(true);
 	
 	sym_pi_code.set_sym(0, 0xF);
@@ -242,8 +254,6 @@ RDSView::RDSView(
 	};
 	
 	options_pty.set_selected_index(0);				// None
-	//options_countrycode.set_selected_index(18);		// Baguette du fromage
-	//options_coverage.set_selected_index(0);			// Local
 	
 	tx_view.on_edit_frequency = [this, &nav]() {
 		auto new_view = nav.push<FrequencyKeypadView>(receiver_model.tuning_frequency());
@@ -24,7 +24,7 @@
 #include "ui_transmitter.hpp"
 #include "ui_textentry.hpp"
 #include "ui_tabview.hpp"
-
+#include "app_settings.hpp"
 #include "rds.hpp"

 using namespace rds;
@@ -144,12 +144,17 @@ public:
 	
 	void focus() override;

-	std::string title() const override { return "RDS transmit"; };
+	std::string title() const override { return "RDS TX"; };

 private:
 	NavigationView& nav_;
 	RDS_flags rds_flags { };
 	
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };
+
+
 	std::vector<RDSGroup> frame_psn { };
 	std::vector<RDSGroup> frame_radiotext { };
 	std::vector<RDSGroup> frame_datetime { };
@@ -0,0 +1,403 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2018 Furrtek
+ *
+ * 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_RECON
+#define _UI_RECON
+
+#include "ui.hpp"
+#include "receiver_model.hpp"
+#include "ui_receiver.hpp"
+#include "ui_font_fixed_8x16.hpp"
+#include "freqman.hpp"
+#include "analog_audio_app.hpp"
+#include "audio.hpp"
+#include "ui_mictx.hpp"
+#include "portapack_persistent_memory.hpp"
+#include "baseband_api.hpp"
+#include "string_format.hpp"
+#include "file.hpp"
+#include "app_settings.hpp"
+
+
+namespace ui {
+
+    class ReconThread {
+        public:
+            ReconThread(freqman_db *database );
+            ~ReconThread();
+
+            void set_recon(const bool v);
+            void set_freq_delete(const bool v);
+            bool is_recon();
+
+            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();
+
+            void set_freq_lock(const uint32_t v);
+            uint32_t is_freq_lock();
+            int64_t get_current_freq();
+
+            void set_stepper(const int64_t v);
+
+            void change_recon_direction();
+            bool get_recon_direction();
+            void set_recon_direction( const bool v);
+
+            void set_continuous(const bool v);
+
+            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();
+
+            void run();
+            void stop();
+
+            ReconThread(const ReconThread&) = delete;
+            ReconThread(ReconThread&&) = delete;
+            ReconThread& operator=(const ReconThread&) = delete;
+            ReconThread& operator=(ReconThread&&) = delete;
+
+        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 ;
+
+            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);
+    };
+
+    class ReconView : public View {
+        public:
+            ReconView(NavigationView& nav);
+            ~ReconView();
+
+            void focus() override;
+
+            void big_display_freq( int64_t f );
+
+            const Style style_grey {		// recon
+                .font = font::fixed_8x16,
+                    .background = Color::black(),
+                    .foreground = Color::grey(),
+            };
+
+            const Style style_white {		// recon
+                .font = font::fixed_8x16,
+                    .background = Color::black(),
+                    .foreground = Color::white(),
+            };
+
+            const Style style_yellow {		//Found signal
+                .font = font::fixed_8x16,
+                    .background = Color::black(),
+                    .foreground = Color::yellow(),
+            };
+
+            const Style style_green {		//Found signal
+                .font = font::fixed_8x16,
+                    .background = Color::black(),
+                    .foreground = Color::green(),
+            };
+
+            const Style style_red {		//erasing freq
+                .font = font::fixed_8x16,
+                    .background = Color::black(),
+                    .foreground = Color::red(),
+            };
+
+            const Style style_blue {		// quick recon, wait == 0
+                .font = font::fixed_8x16,
+                    .background = Color::black(),
+                    .foreground = Color::blue(),
+            };
+
+            std::string title() const override { return "Recon"; };
+
+            //void set_parent_rect(const Rect new_parent_rect) override;
+
+        private:
+            NavigationView& nav_;
+
+            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();
+
+            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 ;
+
+            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() },
+            };
+
+            LNAGainField field_lna {
+                { 4 * 8, 0 * 16 }
+            };
+
+            VGAGainField field_vga {
+                { 11 * 8, 0 * 16 }
+            };
+
+            RFAmpField field_rf_amp {
+                { 18 * 8, 0 * 16 }
+            };
+
+            NumberField field_volume {
+                { 24 * 8, 0 * 16 },
+                    2,
+                    { 0, 99 },
+                    1,
+                    ' ',
+            };
+
+            OptionsField field_bw {
+                { 3 * 8, 1 * 16 },
+                    6,
+                    { }
+            };		
+
+            NumberField field_squelch {
+                { 12 * 8, 1 * 16 },
+                    3,
+                    { -90, 20 },
+                    1,
+                    ' ',
+            };
+
+            NumberField field_wait {
+                { 20 * 8, 1 * 16 },
+                    5,
+                    { -9000, 9000 },
+                    100,
+                    ' ',
+            };
+
+            NumberField field_lock_wait {
+                { 26 * 8, 1 * 16 },
+                    4,
+                    { 100 , 9000 },
+                    100,
+                    ' ',
+            };
+
+            RSSI rssi {
+                { 0 * 16, 2 * 16, 15 * 16, 8 },
+            }; 
+
+            Text text_cycle {
+                { 0, 3 * 16, 3 * 8, 16 },  
+            };
+
+            Text text_max {
+                { 3 * 8, 3 * 16, 20 * 8 , 16 },  
+            };
+
+            Text desc_cycle {
+                {0, 4 * 16, 240, 16 },	   
+            };
+
+            /* BigFrequency big_display {		//Show frequency in glamour
+               { 4, 7 * 16 - 8 , 28 * 8, 52 },
+               0
+               }; */
+
+            Text big_display {		//Show frequency in text mode
+                { 0, 5 * 16 , 28 * 8, 16 },
+            };
+
+            Text freq_stats {		//Show frequency stats in text mode
+                { 0, 6 * 16 , 28 * 8, 16 },
+            };
+
+            Text text_timer {		//Show frequency stats in text mode
+                { 0, 7 * 16 , 28 * 8, 16 },
+            };
+
+            Button button_recon_setup {
+                { 25 * 8 , 2 * 16 + 8 , 4 * 8, 28 },
+                    "OPT"
+            };
+
+            Button button_scanner_mode {
+                { 21 * 8 , 8 * 16 , 9 * 8, 28 },
+                    "RECON"
+            };
+
+            Text file_name {		//Show file used
+                { 0 , 8 * 16 + 4 , 20 * 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"
+            }; 
+
+
+            Button button_audio_app {
+                { 84, (15 * 16) - 4, 72, 28 },
+                    "AUDIO"
+            };
+
+            ButtonWithEncoder button_add {
+                { 168, (15 * 16) - 4, 72, 28 },
+                    "<STORE>"
+            };
+
+            Button button_dir {
+                { 0,  (35 * 8) - 4, 34, 28 },
+                    "FW>"
+            };
+
+            Button button_restart {
+                { 38, (35 * 8) - 4, 34, 28 },
+                    "RST"
+            };
+
+
+            Button button_mic_app {
+                { 84,  (35 * 8) - 4, 72, 28 },
+                    "MIC TX"
+            };
+
+            ButtonWithEncoder button_remove {
+                { 168, (35 * 8) - 4, 72, 28 },
+                    "<REMOVE>"
+            };
+
+            std::unique_ptr<ReconThread> recon_thread { };
+
+            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 { };
+    };
+
+} /* namespace ui */
+
+#endif
@@ -0,0 +1,301 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
+ *
+ * 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_recon_settings.hpp"
+#include "ui_navigation.hpp"
+#include "ui_fileman.hpp"
+#include "ui_textentry.hpp"
+
+#include "file.hpp"
+#include "portapack.hpp"
+#include "portapack_persistent_memory.hpp"
+
+using namespace std;
+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];
+
+        uint32_t it = 0 ;
+        uint32_t nb_params = 9 ;
+        std::string params[ 9 ];
+
+        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
+
+                    // Restart at beginning of last incomplete line
+                    file_position -= (file_data + 256 - line_start);
+                }
+            }
+
+        }
+
+        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 > 2 )
+            recon_lock_duration = strtoll( params[ 2 ].c_str() , nullptr , 10 );
+        else
+            recon_lock_duration = 50 ;
+
+        if( it > 3 )
+            recon_lock_nb_match = strtoll( params[ 3 ].c_str() , nullptr , 10 );
+        else
+            recon_lock_nb_match = 10 ;
+
+        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 > 6 )
+            wait = strtoll( params[ 6 ].c_str() , nullptr , 10 );
+        else
+            wait = 5000 ;
+
+        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 < 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 , 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_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
+                });
+
+        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 );	
+
+        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_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::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);
+
+        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 ); 
+    };
+
+    void ReconSetupViewMore::focus() {
+        checkbox_load_freqs.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
+                });
+
+        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 */
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
+ *
+ * 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 "serializer.hpp"
+#include "ui.hpp"
+#include "ui_widget.hpp"
+#include "ui_tabview.hpp"
+#include "ui_navigation.hpp"
+#include "string_format.hpp"
+
+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 );
+
+    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" };
+
+            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"	
+            };
+
+            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_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 );
+
+            void Save( uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , uint32_t &recon_match_mode );
+
+            void focus() override;
+
+        private:
+
+            const uint32_t _recon_lock_duration = 50 ;
+            const uint32_t _recon_lock_nb_match = 10 ;
+            const uint32_t _recon_match_mode = 0 ;
+
+            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_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 }
+                    }
+            };
+    };
+
+
+    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 { };
+
+            void focus() override;
+
+            std::string title() const override { return "Recon setup"; };
+
+        private:
+
+            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 ;
+
+            Rect view_rect = { 0, 3 * 8, 240, 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 };
+
+            TabView tab_view {
+                { "Main", Color::cyan() , &viewMain },
+                    { "More", Color::green(), &viewMore }
+            };
+            Button button_save {
+                { 9 * 8, 255, 14 * 8 , 40 },
+                    "SAVE"
+            };
+    };
+
+} /* namespace ui */
@@ -160,9 +160,9 @@ ScannerView::~ScannerView() {
 }

 void ScannerView::show_max() {		//show total number of freqs to scan
-	if (frequency_list.size() == MAX_DB_ENTRY) {
+	if (frequency_list.size() == FREQMAN_MAX_PER_FILE ) {
 		text_max.set_style(&style_red);
-		text_max.set( "/ " + to_string_dec_uint(MAX_DB_ENTRY) + " (DB MAX!)");
+		text_max.set( "/ " + to_string_dec_uint(FREQMAN_MAX_PER_FILE ) + " (DB MAX!)");
 	}
 	else {
 		text_max.set_style(&style_grey);
@@ -304,7 +304,7 @@ ScannerView::ScannerView(
 		);

 		rf::Frequency frequency = frequency_range.min;
-		while (frequency_list.size() < MAX_DB_ENTRY &&  frequency <= frequency_range.max) { //add manual range				
+		while (frequency_list.size() < FREQMAN_MAX_PER_FILE  &&  frequency <= frequency_range.max) { //add manual range				
 			frequency_list.push_back(frequency);
 			description_list.push_back("");				//If empty, will keep showing the last description
 			frequency+=def_step;
@@ -398,7 +398,7 @@ void ScannerView::frequency_file_load(std::string file_name, bool stop_all_befor
 	if ( load_freqman_file(file_name, database)  ) {
 		loaded_file_name = file_name; // keep loaded filename in memory
 		for(auto& entry : database) {									// READ LINE PER LINE
-			if (frequency_list.size() < MAX_DB_ENTRY) {					//We got space!
+			if (frequency_list.size() < FREQMAN_MAX_PER_FILE ) {					//We got space!
 				if (entry.type == RANGE)  {								//RANGE	
 					switch (entry.step) {
 						case AM_US:	def_step = 10000;  	break ;
@@ -421,7 +421,7 @@ void ScannerView::frequency_file_load(std::string file_name, bool stop_all_befor
 						+ ">" + to_string_short_freq(entry.frequency_b)
 						+ " S" + to_string_short_freq(def_step).erase(0,1) //euquiq: lame kludge to reduce spacing in step freq
 						);
-					while (frequency_list.size() < MAX_DB_ENTRY && entry.frequency_a <= entry.frequency_b) { //add the rest of the range
+					while (frequency_list.size() < FREQMAN_MAX_PER_FILE  && entry.frequency_a <= entry.frequency_b) { //add the rest of the range
 						entry.frequency_a+=def_step;
 						frequency_list.push_back(entry.frequency_a);
 						description_list.push_back("");				//Token (keep showing the last description)
@@ -529,10 +529,12 @@ size_t ScannerView::change_mode(uint8_t new_mod) { //Before this, do a scan_thre
 		receiver_model.set_sampling_rate(3072000);	receiver_model.set_baseband_bandwidth(1750000);	
 		break;
 	case AM:
-		bw.emplace_back("DSB", 0);
-		bw.emplace_back("USB", 0);
-		bw.emplace_back("LSB", 0);
-		bw.emplace_back("CW ", 0);
+		bw.emplace_back("DSB 9k" , 0 );
+		bw.emplace_back("DSB 6k" , 1 );
+		bw.emplace_back("USB+3k" , 2 );
+		bw.emplace_back("LSB-3k" , 3 );
+		bw.emplace_back("CW    " , 4 );
+
 		field_bw.set_options(bw);

 		baseband::run_image(portapack::spi_flash::image_tag_am_audio);
@@ -540,10 +542,10 @@ size_t ScannerView::change_mode(uint8_t new_mod) { //Before this, do a scan_thre
 		field_bw.set_selected_index(0);
 		receiver_model.set_am_configuration(field_bw.selected_index());
 		field_bw.on_change = [this](size_t n, OptionsField::value_t) { receiver_model.set_am_configuration(n);	};		
-		receiver_model.set_sampling_rate(2000000);receiver_model.set_baseband_bandwidth(2000000); 
+		receiver_model.set_sampling_rate(3072000);	receiver_model.set_baseband_bandwidth(1750000); 
 		break;
 	case WFM:
-		bw.emplace_back("16k", 0);
+		bw.emplace_back("200k", 0);
 		field_bw.set_options(bw);

 		baseband::run_image(portapack::spi_flash::image_tag_wfm_audio);
@@ -34,7 +34,6 @@
 #include "file.hpp"


-#define MAX_DB_ENTRY 500
 #define MAX_FREQ_LOCK 10 		//50ms cycles scanner locks into freq when signal detected, to verify signal is not spureous

 namespace ui {
@@ -111,7 +110,7 @@ public:
 		.foreground = Color::red(),
 	};

-	std::string title() const override { return "SCANNER"; };
+	std::string title() const override { return "Scanner"; };
 	std::vector<rf::Frequency> frequency_list{ };
 	std::vector<string> description_list { };

@@ -144,7 +143,7 @@ private:
 	
 	Labels labels {
 		{ { 0 * 8, 0 * 16 }, "LNA:   VGA:   AMP:  VOL:", Color::light_grey() },
-		{ { 0 * 8, 1* 16 }, "BW:    SQUELCH:   db WAIT:", Color::light_grey() },
+		{ { 0 * 8, 1* 16 }, "BW:       SQLCH:   db WAIT:", 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() },
@@ -177,7 +176,7 @@ private:
 	};		

 	NumberField field_squelch {
-		{ 15 * 8, 1 * 16 },
+		{ 18 * 8, 1 * 16 },
 		3,
 		{ -90, 20 },
 		1,
@@ -185,7 +184,7 @@ private:
 	};

 	NumberField field_wait {
-		{ 26 * 8, 1 * 16 },
+		{ 27 * 8, 1 * 16 },
 		2,
 		{ 0, 99 },
 		1,
@@ -38,7 +38,7 @@ public:
 	~WipeSDView();
 	void focus() override;
 	
-	std::string title() const override { return "Wipe FAT"; };	
+	std::string title() const override { return "Wipe SD Card"; };	

 private:
 	NavigationView& nav_;
@@ -234,6 +234,7 @@ SetUIView::SetUIView(NavigationView& nav) {
 		&checkbox_showsplash,
 		&checkbox_showclock,
 		&options_clockformat,
+		&checkbox_guireturnflag,
 		&button_save,
 		&button_cancel
 	});
@@ -242,14 +243,11 @@ SetUIView::SetUIView(NavigationView& nav) {
 	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());
 	
-	uint32_t backlight_timer = persistent_memory::config_backlight_timer();
-	if (backlight_timer) {
-		checkbox_bloff.set_value(true);
-		options_bloff.set_by_value(backlight_timer);
-	} else {
-		options_bloff.set_selected_index(0);
-	}
+	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);
@@ -257,19 +255,13 @@ SetUIView::SetUIView(NavigationView& nav) {
 		options_clockformat.set_selected_index(0);
 	}

-	//checkbox_speaker.on_select = [this](Checkbox&, bool v) {
-    	//	if (v) audio::output::speaker_mute();			//Just mute audio if speaker is disabled
-	//		persistent_memory::set_config_speaker(v);	//Store Speaker status
-        //	StatusRefreshMessage message { };			//Refresh status bar with/out speaker
-        //	EventDispatcher::send_message(message);
-    	//};

 	button_save.on_select = [&nav, this](Button&) {
-		if (checkbox_bloff.value())
-			persistent_memory::set_config_backlight_timer(options_bloff.selected_index() + 1);
-		else
-			persistent_memory::set_config_backlight_timer(0);
-		
+		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);    
@@ -284,6 +276,7 @@ SetUIView::SetUIView(NavigationView& nav) {
 	
 		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();
 	};
@@ -296,6 +289,36 @@ 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());
+
+
+	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();
+}
+
 SetAudioView::SetAudioView(NavigationView& nav) {
 	add_children({
 		&labels,
@@ -344,14 +367,22 @@ 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>(); } },
-		{ "Interface", 		ui::Color::dark_cyan(), &bitmap_icon_options_ui,		[&nav](){ nav.push<SetUIView>(); } },
+		{ "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>(); } },
-		{ "Touchscreen",	ui::Color::dark_cyan(), &bitmap_icon_options_touch,		[&nav](){ nav.push<TouchCalibrationView>(); } },
-		{ "QR code",		ui::Color::dark_cyan(), &bitmap_icon_qr_code,		[&nav](){ nav.push<SetQRCodeView>(); } }
+		{ "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
 }
@@ -27,6 +27,7 @@
 #include "ui_menu.hpp"
 #include "ui_navigation.hpp"
 #include "ff.h"
+#include "portapack_persistent_memory.hpp"

 #include <cstdint>

@@ -47,7 +48,7 @@ public:

 	void focus() override;
 	
-	std::string title() const override { return "Set Date/Time"; };
+	std::string title() const override { return "Date/Time"; };

 private:
 	Labels labels {
@@ -210,6 +211,8 @@ private:
 	SetFrequencyCorrectionModel form_collect();
 };

+using portapack::persistent_memory::backlight_timeout_t;
+
 class SetUIView : public View {
 public:
 	SetUIView(NavigationView& nav);
@@ -241,13 +244,14 @@ private:
 		{ 52, 7 * 16 + 8 },
 		20,
 		{
-			{ "5 seconds", 5 },
-			{ "15 seconds", 15 },
-			{ "30 seconds", 30 },
-			{ "1 minute", 60 },
-			{ "3 minutes", 180 },
-			{ "5 minutes", 300 },
-			{ "10 minutes", 600 }
+			{ "5 seconds",  backlight_timeout_t::Timeout5Sec    },
+			{ "15 seconds", backlight_timeout_t::Timeout15Sec   },
+			{ "30 seconds", backlight_timeout_t::Timeout30Sec   },
+			{ "1 minute",   backlight_timeout_t::Timeout60Sec   },
+			{ "3 minutes",  backlight_timeout_t::Timeout180Sec  },
+			{ "5 minutes",  backlight_timeout_t::Timeout300Sec  },
+			{ "10 minutes", backlight_timeout_t::Timeout600Sec  },
+			{ "1 hour",     backlight_timeout_t::Timeout3600Sec },
 		}
 	};
 	
@@ -271,6 +275,45 @@ private:
 			{ "time and date", 1 }
 		}
 	};	
+
+    Checkbox checkbox_guireturnflag {	
+		{ 3 * 8, 14 * 16 },
+		25,
+		"add return icon in GUI"
+	};
+	
+	Button button_save {
+		{ 2 * 8, 16 * 16, 12 * 8, 32 },
+		"Save"
+	};
+	
+	Button button_cancel {
+		{ 16 * 8, 16 * 16, 12 * 8, 32 },
+		"Cancel",
+	};
+};
+
+class SetAppSettingsView : public View {
+public:
+	SetAppSettingsView(NavigationView& nav);
+	
+	void focus() override;
+	
+	std::string title() const override { return "App Settings"; };
+	
+private:
+
+	Checkbox checkbox_load_app_settings {
+		{ 3 * 8, 2 * 16 },
+		25,
+		"Load app settings"
+	};
+	
+	Checkbox checkbox_save_app_settings {
+		{ 3 * 8, 4 * 16 },
+		25,
+		"Save app settings"
+	};
 	
 	Button button_save {
 		{ 2 * 8, 16 * 16, 12 * 8, 32 },
@@ -322,7 +365,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "QR code"; };
+	std::string title() const override { return "QR Code"; };
 	
 private:
 	Checkbox checkbox_bigger_qr {
@@ -40,7 +40,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "Generator"; };
+	std::string title() const override { return "Signal gen"; };

 private:
 	void start_tx();
@@ -23,6 +23,7 @@
 #include "ui_sonde.hpp"
 #include "baseband_api.hpp"
 #include "audio.hpp"
+#include "app_settings.hpp"

 #include "portapack.hpp"
 #include <cstring>
@@ -43,6 +44,8 @@ namespace ui {


 SondeView::SondeView(NavigationView& nav) {
+	
+
 	baseband::run_image(portapack::spi_flash::image_tag_sonde);

 	add_children({
@@ -68,8 +71,17 @@ SondeView::SondeView(NavigationView& nav) {
 		&button_see_map
 	});

-	// start from the frequency currently stored in the receiver_model:
-	target_frequency_ = receiver_model.tuning_frequency();
+
+	// load app settings
+	auto rc = settings.load("rx_sonde", &app_settings);
+	if(rc == SETTINGS_OK) {
+		field_lna.set_value(app_settings.lna);
+		field_vga.set_value(app_settings.vga);
+		field_rf_amp.set_value(app_settings.rx_amp);
+		target_frequency_ = app_settings.rx_frequency;
+	}
+	else target_frequency_ = receiver_model.tuning_frequency();
+

 	field_frequency.set_value(target_frequency_);
 	field_frequency.set_step(500);		//euquiq: was 10000, but we are using this for fine-tunning
@@ -104,16 +116,6 @@ SondeView::SondeView(NavigationView& nav) {
    receiver_model.set_sampling_rate(sampling_rate);
    receiver_model.set_baseband_bandwidth(baseband_bandwidth);
    receiver_model.enable();   // Before using radio::enable(), but not updating Ant.DC-Bias.
-	
-	/* radio::enable({        // this can be removed, previous version, no DC-bias ant. control.
-		tuning_frequency(),
-		sampling_rate,
-		baseband_bandwidth,
-		rf::Direction::Receive,
-		receiver_model.rf_amp(),
-		static_cast<int8_t>(receiver_model.lna()),
-		static_cast<int8_t>(receiver_model.vga()),
-	}); */


        // QR code with geo URI
@@ -157,9 +159,13 @@ SondeView::SondeView(NavigationView& nav) {
 }

 SondeView::~SondeView() {
+	// save app settings
+	app_settings.rx_frequency = target_frequency_;
+	settings.save("rx_sonde", &app_settings);
+
 	baseband::set_pitch_rssi(0, false);
-/* 	radio::disable(); */  
-    receiver_model.disable();   // to switch off all, including DC bias.
+
+    	receiver_model.disable();   // to switch off all, including DC bias.
 	baseband::shutdown();
 	audio::output::stop();
 }
@@ -34,7 +34,7 @@
 #include "log_file.hpp"

 #include "sonde_packet.hpp"
-
+#include "app_settings.hpp"
 #include <cstddef>
 #include <string>

@@ -74,6 +74,9 @@ private:
 	bool beep { false };

 	char geo_uri[32]  = {};
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };	 

 	sonde::GPS_data gps_info { };
 	sonde::temp_humid temp_humid_info { };
@@ -25,6 +25,7 @@

 #include "portapack.hpp"
 #include "hackrf_hal.hpp"
+#include "cpld_update.hpp"

 #include <cstring>
 #include <stdio.h>
@@ -88,8 +89,13 @@ void SSTVTXView::paint(Painter&) {
 }

 SSTVTXView::~SSTVTXView() {
+	// save app settings
+	app_settings.tx_frequency = transmitter_model.tuning_frequency();	
+	settings.save("tx_sstv", &app_settings);
+
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit.
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }

 void SSTVTXView::on_tuning_frequency_changed(rf::Frequency f) {
@@ -215,6 +221,15 @@ SSTVTXView::SSTVTXView(
 	options_t mode_options;
 	uint32_t c;

+	// load app settings
+	auto rc = settings.load("tx_sstv", &app_settings);
+	if(rc == SETTINGS_OK) {
+		transmitter_model.set_rf_amp(app_settings.tx_amp);
+		transmitter_model.set_channel_bandwidth(app_settings.channel_bandwidth);
+		transmitter_model.set_tuning_frequency(app_settings.tx_frequency);
+		transmitter_model.set_tx_gain(app_settings.tx_gain);		
+	}
+
 	// Search for valid bitmaps
 	file_list = scan_root_files(u"/sstv", u"*.bmp");
 	if (!file_list.size()) {
@@ -34,6 +34,7 @@
 #include "sstv.hpp"
 #include "file.hpp"
 #include "bmp.hpp"
+#include "app_settings.hpp"

 using namespace sstv;

@@ -58,7 +59,10 @@ private:
 	NavigationView& nav_;
 	
 	sstv_scanline scanline_buffer { };
-	
+	// app save settings
+	std::app_settings 		settings { }; 		
+	std::app_settings::AppSettings 	app_settings { };	
+
 	bool file_error { false };
 	File bmp_file { };
 	bmp_header_t bmp_header { };
@@ -31,7 +31,7 @@ namespace ui {
 TouchCalibrationView::TouchCalibrationView(
 	NavigationView& nav
 ) : nav { nav },
-	calibration { touch::default_calibration() }
+	calibration { touch::Calibration() }
 {
 	add_children({
 		&image_calibrate_0,
@@ -26,6 +26,7 @@

 #include "baseband_api.hpp"
 #include "string_format.hpp"
+#include "cpld_update.hpp"


 using namespace portapack;
@@ -39,7 +40,8 @@ void TouchTunesView::focus() {

 TouchTunesView::~TouchTunesView() {
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit.	
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }

 void TouchTunesView::stop_tx() {
@@ -45,11 +45,11 @@ static void send_message(const Message* const message) {

 void AMConfig::apply() const {
 	const AMConfigureMessage message {
-		taps_6k0_decim_0,
-		taps_6k0_decim_1,
-		taps_6k0_decim_2,
-		channel,
-		modulation,
+		taps_6k0_decim_0,	// common FIR filter taps pre-decim_0 to all 5 x AM mod types.(AM-9K, AM-6K, USB, LSB, CW)
+		taps_6k0_decim_1,	// common FIR filter taps pre-decim_1 to all 5 x AM mod. types.
+		decim_2,			// var decim_2 FIR taps filter , variable values, depending selected  AM mod(AM  9k / 6k all rest AM modes)
+		channel,			// var channel FIR taps filter , variable values, depending selected  AM mode, each one different  (DSB-9K, DSB-6K, USB-3K, LSB-3K,CW)
+		modulation,         // var parameter .
 		audio_12k_hpf_300hz_config
 	};
 	send_message(&message);
@@ -146,7 +146,7 @@ void set_btle(const uint32_t baudrate, const uint32_t word_length, const uint32_
 	};
 	send_message(&message);
 }
-    
+
 void set_nrf(const uint32_t baudrate, const uint32_t word_length, const uint32_t trigger_value, const bool trigger_word) {
 	const NRFRxConfigureMessage message {
 		baudrate,
@@ -156,7 +156,7 @@ void set_nrf(const uint32_t baudrate, const uint32_t word_length, const uint32_t
 	};
 	send_message(&message);
 }
-    
+
 void set_afsk_data(const uint32_t afsk_samples_per_bit, const uint32_t afsk_phase_inc_mark, const uint32_t afsk_phase_inc_space,
 					const uint8_t afsk_repeat, const uint32_t afsk_bw, const uint8_t symbol_count) {
 	const AFSKTxConfigureMessage message {
@@ -183,12 +183,13 @@ void kill_afsk() {
 }

 void set_audiotx_config(const uint32_t divider, const float deviation_hz, const float audio_gain,
-					const uint32_t tone_key_delta, const bool am_enabled, const bool dsb_enabled,
-					const bool usb_enabled, const bool lsb_enabled) {
+					uint8_t audio_shift_bits_s16, const uint32_t tone_key_delta, const bool am_enabled,
+					const bool dsb_enabled, const bool usb_enabled, const bool lsb_enabled) {
 	const AudioTXConfigMessage message {
 		divider,
 		deviation_hz,
 		audio_gain,
+		audio_shift_bits_s16,
 		tone_key_delta,
 		(float)persistent_memory::tone_mix() / 100.0f,
 		am_enabled,
@@ -211,16 +212,28 @@ void set_pitch_rssi(int32_t avg, bool enabled) {
 		enabled,
 		avg
 	};
-	send_message(&message);	
+	send_message(&message);
 }

 void set_ook_data(const uint32_t stream_length, const uint32_t samples_per_bit, const uint8_t repeat,
-					const uint32_t pause_symbols) {
+					const uint32_t pause_symbols, const uint8_t de_bruijn_length) {
 	const OOKConfigureMessage message {
 		stream_length,
 		samples_per_bit,
 		repeat,
-		pause_symbols
+		pause_symbols,
+		de_bruijn_length
+	};
+	send_message(&message);
+}
+
+void kill_ook() {
+	const OOKConfigureMessage message {
+		0,
+		0,
+		0,
+		0,
+		0
 	};
 	send_message(&message);
 }
@@ -250,7 +263,7 @@ void set_adsb() {

 void set_jammer(const bool run, const jammer::JammerType type, const uint32_t speed) {
 	const JammerConfigureMessage message {
-		run, 
+		run,
 		type,
 		speed
 	};
@@ -311,7 +324,7 @@ void shutdown() {
 	send_message(&message);

 	shared_memory.application_queue.reset();
-	
+
 	baseband_image_running = false;
 }

@@ -36,6 +36,7 @@
 namespace baseband {

 struct AMConfig {
+	const fir_taps_real<32> decim_2;		// added to handle two types decim_2 9k, 6k
 	const fir_taps_complex<64> channel;
 	const AMConfigureMessage::Modulation modulation;

@@ -61,8 +62,8 @@ void set_tones_config(const uint32_t bw, const uint32_t pre_silence, const uint1
 void kill_tone();
 void set_sstv_data(const uint8_t vis_code, const uint32_t pixel_duration);
 void set_audiotx_config(const uint32_t divider, const float deviation_hz, const float audio_gain,
-			const uint32_t tone_key_delta, const bool am_enabled, const bool dsb_enabled,
-			const bool usb_enabled, const bool lsb_enabled);
+			uint8_t audio_shift_bits_s16, const uint32_t tone_key_delta, const bool am_enabled,
+			const bool dsb_enabled,	const bool usb_enabled, const bool lsb_enabled);
 void set_fifo_data(const int8_t * data);
 void set_pitch_rssi(int32_t avg, bool enabled);
 void set_afsk_data(const uint32_t afsk_samples_per_bit, const uint32_t afsk_phase_inc_mark, const uint32_t afsk_phase_inc_space,
@@ -76,7 +77,8 @@ void set_btle(const uint32_t baudrate, const uint32_t word_length, const uint32_
 void set_nrf(const uint32_t baudrate, const uint32_t word_length, const uint32_t trigger_value, const bool trigger_word);

 void set_ook_data(const uint32_t stream_length, const uint32_t samples_per_bit, const uint8_t repeat,
-					const uint32_t pause_symbols);
+					const uint32_t pause_symbols, const uint8_t de_bruijn_length = 0);
+void kill_ook();
 void set_fsk_data(const uint32_t stream_length, const uint32_t samples_per_bit, const uint32_t shift,
 					const uint32_t progress_notice);
 void set_pocsag();
@@ -226,15 +226,17 @@ void EventDispatcher::handle_rtc_tick() {

 	portapack::temperature_logger.second_tick();
 	
-	uint32_t backlight_timer = portapack::persistent_memory::config_backlight_timer();
-	if (backlight_timer) {
-		if (portapack::bl_tick_counter == backlight_timer)
+	const auto backlight_timer = portapack::persistent_memory::config_backlight_timer();
+	if (backlight_timer.timeout_enabled()) {
+		if (portapack::bl_tick_counter == backlight_timer.timeout_seconds())
 			set_display_sleep(true);
 		else
 			portapack::bl_tick_counter++;
 	}

 	rtc_time::on_tick_second();
+
+	portapack::persistent_memory::cache::persist();
 }

 ui::Widget* EventDispatcher::touch_widget(ui::Widget* const w, ui::TouchEvent event) {
@@ -23,166 +23,492 @@
 #include "freqman.hpp"
 #include <algorithm>

+using option_t = std::pair<std::string, int32_t>;
+using options_t = std::vector<option_t>;
+
+options_t freqman_entry_modulations = {
+    { "AM", 0 },
+    { "NFM", 1 },
+    { "WFM", 2 }
+};
+
+options_t freqman_entry_bandwidths[ 4 ] = {
+    { //AM
+        { "DSB 9k" , 0 },
+        { "DSB 6k" , 1 },
+        { "USB+3k" , 2 },
+        { "LSB-3k" , 3 },
+        { "CW"     , 4 }
+    },
+    { //NFM
+        { "8k5" , 0 },
+        { "11k" , 1 },
+        { "16k" , 2 }
+    },
+    { //WFM
+        { "200k" , 0 },
+    }
+};
+
+options_t freqman_entry_steps = {
+    { "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 = {
+    { "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 }
+};
+
 std::vector<std::string> get_freqman_files() {
-	std::vector<std::string> file_list;
-	
-	auto files = scan_root_files(u"FREQMAN", u"*.TXT");
-	
-	for (auto file : files) {
-		std::string file_name = file.stem().string();
-		// don't propose tmp / hidden files in freqman's list
-		if (file_name.length() && file_name[0] != '.') {
-			file_list.emplace_back(file_name);
-		}
-	}
-	
-	return file_list;
+    std::vector<std::string> file_list;
+
+    auto files = scan_root_files(u"FREQMAN", u"*.TXT");
+
+    for (auto file : files) {
+        std::string file_name = file.stem().string();
+        // don't propose tmp / hidden files in freqman's list
+        if (file_name.length() && file_name[0] != '.') {
+            file_list.emplace_back(file_name);
+        }
+    }
+
+    return file_list;
 };

 bool load_freqman_file(std::string& file_stem, freqman_db &db) {
-	File freqman_file;
-	size_t length, n = 0, file_position = 0;
-	char * pos;
-	char * line_start;
-	char * line_end;
-	std::string description;
-	rf::Frequency frequency_a, frequency_b;
-	char file_data[257];
-	freqman_entry_type type;
-	
-	db.clear();
-	
-	auto result = freqman_file.open("FREQMAN/" + file_stem + ".TXT");
-	if (result.is_valid())
-		return false;
-	
-	while (1) {
-		// Read a 256 bytes block from file
-		freqman_file.seek(file_position);
-		
-		memset(file_data, 0, 257);
-		auto read_size = freqman_file.read(file_data, 256);
-		if (read_size.is_error())
-			return false;	// Read error
-		
-		file_position += 256;
-		
-		// Reset line_start to beginning of buffer
-		line_start = file_data;
-		
-		if (!strstr(file_data, "f=") && !strstr(file_data, "a="))
-			break;
-		
-		// Look for complete lines in buffer
-		while ((line_end = strstr(line_start, "\x0A"))) {
-			// Read frequency
-			pos = strstr(line_start, "f=");
-			frequency_b = 0;
-			type = SINGLE;
-			if (pos) {
-				pos += 2;
-				frequency_a = strtoll(pos, nullptr, 10);
-			} else {
-				// ...or range
-				pos = strstr(line_start, "a=");
-				if (pos) {
-					pos += 2;
-					frequency_a = strtoll(pos, nullptr, 10);
-					type = RANGE;
-					pos = strstr(line_start, "b=");
-					if (pos) {
-						pos += 2;
-						frequency_b = strtoll(pos, nullptr, 10);
-					} else
-						frequency_b = 0;
-				} else
-					frequency_a = 0;
-			}
-			
-			// Read description until , or LF
-			pos = strstr(line_start, "d=");
-			if (pos) {
-				pos += 2;
-				length = std::min(strcspn(pos, ",\x0A"), (size_t)FREQMAN_DESC_MAX_LEN);
-				description = string(pos, length);
-			} else
-				description = "-";
-			
-			db.push_back({ frequency_a, frequency_b, description, type });
-			n++;
-			
-			if (n >= FREQMAN_MAX_PER_FILE) return true;
-			
-			line_start = line_end + 1;
-			if (line_start - file_data >= 256) break;
-		}
-		
-		if (read_size.value() != 256)
-			break;	// End of file
-		
-		// Restart at beginning of last incomplete line
-		file_position -= (file_data + 256 - line_start);
-	}
-	
-	return true;
+    return load_freqman_file_ex( file_stem , db , true , true , true );
 }

-bool save_freqman_file(std::string& file_stem, freqman_db &db) {
-	File freqman_file;
-	std::string item_string;
-	rf::Frequency frequency_a, frequency_b;
-	
-	if (!create_freqman_file(file_stem, freqman_file))
-		return false;
-	
-	for (size_t n = 0; n < db.size(); n++) {
-		auto& entry = db[n];
+bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freqs , bool load_ranges , bool load_hamradios ) {
+    File freqman_file;
+    size_t length, n = 0, file_position = 0;
+    char * pos;
+    char * line_start;
+    char * line_end;
+    std::string description;
+    rf::Frequency frequency_a, frequency_b;
+    char file_data[257];
+    freqman_entry_type type;
+    freqman_index_t modulation = 0 ;
+    freqman_index_t bandwidth = 0 ;
+    freqman_index_t step = 0 ;
+    freqman_index_t tone = 0 ;

-		frequency_a = entry.frequency_a;
-		
-		if (entry.type == SINGLE) {
-			// Single
-			
-			// TODO: Make to_string_dec_uint be able to return uint64_t's
-			// Please forgive me...
-			item_string = "f=" + to_string_dec_uint(frequency_a / 1000) + to_string_dec_uint(frequency_a % 1000UL, 3, '0');
-			
-		} else {
-			// Range
-			frequency_b = entry.frequency_b;
-			
-			item_string = "a=" + to_string_dec_uint(frequency_a / 1000) + to_string_dec_uint(frequency_a % 1000UL, 3, '0');
-			item_string += ",b=" + to_string_dec_uint(frequency_b / 1000) + to_string_dec_uint(frequency_b % 1000UL, 3, '0');
-		}
-		
-		if (entry.description.size())
-			item_string += ",d=" + entry.description;
-		
-		freqman_file.write_line(item_string);
-	}
-	
-	return true;
+
+    db.clear();
+
+    auto result = freqman_file.open("FREQMAN/" + file_stem + ".TXT");
+    if (result.is_valid())
+        return false;
+
+    while (1) {
+        // Read a 256 bytes block from file
+        freqman_file.seek(file_position);
+
+        memset(file_data, 0, 257);
+        auto read_size = freqman_file.read(file_data, 256);
+        if (read_size.is_error())
+            return false;	// Read error
+
+        file_position += 256;
+
+        // 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"))) {
+
+            modulation = -1 ;
+            bandwidth = -1 ;
+            step = -1 ;
+            tone = -1 ;
+            type=SINGLE ;
+
+            frequency_a = frequency_b = 0;
+            // Read frequency
+            pos = strstr(line_start, "f=");
+            if(pos) {
+                pos += 2;
+                frequency_a = strtoll(pos, nullptr, 10);
+            } else {
+                // ...or range
+                pos = strstr(line_start, "a=");
+                if (pos) {
+                    pos += 2;
+                    frequency_a = strtoll(pos, nullptr, 10);
+                    type = RANGE;
+                    pos = strstr(line_start, "b=");
+                    if (pos) {
+                        pos += 2;
+                        frequency_b = strtoll(pos, nullptr, 10);
+                    } else
+                        frequency_b = 0;
+                }else {
+                    // ... or hamradio
+                    pos = strstr(line_start, "r=");
+                    if (pos) {
+                        pos += 2;
+                        frequency_a = strtoll(pos, nullptr, 10);
+                        type = HAMRADIO;
+                        pos = strstr(line_start, "t=");
+                        if (pos) {
+                            pos += 2;
+                            frequency_b = strtoll(pos, nullptr, 10);
+                        } else
+                            frequency_b = frequency_a ;
+                    } else
+                        frequency_a = 0;
+                }
+            }
+            // modulation if any
+            pos = strstr(line_start, "m=");
+            if (pos) {
+                pos += 2;
+                modulation = freqman_entry_get_modulation_from_str( pos );
+            } 
+            // bandwidth if any
+            pos = strstr(line_start, "bw=");
+            if (pos) {
+                pos += 3;
+                bandwidth = freqman_entry_get_bandwidth_from_str( modulation , pos );
+            } 
+            // step if any
+            pos = strstr(line_start, "s=");
+            if (pos) {
+                pos += 2;
+                step = freqman_entry_get_step_from_str_short( pos );
+            } 
+            // ctcss tone if any
+            /* disabled until better form
+               pos = strstr(line_start, "c=");
+               if (pos) {
+               pos += 2;
+               tone = tone_key_index_by_value( strtoll( pos , nullptr , 10 ) );
+               } */
+            // Read description until , or LF
+            pos = strstr(line_start, "d=");
+            if (pos) {
+                pos += 2;
+                length = std::min(strcspn(pos, ",\x0A"), (size_t)FREQMAN_DESC_MAX_LEN);
+                description = string(pos, length);
+            } else
+                description = "-";
+            if( (type == SINGLE && load_freqs) || (type == RANGE && load_ranges) || (type == HAMRADIO && load_hamradios) )
+            {
+                db.push_back({ frequency_a, frequency_b, description, type , modulation , bandwidth , step , tone });
+                n++;
+                if (n >= FREQMAN_MAX_PER_FILE) return true;
+            }
+
+            line_start = line_end + 1;
+            if (line_start - file_data >= 256) break;
+        }
+
+        if (read_size.value() != 256)
+            break;	// End of file
+
+        // Restart at beginning of last incomplete line
+        file_position -= (file_data + 256 - line_start);
+    }
+
+    /* populate implicitly specified modulation / bandwidth */
+    if( db.size() > 2 )
+    {
+        modulation = db[ 0 ] . modulation; 
+        bandwidth = db[ 0 ] . bandwidth; 
+
+        for( unsigned int it = 1 ; it < db.size() ; it ++ )
+        {
+            if( db[ it ] . modulation < 0 )
+            {
+                db[ it ] . modulation = modulation ;
+            }
+            else
+            {
+                modulation = db[ it ] . modulation ;
+            }
+            if( db[ it ] . bandwidth < 0 )
+            {
+                db[ it ] . bandwidth = bandwidth ;
+            }
+            else
+            {
+                modulation = db[ it ] . bandwidth ;
+            }
+        }
+    }
+    return true;
+}
+
+bool get_freq_string( freqman_entry &entry , std::string &item_string )
+{
+    rf::Frequency frequency_a, frequency_b;
+
+    frequency_a = entry.frequency_a;
+    if (entry.type == SINGLE) {
+        // Single
+        item_string = "f=" + to_string_dec_uint(frequency_a / 1000) + to_string_dec_uint(frequency_a % 1000UL, 3, '0');
+    } else if( entry.type == RANGE ) {
+        // Range
+        frequency_b = entry.frequency_b;
+        item_string = "a=" + to_string_dec_uint(frequency_a / 1000) + to_string_dec_uint(frequency_a % 1000UL, 3, '0');
+        item_string += ",b=" + to_string_dec_uint(frequency_b / 1000) + to_string_dec_uint(frequency_b % 1000UL, 3, '0');
+        if( entry.step >= 0 )
+        {
+            item_string += ",s=" + freqman_entry_get_step_string_short( entry.step );
+        }
+    } else if( entry.type == HAMRADIO ) {
+        frequency_b = entry.frequency_b;
+        item_string = "r=" + to_string_dec_uint(frequency_a / 1000) + to_string_dec_uint(frequency_a % 1000UL, 3, '0');
+        item_string += ",t=" + to_string_dec_uint(frequency_b / 1000) + to_string_dec_uint(frequency_b % 1000UL, 3, '0');
+        if( entry.tone >= 0 )
+        {
+            item_string += ",c=" + tone_key_string( entry.tone );
+        }
+    }
+    if( entry.modulation >= 0 && (unsigned)entry.modulation < freqman_entry_modulations . size() )
+    {
+        item_string += ",m=" + freqman_entry_get_modulation_string( entry.modulation );
+        if( entry.bandwidth >= 0 && (unsigned)entry.bandwidth < freqman_entry_bandwidths[ entry.modulation ] . size()  )
+        {
+            item_string += ",bw=" + freqman_entry_get_bandwidth_string( entry.modulation , entry.bandwidth );
+        }
+    }
+    if (entry.description.size())
+        item_string += ",d=" + entry.description;
+
+    return true ;
+}
+
+bool save_freqman_file(std::string &file_stem, freqman_db &db) {
+
+    File freqman_file;
+
+    std::string freq_file_path = "FREQMAN/" + file_stem + ".TXT";
+    std::string tmp_freq_file_path = "FREQMAN/" + file_stem + ".TXT.TMP";
+
+    if( !db.size() )
+    {
+        delete_file( "FREQMAN/"+file_stem+".TXT" );
+        return true ;
+    }
+
+    delete_file( tmp_freq_file_path );
+    auto result = freqman_file.open( tmp_freq_file_path );
+    if ( !result.is_valid() ) {
+        for (size_t n = 0; n < db.size(); n++) {
+            std::string item_string;
+            auto& entry = db[n];
+            get_freq_string( entry , item_string );
+            freqman_file.write_line( item_string );
+            delete &item_string; 
+        }
+        delete_file( freq_file_path );
+        rename_file( tmp_freq_file_path , freq_file_path );
+        return true;
+    }
+    return false ;
 }

 bool create_freqman_file(std::string& file_stem, File& freqman_file) {
-	auto result = freqman_file.create("FREQMAN/" + file_stem + ".TXT");
-	if (result.is_valid())
-		return false;
-	
-	return true;
+
+    auto result = freqman_file.create( "FREQMAN/" + file_stem + ".TXT" );
+
+    if (result.is_valid())
+        return false;
+
+    return true;
 }

 std::string freqman_item_string(freqman_entry &entry, size_t max_length) {
-	std::string item_string;
+    std::string item_string;

-	if (entry.type == SINGLE) {
-		item_string = to_string_short_freq(entry.frequency_a) + "M: " + entry.description;
-	} else {
-		item_string = "Range: " + entry.description;
-	}
-	
-	if (item_string.size() > max_length)
-		return item_string.substr(0, max_length - 3) + "...";
-	
-	return item_string;
+    switch( entry.type ){
+        case SINGLE:
+            item_string = to_string_short_freq(entry.frequency_a) + "M: " + entry.description;
+            break;
+        case RANGE:
+            item_string = "R: " + entry.description;
+            break;
+        case HAMRADIO:
+            item_string = "H: " + entry.description;
+            break;
+        default:
+            item_string = "!UNKNOW TYPE " + entry.description;
+            break;
+    }
+
+    if (item_string.size() > max_length)
+        return item_string.substr(0, max_length - 3) + "...";
+
+    return item_string;
+}
+
+void freqman_set_modulation_option( OptionsField &option )
+{
+    option.set_options( freqman_entry_modulations );
+}
+
+void freqman_set_bandwidth_option( freqman_index_t modulation , OptionsField &option )
+{
+    option.set_options( freqman_entry_bandwidths[ modulation ] );
+}
+
+void freqman_set_step_option( OptionsField &option )
+{
+    option.set_options( freqman_entry_steps );
+}
+
+void freqman_set_step_option_short( OptionsField &option )
+{
+    option.set_options( freqman_entry_steps_short );
+}
+
+std::string freqman_entry_get_modulation_string( freqman_index_t modulation )
+{
+    if( modulation < 0 || (unsigned)modulation >= freqman_entry_modulations . size() )
+    {
+        return std::string( "" ); // unknown modulation
+    }
+    return freqman_entry_modulations[ modulation ] . first ;
+}
+
+std::string freqman_entry_get_bandwidth_string( freqman_index_t modulation , freqman_index_t bandwidth )
+{
+    if( modulation < 0 || (unsigned)modulation >= freqman_entry_modulations . size() )
+    {
+        return std::string( "" ); // unknown modulation
+    }
+    if( bandwidth < 0 || (unsigned)bandwidth > freqman_entry_bandwidths[ modulation ] . size() )
+    {
+        return std::string( "" ); // unknown modulation
+    }
+    return freqman_entry_bandwidths[ modulation ][ bandwidth ] . first ;
+}
+
+std::string freqman_entry_get_step_string( freqman_index_t step )
+{
+    if( step < 0 || (unsigned)step >= freqman_entry_steps . size() )
+    {
+        return std::string( "" ); // unknown modulation
+    }
+    return freqman_entry_steps[ step ] . first ;
+}
+
+std::string freqman_entry_get_step_string_short( freqman_index_t step )
+{
+    if( step < 0 || (unsigned)step >= freqman_entry_steps_short . size() )
+    {
+        return std::string( "" ); // unknown modulation
+    }
+    return freqman_entry_steps_short[ step ] . first ;
+}
+
+int32_t freqman_entry_get_modulation_value( freqman_index_t modulation )
+{
+    if( modulation < 0 || (unsigned)modulation >= freqman_entry_modulations . size() )
+    {
+        return -1 ; // unknown modulation
+    }
+    return freqman_entry_modulations[ modulation ] . second ;
+}
+
+int32_t freqman_entry_get_bandwidth_value( freqman_index_t modulation , freqman_index_t bandwidth )
+{
+    if( modulation < 0 || (unsigned)modulation >= freqman_entry_modulations . size() )
+    {
+        return -1 ; // unknown modulation
+    }
+    if( bandwidth < 0 || (unsigned)bandwidth > freqman_entry_bandwidths[ modulation ] . size() )
+    {
+        return -1 ; // unknown bandwidth for modulation
+    }
+    return freqman_entry_bandwidths[ modulation ][ bandwidth ] . second ;
+}
+
+int32_t freqman_entry_get_step_value( freqman_index_t step )
+{
+    if( step < 0 || (unsigned)step >= freqman_entry_steps . size() )
+    {
+        return -1 ; // unknown modulation
+    }
+    return freqman_entry_steps[ step ] . second ;
+}
+
+freqman_index_t freqman_entry_get_modulation_from_str( char *str )
+{
+    if( !str )
+        return -1 ;
+    for( freqman_index_t index = 0 ; (unsigned)index < freqman_entry_modulations . size() ; index ++ )
+    {
+        if( strncmp( freqman_entry_modulations[ index ] . first . c_str() , str , freqman_entry_modulations[ index ] . first . size() ) == 0 )
+            return index ;
+    }
+    return -1 ;	
+}
+
+freqman_index_t freqman_entry_get_bandwidth_from_str( freqman_index_t modulation , char *str )
+{
+    if( !str )
+        return -1 ;
+    if( modulation < 0 || (unsigned)modulation >= freqman_entry_modulations . size() )
+        return -1 ;
+    for( freqman_index_t index = 0 ; (unsigned)index < freqman_entry_bandwidths[ modulation ] . size() ; index ++ )
+    {
+        if( strncmp( freqman_entry_bandwidths[ modulation ][ index ] . first . c_str() , str , freqman_entry_bandwidths[ modulation ][ index ] . first . size() ) == 0 )
+            return index ;
+    }
+    return -1 ;	
+}
+
+freqman_index_t freqman_entry_get_step_from_str( char *str )
+{
+    if( !str )
+        return -1 ;
+    for( freqman_index_t index = 0 ; (unsigned)index < freqman_entry_steps . size() ; index ++ )
+    {
+        if( strncmp( freqman_entry_steps[ index ] . first . c_str() , str , freqman_entry_steps[ index ] . first . size() ) == 0 )
+            return index ;
+    }
+    return -1 ;	
+}
+
+freqman_index_t freqman_entry_get_step_from_str_short( char *str )
+{
+    if( !str )
+        return -1 ;
+    for( freqman_index_t index = 0 ; (unsigned)index < freqman_entry_steps_short . size() ; index ++ )
+    {
+        if( strncmp( freqman_entry_steps_short[ index ] . first . c_str() , str , freqman_entry_steps_short[ index ] . first . size() ) == 0 )
+            return index ;
+    }
+    return -1 ;	
 }
@@ -20,21 +20,27 @@
 * Boston, MA 02110-1301, USA.
 */

+#ifndef __FREQMAN_H__
+#define __FREQMAN_H__
+
 #include <cstring>
 #include <string>
 #include "file.hpp"
 #include "ui_receiver.hpp"
+#include "tone_key.hpp"
 #include "string_format.hpp"
-
-#ifndef __FREQMAN_H__
-#define __FREQMAN_H__
+#include "ui_widget.hpp"

 #define FREQMAN_DESC_MAX_LEN 30
-#define FREQMAN_MAX_PER_FILE 99
-#define FREQMAN_MAX_PER_FILE_STR "99"
+#define FREQMAN_MAX_PER_FILE 500        /* MAX PER FILES */
+#define FREQMAN_MAX_PER_FILE_STR "500"  /*STRING OF FREQMAN_MAX_PER_FILE */

 using namespace ui;
 using namespace std;
+using namespace tonekey;
+
+// needs to be signed as -1 means not set
+typedef int8_t freqman_index_t ;

 enum freqman_error {
 	NO_ERROR = 0,
@@ -44,13 +50,23 @@ enum freqman_error {
 };

 enum freqman_entry_type {
-	SINGLE = 0,
-	RANGE
+	SINGLE = 0,	//f=
+	RANGE,		//a=,b=
+	HAMRADIO,	//r=,t=
+	ERROR_TYPE
+};
+
+enum freqman_entry_modulation {
+	AM_MODULATION = 0 ,
+	NFM_MODULATION ,
+	WFM_MODULATION ,
+	MODULATION_DEF ,
+	ERROR_MODULATION 
 };

 //Entry step placed for AlainD freqman version (or any other enhanced version)
 enum freqman_entry_step {
-	STEP_DEF = 0,	// default
+	STEP_DEF = -1,  // default
 	AM_US,			// 10 kHz   AM/CB
 	AM_EUR,			// 9 kHz	LW/MW
 	NFM_1,			// 12,5 kHz (Analogic PMR 446)
@@ -63,21 +79,46 @@ enum freqman_entry_step {
 	ERROR_STEP
 };

-// freqman_entry_step step added, as above, to provide compatibility / future enhancement.
 struct freqman_entry {
-	rf::Frequency frequency_a { 0 };
-	rf::Frequency frequency_b { 0 };
-	std::string description { };
-	freqman_entry_type type { };
-	freqman_entry_step step { };
+	rf::Frequency frequency_a { 0 }; // 'f=freq' or 'a=freq_start' or 'r=recv_freq'
+	rf::Frequency frequency_b { 0 }; // 'b=freq_end' or 't=tx_freq'
+	std::string description { };     // 'd=desc'
+	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,...
+	tone_index tone { };               // 0XZ, 11 1ZB,...
 };

 using freqman_db = std::vector<freqman_entry>;

 std::vector<std::string> get_freqman_files();
 bool load_freqman_file(std::string& file_stem, freqman_db& db);
+bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freqs , bool load_ranges , bool load_hamradios );
+bool get_freq_string( freqman_entry &entry , std::string &item_string );
 bool save_freqman_file(std::string& file_stem, freqman_db& db);
 bool create_freqman_file(std::string& file_stem, File& freqman_file);
+
 std::string freqman_item_string(freqman_entry &item, size_t max_length);

+void freqman_set_bandwidth_option( freqman_index_t modulation , OptionsField &option );
+void freqman_set_modulation_option( OptionsField &option );
+void freqman_set_step_option( OptionsField &option );
+void freqman_set_step_option_short( OptionsField &option );
+void freqman_set_tone_option( OptionsField &option );
+
+std::string freqman_entry_get_modulation_string( freqman_index_t modulation );
+std::string freqman_entry_get_bandwidth_string( freqman_index_t modulation , freqman_index_t bandwidth );
+std::string freqman_entry_get_step_string( freqman_index_t step );
+std::string freqman_entry_get_step_string_short( freqman_index_t step );
+
+int32_t freqman_entry_get_modulation_value( freqman_index_t modulation );
+int32_t freqman_entry_get_bandwidth_value( freqman_index_t modulation , freqman_index_t bandwidth );
+int32_t freqman_entry_get_step_value( freqman_index_t step );
+
+freqman_index_t freqman_entry_get_modulation_from_str( char *str );
+freqman_index_t freqman_entry_get_bandwidth_from_str( freqman_index_t modulation , char *str );
+freqman_index_t freqman_entry_get_step_from_str( char *str );
+freqman_index_t freqman_entry_get_step_from_str_short( char *str );
+
 #endif/*__FREQMAN_H__*/
@@ -215,7 +215,7 @@ static int load_config(){
 	static Optional<int> config_value;
 	if(!config_value.is_valid()){
 		int8_t value = portapack::persistent_memory::config_cpld();
-		if((value <= 0 || value >= 4) && sd_card::status() == sd_card::Status::Mounted){
+		if((value <= 0 || value >= 5) && sd_card::status() == sd_card::Status::Mounted){
 			int data = read_file("/hardware/settings.txt");
 			if(data != -1) {
 				config_value = data;
@@ -235,14 +235,19 @@ static PortaPackModel portapack_model() {
 		const auto switches_state = get_switches_state();
 		if (switches_state[(size_t)ui::KeyEvent::Up]){
 			save_config(1);
-			model = PortaPackModel::R2_20170522;
+			// model = PortaPackModel::R2_20170522; // Commented these out as they should be set down below anyway
 		}
 		else if (switches_state[(size_t)ui::KeyEvent::Down]){
 			save_config(2);
-			model = PortaPackModel::R1_20150901;
+			// model = PortaPackModel::R1_20150901;
 		}
 		else if (switches_state[(size_t)ui::KeyEvent::Left]){
 			save_config(3);
+			// model = PortaPackModel::R1_20150901;
+		}
+		else if (switches_state[(size_t)ui::KeyEvent::Right]){
+			save_config(4);
+			// model = PortaPackModel::R2_20170522;
 		}
 		else if (switches_state[(size_t)ui::KeyEvent::Select]){
 			save_config(0);
@@ -253,6 +258,10 @@ static PortaPackModel portapack_model() {
 			model = PortaPackModel::R2_20170522;
 		} else if (load_config() == 2) {
 			model = PortaPackModel::R1_20150901;
+		} else if (load_config() == 3) {
+			model = PortaPackModel::R1_20150901;
+		} else if (load_config() == 4) {
+			model = PortaPackModel::R2_20170522;
 		} else {
 			if( audio_codec_wm8731.detected() ) {
 				model = PortaPackModel::R1_20150901; // H1R1
@@ -403,6 +412,7 @@ bool init() {
 	// if( !hackrf::cpld::load_sram() ) {
 	// 	chSysHalt();
 	// }
+	chThdSleepMilliseconds(100);

 	configure_pins_portapack();
 	
@@ -412,6 +422,8 @@ bool init() {

 	i2c0.stop();

+	chThdSleepMilliseconds(10);
+
 	set_clock_config(clock_config_irc);
 	cgu::pll1::disable();

@@ -452,9 +464,14 @@ bool init() {
 	cgu::pll1::direct();

 	i2c0.start(i2c_config_fast_clock);
+	chThdSleepMilliseconds(10);
+
+	/* Cache some configuration data from persistent memory. */
+	persistent_memory::cache::init();

 	touch::adc::init();
 	controls_init();
+	chThdSleepMilliseconds(10);

 	clock_manager.set_reference_ppb(persistent_memory::correction_ppb());
 	clock_manager.enable_first_if_clock();
@@ -465,12 +482,12 @@ bool init() {
 	sdcStart(&SDCD1, nullptr);
 	sd_card::poll_inserted();
 	
-	chThdSleepMilliseconds(1);
+	chThdSleepMilliseconds(10);

 	if( !portapack::cpld::update_if_necessary(portapack_cpld_config()) ) {
-		chThdSleepMilliseconds(1);
+		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){
+		if (load_config() != 3 && load_config() != 4){
 			shutdown_base();
 			return false;
 		}
@@ -480,11 +497,13 @@ bool init() {
 		chSysHalt();
 	}

-	chThdSleepMilliseconds(1); // This delay seems to solve white noise audio issues
+	chThdSleepMilliseconds(10); // This delay seems to solve white noise audio issues

 	LPC_CREG->DMAMUX = portapack::gpdma_mux;
 	gpdma::controller.enable();

+	chThdSleepMilliseconds(10);
+
 	audio::init(portapack_audio_codec());
 	

@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <string.h>

-#pragma mark - Error Correction Lookup tables
+/* #pragma mark - Error Correction Lookup tables */

 #if LOCK_VERSION == 0

@@ -101,7 +101,7 @@ static int abs(int value) {
 */


-#pragma mark - Mode testing and conversion
+/* #pragma mark - Mode testing and conversion */

 static int8_t getAlphanumeric(char c) {
    
@@ -140,7 +140,7 @@ static bool isNumeric(const char *text, uint16_t length) {
 }


-#pragma mark - Counting
+/* #pragma mark - Counting */

 // We store the following tightly packed (less 8) in modeInfo
 //               <=9  <=26  <= 40
@@ -167,7 +167,7 @@ static char getModeBits(uint8_t version, uint8_t mode) {
 }


-#pragma mark - BitBucket
+/* #pragma mark - BitBucket */

 typedef struct BitBucket {
    uint32_t bitOffsetOrWidth;
@@ -251,7 +251,7 @@ static bool bb_getBit(BitBucket *bitGrid, uint8_t x, uint8_t y) {
 }


-#pragma mark - Drawing Patterns
+/* #pragma mark - Drawing Patterns */

 // XORs the data modules in this QR Code with the given mask pattern. Due to XOR's mathematical
 // properties, calling applyMask(m) twice with the same value is equivalent to no change at all.
@@ -474,7 +474,7 @@ static void drawCodewords(BitBucket *modules, BitBucket *isFunction, BitBucket *



-#pragma mark - Penalty Calculation
+/* #pragma mark - Penalty Calculation */

 #define PENALTY_N1      3
 #define PENALTY_N2      3
@@ -574,7 +574,7 @@ static uint32_t getPenaltyScore(BitBucket *modules) {
 }


-#pragma mark - Reed-Solomon Generator
+/* #pragma mark - Reed-Solomon Generator */

 static uint8_t rs_multiply(uint8_t x, uint8_t y) {
    // Russian peasant multiplication
@@ -628,7 +628,7 @@ static void rs_getRemainder(uint8_t degree, uint8_t *coeff, uint8_t *data, uint8



-#pragma mark - QrCode
+/* #pragma mark - QrCode */

 static int8_t encodeDataCodewords(BitBucket *dataCodewords, const uint8_t *text, uint16_t length, uint8_t version) {
    int8_t mode = MODE_BYTE;
@@ -769,7 +769,7 @@ static void performErrorCorrection(uint8_t version, uint8_t ecc, BitBucket *data
 static const uint8_t ECC_FORMAT_BITS = (0x02 << 6) | (0x03 << 4) | (0x00 << 2) | (0x01 << 0);


-#pragma mark - Public QRCode functions
+/* #pragma mark - Public QRCode functions */

 uint16_t qrcode_getBufferSize(uint8_t version) {
    return bb_getGridSizeBytes(4 * version + 17);
@@ -857,7 +857,7 @@ int8_t qrcode_initText(QRCode *qrcode, uint8_t *modules, uint8_t version, uint8_
 }

 bool qrcode_getModule(QRCode *qrcode, uint8_t x, uint8_t y) {
-    if (x < 0 || x >= qrcode->size || y < 0 || y >= qrcode->size) {
+    if ( x >= qrcode->size || y >= qrcode->size) {
        return false;
    }

@@ -873,4 +873,4 @@ uint8_t qrcode_getHexLength(QRCode *qrcode) {
 void qrcode_getHex(QRCode *qrcode, char *result) {
    
 }
-*/
+*/
@@ -38,11 +38,12 @@ using namespace portapack;

 namespace {

-static constexpr std::array<baseband::AMConfig, 4> am_configs { {
-	{ taps_6k0_dsb_channel, AMConfigureMessage::Modulation::DSB },
-	{ taps_2k8_usb_channel, AMConfigureMessage::Modulation::SSB },
-	{ taps_2k8_lsb_channel, AMConfigureMessage::Modulation::SSB },	
-	{ taps_0k7_usb_channel, AMConfigureMessage::Modulation::SSB },
+static constexpr std::array<baseband::AMConfig, 5> am_configs { {	// we config here all the non COMMON  parameters to each AM modulation type in RX.
+	{ taps_9k0_decim_2, taps_9k0_dsb_channel, AMConfigureMessage::Modulation::DSB },		// AM DSB-C  BW 9khz  (+-4k5)	commercial EU bandwidth .
+	{ taps_6k0_decim_2, taps_6k0_dsb_channel, AMConfigureMessage::Modulation::DSB },		// AM DSB-C  BW 6khz  (+-3k0)	narrow AM , ham equipments.
+	{ taps_6k0_decim_2, taps_2k8_usb_channel, AMConfigureMessage::Modulation::SSB },		// SSB USB   BW 2K8   (+ 2K8)
+	{ taps_6k0_decim_2, taps_2k8_lsb_channel, AMConfigureMessage::Modulation::SSB },		// SSB LSB   BW 2K8   (- 2K8)
+	{ taps_6k0_decim_2, taps_0k7_usb_channel, AMConfigureMessage::Modulation::SSB },		// SSB USB   BW 0K7   (+ 0K7)  used to get audio tone from CW Morse, assuming tx shifted +700hz aprox 
 } };

 static constexpr std::array<baseband::NBFMConfig, 3> nbfm_configs { {
@@ -45,6 +45,14 @@ struct serial_format_t {
 	parity_enum parity;
 	uint8_t stop_bits;
 	order_enum bit_order;
+
+	constexpr serial_format_t() :
+		data_bits(7),
+		parity(parity_enum::EVEN),
+		stop_bits(1),
+		bit_order(order_enum::LSB_FIRST)
+	{
+	}
 };

 size_t symbol_count(const serial_format_t& serial_format);
@@ -281,262 +281,262 @@ const std::array<ui::Color, 256> spectrum_rgb2_lut { {
 } };

 const std::array<ui::Color, 256> spectrum_rgb3_lut { {
-	{   0,   0,   0 },
-	{   0,   0,   3 },
-	{   0,   0,   6 },
-	{   0,   0,   9 },
-	{   0,   0,  12 },
-	{   0,   0,  15 },
-	{   0,   0,  18 },
-	{   0,   0,  21 },
-	{   0,   0,  24 },
-	{   0,   0,  27 },
-	{   0,   0,  30 },
-	{   0,   0,  33 },
-	{   0,   0,  36 },
-	{   0,   0,  39 },
-	{   0,   0,  42 },
-	{   0,   0,  45 },
-	{   0,   0,  48 },
-	{   0,   0,  51 },
-	{   0,   0,  54 },
-	{   0,   0,  57 },
-	{   0,   0,  60 },
-	{   0,   0,  63 },
-	{   0,   0,  66 },
-	{   0,   0,  69 },
-	{   0,   0,  72 },
-	{   0,   0,  75 },
-	{   0,   0,  78 },
-	{   0,   0,  81 },
-	{   0,   0,  84 },
-	{   0,   0,  87 },
-	{   0,   0,  90 },
-	{   0,   0,  93 },
-	{   0,   0,  96 },
-	{   0,   0,  99 },
-	{   0,   0, 102 },
-	{   0,   0, 105 },
-	{   0,   0, 108 },
-	{   0,   0, 111 },
-	{   0,   0, 114 },
-	{   0,   0, 117 },
-	{   0,   0, 120 },
-	{   0,   0, 123 },
-	{   0,   0, 126 },
-	{   0,   0, 129 },
-	{   0,   0, 132 },
-	{   0,   0, 135 },
-	{   0,   0, 138 },
-	{   0,   0, 141 },
-	{   0,   0, 144 },
-	{   0,   0, 147 },
-	{   0,   0, 150 },
-	{   0,   0, 153 },
-	{   0,   0, 156 },
-	{   0,   0, 159 },
-	{   0,   0, 162 },
-	{   0,   0, 165 },
-	{   0,   0, 168 },
-	{   0,   0, 171 },
-	{   0,   0, 174 },
-	{   0,   0, 177 },
-	{   0,   0, 180 },
-	{   0,   0, 183 },
-	{   0,   0, 186 },
-	{   0,   0, 189 },
-	{   0,   0, 192 },
-	{   0,   0, 195 },
-	{   0,   0, 198 },
-	{   0,   0, 201 },
-	{   0,   0, 204 },
-	{   0,   0, 207 },
-	{   0,   0, 210 },
-	{   0,   0, 213 },
-	{   0,   0, 216 },
-	{   0,   0, 219 },
-	{   0,   0, 222 },
-	{   0,   0, 225 },
-	{   0,   0, 228 },
-	{   0,   0, 231 },
-	{   0,   0, 234 },
-	{   0,   0, 237 },
-	{   0,   0, 240 },
-	{   0,   0, 243 },
-	{   0,   0, 246 },
-	{   0,   0, 249 },
-	{   0,   0, 252 },
-	{   0,   0, 255 },
-	{   0,   3, 252 },
-	{   0,   6, 249 },
-	{   0,   9, 246 },
-	{   0,  12, 243 },
-	{   0,  15, 240 },
-	{   0,  18, 237 },
-	{   0,  21, 234 },
-	{   0,  24, 231 },
-	{   0,  27, 228 },
-	{   0,  30, 225 },
-	{   0,  33, 222 },
-	{   0,  36, 219 },
-	{   0,  39, 216 },
-	{   0,  42, 213 },
-	{   0,  45, 210 },
-	{   0,  48, 207 },
-	{   0,  51, 204 },
-	{   0,  54, 201 },
-	{   0,  57, 198 },
-	{   0,  60, 195 },
-	{   0,  63, 192 },
-	{   0,  66, 189 },
-	{   0,  69, 186 },
-	{   0,  72, 183 },
-	{   0,  75, 180 },
-	{   0,  78, 177 },
-	{   0,  81, 174 },
-	{   0,  84, 171 },
-	{   0,  87, 168 },
-	{   0,  90, 165 },
-	{   0,  93, 162 },
-	{   0,  96, 159 },
-	{   0,  99, 156 },
-	{   0, 102, 153 },
-	{   0, 105, 150 },
-	{   0, 108, 147 },
-	{   0, 111, 144 },
-	{   0, 114, 141 },
-	{   0, 117, 138 },
-	{   0, 120, 135 },
-	{   0, 123, 132 },
-	{   0, 126, 129 },
-	{   0, 129, 126 },
-	{   0, 132, 123 },
-	{   0, 135, 120 },
-	{   0, 138, 117 },
-	{   0, 141, 114 },
-	{   0, 144, 111 },
-	{   0, 147, 108 },
-	{   0, 150, 105 },
-	{   0, 153, 102 },
-	{   0, 156,  99 },
-	{   0, 159,  96 },
-	{   0, 162,  93 },
-	{   0, 165,  90 },
-	{   0, 168,  87 },
-	{   0, 171,  84 },
-	{   0, 174,  81 },
-	{   0, 177,  78 },
-	{   0, 180,  75 },
-	{   0, 183,  72 },
-	{   0, 186,  69 },
-	{   0, 189,  66 },
-	{   0, 192,  63 },
-	{   0, 195,  60 },
-	{   0, 198,  57 },
-	{   0, 201,  54 },
-	{   0, 204,  51 },
-	{   0, 207,  48 },
-	{   0, 210,  45 },
-	{   0, 213,  42 },
-	{   0, 216,  39 },
-	{   0, 219,  36 },
-	{   0, 222,  33 },
-	{   0, 225,  30 },
-	{   0, 228,  27 },
-	{   0, 231,  24 },
-	{   0, 234,  21 },
-	{   0, 237,  18 },
-	{   0, 240,  15 },
-	{   0, 243,  12 },
-	{   0, 246,   9 },
-	{   0, 249,   6 },
-	{   0, 252,   3 },
-	{   0, 255,   0 },
-	{   3, 252,   0 },
-	{   6, 249,   0 },
-	{   9, 246,   0 },
-	{  12, 243,   0 },
-	{  15, 240,   0 },
-	{  18, 237,   0 },
-	{  21, 234,   0 },
-	{  24, 231,   0 },
-	{  27, 228,   0 },
-	{  30, 225,   0 },
-	{  33, 222,   0 },
-	{  36, 219,   0 },
-	{  39, 216,   0 },
-	{  42, 213,   0 },
-	{  45, 210,   0 },
-	{  48, 207,   0 },
-	{  51, 204,   0 },
-	{  54, 201,   0 },
-	{  57, 198,   0 },
-	{  60, 195,   0 },
-	{  63, 192,   0 },
-	{  66, 189,   0 },
-	{  69, 186,   0 },
-	{  72, 183,   0 },
-	{  75, 180,   0 },
-	{  78, 177,   0 },
-	{  81, 174,   0 },
-	{  84, 171,   0 },
-	{  87, 168,   0 },
-	{  90, 165,   0 },
-	{  93, 162,   0 },
-	{  96, 159,   0 },
-	{  99, 156,   0 },
-	{ 102, 153,   0 },
-	{ 105, 150,   0 },
-	{ 108, 147,   0 },
-	{ 111, 144,   0 },
-	{ 114, 141,   0 },
-	{ 117, 138,   0 },
-	{ 120, 135,   0 },
-	{ 123, 132,   0 },
-	{ 126, 129,   0 },
-	{ 129, 126,   0 },
-	{ 132, 123,   0 },
-	{ 135, 120,   0 },
-	{ 138, 117,   0 },
-	{ 141, 114,   0 },
-	{ 144, 111,   0 },
-	{ 147, 108,   0 },
-	{ 150, 105,   0 },
-	{ 153, 102,   0 },
-	{ 156,  99,   0 },
-	{ 159,  96,   0 },
-	{ 162,  93,   0 },
-	{ 165,  90,   0 },
-	{ 168,  87,   0 },
-	{ 171,  84,   0 },
-	{ 174,  81,   0 },
-	{ 177,  78,   0 },
-	{ 180,  75,   0 },
-	{ 183,  72,   0 },
-	{ 186,  69,   0 },
-	{ 189,  66,   0 },
-	{ 192,  63,   0 },
-	{ 195,  60,   0 },
-	{ 198,  57,   0 },
-	{ 201,  54,   0 },
-	{ 204,  51,   0 },
-	{ 207,  48,   0 },
-	{ 210,  45,   0 },
-	{ 213,  42,   0 },
-	{ 216,  39,   0 },
-	{ 219,  36,   0 },
-	{ 222,  33,   0 },
-	{ 225,  30,   0 },
-	{ 228,  27,   0 },
-	{ 231,  24,   0 },
-	{ 234,  21,   0 },
-	{ 237,  18,   0 },
-	{ 240,  15,   0 },
-	{ 243,  12,   0 },
-	{ 246,   9,   0 },
-	{ 249,   6,   0 },
-	{ 252,   3,   0 },
-	{ 255,   0,   0 },
+	{ 0x00, 0x00, 0x02 },
+	{ 0x00, 0x00, 0x04 },
+	{ 0x00, 0x00, 0x05 },
+	{ 0x00, 0x00, 0x07 },
+	{ 0x00, 0x00, 0x0a },
+	{ 0x00, 0x00, 0x0c },
+	{ 0x00, 0x00, 0x0e },
+	{ 0x00, 0x00, 0x10 },
+	{ 0x00, 0x00, 0x13 },
+	{ 0x00, 0x00, 0x15 },
+	{ 0x00, 0x00, 0x17 },
+	{ 0x00, 0x00, 0x19 },
+	{ 0x00, 0x00, 0x1b },
+	{ 0x00, 0x00, 0x1d },
+	{ 0x00, 0x00, 0x1f },
+	{ 0x00, 0x00, 0x21 },
+	{ 0x00, 0x00, 0x24 },
+	{ 0x00, 0x00, 0x25 },
+	{ 0x00, 0x00, 0x28 },
+	{ 0x00, 0x00, 0x29 },
+	{ 0x00, 0x00, 0x2c },
+	{ 0x00, 0x00, 0x2e },
+	{ 0x00, 0x00, 0x30 },
+	{ 0x00, 0x00, 0x33 },
+	{ 0x00, 0x00, 0x35 },
+	{ 0x00, 0x00, 0x37 },
+	{ 0x00, 0x00, 0x39 },
+	{ 0x00, 0x00, 0x3b },
+	{ 0x00, 0x00, 0x3d },
+	{ 0x00, 0x00, 0x3f },
+	{ 0x00, 0x00, 0x41 },
+	{ 0x00, 0x00, 0x43 },
+	{ 0x00, 0x00, 0x46 },
+	{ 0x00, 0x00, 0x48 },
+	{ 0x00, 0x00, 0x4a },
+	{ 0x00, 0x00, 0x4c },
+	{ 0x00, 0x00, 0x4e },
+	{ 0x00, 0x00, 0x50 },
+	{ 0x00, 0x00, 0x53 },
+	{ 0x00, 0x00, 0x55 },
+	{ 0x00, 0x00, 0x56 },
+	{ 0x00, 0x00, 0x59 },
+	{ 0x00, 0x00, 0x5b },
+	{ 0x00, 0x00, 0x5d },
+	{ 0x00, 0x00, 0x5f },
+	{ 0x00, 0x00, 0x62 },
+	{ 0x00, 0x00, 0x63 },
+	{ 0x00, 0x00, 0x66 },
+	{ 0x00, 0x00, 0x68 },
+	{ 0x00, 0x00, 0x6a },
+	{ 0x00, 0x00, 0x6c },
+	{ 0x00, 0x00, 0x6e },
+	{ 0x00, 0x00, 0x70 },
+	{ 0x00, 0x00, 0x73 },
+	{ 0x00, 0x00, 0x75 },
+	{ 0x00, 0x00, 0x77 },
+	{ 0x00, 0x00, 0x79 },
+	{ 0x00, 0x00, 0x7b },
+	{ 0x00, 0x00, 0x7d },
+	{ 0x00, 0x00, 0x7f },
+	{ 0x00, 0x00, 0x82 },
+	{ 0x00, 0x00, 0x84 },
+	{ 0x00, 0x00, 0x86 },
+	{ 0x00, 0x00, 0x88 },
+	{ 0x00, 0x00, 0x8a },
+	{ 0x00, 0x00, 0x8c },
+	{ 0x00, 0x00, 0x8e },
+	{ 0x00, 0x00, 0x91 },
+	{ 0x00, 0x00, 0x93 },
+	{ 0x00, 0x00, 0x95 },
+	{ 0x00, 0x00, 0x97 },
+	{ 0x00, 0x00, 0x99 },
+	{ 0x00, 0x00, 0x9b },
+	{ 0x00, 0x00, 0x9d },
+	{ 0x00, 0x00, 0x9f },
+	{ 0x00, 0x00, 0xa2 },
+	{ 0x00, 0x00, 0xa4 },
+	{ 0x00, 0x00, 0xa6 },
+	{ 0x00, 0x00, 0xa8 },
+	{ 0x00, 0x00, 0xaa },
+	{ 0x00, 0x00, 0xac },
+	{ 0x00, 0x00, 0xae },
+	{ 0x00, 0x00, 0xb1 },
+	{ 0x00, 0x00, 0xb3 },
+	{ 0x00, 0x00, 0xb5 },
+	{ 0x00, 0x00, 0xb7 },
+	{ 0x00, 0x00, 0xb9 },
+	{ 0x00, 0x00, 0xbb },
+	{ 0x00, 0x00, 0xbd },
+	{ 0x00, 0x00, 0xbf },
+	{ 0x00, 0x00, 0xc2 },
+	{ 0x00, 0x00, 0xc4 },
+	{ 0x00, 0x00, 0xc6 },
+	{ 0x00, 0x00, 0xc8 },
+	{ 0x00, 0x00, 0xca },
+	{ 0x00, 0x00, 0xcc },
+	{ 0x00, 0x00, 0xce },
+	{ 0x00, 0x00, 0xd1 },
+	{ 0x00, 0x00, 0xd3 },
+	{ 0x00, 0x00, 0xd5 },
+	{ 0x00, 0x00, 0xd7 },
+	{ 0x00, 0x00, 0xd9 },
+	{ 0x00, 0x00, 0xdb },
+	{ 0x00, 0x00, 0xdd },
+	{ 0x00, 0x00, 0xdf },
+	{ 0x00, 0x00, 0xe2 },
+	{ 0x00, 0x00, 0xe4 },
+	{ 0x00, 0x00, 0xe6 },
+	{ 0x00, 0x00, 0xe8 },
+	{ 0x00, 0x00, 0xea },
+	{ 0x00, 0x00, 0xec },
+	{ 0x00, 0x00, 0xee },
+	{ 0x00, 0x00, 0xf1 },
+	{ 0x00, 0x00, 0xf3 },
+	{ 0x00, 0x00, 0xf5 },
+	{ 0x00, 0x00, 0xf7 },
+	{ 0x00, 0x00, 0xf9 },
+	{ 0x00, 0x00, 0xfb },
+	{ 0x00, 0x00, 0xfd },
+	{ 0x01, 0x00, 0xfe },
+	{ 0x05, 0x00, 0xfa },
+	{ 0x09, 0x00, 0xf6 },
+	{ 0x0e, 0x00, 0xf2 },
+	{ 0x12, 0x00, 0xed },
+	{ 0x16, 0x00, 0xe9 },
+	{ 0x1b, 0x00, 0xe4 },
+	{ 0x1f, 0x00, 0xe0 },
+	{ 0x24, 0x00, 0xdc },
+	{ 0x27, 0x00, 0xd8 },
+	{ 0x2c, 0x00, 0xd3 },
+	{ 0x30, 0x00, 0xcf },
+	{ 0x35, 0x00, 0xcb },
+	{ 0x39, 0x00, 0xc6 },
+	{ 0x3d, 0x00, 0xc2 },
+	{ 0x42, 0x00, 0xbd },
+	{ 0x46, 0x00, 0xb9 },
+	{ 0x4b, 0x00, 0xb5 },
+	{ 0x4f, 0x00, 0xb0 },
+	{ 0x53, 0x00, 0xac },
+	{ 0x58, 0x00, 0xa7 },
+	{ 0x5c, 0x00, 0xa3 },
+	{ 0x61, 0x00, 0x9f },
+	{ 0x65, 0x00, 0x9a },
+	{ 0x69, 0x00, 0x96 },
+	{ 0x6e, 0x00, 0x91 },
+	{ 0x72, 0x00, 0x8d },
+	{ 0x77, 0x00, 0x89 },
+	{ 0x7b, 0x00, 0x84 },
+	{ 0x7f, 0x00, 0x80 },
+	{ 0x84, 0x00, 0x7b },
+	{ 0x88, 0x00, 0x77 },
+	{ 0x8d, 0x00, 0x73 },
+	{ 0x91, 0x00, 0x6e },
+	{ 0x95, 0x00, 0x6a },
+	{ 0x9a, 0x00, 0x65 },
+	{ 0x9e, 0x00, 0x61 },
+	{ 0xa3, 0x00, 0x5d },
+	{ 0xa7, 0x00, 0x58 },
+	{ 0xab, 0x00, 0x54 },
+	{ 0xb0, 0x00, 0x4f },
+	{ 0xb4, 0x00, 0x4b },
+	{ 0xb9, 0x00, 0x47 },
+	{ 0xbd, 0x00, 0x42 },
+	{ 0xc1, 0x00, 0x3e },
+	{ 0xc6, 0x00, 0x39 },
+	{ 0xca, 0x00, 0x35 },
+	{ 0xcf, 0x00, 0x31 },
+	{ 0xd3, 0x00, 0x2c },
+	{ 0xd7, 0x00, 0x28 },
+	{ 0xdc, 0x00, 0x23 },
+	{ 0xe0, 0x00, 0x1f },
+	{ 0xe5, 0x00, 0x1b },
+	{ 0xe9, 0x00, 0x16 },
+	{ 0xed, 0x00, 0x12 },
+	{ 0xf2, 0x00, 0x0d },
+	{ 0xf6, 0x00, 0x09 },
+	{ 0xfb, 0x00, 0x05 },
+	{ 0xfe, 0x01, 0x01 },
+	{ 0xff, 0x06, 0x00 },
+	{ 0xff, 0x0d, 0x00 },
+	{ 0xff, 0x13, 0x00 },
+	{ 0xff, 0x1a, 0x00 },
+	{ 0xff, 0x20, 0x00 },
+	{ 0xff, 0x26, 0x00 },
+	{ 0xff, 0x2d, 0x00 },
+	{ 0xff, 0x33, 0x00 },
+	{ 0xff, 0x3a, 0x00 },
+	{ 0xff, 0x40, 0x00 },
+	{ 0xff, 0x46, 0x00 },
+	{ 0xff, 0x4d, 0x00 },
+	{ 0xff, 0x53, 0x00 },
+	{ 0xff, 0x59, 0x00 },
+	{ 0xff, 0x60, 0x00 },
+	{ 0xff, 0x66, 0x00 },
+	{ 0xff, 0x6c, 0x00 },
+	{ 0xff, 0x73, 0x00 },
+	{ 0xff, 0x79, 0x00 },
+	{ 0xff, 0x80, 0x00 },
+	{ 0xff, 0x86, 0x00 },
+	{ 0xff, 0x8c, 0x00 },
+	{ 0xff, 0x93, 0x00 },
+	{ 0xff, 0x99, 0x00 },
+	{ 0xff, 0x9f, 0x00 },
+	{ 0xff, 0xa6, 0x00 },
+	{ 0xff, 0xac, 0x00 },
+	{ 0xff, 0xb3, 0x00 },
+	{ 0xff, 0xb9, 0x00 },
+	{ 0xff, 0xbf, 0x00 },
+	{ 0xff, 0xc6, 0x00 },
+	{ 0xff, 0xcc, 0x00 },
+	{ 0xff, 0xd2, 0x00 },
+	{ 0xff, 0xd9, 0x00 },
+	{ 0xff, 0xdf, 0x00 },
+	{ 0xff, 0xe6, 0x00 },
+	{ 0xff, 0xec, 0x00 },
+	{ 0xff, 0xf2, 0x00 },
+	{ 0xff, 0xf9, 0x00 },
+	{ 0xff, 0xfe, 0x01 },
+	{ 0xff, 0xff, 0x06 },
+	{ 0xff, 0xff, 0x0d },
+	{ 0xff, 0xff, 0x14 },
+	{ 0xff, 0xff, 0x1b },
+	{ 0xff, 0xff, 0x21 },
+	{ 0xff, 0xff, 0x28 },
+	{ 0xff, 0xff, 0x2f },
+	{ 0xff, 0xff, 0x35 },
+	{ 0xff, 0xff, 0x3c },
+	{ 0xff, 0xff, 0x42 },
+	{ 0xff, 0xff, 0x49 },
+	{ 0xff, 0xff, 0x4f },
+	{ 0xff, 0xff, 0x56 },
+	{ 0xff, 0xff, 0x5d },
+	{ 0xff, 0xff, 0x63 },
+	{ 0xff, 0xff, 0x6a },
+	{ 0xff, 0xff, 0x71 },
+	{ 0xff, 0xff, 0x77 },
+	{ 0xff, 0xff, 0x7e },
+	{ 0xff, 0xff, 0x84 },
+	{ 0xff, 0xff, 0x8b },
+	{ 0xff, 0xff, 0x92 },
+	{ 0xff, 0xff, 0x98 },
+	{ 0xff, 0xff, 0x9f },
+	{ 0xff, 0xff, 0xa6 },
+	{ 0xff, 0xff, 0xac },
+	{ 0xff, 0xff, 0xb3 },
+	{ 0xff, 0xff, 0xb9 },
+	{ 0xff, 0xff, 0xc0 },
+	{ 0xff, 0xff, 0xc7 },
+	{ 0xff, 0xff, 0xcd },
+	{ 0xff, 0xff, 0xd4 },
+	{ 0xff, 0xff, 0xdb },
+	{ 0xff, 0xff, 0xe1 },
+	{ 0xff, 0xff, 0xe8 },
+	{ 0xff, 0xff, 0xee },
+	{ 0xff, 0xff, 0xf5 },
+	{ 0xff, 0xff, 0xfb }
 } };

 const std::array<ui::Color, 256> spectrum_rgb4_lut { {
@@ -104,8 +104,30 @@ void tone_keys_populate(OptionsField& field) {
 	field.set_options(tone_key_options);
 }

-float tone_key_frequency(const uint32_t index) {
+float tone_key_frequency(const tone_index index) {
 	return tone_keys[index].second;
 }

+std::string tone_key_string( tone_index index ) {
+	if( index < 0 || (unsigned)index >= tone_keys . size() )
+		return std::string( "" ); 
+	return tone_keys[ index ] .first ;
+}
+
+tone_index tone_key_index_by_string( char *str ) {
+	if( !str )
+		return -1 ;
+	for( tone_index index = 0 ; (unsigned)index < tone_keys . size() ; index ++ )
+	{
+		if( tone_keys[ index ] . first . compare( str ) >= 0 )
+			return index ;
+	}
+	return -1 ;	
+}	
+
+/* tone_index tone_key_index_by_value( int32_t freq )
+{
+	return -1 ;	
+} */
+
 }
@@ -30,12 +30,18 @@ using namespace ui;

 namespace tonekey {

+typedef int16_t tone_index ;
+
 using tone_key_t = std::vector<std::pair<std::string, float>>;

 extern const tone_key_t tone_keys;

 void tone_keys_populate(OptionsField& field);
-float tone_key_frequency(const uint32_t index);
+float tone_key_frequency(const tone_index index);
+
+std::string tone_key_string( const tone_index index );
+tone_index tone_key_index_by_string( char *str );
+// tone_index tone_key_index_by_value( int32_t freq );

 }

@@ -76,14 +76,6 @@ ui::Point Calibration::translate(const DigitizerPoint& p) const {
 	return { x_clipped, y_clipped };
 }

-const Calibration default_calibration() {
-	/* Values derived from one PortaPack H1 unit. */
-	return {
-		{ { { 256, 731 }, { 880, 432 }, { 568, 146 } } },
-		{ { {  32,  48 }, { 208, 168 }, { 120, 288 } } }
-	};
-};
-
 void Manager::feed(const Frame& frame) {
 	// touch_debounce.feed(touch_raw);
 	const auto touch_raw = frame.touch;
@@ -137,6 +137,15 @@ struct Calibration {
 	{
 	}

+	constexpr Calibration() :
+		Calibration(
+			/* Values derived from one PortaPack H1 unit. */
+			{ { { 256, 731 }, { 880, 432 }, { 568, 146 } } },
+			{ { {  32,  48 }, { 208, 168 }, { 120, 288 } } }
+		)
+	{
+	}
+
 	ui::Point translate(const DigitizerPoint& p) const;

 private:
@@ -149,8 +158,6 @@ private:
 	int32_t f;
 };

-const Calibration default_calibration();
-
 template<size_t N>
 class Filter {
 public:
@@ -43,8 +43,25 @@ QRCodeImage::QRCodeImage(
 	
 }

+QRCodeImage::~QRCodeImage( )
+{
+
+}
+
+QRCodeImage::QRCodeImage(const QRCodeImage&Image) : Widget { }
+{
+    (void)Image;
+}
+
+QRCodeImage & QRCodeImage::operator=(const QRCodeImage&Image)
+{
+    (void)Image;
+    return *this;
+}
+
 void QRCodeImage::paint(Painter& painter) {

+    (void)painter ;

 	// The structure to manage the QR code
 	QRCode qrcode;
@@ -40,10 +40,13 @@ public:
 		qr_text_ = qr_text;
 	}
 	void paint(Painter& painter) override;
-
+                                                   // for -weffc++ to be killed
+    ~QRCodeImage();                                // destructor 
+    QRCodeImage(const QRCodeImage&Image);
+    QRCodeImage & operator=(const QRCodeImage &Image); // assignment

 private:
-	const char * qr_text_ ;
+	const char * qr_text_ = NULL ;
 };

 class QRCodeView : public View {
--- a/Show More
+++ b/Show More