Merge pull request #630 from TQMatvey/next

Fix KeyFob (beta) being off-screen
2026-08-25 17:09:03 +00:00 · 2022-05-05 14:57:35 +02:00 · 2022-05-05 18:06:15 +07:00 · 2022-05-05 08:31:54 +12:00 · 2022-05-04 13:47:34 +02:00 · 2022-05-04 10:29:12 +02:00
135 changed files with 38194 additions and 36113 deletions
@@ -0,0 +1,28 @@
+import os
+import re
+import sys
+
+raw_git = os.popen('git log next --since="24 hours" --pretty=format:"- %h - {USERNAME}*+%al-%an*: %s"').read()
+
+
+def compute_username(line):
+    stripped = re.search(r'(?<=\*)(.*?)(?=\*)', line).group(0)
+
+    pattern = re.compile("[$@+&?].*[$@+&?]")
+    if pattern.match(stripped):
+        stripped = re.sub("[$@+&?].*[$@+&?]", "", stripped)
+        stripped = re.match(r'.+?(?=-)', stripped).group(0)
+    else:
+        stripped = re.sub(r'^.*?-', "", stripped)
+    return "@" + stripped
+
+
+def compile_line(line):
+    username = compute_username(line)
+    line = re.sub(r'[*].*[*]', "", line)
+    line = line.replace("{USERNAME}", username)
+    return line
+
+
+for row in raw_git.splitlines():
+    print(compile_line(row))
@@ -0,0 +1,99 @@
+name: Nightly Release
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+    
+  workflow_dispatch:
+
+jobs:
+  check_date:
+    runs-on: ubuntu-latest
+    name: Check latest commit
+    outputs:
+      should_run: ${{ steps.should_run.outputs.should_run }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: print latest_commit
+        run: echo ${{ github.sha }}
+
+      - name: check latest commit is less than a day
+        id: should_run
+        continue-on-error: true
+        run: test -z $(git rev-list  --after="24 hours" ${{ github.sha }}) && echo "::set-output name=should_run::false"
+  build:
+    needs: check_date
+    if: ${{ needs.check_date.outputs.should_run != 'false' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
+      - name: Get version date
+        id: version_date
+        run: echo "::set-output name=date::n_$(date +'%y%m%d')"
+      - name: Checkout 
+        uses: actions/checkout@master
+        with:
+          fetch-depth: 0
+          ref: next
+          submodules: true
+      - name: Git Sumbodule Update
+        run: |
+          git submodule update --init --recursive
+      - name: Build the Docker image
+        run: docker build -t portapack-dev -f dockerfile-nogit . --tag my-image-name:$(date +%s)
+      - name: Make build folder
+        run: mkdir ${{ github.workspace }}/build
+      - name: Run the Docker image
+        run: docker run -e VERSION_STRING=${{ steps.version_date.outputs.date }} -i -v ${{ github.workspace }}:/havoc portapack-dev
+      - name: Create Firmware ZIP
+        run: |
+          zip -j firmware.zip build/firmware/portapack-h1_h2-mayhem.bin && cd flashing && zip -r ../firmware.zip *
+      - name: Create SD Card ZIP
+        run: |
+          zip -r sdcard.zip sdcard
+      - name: Create changelog
+        run: |
+          CHANGELOG=$(python3 .github/workflows/changelog.py)
+          CHANGELOG="${CHANGELOG//'%'/'%25'}"
+          CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
+          CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
+          echo "::set-output name=content::$CHANGELOG"
+        id: changelog
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: nightly-tag-${{ steps.date.outputs.date }}
+          release_name: Nightly Release - ${{ steps.date.outputs.date }}
+          body: |
+            **Nightly release - ${{ steps.date.outputs.date }}**
+            This build is the latest and greatest, although may not be the most stable as this is a nightly release.
+            ## Release notes
+            ###  Revision (${{ steps.version_date.outputs.date }}):
+            ${{ steps.changelog.outputs.content }}
+          draft: false
+          prerelease: true
+      - name: Upload Firmware Asset
+        id: upload-firmware-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./firmware.zip
+          asset_name: mayhem_nightly_${{ steps.version_date.outputs.date }}_FIRMWARE.zip
+          asset_content_type: application/zip
+      - name: Upload SD Card Assets
+        id: upload-sd-card-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./sdcard.zip
+          asset_name: mayhem_nightly_${{ steps.version_date.outputs.date }}_COPY_TO_SDCARD.zip
+          asset_content_type: application/zip
@@ -0,0 +1,93 @@
+name: Stable Release
+
+on:    
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
+      - name: Checkout 
+        uses: actions/checkout@master
+        with:
+          fetch-depth: 0
+          ref: next
+          submodules: true
+      - name: Git Sumbodule Update
+        run: |
+          git submodule update --init --recursive
+      - name: Get version
+        id: version
+        run: echo "::set-output name=version::$(cat .github/workflows/version.txt)"
+      - name: Get past version
+        id: past_version
+        run: echo "::set-output name=past_version::$(cat .github/workflows/past_version.txt)"
+      - name: Build the Docker image
+        run: docker build -t portapack-dev -f dockerfile-nogit . --tag my-image-name:$(date +%s)
+      - name: Make build folder
+        run: mkdir ${{ github.workspace }}/build
+      - name: Run the Docker image
+        run: docker run -e VERSION_STRING=${{ steps.version.outputs.version }} -i -v ${{ github.workspace }}:/havoc portapack-dev
+      - name: Create Firmware ZIP
+        run: |
+          zip -j firmware.zip build/firmware/portapack-h1_h2-mayhem.bin && cd flashing && zip -r ../firmware.zip *
+      - name: Create SD Card ZIP
+        run: |
+          zip -r sdcard.zip sdcard
+      - name: Create changelog
+        run: |
+          CHANGELOG=$(python3 .github/workflows/stable_changelog.py ${{ steps.past_version.outputs.past_version }})
+          CHANGELOG="${CHANGELOG//'%'/'%25'}"
+          CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
+          CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
+          echo "::set-output name=content::$CHANGELOG"
+        id: changelog
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: v1.5.1
+          release_name: Mayhem firmware ${{ steps.version.outputs.version }}
+          body: |
+            **Stable release - ${{ steps.version.outputs.version }}**
+            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/). Please check the [readme](https://github.com/eried/portapack-mayhem/blob/master/README.md) for details.
+            ## Release notes
+            ###  Revision (${{ steps.version.outputs.version }}):
+            ${{ steps.changelog.outputs.content }}
+            
+            **Full Changelog**: https://github.com/eried/portapack-mayhem/compare/${{ steps.past_version.outputs.past_version }}...${{ steps.version.outputs.version }}
+
+            ## Installation
+            Check the [wiki](https://github.com/eried/portapack-havoc/wiki/Update-firmware) for details how to upgrade. 
+
+            ### MicroSD card files
+
+            For certain functionality, like the world map, GPS simulator, and others you need to uncompress (using [7-zip](https://www.7-zip.org/download.html)) the files from `mayhem_vX.Y.Z_COPY_TO_SDCARD.zip` to a FAT32 formatted MicroSD card.
+          draft: true
+          prerelease: false
+      - name: Upload Firmware Asset
+        id: upload-firmware-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./firmware.zip
+          asset_name: mayhem_${{ steps.version.outputs.version }}_FIRMWARE.zip
+          asset_content_type: application/zip
+      - name: Upload SD Card Assets
+        id: upload-sd-card-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./sdcard.zip
+          asset_name: mayhem_${{ steps.version.outputs.version }}_COPY_TO_SDCARD.zip
+          asset_content_type: application/zip
+     
@@ -0,0 +1 @@
+v1.5.0
@@ -0,0 +1,30 @@
+import os
+import re
+import sys
+
+past_version = sys.argv[1]
+
+raw_git = os.popen('git log ' + past_version + '..next --pretty=format:"- %h - {USERNAME}*+%al-%an*: %s"').read()
+
+
+def compute_username(line):
+    stripped = re.search(r'(?<=\*)(.*?)(?=\*)', line).group(0)
+
+    pattern = re.compile("[$@+&?].*[$@+&?]")
+    if pattern.match(stripped):
+        stripped = re.sub("[$@+&?].*[$@+&?]", "", stripped)
+        stripped = re.match(r'.+?(?=-)', stripped).group(0)
+    else:
+        stripped = re.sub(r'^.*?-', "", stripped)
+    return "@" + stripped
+
+
+def compile_line(line):
+    username = compute_username(line)
+    line = re.sub(r'[*].*[*]', "", line)
+    line = line.replace("{USERNAME}", username)
+    return line
+
+
+for row in raw_git.splitlines():
+    print(compile_line(row))
@@ -0,0 +1 @@
+v1.5.1
@@ -39,7 +39,6 @@
 *.lib

 # Executables
-*.exe
 *.out
 *.app
 /firmware/baseband/*.bin
@@ -25,8 +25,8 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/firmware/toolchain-arm-cortex

 project(portapack-h1)

-#set(VERSION "")
-if (NOT DEFINED VERSION)
+set(VERSION "$ENV{VERSION_STRING}")
+if ("$ENV{VERSION_STRING}" STREQUAL "")
 	execute_process(
 		COMMAND git log -n 1 --format=%h
 		WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
@@ -38,7 +38,7 @@ if (NOT DEFINED VERSION)
 	if (GIT_VERSION_FOUND)
 		set(VERSION "unknown")
 	else (GIT_VERSION_FOUND)
-		set(VERSION "local-${GIT_VERSION}")
+		set(VERSION "${GIT_VERSION}")
 	endif (GIT_VERSION_FOUND)
 endif()

@@ -26,7 +26,9 @@ To support the people behind the hardware, please buy a genuine [HackRF](https:/

 ## Where is the latest firmware?

-The current stable release is on the [![GitHub release (latest by date)](https://img.shields.io/github/v/release/eried/portapack-mayhem?label=Releases&style=social)](https://github.com/eried/portapack-mayhem/releases/latest) page. Follow the instructions you can find in the release description. 
+The **latest (nightly) release** can be found [here](https://github.com/eried/portapack-mayhem/releases/).
+
+The current **stable release** is on the [![GitHub release (latest by date)](https://img.shields.io/github/v/release/eried/portapack-mayhem?label=Releases&style=social)](https://github.com/eried/portapack-mayhem/releases/latest) page. Follow the instructions you can find in the release description. 

 ## Is this the newest firmware for my PortaPack? 
 Most probably: **YES**. *If you find new features somewhere else, please [suggest](https://github.com/eried/portapack-mayhem/issues/new/choose) them*.
@@ -154,11 +154,13 @@ set(CPPSRC
 	${COMMON}/ui_widget.cpp
 	${COMMON}/utility.cpp
 	${COMMON}/wm8731.cpp
+	app_settings.cpp
 	audio.cpp
 	baseband_api.cpp
 	capture_thread.cpp
 	clock_manager.cpp
 	core_control.cpp
+	database.cpp
 	de_bruijn.cpp
 	#emu_cc1101.cpp
 	rfm69.cpp
@@ -0,0 +1,113 @@
+/*
+ * 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>
+
+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, 256);
+			
+			// Retrieve settings
+			auto position1 = strstr(file_content, "baseband_bandwidth=");
+			if (position1) {
+				position1 += 19;
+				settings->baseband_bandwidth=strtoll(position1, nullptr, 10);
+			}
+
+			auto position2 = strstr(file_content, "rx_frequency=");
+			if (position2)  {
+				position2 += 13;
+				settings->rx_frequency=strtoll(position2, nullptr, 10);
+			}
+
+			auto position3 = strstr(file_content, "lna=");
+			if (position3) {
+				position3 += 4;
+				settings->lna=strtoll(position3, nullptr, 10);
+			}
+
+			auto position4 = strstr(file_content, "rx_amp=");
+			if (position4) {
+				position4 += 7;
+				settings->rx_amp=strtoll(position4, nullptr, 10);
+			}
+
+			auto position5 = strstr(file_content, "sampling_rate=");
+			if (position5) {
+				position5 += 13;
+				settings->sampling_rate=strtoll(position5, nullptr, 10);
+			}
+
+
+			auto position6 = strstr(file_content, "vga=");
+			if (position6) {
+				position6 += 4;
+				settings->vga=strtoll(position6, nullptr, 10);
+			} 
+
+			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("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("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));
+
+			rc = SETTINGS_OK;
+		}
+		else rc = SETTINGS_UNABLE_TO_SAVE;
+	}
+	else rc = SETTINGS_DISABLED;
+	return(rc);
+}
+
+} /* namespace std */
@@ -0,0 +1,78 @@
+/*
+ * 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
+
+
+	// store settings that can't be set directly, but have to be stored in app	
+	struct AppSettings {
+		uint32_t 	baseband_bandwidth;
+		uint8_t 	lna;
+		uint8_t 	rx_amp;
+		uint32_t 	rx_frequency;
+		uint32_t 	sampling_rate;
+		uint8_t 	vga;
+	};
+
+	int load(std::string application, AppSettings* settings);
+	int save(std::string application, AppSettings* settings);
+
+
+private:
+
+
+	char 		file_content[257] = {};	
+	std::string 	file_path = "";
+	std::string 	folder = "SETTINGS";
+	int		rc = SETTINGS_OK;
+	File 		settings_file { };	
+
+
+}; // class app_settings
+} // namespace std
+
+
+
+#endif/*__APP_SETTINGS_H__*/
@@ -22,6 +22,7 @@
 #include "ais_app.hpp"

 #include "string_format.hpp"
+#include "database.hpp"

 #include "baseband_api.hpp"

@@ -59,7 +60,26 @@ static float latlon_float(const int32_t normalized) {
 static std::string mmsi(
 	const ais::MMSI& mmsi
 ) {
-	return to_string_dec_uint(mmsi, 9);
+	return to_string_dec_uint(mmsi, 9, '0'); // MMSI is always is always 9 characters pre-padded with zeros
+}
+
+
+static std::string mid(
+	const ais::MMSI& mmsi
+) {
+	std::database 			db;
+	std::string 			mid_code = "";
+	std::database::MidDBRecord 	mid_record = {};
+	int 				return_code = 0;
+
+	// Try getting the country name from mids.db using MID code for given MMSI
+	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_NOT_FOUND: 	return "No mids.db file";
+		default:			return "";
+	}
 }

 static std::string navigational_status(const unsigned int value) {
@@ -234,13 +254,23 @@ AISRecentEntryDetailView::AISRecentEntryDetailView(NavigationView& nav) {

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

 void AISRecentEntryDetailView::update_position() {
 	if (send_updates)
-		geomap_view->update_position(ais::format::latlon_float(entry_.last_position.latitude.normalized()), ais::format::latlon_float(entry_.last_position.longitude.normalized()), (float)entry_.last_position.true_heading);
+		geomap_view->update_position(ais::format::latlon_float(entry_.last_position.latitude.normalized()), ais::format::latlon_float(entry_.last_position.longitude.normalized()), (float)entry_.last_position.true_heading, 0);
 }

 void AISRecentEntryDetailView::focus() {
@@ -271,6 +301,7 @@ void AISRecentEntryDetailView::paint(Painter& painter) {
 	auto field_rect = Rect { rect.left(), rect.top() + 16, rect.width(), 16 };

 	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);
@@ -304,20 +335,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;
-
-	radio::enable({
-		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()),
-	});
-
+    	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.
+	
 	options_channel.on_change = [this](size_t, OptionsField::value_t v) {
 		this->on_frequency_changed(v);
 	};
@@ -337,7 +372,12 @@ 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,15 +127,18 @@ public:
 	void focus() override;
 	void paint(Painter&) override;

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

 	Button button_done {
-		{ 125, 216, 96, 24 },
+		{ 125, 224, 96, 24 },
 		"Done"
 	};
 	Button button_see_map {
-		{ 19, 216, 96, 24 },
+		{ 19, 224, 96, 24 },
 		"See on map"
 	};
 	GeoMapView* geomap_view { nullptr };
@@ -163,12 +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,7 +129,20 @@ AnalogAudioView::AnalogAudioView(
 		&waterfall
 	});

-	field_frequency.set_value(receiver_model.tuning_frequency());
+	// 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_step(receiver_model.frequency_step());
 	field_frequency.on_change = [this](rf::Frequency f) {
 		this->on_tuning_frequency_changed(f);
@@ -207,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();
@@ -28,11 +28,11 @@
 #include "ui_receiver.hpp"
 #include "ui_spectrum.hpp"
 #include "ui_record_view.hpp"
-
 #include "ui_font_fixed_8x16.hpp"
-
+#include "app_settings.hpp"
 #include "tone_key.hpp"

+
 namespace ui {

 constexpr Style style_options_group {
@@ -143,7 +143,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 +154,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 };

@@ -216,7 +220,10 @@ private:

 	RecordView record_view {
 		{ 0 * 8, 2 * 16, 30 * 8, 1 * 16 },
-		u"AUD_????", RecordView::FileType::WAV, 4096, 4
+		u"AUD",
+		RecordView::FileType::WAV, 
+		4096, 
+		4
 	};

 	spectrum::WaterfallWidget waterfall { true };
@@ -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 };

@@ -75,8 +75,8 @@ CaptureAppView::CaptureAppView(NavigationView& nav) {
 	option_bandwidth.on_change = [this](size_t, uint32_t base_rate) {
 		sampling_rate = 8 * base_rate;	// Decimation by 8 done on baseband side
  	    /* base_rate  is used for FFT calculation and display LCD, and also in  recording writing SD Card  rate. */
-		/* ex. sampling_rate values, 4Mhz, when recording 500 khz (BW) and fs 8 Mhz , when selected 1 Mhz BW ...*/ 
-	    /* ex. recording 500khz BW  to .C16 file, base_rate clock 500khz x2(I,Q) x 2 bytes (int signed) =2MB/sec rate SD Card  */
+		/* ex. sampling_rate values, 4Mhz, when recording 500 kHz (BW) and fs 8 Mhz , when selected 1 Mhz BW ...*/ 
+	    /* ex. recording 500kHz BW  to .C16 file, base_rate clock 500kHz x2(I,Q) x 2 bytes (int signed) =2MB/sec rate SD Card  */

 		waterfall.on_hide();
 		record_view.set_sampling_rate(sampling_rate);
@@ -85,12 +85,12 @@ CaptureAppView::CaptureAppView(NavigationView& nav) {
 		
 		switch(sampling_rate) {   // we use the var fs (sampling_rate) , to set up BPF aprox < fs_max/2 by Nyquist theorem. 
 	  
-	  			case 0 ... 2000000:  //  BW Captured range  (0 <= 250Khz max )  fs = 8 x 250 Khz 
+	  			case 0 ... 2000000:  //  BW Captured range  (0 <= 250kHz max )  fs = 8 x 250 kHz 
 					anti_alias_baseband_bandwidth_filter = 1750000;  // Minimum BPF MAX2837 for all those lower BW options.
        	 		break;

-				case 4000000 ... 6000000:    // BW capture  range (500k ... 750Khz max )  fs_max = 8 x 750Khz = 6Mhz 
-     				//  BW 500k ... 750khz   ,  ex. 500khz   (fs = 8*BW =  4Mhz) , BW 600Khz (fs = 4,8Mhz) , BW  750 Khz (fs = 6Mhz)  
+				case 4000000 ... 6000000:    // BW capture  range (500k ... 750kHz max )  fs_max = 8 x 750kHz = 6Mhz 
+     				//  BW 500k ... 750kHz   ,  ex. 500kHz   (fs = 8*BW =  4Mhz) , BW 600kHz (fs = 4,8Mhz) , BW  750 kHz (fs = 6Mhz)  
 					anti_alias_baseband_bandwidth_filter = 2500000;  // in some IC MAX2837 appear 2250000 , but both works similar. 
 					break;	

@@ -123,7 +123,7 @@ CaptureAppView::CaptureAppView(NavigationView& nav) {
 		waterfall.on_show();
 	};
 	
-	option_bandwidth.set_selected_index(7);		// 500k,  Preselected starting default option 500khz 
+	option_bandwidth.set_selected_index(7);		// 500k,  Preselected starting default option 500kHz 
 	
 	receiver_model.set_modulation(ReceiverModel::Mode::Capture);
 	receiver_model.enable();
@@ -105,6 +105,15 @@ ERTAppView::ERTAppView(NavigationView&) {
 		&recent_entries_view,
 	});

+	// 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);
+	}
+
+
 	radio::enable({
 		initial_target_frequency,
 		sampling_rate,
@@ -122,6 +131,10 @@ ERTAppView::ERTAppView(NavigationView&) {
 }

 ERTAppView::~ERTAppView() {
+
+	// save app settings
+	settings.save("rx_ert", &app_settings);
+
 	radio::disable();

 	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 },
@@ -140,13 +140,24 @@ void GpsSimAppView::start() {
 			}
 		);
 	}
+	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);
 	
 	radio::enable({
 		receiver_model.tuning_frequency(),
 		sample_rate ,
 		baseband_bandwidth,
 		rf::Direction::Transmit,
-		receiver_model.rf_amp(),
+		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())
 	});
@@ -181,6 +192,9 @@ GpsSimAppView::GpsSimAppView(
 	NavigationView& nav
 ) : nav_ (nav)
 {
+	tx_gain = 35;field_rfgain.set_value(tx_gain);  // Initial default  value (-12 dB's max 47dBs ).
+	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_gps);

 	add_children({
@@ -191,8 +205,8 @@ GpsSimAppView::GpsSimAppView(
 		&text_duration,
 		&progressbar,
 		&field_frequency,
-		&field_lna,
-		&field_rf_amp,
+		&field_rfgain,
+		&field_rfamp,       // let's not use common persistent rf_amp , local rfamp is enough
 		&check_loop,
 		&button_play,
 		&waterfall,
@@ -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_;
@@ -52,6 +52,8 @@ private:
 	static constexpr ui::Dim header_height = 3 * 16;
 	
 	uint32_t sample_rate = 0;
+	int32_t tx_gain { 47 };
+	bool rf_amp { true }; // aux private var to store temporal, same as Replay App rf_amp user selection.
 	static constexpr uint32_t baseband_bandwidth = 3000000; //filter bandwidth
 	const size_t read_size { 16384 };
 	const size_t buffer_count { 3 };
@@ -76,7 +78,7 @@ private:
 	bool ready_signal { false };

 	Labels labels {
-		{ { 10 * 8, 2 * 16 }, "LNA:   A:", Color::light_grey() }
+		{ { 10 * 8, 2 * 16 }, "GAIN   A:", Color::light_grey() }
 	};
 	
 	Button button_open {
@@ -104,11 +106,19 @@ private:
 	FrequencyField field_frequency {
 		{ 0 * 8, 2 * 16 },
 	};
-	LNAGainField field_lna {
-		{ 14 * 8, 2 * 16 }
+	NumberField field_rfgain {
+		{ 14 * 8, 2 * 16 },
+		2,
+		{ 0, 47 },
+		1,
+		' '	
 	};
-	RFAmpField field_rf_amp {
-		{ 19 * 8, 2 * 16 }
+	NumberField field_rfamp {     // previously we were 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 and Replay App
+		14,
+		' '
 	};
 	Checkbox check_loop {
 		{ 21 * 8, 2 * 16 },
@@ -40,7 +40,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 {
@@ -77,11 +77,20 @@ 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_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 +136,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;
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2016 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
+ * Copyleft  (ↄ) 2022 NotPike
 *
 * This file is part of PortaPack.
 *
@@ -121,6 +122,7 @@ void ReplayAppView::start() {
 	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);
 	}
@@ -150,17 +152,19 @@ void ReplayAppView::start() {
 		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 ,
+		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 ReplayAppView::stop(const bool do_loop) {
@@ -170,6 +174,7 @@ void ReplayAppView::stop(const bool do_loop) {
 	if (do_loop && check_loop.value()) {
 		start();
 	} else {
+		radio::set_antenna_bias(false);    //Turn off Bias Tee
 		radio::disable();
 		button_play.set_bitmap(&bitmap_play);
 	}
@@ -45,7 +45,7 @@ public:

 	void focus() override;
 	
-	std::string title() const override { return "Soundboard"; };
+	std::string title() const override { return "Soundboard TX"; };
 	
 private:
 	NavigationView& nav_;
@@ -34,6 +34,8 @@ namespace tpms {

 namespace format {

+static bool use_kpa = true;
+
 std::string type(Reading::Type type) {
 	return to_string_dec_uint(toUType(type), 2);
 }
@@ -43,7 +45,11 @@ std::string id(TransponderID id) {
 }

 std::string pressure(Pressure pressure) {
-	return to_string_dec_int(pressure.kilopascal(), 3);
+	if(use_kpa){
+		return to_string_dec_int(pressure.kilopascal(), 3);
+	}
+	return to_string_dec_int(pressure.psi(), 3);
+	
 }

 std::string temperature(Temperature temperature) {
@@ -142,9 +148,19 @@ TPMSAppView::TPMSAppView(NavigationView&) {
 		&field_rf_amp,
 		&field_lna,
 		&field_vga,
-		&recent_entries_view,
+		&options_type,
 	});

+	// 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());
+
 	radio::enable({
 		tuning_frequency(),
 		sampling_rate,
@@ -160,6 +176,17 @@ TPMSAppView::TPMSAppView(NavigationView&) {
 	};
 	options_band.set_by_value(target_frequency());

+	options_type.on_change = [this](size_t, int32_t i) {		
+		if (i == 0){
+			tpms::format::use_kpa = true;
+		} else if (i == 1){
+			tpms::format::use_kpa = false;
+		}	
+		update_type();
+	};
+
+	options_type.set_selected_index(0, true);
+
 	logger = std::make_unique<TPMSLogger>();
 	if( logger ) {
 		logger->append(u"tpms.txt");
@@ -167,6 +194,12 @@ TPMSAppView::TPMSAppView(NavigationView&) {
 }

 TPMSAppView::~TPMSAppView() {
+
+
+	// save app settings
+	app_settings.rx_frequency = target_frequency_;
+	settings.save("rx_tpms", &app_settings);
+
 	radio::disable();

 	baseband::shutdown();
@@ -176,9 +209,24 @@ void TPMSAppView::focus() {
 	options_band.focus();
 }

+void TPMSAppView::update_type() {
+	if (tpms::format::use_kpa){
+		remove_child(&recent_entries_view_psi);
+		add_child(&recent_entries_view_kpa);
+		recent_entries_view_kpa.set_parent_rect(view_normal_rect);
+	} else {
+		remove_child(&recent_entries_view_kpa);
+		add_child(&recent_entries_view_psi);
+		recent_entries_view_psi.set_parent_rect(view_normal_rect);
+	}	
+}
+
 void TPMSAppView::set_parent_rect(const Rect new_parent_rect) {
 	View::set_parent_rect(new_parent_rect);
-	recent_entries_view.set_parent_rect({ 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height });
+
+	view_normal_rect  = { 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height };
+
+	update_type();
 }

 void TPMSAppView::on_packet(const tpms::Packet& packet) {
@@ -191,13 +239,23 @@ void TPMSAppView::on_packet(const tpms::Packet& packet) {
 		const auto reading = reading_opt.value();
 		auto& entry = ::on_packet(recent, TPMSRecentEntry::Key { reading.type(), reading.id() });
 		entry.update(reading);
-		recent_entries_view.set_dirty();
+		
+		if(tpms::format::use_kpa){
+			recent_entries_view_kpa.set_dirty();
+		} else {
+			recent_entries_view_psi.set_dirty();
+		}
 	}
 }

 void TPMSAppView::on_show_list() {
-	recent_entries_view.hidden(false);
-	recent_entries_view.focus();
+	if(tpms::format::use_kpa){
+		recent_entries_view_kpa.hidden(false);
+		recent_entries_view_kpa.focus();
+	} else {
+		recent_entries_view_psi.hidden(false);
+		recent_entries_view_psi.focus();
+	}
 }

 void TPMSAppView::on_band_changed(const uint32_t new_band_frequency) {
@@ -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) {
@@ -121,6 +125,8 @@ private:

 	static constexpr ui::Dim header_height = 1 * 16;

+	ui::Rect view_normal_rect { };
+
 	RSSI rssi {
 		{ 21 * 8, 0, 6 * 8, 4 },
 	};
@@ -134,7 +140,16 @@ private:
 		3,
 		{
 			{ "315", 315000000 },
-			{ "434", 433920000 },
+			{ "433", 433920000 },
+		}
+	};
+
+	OptionsField options_type {
+		{ 5 * 8, 0 * 16 },
+		3,
+		{
+			{ "kPa", 0 },
+			{ "PSI", 1 }
 		}
 	};

@@ -153,7 +168,7 @@ private:
 	TPMSRecentEntries recent { };
 	std::unique_ptr<TPMSLogger> logger { };

-	const RecentEntriesColumns columns { {
+	const RecentEntriesColumns columns_kpa { {
 		{ "Tp", 2 },
 		{ "ID", 8 },
 		{ "kPa", 3 },
@@ -161,12 +176,23 @@ private:
 		{ "Cnt", 3 },
 		{ "Fl", 2 },
 	} };
-	TPMSRecentEntriesView recent_entries_view { columns, recent };
+	TPMSRecentEntriesView recent_entries_view_kpa { columns_kpa, recent };
+
+	const RecentEntriesColumns columns_psi { {
+		{ "Tp", 2 },
+		{ "ID", 8 },
+		{ "PSI", 3 },
+		{ "C", 3 },
+		{ "Cnt", 3 },
+		{ "Fl", 2 },
+	} };
+	TPMSRecentEntriesView recent_entries_view_psi { columns_psi, recent };

 	uint32_t target_frequency_ = initial_target_frequency;

 	void on_packet(const tpms::Packet& packet);
 	void on_show_list();
+	void update_type();

 	void on_band_changed(const uint32_t new_band_frequency);

@@ -37,7 +37,8 @@ namespace ui
                console.writeln("vXxOinvizioNxX,teixeluis");
                console.writeln("Brumi-2021,texasyojimbo");
                console.writeln("heurist1,intoxsick,ckuethe");
-                console.writeln("notpike");
+                console.writeln("notpike,jLynx,zigad");
+                console.writeln("MichalLeonBorsuk");
                console.writeln("");
                break;

@@ -72,7 +72,7 @@ void RecentEntriesTable<AircraftRecentEntries>::draw(
 		to_string_dec_uint((unsigned int)entry.velo.speed,4) +
 		to_string_dec_uint((unsigned int)(entry.amp>>9),4) + " " +
 		(entry.hits <= 999 ? to_string_dec_uint(entry.hits, 3) + " " : "1k+ ") +
-		to_string_dec_uint(entry.age, 3);
+		to_string_dec_uint(entry.age, 4);
 #endif
 	
 	painter.draw_string(
@@ -107,11 +107,7 @@ ADSBRxAircraftDetailsView::ADSBRxAircraftDetailsView(
 	const std::function<void(void)> on_close
 ) : entry_copy(entry),
 	on_close_(on_close)
-{
-	char file_buffer[32] { 0 };
-	bool found = false;
-	size_t number_of_icao_codes = 0;	
-	std::string icao_code;
+{	
 	
 	add_children({
 		&labels,
@@ -130,46 +126,22 @@ ADSBRxAircraftDetailsView::ADSBRxAircraftDetailsView(
 	std::unique_ptr<ADSBLogger> logger { };
 	//update(entry_copy);

+
+	icao_code = to_string_hex(entry_copy.ICAO_address, 6);
 	text_icao_address.set(to_string_hex(entry_copy.ICAO_address, 6));

-
 	// Try getting the aircraft information from icao24.db
-	auto result = db_file.open("ADSB/icao24.db");
-	if (!result.is_valid()) {
-		// determine number of ICAO24 codes in file, total size / (single index + record size)
-		number_of_icao_codes = (db_file.size() / 153); 
-		icao_code = to_string_hex(entry_copy.ICAO_address, 6);
-
-  		// binary search
-    		int first = 0,         				// First search element       
-    		last = number_of_icao_codes - 1,        	// Last search element       
-    		middle,                				// Mid point of search       
-    		position = -1;         				// Position of search value   
-    		while (!found && first <= last) {  
-        		middle = (first + last) / 2;     	// Calculate mid point      
-        		db_file.seek(middle * 7); 
-			db_file.read(file_buffer, 6);
-			if (file_buffer == icao_code) {     	// If value is found at mid        
-                		found = true;         
-                		position = middle;      
-        		}      
-        		else if (file_buffer > icao_code)  	// If value is in lower half         
-            			last = middle - 1;      
-        		else         
-            			first = middle + 1;          	// If value is in upper half   
-    		}   
-		
-		if (position > -1) {
-			db_file.seek((number_of_icao_codes * 7) + (position * 146)); // seek starting after index
-			db_file.read(file_buffer, 9);
-			text_registration.set(file_buffer);
-			db_file.read(file_buffer, 33);
-			text_manufacturer.set(file_buffer);
-			db_file.read(file_buffer, 33);
-			text_model.set(file_buffer);
-			db_file.read(file_buffer, 5); // ICAO type decripton
-			if(strlen(file_buffer) == 3) {
-				switch(file_buffer[0]) {
+	return_code = db.retrieve_aircraft_record(&aircraft_record, icao_code);
+	switch(return_code) {
+		case DATABASE_RECORD_FOUND: 
+			text_registration.set(aircraft_record.aircraft_registration);
+			text_manufacturer.set(aircraft_record.aircraft_manufacturer);
+			text_model.set(aircraft_record.aircraft_model);	
+			text_owner.set(aircraft_record.aircraft_owner);
+			text_operator.set(aircraft_record.aircraft_operator);
+			// Check for ICAO type, e.g. L2J
+			if(strlen(aircraft_record.icao_type) == 3) {
+				switch(aircraft_record.icao_type[0]) {
 					case 'L': 
 						text_type.set("Landplane"); 
 						break;
@@ -189,8 +161,8 @@ ADSBRxAircraftDetailsView::ADSBRxAircraftDetailsView(
 						text_type.set("Tilt-wing aircraft"); 
 						break;					
 				}
-				text_number_of_engines.set(std::string(1, file_buffer[1]));
-				switch(file_buffer[2]) {
+				text_number_of_engines.set(std::string(1, aircraft_record.icao_type[1]));
+				switch(aircraft_record.icao_type[2]) {
 					case 'P': 
 						text_engine_type.set("Piston engine"); 
 						break;
@@ -206,30 +178,22 @@ ADSBRxAircraftDetailsView::ADSBRxAircraftDetailsView(
 				}

 			}
-			// check for ICAO type designator
-			else if(strlen(file_buffer) == 4) {
-				if(strcmp(file_buffer,"SHIP") == 0) text_type.set("Airship");
-				else if(strcmp(file_buffer,"BALL") == 0) text_type.set("Balloon");
-				else if(strcmp(file_buffer,"GLID") == 0) text_type.set("Glider / sailplane");
-				else if(strcmp(file_buffer,"ULAC") == 0) text_type.set("Micro/ultralight aircraft");
-				else if(strcmp(file_buffer,"GYRO") == 0) text_type.set("Micro/ultralight autogyro");
-				else if(strcmp(file_buffer,"UHEL") == 0) text_type.set("Micro/ultralight helicopter");
-				else if(strcmp(file_buffer,"SHIP") == 0) text_type.set("Airship");
-				else if(strcmp(file_buffer,"PARA") == 0) text_type.set("Powered parachute/paraplane");
-			}			
-			db_file.read(file_buffer, 33);
-			text_owner.set(file_buffer);
-			db_file.read(file_buffer, 33);
-			text_operator.set(file_buffer);
-		} else {
-			text_registration.set("Unknown");
-			text_manufacturer.set("Unknown");
-		}
-	} else {
-		text_manufacturer.set("No icao24.db file");
+			// Check for ICAO type designator
+			else if(strlen(aircraft_record.icao_type) == 4) {
+				if(strcmp(aircraft_record.icao_type,"SHIP") == 0) text_type.set("Airship");
+				else if(strcmp(aircraft_record.icao_type,"BALL") == 0) text_type.set("Balloon");
+				else if(strcmp(aircraft_record.icao_type,"GLID") == 0) text_type.set("Glider / sailplane");
+				else if(strcmp(aircraft_record.icao_type,"ULAC") == 0) text_type.set("Micro/ultralight aircraft");
+				else if(strcmp(aircraft_record.icao_type,"GYRO") == 0) text_type.set("Micro/ultralight autogyro");
+				else if(strcmp(aircraft_record.icao_type,"UHEL") == 0) text_type.set("Micro/ultralight helicopter");
+				else if(strcmp(aircraft_record.icao_type,"SHIP") == 0) text_type.set("Airship");
+				else if(strcmp(aircraft_record.icao_type,"PARA") == 0) text_type.set("Powered parachute/paraplane");
+			}
+			break;
+		case DATABASE_NOT_FOUND: 
+			text_manufacturer.set("No icao24.db file");
+			break;	
 	}
-
-
 	button_close.on_select =  [&nav](Button&){
 		nav.pop();
 	};
@@ -261,7 +225,7 @@ void ADSBRxDetailsView::update(const AircraftRecentEntry& entry) {
 	text_frame_pos_odd.set(to_string_hex_array(entry_copy.frame_pos_odd.get_raw_data(), 14));
 	
 	if (send_updates)
-		geomap_view->update_position(entry_copy.pos.latitude, entry_copy.pos.longitude, entry_copy.velo.heading);
+		geomap_view->update_position(entry_copy.pos.latitude, entry_copy.pos.longitude, entry_copy.velo.heading, entry_copy.pos.altitude);
 }

 ADSBRxDetailsView::~ADSBRxDetailsView() {
@@ -275,11 +239,7 @@ ADSBRxDetailsView::ADSBRxDetailsView(
 ) : entry_copy(entry),
 	on_close_(on_close)
 {
-	char file_buffer[32] { 0 };
-	bool found = false;
-	size_t number_of_airlines = 0;	
-	std::string airline_code;
-	
+
 	add_children({
 		&labels,
 		&text_icao_address,
@@ -300,46 +260,19 @@ ADSBRxDetailsView::ADSBRxDetailsView(

 	// The following won't (shouldn't !) change for a given airborne aircraft
 	// Try getting the airline's name from airlines.db
-	auto result = db_file.open("ADSB/airlines.db");
-	if (!result.is_valid()) {
-		// Search for 3-letter code
-		number_of_airlines = (db_file.size() / 68); // determine number of airlines in file
-		airline_code = entry_copy.callsign.substr(0, 3);
-
-  		// binary search
-    		int first = 0,         				// First search element       
-    		last = number_of_airlines - 1,        	 	// Last search element       
-    		middle,                				// Mid point of search       
-    		position = -1;         				// Position of search value   
-    		while (!found && first <= last) {  
-        		middle = (first + last) / 2;     	// Calculate mid point      
-        		db_file.seek(middle * 4); 
-			db_file.read(file_buffer, 3);
-			if (file_buffer == airline_code) {     	// If value is found at mid        
-                		found = true;         
-                		position = middle;      
-        		}      
-        		else if (file_buffer > airline_code)  	// If value is in lower half         
-            			last = middle - 1;      
-        		else         
-            			first = middle + 1;          	// If value is in upper half   
-    		}   
-		
-		if (position > -1) {
-			db_file.seek((number_of_airlines * 4) + (position << 6)); // seek starting after index
-			db_file.read(file_buffer, 32);
-			text_airline.set(file_buffer);
-			db_file.read(file_buffer, 32);
-			text_country.set(file_buffer);
-		} else {
-			text_airline.set("Unknown");
-			text_country.set("Unknown");
-		}
-	} else {
-		text_airline.set("No airlines.db file");
-		text_country.set("No airlines.db file");
+	airline_code = entry_copy.callsign.substr(0, 3);
+	return_code = db.retrieve_airline_record(&airline_record, airline_code);
+	switch(return_code) {
+		case DATABASE_RECORD_FOUND: 
+			text_airline.set(airline_record.airline);
+			text_country.set(airline_record.country);	
+			break;
+		case DATABASE_NOT_FOUND: 
+			text_airline.set("No airlines.db file");
+			break;
 	}
-	
+
+
 	text_callsign.set(entry_copy.callsign);
 	text_icao_address.set(to_string_hex(entry_copy.ICAO_address, 6));

@@ -376,8 +309,11 @@ void ADSBRxView::focus() {
 }

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

+	// save app settings
+	settings.save("rx_adsb", &app_settings);
+
+	receiver_model.set_tuning_frequency(prevFreq);
 	rtc_time::signal_tick_second -= signal_token_tick_second;
 	receiver_model.disable();
 	baseband::shutdown();
@@ -525,6 +461,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();
@@ -545,8 +496,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);
@@ -27,11 +27,12 @@
 #include "ui_font_fixed_8x16.hpp"

 #include "file.hpp"
+#include "database.hpp"
 #include "recent_entries.hpp"
 #include "log_file.hpp"
 #include "adsb.hpp"
 #include "message.hpp"
-
+#include "app_settings.hpp"
 #include "crc.hpp"

 using namespace adsb;
@@ -176,13 +177,17 @@ public:
 	std::string title() const override { return "AC Details"; };

 	AircraftRecentEntry get_current_entry() { return entry_copy; }
+
+	std::database::AircraftDBRecord aircraft_record = {};
 	
 private:
-	AircraftRecentEntry entry_copy { 0 };
-	std::function<void(void)> on_close_ { };
-	bool send_updates { false };
-	File db_file { };
-	
+	AircraftRecentEntry 		entry_copy { 0 };
+	std::function<void(void)> 	on_close_ { };
+	bool 				send_updates { false };
+	std::database 			db = { };
+	std::string 			icao_code = "";
+	int 				return_code = 0;
+
 	Labels labels {
 	        { { 0 * 8, 1 * 16 }, "ICAO:", Color::light_grey() },
 		{ { 0 * 8, 2 * 16 }, "Registration:", Color::light_grey() },
@@ -264,14 +269,19 @@ public:
 	std::string title() const override { return "Details"; };

 	AircraftRecentEntry get_current_entry() { return entry_copy; }
+
+
+	std::database::AirlinesDBRecord airline_record = {};
 	
 private:
-	AircraftRecentEntry entry_copy { 0 };
-	std::function<void(void)> on_close_ { };
-	GeoMapView* geomap_view { nullptr };
-	ADSBRxAircraftDetailsView* aircraft_details_view { nullptr };
-	bool send_updates { false };
-	File db_file { };
+	AircraftRecentEntry 		entry_copy { 0 };
+	std::function<void(void)> 	on_close_ { };
+	GeoMapView* 			geomap_view { nullptr };
+	ADSBRxAircraftDetailsView* 	aircraft_details_view { nullptr };
+	bool 				send_updates { false };
+	std::database 			db = { };	
+	std::string 			airline_code = "";
+	int 				return_code = 0;
 	
 	Labels labels {
 	        { { 0 * 8, 1 * 16 }, "ICAO:", Color::light_grey() },
@@ -351,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
@@ -375,7 +388,7 @@ private:
 		{ "Spd", 3 },
 		{ "Amp", 3 },
 		{ "Hit", 3 },
-		{ "Age", 3 }
+		{ "Age", 4 }
 #endif
 	} };
 	AircraftRecentEntries recent { };
@@ -152,7 +152,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 {
@@ -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);
@@ -108,12 +117,12 @@ APRSRxView::APRSRxView(NavigationView& nav, Rect parent_rect) : View(parent_rect
 	options_region.on_change = [this](size_t, int32_t i) {		
 		if (i == 0){
 			field_frequency.set_value(144390000);			
-		}
-		if(i == 1){
+		} else if(i == 1){
 			field_frequency.set_value(144800000);
-		}
-		if(i == 2){
+		} else if(i == 2){
 			field_frequency.set_value(145175000);
+		} else if(i == 3){
+			field_frequency.set_value(144575000);
 		}		
 	};
 	
@@ -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();
@@ -351,7 +364,7 @@ void APRSDetailsView::update() {
 	}	
 	
 	if (send_updates)
-		geomap_view->update_position(entry_copy.pos.latitude, entry_copy.pos.longitude, 0);
+		geomap_view->update_position(entry_copy.pos.latitude, entry_copy.pos.longitude, 0, 0);
 }

 APRSDetailsView::~APRSDetailsView() {
@@ -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 { "" };

@@ -217,7 +223,8 @@ private:
 		{
 			{ "NA ", 0 },
 			{ "EUR", 1 },
-			{ "AUS", 2 }
+			{ "AUS", 2 },
+			{ "NZ ", 3 }
 		}
 	};
 	
@@ -178,7 +178,7 @@ public:

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

 private:
 	void on_tx_progress(const uint32_t progress, const bool done);
@@ -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 { "" };
@@ -39,7 +39,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 {
@@ -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 },
@@ -158,7 +158,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "OOK transmit"; };
+	std::string title() const override { return "OOK TX"; };

 private:
 	NavigationView& nav_;
@@ -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_;
@@ -36,7 +36,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "Keyfob (BETA)"; };
+	std::string title() const override { return "Key fob TX"; };

 private:
 	NavigationView& nav_;
@@ -39,7 +39,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 {
@@ -24,6 +24,10 @@

 #include "baseband_api.hpp"
 #include "audio.hpp"
+
+#include "wm8731.hpp"
+using wolfson::wm8731::WM8731;
+
 #include "tonesets.hpp"
 #include "portapack_hal.hpp"
 #include "string_format.hpp"
@@ -34,6 +38,10 @@
 using namespace tonekey;
 using namespace portapack;

+
+WM8731 audio_codec_wm8731 { i2c0, 0x1a };
+
+
 namespace ui {

 void MicTXView::focus() {
@@ -178,7 +186,7 @@ void MicTXView::rxaudio(bool is_on) {

 		baseband::run_image(portapack::spi_flash::image_tag_mic_tx);
 		audio::output::stop();
-		audio::input::start();	
+		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)
 		portapack::pin_i2s0_rx_sda.mode(3);
 		configure_baseband();
 	}
@@ -203,10 +211,12 @@ MicTXView::MicTXView(
 	
 	baseband::run_image(portapack::spi_flash::image_tag_mic_tx);
 	
-	add_children({
-		&labels,
+	
+	if ( audio_codec_wm8731.detected() ) {
+	add_children({		
+		&labels_WM8731,		// we have audio codec WM8731, same MIC menu  as original.
 		&vumeter,
-		&options_gain,
+		&options_gain,		// MIC GAIN float factor on the GUI.
 //		&check_va,
 		&field_va,
 		&field_va_level,
@@ -229,6 +239,37 @@ MicTXView::MicTXView(
 		&field_rxamp,
 		&tx_button
 	});
+    
+	} else {			
+	add_children({
+		&labels_AK4951,		// we have audio codec AK4951, enable Automatic Level Control
+		&vumeter,
+		&options_gain,
+		&options_ak4951_alc_mode,
+//		&check_va,
+		&field_va,
+		&field_va_level,
+		&field_va_attack,
+		&field_va_decay,
+		&field_bw,
+		&field_rfgain,
+		&field_rfamp,
+		&options_mode,
+		&field_frequency,
+		&options_tone_key,
+		&check_rogerbeep,
+		&check_rxactive,
+		&field_volume,
+		&field_rxbw,
+		&field_squelch,
+		&field_rxfrequency,
+		&field_rxlna,
+		&field_rxvga,
+		&field_rxamp,
+		&tx_button
+	});
+	
+	}

 	tone_keys_populate(options_tone_key);
 	options_tone_key.on_change = [this](size_t i, int32_t) {
@@ -242,6 +283,12 @@ MicTXView::MicTXView(
 	};
 	options_gain.set_selected_index(1);		// x1.0
 	
+	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);
+	 
 	tx_frequency = transmitter_model.tuning_frequency();
 	field_frequency.set_value(transmitter_model.tuning_frequency());
 	field_frequency.set_step(receiver_model.frequency_step());
@@ -478,7 +525,7 @@ MicTXView::MicTXView(
 	set_tx(false);
 	
 	audio::set_rate(audio::Rate::Hz_24000);
-	audio::input::start();
+	audio::input::start(ak4951_alc_GUI_selected);		// originally , audio::input::start();  (we added parameter)
 }

 MicTXView::~MicTXView() {
@@ -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,6 +83,7 @@ private:
 	bool rx_enabled { false };
 	uint32_t tone_key_index { };
 	float mic_gain { 1.0 };
+    uint8_t  ak4951_alc_GUI_selected { 0 }; 
 	uint32_t audio_level { 0 };
 	uint32_t va_level { };
 	uint32_t attack_ms { };
@@ -106,8 +107,8 @@ private:
 	bool enable_lsb { false };

 	
-	Labels labels {
-		{ { 3 * 8, 1 * 8 }, "MIC. GAIN:", Color::light_grey() },
+	Labels labels_WM8731 {		
+		{ { 3 * 8, 1 * 8 }, "MIC-GAIN:", Color::light_grey() },
 		{ { 3 * 8, 3 * 8 }, "F:", Color::light_grey() },
 		{ { 15 * 8, 3 * 8 }, "BW:   FM kHz", Color::light_grey() },
 		{ { 3 * 8, 5 * 8 }, "GAIN:", Color::light_grey() },
@@ -118,15 +119,36 @@ 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() },
-		{ { 9 * 8, 23 * 8 }, "VOL:", Color::light_grey() },
-		{ {17 * 8, 23 * 8 }, "FM RXBW:", Color::light_grey() },
+		{ { 7 * 8, 23 * 8 }, "VOL:", Color::light_grey() },
+		{ {15 * 8, 23 * 8 }, "FM RXBW:", Color::light_grey() },
 		{ {17 * 8, 25 * 8 }, "SQ:", Color::light_grey() },
 		{ { 5 * 8, 25 * 8 }, "F:", Color::light_grey() },
 		{ { 5 * 8, 27 * 8 }, "LNA:", Color::light_grey()},
 		{ {12 * 8, 27 * 8 }, "VGA:", Color::light_grey()},
 		{ {19 * 8, 27 * 8 }, "AMP:", Color::light_grey()}
 	};
-	
+	Labels labels_AK4951 {
+		{ { 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() },
+		{ { 3 * 8, 5 * 8 }, "GAIN:", Color::light_grey() },
+		{ {11 * 8, 5 * 8 }, "Amp:", Color::light_grey() },
+		{ { 18 * 8, (5 * 8) }, "Mode:", Color::light_grey() },
+		{ { 3 * 8, 8 * 8 }, "TX Activation:", Color::light_grey() },
+		{ { 4 * 8, 10 * 8 }, "LVL:", Color::light_grey() },
+		{ {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() },
+		{ {17 * 8, 25 * 8 }, "SQ:", Color::light_grey() },
+		{ { 5 * 8, 25 * 8 }, "F:", Color::light_grey() },
+		{ { 5 * 8, 27 * 8 }, "LNA:", Color::light_grey()},
+		{ {12 * 8, 27 * 8 }, "VGA:", Color::light_grey()},
+		{ {19 * 8, 27 * 8 }, "AMP:", Color::light_grey()}
+	};
+
 	VuMeter vumeter {
 		{ 0 * 8, 1 * 8, 2 * 8, 33 * 8 },
 		12,
@@ -135,7 +157,7 @@ private:

 	
 	OptionsField options_gain {
-		{ 13 * 8, 1 * 8 },
+		{ 12 * 8, 1 * 8 },
 		4,
 		{
 			{ "x0.5", 5 },
@@ -145,6 +167,25 @@ private:
 		}
 	};
 	
+	OptionsField options_ak4951_alc_mode {
+		{ 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)
+			{ "+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)
+			{ "+03dB-2kHz", 4 },	// ALC-> on, (+03dB's) Auto Vol max + Wind Noise cancel + LPF 3,5k + Pre-amp Mic (+21dB=original)+ EQ boosting ~<2kHz (f0~1k1,fb:1,7K, k=1,8)
+			{ "+03dB-4kHz", 5 },	// ALC-> on, (+03dB's) Auto Vol max + Wind Noise cancel + LPF 4kHz + Pre-amp Mic (+21dB=original)+ EQ boosting ~<3kHz (f0~1k4,fb~2,4k, k=1,8)
+			{ "+03dB-6kHz", 6 },	// ALC-> on, (+03dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz + Pre-amp Mic (+21dB=original)
+			{ "+00dB-6kHz", 7 },	// ALC-> on, (+00dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz + Pre-amp Mic (+21dB=original)
+			{ "-03dB-6kHz", 8 },	// ALC-> on, (-03dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz + Pre-amp Mic (+21dB=original)
+			{ "-06dB-6kHz", 9 },	// ALC-> on, (-06dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz + Pre-amp Mic (+21dB=original)
+			{ "-09dB-6kHz", 10 },	// ALC-> on, (-09dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz - Pre-amp MIC -3dB (18dB's) 
+			{ "-12dB-6kHz", 11 },	// ALC-> on, (-12dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz - Pre-amp MIC -6dB (15dB's) 	
+		}
+	};
+
 	FrequencyField field_frequency {
 		{ 5 * 8, 3 * 8 },
 	};
@@ -244,7 +285,7 @@ private:
 	};

 	NumberField field_volume {
-		{ 13 * 8, 23 * 8 },
+		{ 11* 8, 23 * 8 },
 		2,
 		{ 0, 99 },
 		1,
@@ -252,7 +293,7 @@ private:
 	};
 	
 	OptionsField field_rxbw {
-	       { 25 * 8, 23 * 8},
+	       { 23* 8, 23 * 8},
 	       3,
 	       {
 	       		{"8k5", 0},
@@ -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 { "" };
@@ -144,7 +144,7 @@ public:
 	
 	void focus() override;

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

 private:
 	NavigationView& nav_;
@@ -484,6 +484,7 @@ void ScannerView::scan_pause() {
 		scan_thread->set_freq_lock(0); 		//Reset the scanner lock (because user paused, or MAX_FREQ_LOCK reached) for next freq scan	
 		scan_thread->set_scanning(false); // WE STOP SCANNING
 		audio::output::start();
+		on_headphone_volume_changed(field_volume.value()); // quick fix to make sure WM8731S chips don't stay silent after pause
 	}
 }

@@ -111,7 +111,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 { };

@@ -242,16 +242,16 @@ private:
 		{ 17 * 8, (26 * 8) + 4 },
 		12,
 		{
-			{ "5Khz (SA AM)", 	5000 },
-			{ "9Khz (EU AM)", 	9000 },
-			{ "10Khz(US AM)", 	10000 },
-			{ "50Khz (FM1)", 	50000 },
-			{ "100Khz(FM2)", 	100000 },
-			{ "6.25khz(NFM)",	6250 },
-			{ "12.5khz(NFM)",	12500 },
-			{ "25khz (N1)",		25000 },
-			{ "250khz (N2)",	250000 },
-			{ "8.33khz(AIR)",	8330 }
+			{ "5kHz (SA AM)", 	5000 },
+			{ "9kHz (EU AM)", 	9000 },
+			{ "10kHz(US AM)", 	10000 },
+			{ "50kHz (FM1)", 	50000 },
+			{ "100kHz(FM2)", 	100000 },
+			{ "6.25kHz(NFM)",	6250 },
+			{ "12.5kHz(NFM)",	12500 },
+			{ "25kHz (N1)",		25000 },
+			{ "250kHz (N2)",	250000 },
+			{ "8.33kHz(AIR)",	8330 }
 		}
 	};

@@ -308,4 +308,4 @@ private:
 	};
 };

-} /* namespace ui */
+} /* namespace ui */
@@ -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_;
@@ -43,7 +43,7 @@ namespace ui {
 SetDateTimeView::SetDateTimeView(
 	NavigationView& nav
 ) {
-	button_done.on_select = [&nav, this](Button&){
+	button_save.on_select = [&nav, this](Button&){
 		const auto model = this->form_collect();
 		const rtc::RTC new_datetime {
 			model.year, model.month, model.day,
@@ -65,7 +65,7 @@ SetDateTimeView::SetDateTimeView(
 		&field_hour,
 		&field_minute,
 		&field_second,
-		&button_done,
+		&button_save,
 		&button_cancel,
 	});

@@ -150,7 +150,7 @@ SetRadioView::SetRadioView(
 		&value_freq_step,
 		&labels_bias,
 		&check_bias,
-		&button_done,
+		&button_save,
 		&button_cancel
 	});

@@ -200,7 +200,7 @@ SetRadioView::SetRadioView(
 		EventDispatcher::send_message(message);
 	};

-	button_done.on_select = [this, &nav](Button&){
+	button_save.on_select = [this, &nav](Button&){
 		const auto model = this->form_collect();
 		portapack::persistent_memory::set_correction_ppb(model.ppm * 1000);
 		portapack::persistent_memory::set_clkout_freq(model.freq);
@@ -210,7 +210,7 @@ SetRadioView::SetRadioView(
 }

 void SetRadioView::focus() {
-	button_done.focus();
+	button_save.focus();
 }

 void SetRadioView::form_init(const SetFrequencyCorrectionModel& model) {
@@ -224,76 +224,26 @@ SetFrequencyCorrectionModel SetRadioView::form_collect() {
 	};
 }

-/*
-SetPlayDeadView::SetPlayDeadView(NavigationView& nav) {
-	add_children({
-		&text_sequence,
-		&button_enter,
-		&button_cancel
-	});
-
-	button_enter.on_select = [this, &nav](Button&){
-		if (!entermode) {
-			sequence = 0;
-			keycount = 0;
-			memset(sequence_txt, '-', 10);
-			text_sequence.set(sequence_txt);
-			entermode = true;
-			button_cancel.hidden(true);
-			set_dirty();
-		} else {
-			if (sequence == 0x8D1)	// U D L R
-				nav.display_modal("Warning", "Default sequence entered !", ABORT, nullptr);
-			else {
-				persistent_memory::set_playdead_sequence(sequence);
-				nav.pop();
-			}
-		}
-	};
-	
-	button_enter.on_dir = [this](Button&, KeyEvent key){
-		if ((entermode == true) && (keycount < 10)) {
-			key_code = static_cast<std::underlying_type<KeyEvent>::type>(key);
-			if (key_code == 0)
-				sequence_txt[keycount] = 'R';
-			else if (key_code == 1)
-				sequence_txt[keycount] = 'L';
-			else if (key_code == 2)
-				sequence_txt[keycount] = 'D';
-			else if (key_code == 3)
-				sequence_txt[keycount] = 'U';
-			text_sequence.set(sequence_txt);
-			sequence = (sequence << 3) | (key_code + 1);
-			keycount++;
-			return true;
-		}
-		return false;
-	};
-	
-	button_cancel.on_select = [&nav](Button&){ nav.pop(); };
-}
-
-void SetPlayDeadView::focus() {
-	button_cancel.focus();
-}
-*/

 SetUIView::SetUIView(NavigationView& nav) {
 	add_children({
-		//&checkbox_login,
+		&checkbox_disable_touchscreen,
 		&checkbox_speaker,
 		&checkbox_bloff,
 		&options_bloff,
 		&checkbox_showsplash,
 		&checkbox_showclock,
-		&options_clockformat,		
-		&button_ok
+		&options_clockformat,
+		&checkbox_guireturnflag,
+		&button_save,
+		&button_cancel
 	});
 	
+	checkbox_disable_touchscreen.set_value(persistent_memory::disable_touchscreen());
 	checkbox_speaker.set_value(persistent_memory::config_speaker());
 	checkbox_showsplash.set_value(persistent_memory::config_splash());
 	checkbox_showclock.set_value(!persistent_memory::hide_clock());
-	//checkbox_login.set_value(persistent_memory::config_login());
+	checkbox_guireturnflag.set_value(persistent_memory::show_gui_return_icon());
 	
 	uint32_t backlight_timer = persistent_memory::config_backlight_timer();
 	if (backlight_timer) {
@@ -309,16 +259,8 @@ 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_ok.on_select = [&nav, this](Button&) {
+	button_save.on_select = [&nav, this](Button&) {
 		if (checkbox_bloff.value())
 			persistent_memory::set_config_backlight_timer(options_bloff.selected_index() + 1);
 		else
@@ -329,225 +271,122 @@ SetUIView::SetUIView(NavigationView& nav) {
 			    persistent_memory::set_clock_with_date(true);    
     		else
 			    persistent_memory::set_clock_with_date(false);		
-		}		
+		}
+
+		if (checkbox_speaker.value())  audio::output::speaker_mute();		//Just mute audio if speaker is disabled
+		persistent_memory::set_config_speaker(checkbox_speaker.value());	//Store Speaker status
+        	StatusRefreshMessage message { };					//Refresh status bar with/out speaker
+        	EventDispatcher::send_message(message);
+	
 		persistent_memory::set_config_splash(checkbox_showsplash.value());
 		persistent_memory::set_clock_hidden(!checkbox_showclock.value());
-		//persistent_memory::set_config_login(checkbox_login.value());
+		persistent_memory::set_gui_return_icon(checkbox_guireturnflag.value());
+		persistent_memory::set_disable_touchscreen(checkbox_disable_touchscreen.value());
+		nav.pop();
+	};
+	button_cancel.on_select = [&nav, this](Button&) {
 		nav.pop();
 	};
 }

 void SetUIView::focus() {
-	button_ok.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,
 		&field_tone_mix,
-		&button_ok
+		&button_save,
+		&button_cancel
 	});

 	field_tone_mix.set_value(persistent_memory::tone_mix());
 	
-	button_ok.on_select = [&nav, this](Button&) {
+	button_save.on_select = [&nav, this](Button&) {
 		persistent_memory::set_tone_mix(field_tone_mix.value());
 		nav.pop();
 	};
+
+	button_cancel.on_select = [&nav, this](Button&) {
+		nav.pop();
+	};
 }

 void SetAudioView::focus() {
-	field_tone_mix.focus();
+	button_save.focus();
 }

-/*void ModInfoView::on_show() {
-	if (modules_nb) update_infos(0);
-}
+SetQRCodeView::SetQRCodeView(NavigationView& nav) {
+	add_children({
+		&checkbox_bigger_qr,
+		&button_save,
+		&button_cancel
+	});

-void ModInfoView::update_infos(uint8_t modn) {
-	char info_str[27];
-	char ch;
-	uint8_t c;
-	Point pos = { 0, 0 };
-	Rect rect = { { 16, 144 }, { 208, 144 } };
+	checkbox_bigger_qr.set_value(persistent_memory::show_bigger_qr_code());
 	
-	info_str[0] = 0;
-	strcat(info_str, module_list[modn].name);
-	text_namestr.set(info_str);
-	
-	info_str[0] = 0;
-	strcat(info_str, to_string_dec_uint(module_list[modn].size).c_str());
-	strcat(info_str, " bytes");
-	text_sizestr.set(info_str);
-	
-	info_str[0] = 0;
-	for (c = 0; c < 8; c++)
-		strcat(info_str, to_string_hex(module_list[modn].md5[c], 2).c_str());
-	text_md5_a.set(info_str);
-
-	info_str[0] = 0;
-	for (c = 8; c < 16; c++)
-		strcat(info_str, to_string_hex(module_list[modn].md5[c], 2).c_str());
-	text_md5_b.set(info_str);
-	
-	// TODO: Use ui_console
-	display.fill_rectangle(rect, Color::black());
-	
-	const Font& font = font::fixed_8x16;
-	const auto line_height = font.line_height();
-	c = 0;
-	while((ch = module_list[modn].description[c++])) {
-		const auto glyph = font.glyph(ch);
-		const auto advance = glyph.advance();
-		if((pos.x + advance.x) > rect.width()) {
-			pos.x = 0;
-			pos.y += line_height;
-		}
-		const Point pos_glyph {
-			static_cast<Coord>(rect.pos.x + pos.x),
-			static_cast<Coord>(rect.pos.y + pos.y)
-		};
-		display.draw_glyph(pos_glyph, glyph, Color::white(), Color::black());
-		pos.x += advance.x;
-	}
-}
-
-ModInfoView::ModInfoView(NavigationView& nav) {
-	const char magic[4] = {'P', 'P', 'M', ' '};
-	UINT bw;
-	uint8_t i;
-	char read_buf[16];
-	char info_str[25];
-	FILINFO modinfo;
-	FIL modfile;
-	DIR rootdir;
-	FRESULT res;
-	uint8_t c;
-	
-	using option_t = std::pair<std::string, int32_t>;
-	using options_t = std::vector<option_t>;
-	option_t opt;
-	options_t opts;
-	
-	static constexpr Style style_orange {
-		.font = font::fixed_8x16,
-		.background = Color::black(),
-		.foreground = Color::orange(),
-	};
-	
-	add_children({{
-		&text_modcount,
-		&text_name,
-		&text_namestr,
-		&text_size,
-		&text_sizestr,
-		&text_md5,
-		&text_md5_a,
-		&text_md5_b,
-		&button_ok
-	}});
-	
-	text_name.set_style(&style_orange);
-	text_size.set_style(&style_orange);
-	text_md5.set_style(&style_orange);
-
-	// TODO: Find a way to merge this with m4_load_image() in m4_startup.cpp
-	
-	// Scan SD card root directory for files starting with the magic bytes
-	c = 0;
-	if (f_opendir(&rootdir, "/") == FR_OK) {
-		for (;;) {
-			res = f_readdir(&rootdir, &modinfo);
-			if (res != FR_OK || modinfo.fname[0] == 0) break;	// Reached last file, abort
-			// Only care about files with .bin extension
-			if ((!(modinfo.fattrib & AM_DIR)) && (modinfo.fname[9] == 'B') && (modinfo.fname[10] == 'I') && (modinfo.fname[11] == 'N')) {
-				f_open(&modfile, modinfo.fname, FA_OPEN_EXISTING | FA_READ);
-				// Magic bytes check
-				f_read(&modfile, &read_buf, 4, &bw);
-				for (i = 0; i < 4; i++)
-					if (read_buf[i] != magic[i]) break;
-				if (i == 4) {
-					memcpy(&module_list[c].filename, modinfo.fname, 8);
-					module_list[c].filename[8] = 0;
-					
-					f_lseek(&modfile, 4);
-					f_read(&modfile, &module_list[c].version, 2, &bw);
-					f_lseek(&modfile, 6);
-					f_read(&modfile, &module_list[c].size, 4, &bw);
-					f_lseek(&modfile, 10);
-					f_read(&modfile, &module_list[c].name, 16, &bw);
-					f_lseek(&modfile, 26);
-					f_read(&modfile, &module_list[c].md5, 16, &bw);
-					f_lseek(&modfile, 42);
-					f_read(&modfile, &module_list[c].description, 214, &bw);
-					f_lseek(&modfile, 256);
-					
-					// Sanitize
-					module_list[c].name[15] = 0;
-					module_list[c].description[213] = 0;
-					
-					memcpy(info_str, module_list[c].filename, 16);
-					strcat(info_str, "(V");
-					strcat(info_str, to_string_dec_uint(module_list[c].version, 4, '0').c_str());
-					strcat(info_str, ")");
-					while(strlen(info_str) < 24)
-						strcat(info_str, " ");
-					
-					opt = std::make_pair(info_str, c);
-					opts.insert(opts.end(), opt);
-					
-					c++;
-				}
-				f_close(&modfile);
-			}
-			if (c == 8) break;
-		}
-	}
-	f_closedir(&rootdir);
-	
-	modules_nb = c;
-
-	if (modules_nb) {
-		strcpy(info_str, "Found ");
-		strcat(info_str, to_string_dec_uint(modules_nb, 1).c_str());
-		strcat(info_str, " module(s)");
-		
-		text_modcount.set(info_str);
-		option_modules.set_options(opts);
-		
-		add_child(&option_modules);
-		
-		option_modules.on_change = [this](size_t n, OptionsField::value_t v) {
-			(void)n;
-			update_infos(v);
-		};
-	} else {
-		strcpy(info_str, "No modules found");
-		text_modcount.set(info_str);
-	}
-
-	button_ok.on_select = [&nav,this](Button&){
+	button_save.on_select = [&nav, this](Button&) {
+		persistent_memory::set_show_bigger_qr_code(checkbox_bigger_qr.value());
 		nav.pop();
 	};
+
+	button_cancel.on_select = [&nav, this](Button&) {
+		nav.pop();
+	};
+
 }

-void ModInfoView::focus() {
-	if (modules_nb)
-		option_modules.focus();
-	else
-		button_ok.focus();
-}*/
+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({
-		//{ "..", 			  ui::Color::light_grey(), &bitmap_icon_previous,		  [&nav](){ nav.pop(); } },
-		{ "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>(); } },
-		//{ "SD card modules", ui::Color::dark_cyan(), 								  [&nav](){ nav.push<ModInfoView>(); } },
-		{ "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>(); } },
-		//{ "Play dead",	   ui::Color::dark_cyan(), &bitmap_icon_playdead,		  [&nav](){ nav.push<SetPlayDeadView>(); } }
+		{ "Audio", 		ui::Color::dark_cyan(), &bitmap_icon_speaker,			[&nav](){ nav.push<SetAudioView>(); } },
+		{ "Radio",		ui::Color::dark_cyan(), &bitmap_icon_options_radio,		[&nav](){ nav.push<SetRadioView>(); } },
+		{ "User Interface", 	ui::Color::dark_cyan(), &bitmap_icon_options_ui,		[&nav](){ nav.push<SetUIView>(); } },
+		{ "Date/Time",		ui::Color::dark_cyan(), &bitmap_icon_options_datetime,		[&nav](){ nav.push<SetDateTimeView>(); } },
+		{ "Calibration",	ui::Color::dark_cyan(), &bitmap_icon_options_touch,		[&nav](){ nav.push<TouchCalibrationView>(); } },
+		{ "App Settings",	ui::Color::dark_cyan(), &bitmap_icon_setup,			[&nav](){ nav.push<SetAppSettingsView>(); } },
+		{ "QR Code",		ui::Color::dark_cyan(), &bitmap_icon_qr_code,			[&nav](){ nav.push<SetQRCodeView>(); } }
 	});
 	set_max_rows(2); // allow wider buttons
 }
@@ -47,7 +47,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 {
@@ -99,7 +99,7 @@ private:
 		'0',
 	};

-	Button button_done {
+	Button button_save {
 		{ 2 * 8, 16 * 16, 12 * 8, 32 },
 		"Save"
 	};
@@ -197,7 +197,7 @@ private:
 		"Turn on bias voltage"
 	};

-	Button button_done {
+	Button button_save {
 		{ 2 * 8, 16 * 16, 12 * 8, 32 },
 		"Save"
 	};
@@ -219,11 +219,12 @@ public:
 	std::string title() const override { return "UI settings"; };
 	
 private:
-	/*Checkbox checkbox_login {
+
+	Checkbox checkbox_disable_touchscreen {
 		{ 3 * 8, 2 * 16 },
 		20,
-		"Login with play dead"
-	};*/
+		"Disable touchscreen"
+	};
 	
 	Checkbox checkbox_speaker {
 		{ 3 * 8, 4 * 16 },
@@ -270,11 +271,55 @@ private:
 			{ "time and date", 1 }
 		}
 	};	
+
+    Checkbox checkbox_guireturnflag {	
+		{ 3 * 8, 14 * 16 },
+		25,
+		"add return icon in GUI"
+	};
 	
-	Button button_ok {
+	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 },
+		"Save"
+	};
+	
+	Button button_cancel {
+		{ 16 * 8, 16 * 16, 12 * 8, 32 },
+		"Cancel",
+	};
 };

 class SetAudioView : public View {
@@ -298,111 +343,43 @@ private:
 		'0'
 	};
 	
-	Button button_ok {
+	Button button_save {
 		{ 2 * 8, 16 * 16, 12 * 8, 32 },
 		"Save"
 	};
+	
+	Button button_cancel {
+		{ 16 * 8, 16 * 16, 12 * 8, 32 },
+		"Cancel",
+	};
 };

-/*
-class SetPlayDeadView : public View {
-public:
-	SetPlayDeadView(NavigationView& nav);
-	
-	void focus() override;
-	
-	std::string title() const override { return "Playdead settings"; };
-	
-private:
-	bool entermode = false;
-	uint32_t sequence { 0 };
-	uint8_t keycount { 0 }, key_code { };
-	char sequence_txt[11] = { 0 };
-	
-	Text text_sequence {
-		{ 64, 32, 14 * 8, 16 },
-		"Enter sequence",
-	};
-	
-	Button button_enter {
-		{ 16, 192, 96, 24 },
-		"Enter"
-	};
-	Button button_cancel {
-		{ 128, 192, 96, 24 },
-		"Cancel"
-	};
-};*/

-/*class ModInfoView : public View {
+class SetQRCodeView : public View {
 public:
-	ModInfoView(NavigationView& nav);
+	SetQRCodeView(NavigationView& nav);
+	
 	void focus() override;
-	void on_show() override;
+	
+	std::string title() const override { return "QR Code"; };
 	
 private:
-	void update_infos(uint8_t modn);
-	
-	typedef struct moduleinfo_t{
-		char filename[9];
-		uint16_t version;
-		uint32_t size;
-		char md5[16];
-		char name[16];
-		char description[214];
-	} moduleinfo_t;
-	
-	moduleinfo_t module_list[8];	// 8 max for now
-	
-	uint8_t modules_nb;
-	
-	Text text_modcount {
-		{ 2 * 8, 1 * 16, 18 * 8, 16 },
-		"Searching..."
+	Checkbox checkbox_bigger_qr {
+		{ 3 * 8, 9 * 16 },
+		20,
+		"Show large QR code"
 	};
 	
-	OptionsField option_modules {
-		{ 2 * 8, 2 * 16 },
-		24,
-		{
-			{ "-", 0 }
-		}
+	Button button_save {
+		{ 2 * 8, 16 * 16, 12 * 8, 32 },
+		"Save"
 	};
 	
-	Text text_name {
-		{ 2 * 8, 4 * 16, 5 * 8, 16 },
-		"Name:"
+	Button button_cancel {
+		{ 16 * 8, 16 * 16, 12 * 8, 32 },
+		"Cancel",
 	};
-	Text text_namestr {
-		{ 8 * 8, 4 * 16, 16 * 8, 16 },
-		"..."
-	};
-	Text text_size {
-		{ 2 * 8, 5 * 16, 5 * 8, 16 },
-		"Size:"
-	};
-	Text text_sizestr {
-		{ 8 * 8, 5 * 16, 16 * 8, 16 },
-		"..."
-	};
-	Text text_md5 {
-		{ 2 * 8, 6 * 16, 4 * 8, 16 },
-		"MD5:"
-	};
-	Text text_md5_a {
-		{ 7 * 8, 6 * 16, 16 * 8, 16 },
-		"..."
-	};
-	Text text_md5_b {
-		{ 7 * 8, 7 * 16, 16 * 8, 16 },
-		"..."
-	};
-	
-	Button button_ok {
-		{ 4 * 8, 272, 64, 24 },
-		"Ok"
-	};
-};*/
+};

 class SettingsMenuView : public BtnGridView {
 public:
@@ -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
@@ -100,15 +112,10 @@ SondeView::SondeView(NavigationView& nav) {
 		use_crc = v;
 	};
 	
-	radio::enable({
-		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()),
-	});
+    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.


        // QR code with geo URI
@@ -152,8 +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.
 	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 { };
@@ -168,8 +168,8 @@ void speaker_mute() {

 namespace input {

-void start() {
-	audio_codec->microphone_enable();
+void start(int8_t alc_mode) {
+	audio_codec->microphone_enable(alc_mode);   // added user-GUI selection for AK4951, ALC mode parameter.
 	i2s::i2s0::rx_start();
 }

@@ -49,7 +49,7 @@ public:
 	virtual volume_range_t headphone_gain_range() const = 0;
 	virtual void set_headphone_volume(const volume_t volume) = 0;

-	virtual void microphone_enable() = 0;
+	virtual void microphone_enable(int8_t alc_mode) = 0;	// added user-GUI  AK4951 ,selected ALC mode.
 	virtual void microphone_disable() = 0;

 	virtual size_t reg_count() const = 0;
@@ -59,7 +59,7 @@ public:

 namespace output {

-void start();
+void start();		// this  other start(),no changed. ,in namespace output , used to config audio playback mode, 
 void stop();

 void mute();
@@ -72,7 +72,7 @@ void speaker_unmute();

 namespace input {

-void start();
+void start(int8_t alc_mode);  // added parameter user-GUI select AK4951-ALC mode for config mic path,(recording mode in datasheet),
 void stop();

 } /* namespace input */
@@ -1285,6 +1285,28 @@ static constexpr Bitmap bitmap_icon_previous {
 	{ 16, 16 }, bitmap_icon_previous_data
 };

+static constexpr uint8_t bitmap_icon_qr_code_data[] = {
+	0x00, 0x00, 
+	0xFE, 0x7E, 
+	0xC6, 0x62, 
+	0xFA, 0x5A, 
+	0xFA, 0x5A, 
+	0xDA, 0x5A, 
+	0xFE, 0x7E, 
+	0x7E, 0x7E, 
+	0x00, 0x00, 
+	0xFE, 0x46, 
+	0xC2, 0x06, 
+	0xFA, 0x18, 
+	0xFA, 0x18, 
+	0xC6, 0x60, 
+	0xFE, 0x62, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_qr_code {
+	{ 16, 16 }, bitmap_icon_qr_code_data
+};
+
 static constexpr uint8_t bitmap_icon_rds_data[] = {
 	0x00, 0x00, 
 	0x00, 0x00, 
@@ -0,0 +1,107 @@
+/*
+ * 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 "database.hpp"
+#include "file.hpp"
+#include <cstring>
+
+namespace std {
+
+int database::retrieve_mid_record(MidDBRecord* record, std::string search_term){
+        
+	file_path = "AIS/mids.db";
+	index_item_length = 4;
+	record_length = 32;
+
+	result = std::database::retrieve_record(file_path, index_item_length, record_length, record, search_term);
+
+	return(result);
+}
+
+int database::retrieve_airline_record(AirlinesDBRecord* record, std::string search_term){
+        
+	file_path = "ADSB/airlines.db";
+	index_item_length = 4;
+	record_length = 64;
+
+	result = std::database::retrieve_record(file_path, index_item_length, record_length, record, search_term);
+
+	return(result);
+}
+
+int database::retrieve_aircraft_record(AircraftDBRecord* record, std::string search_term){
+
+	file_path = "ADSB/icao24.db";
+	index_item_length = 7;
+	record_length = 146;
+
+	result = std::database::retrieve_record(file_path, index_item_length, record_length, record, search_term);
+
+	return(result);
+}
+
+
+
+int database::retrieve_record(std::string file_path, int index_item_length, int record_length, void* record, std::string search_term)
+{
+
+	auto result = db_file.open(file_path);
+	if (!result.is_valid()) {
+		number_of_records = (db_file.size() / (index_item_length + record_length)); // determine number of records in file
+  		// binary search tree
+    		int first = 0,         				// First search element       
+    		last = number_of_records - 1,        	 	// Last search element       
+    		middle,                				// Mid point of search       
+    		position = -1;         				// Position of search value   
+
+    		while (!found && first <= last) {  
+        		middle = (first + last) / 2;     	// Calculate mid point      
+        		db_file.seek(middle * index_item_length); 
+			db_file.read(file_buffer, search_term.length());
+			if (file_buffer == search_term) {     	// If value is found at mid        
+                		found = true;         
+                		position = middle;      
+        		}      
+        		else if (file_buffer > search_term)  	// If value is in lower half         
+            			last = middle - 1;      
+        		else         
+            			first = middle + 1;          	// If value is in upper half   
+    		}
+
+		if(found == true) {
+
+			db_file.seek((number_of_records * index_item_length) + (position * record_length)); // seek starting after index
+			db_file.read(record, record_length);
+			return(DATABASE_RECORD_FOUND);
+		}
+		else {
+			return(DATABASE_RECORD_NOT_FOUND);
+		}
+
+	}
+	else return(DATABASE_NOT_FOUND);
+
+}
+
+
+} /* namespace std */
@@ -0,0 +1,94 @@
+/*
+ * 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 __DATABASE_H__
+#define __DATABASE_H__
+
+
+#include <cstddef>
+#include <cstdint>
+#include <string>
+
+#include "file.hpp"
+
+
+
+namespace std {
+class database {
+
+
+
+public:
+
+#define DATABASE_RECORD_FOUND	 	 0		// record found in database
+#define DATABASE_NOT_FOUND		-1		// database not found / could not be opened
+#define DATABASE_RECORD_NOT_FOUND	-2		// record could not be found in database
+
+	struct MidDBRecord {
+		char 	country[32];			// country name
+	};
+
+	int retrieve_mid_record(MidDBRecord* record, std::string search_term);
+
+	struct AirlinesDBRecord {
+		char 	airline[32];			// airline name
+		char 	country[32];			// country name
+	};
+
+	int retrieve_airline_record(AirlinesDBRecord* record, std::string search_term);
+
+	struct AircraftDBRecord { 
+		char 	aircraft_registration[9];	// aircraft registration
+		char 	aircraft_manufacturer[33];	// aircraft manufacturer
+		char 	aircraft_model[33];		// aircraft model
+		char	icao_type[5];			// ICAO type descripton or when unavailable ICAO type designator
+		char 	aircraft_owner[33];		// aircraft owner
+		char 	aircraft_operator[33];		// aircraft operator
+
+	};
+
+	int retrieve_aircraft_record(AircraftDBRecord* record, std::string search_term);
+
+private:
+	string 	file_path = "";				// path inclusing filename
+	int  	index_item_length = 0;			// length of index item
+	int  	record_length = 0;			// length of record
+
+	File 	db_file { };
+	int 	number_of_records = 0;
+	int 	position = 0;
+
+	char 	file_buffer[32] { 0 };
+	bool 	found = false;
+
+	int 	result = 0;
+
+	int retrieve_record(std::string file_path, int index_item_length, int record_length, void* record, std::string search_term);
+
+
+};
+} // namespace std
+
+
+
+#endif/*__DATABASE_H__*/
@@ -197,12 +197,12 @@ std::vector<std::filesystem::path> scan_root_directories(const std::filesystem::
 	return directory_list;
 }

-void delete_file(const std::filesystem::path& file_path) {
-	f_unlink(reinterpret_cast<const TCHAR*>(file_path.c_str()));
+uint32_t delete_file(const std::filesystem::path& file_path) {
+	return f_unlink(reinterpret_cast<const TCHAR*>(file_path.c_str()));
 }

-void rename_file(const std::filesystem::path& file_path, const std::filesystem::path& new_name) {
-	f_rename(reinterpret_cast<const TCHAR*>(file_path.c_str()), reinterpret_cast<const TCHAR*>(new_name.c_str()));
+uint32_t rename_file(const std::filesystem::path& file_path, const std::filesystem::path& new_name) {
+	return f_rename(reinterpret_cast<const TCHAR*>(file_path.c_str()), reinterpret_cast<const TCHAR*>(new_name.c_str()));
 }

 FATTimestamp file_created_date(const std::filesystem::path& file_path) {
@@ -238,8 +238,8 @@ struct FATTimestamp {
 	uint16_t FAT_time;
 };

-void delete_file(const std::filesystem::path& file_path);
-void rename_file(const std::filesystem::path& file_path, const std::filesystem::path& new_name);
+uint32_t delete_file(const std::filesystem::path& file_path);
+uint32_t rename_file(const std::filesystem::path& file_path, const std::filesystem::path& new_name);
 FATTimestamp file_created_date(const std::filesystem::path& file_path);
 uint32_t make_new_directory(const std::filesystem::path& dir_path);

@@ -51,15 +51,15 @@ enum freqman_entry_type {
 //Entry step placed for AlainD freqman version (or any other enhanced version)
 enum freqman_entry_step {
 	STEP_DEF = 0,	// default
-	AM_US,			// 10 Khz   AM/CB
-	AM_EUR,			// 9 Khz	LW/MW
-	NFM_1,			// 12,5 Khz (Analogic PMR 446)
-	NFM_2,			// 6,25 Khz  (Digital PMR 446)
-	FM_1,			// 100 Khz
-	FM_2,			// 50 Khz
-	N_1,			// 25 Khz
-	N_2,			// 250 Khz
-	AIRBAND,		// AIRBAND 8,33 Khz
+	AM_US,			// 10 kHz   AM/CB
+	AM_EUR,			// 9 kHz	LW/MW
+	NFM_1,			// 12,5 kHz (Analogic PMR 446)
+	NFM_2,			// 6,25 kHz  (Digital PMR 446)
+	FM_1,			// 100 kHz
+	FM_2,			// 50 kHz
+	N_1,			// 25 kHz
+	N_2,			// 250 kHz
+	AIRBAND,		// AIRBAND 8,33 kHz
 	ERROR_STEP
 };

@@ -167,14 +167,15 @@ int main(void) {
 	if( portapack::init() ) {
 		portapack::display.init();

-		sdcStart(&SDCD1, nullptr);
+		// sdcStart(&SDCD1, nullptr); // Commented out as now happens in portapack.cpp

-		controls_init();
+		// controls_init(); // Commented out as now happens in portapack.cpp
 		lcd_frame_sync_configure();
 		rtc_interrupt_enable();

 		event_loop();

+
 		sdcDisconnect(&SDCD1);
 		sdcStop(&SDCD1);

@@ -29,6 +29,7 @@
 #include "hackrf_gpio.hpp"
 using namespace hackrf::one;

+
 #include "clock_manager.hpp"
 #include "event_m0.hpp"

@@ -45,6 +46,11 @@ using asahi_kasei::ak4951::AK4951;
 #include "cpld_update.hpp"

 #include "optional.hpp"
+#include "irq_controls.hpp"
+
+#include "file.hpp" 
+#include "sd_card.hpp"
+#include "string_format.hpp"

 namespace portapack {

@@ -175,22 +181,93 @@ enum class PortaPackModel {
 	R2_20170522,
 };

+static bool save_config(int8_t value){
+	persistent_memory::set_config_cpld(value);
+	if(sd_card::status() == sd_card::Status::Mounted){
+		make_new_directory("/hardware"); 
+		File file;
+		auto sucess = file.create("/hardware/settings.txt");
+		if(!sucess.is_valid()) {
+			file.write_line(to_string_dec_uint(value));
+		}
+	}
+	return true;
+}
+
+int read_file(std::string name) {
+	std::string return_string = "";
+	File file;
+	auto success = file.open(name);
+
+	if(!success.is_valid()) {
+		char one_char[1];
+		for(size_t pointer = 0; pointer < file.size() ; pointer++) {
+			file.seek(pointer);
+			file.read(one_char, 1);
+			return_string += one_char[0];
+		}
+		return std::stoi(return_string);
+	} 
+	return -1; 
+}
+
+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){
+			int data = read_file("/hardware/settings.txt");
+			if(data != -1) {
+				config_value = data;
+			}
+		} else {
+			config_value = value;
+		}
+	}
+	return config_value.value();
+}
+
+
 static PortaPackModel portapack_model() {
 	static Optional<PortaPackModel> model;

 	if( !model.is_valid() ) {
-		/*For the time being, it is impossible to distinguish the hardware of R1 and R2 from the software level*/
-		/*At this point, I2c is not ready.*/
-		//if( audio_codec_wm8731.detected() ) {
-		//	model = PortaPackModel::R1_20150901;
-		//} else {
+		const auto switches_state = get_switches_state();
+		if (switches_state[(size_t)ui::KeyEvent::Up]){
+			save_config(1);
 			model = PortaPackModel::R2_20170522;
-		//}
+		}
+		else if (switches_state[(size_t)ui::KeyEvent::Down]){
+			save_config(2);
+			model = PortaPackModel::R1_20150901;
+		}
+		else if (switches_state[(size_t)ui::KeyEvent::Left]){
+			save_config(3);
+		}
+		else if (switches_state[(size_t)ui::KeyEvent::Select]){
+			save_config(0);
+		}
+		
+
+		if (load_config() == 1) {
+			model = PortaPackModel::R2_20170522;
+		} else if (load_config() == 2) {
+			model = PortaPackModel::R1_20150901;
+		} else {
+			if( audio_codec_wm8731.detected() ) {
+				model = PortaPackModel::R1_20150901; // H1R1
+			} else {
+				model = PortaPackModel::R2_20170522; // H1R2, H2, H2+
+			}
+		}
 	}

 	return model.value();
 }

+//audio_codec_wm8731 = H1R1 & H2+
+//audio_codec_ak4951 = H1R2
+
 static audio::Codec* portapack_audio_codec() {
 	/* I2C ready OK, Automatic recognition of audio chip */
 	return (audio_codec_wm8731.detected())
@@ -201,15 +278,14 @@ static audio::Codec* portapack_audio_codec() {

 static const portapack::cpld::Config& portapack_cpld_config() {
 	return (portapack_model() == PortaPackModel::R2_20170522)
-		? portapack::cpld::rev_20170522::config
-		: portapack::cpld::rev_20150901::config
-		;
+			? portapack::cpld::rev_20170522::config
+			: portapack::cpld::rev_20150901::config;
 }

 Backlight* backlight() {
 	return (portapack_model() == PortaPackModel::R2_20170522)
-		? static_cast<portapack::Backlight*>(&backlight_cat4004)
-		: static_cast<portapack::Backlight*>(&backlight_on_off);
+		? static_cast<portapack::Backlight*>(&backlight_cat4004) // R2_20170522
+		: static_cast<portapack::Backlight*>(&backlight_on_off); // R1_20150901
 }

 #define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
@@ -318,14 +394,16 @@ bool init() {

 	i2c0.start(i2c_config_boot_clock);

-	if( !portapack::cpld::update_if_necessary(portapack_cpld_config()) ) {
-		shutdown_base();
-		return false;
-	}
+	// Keeping this here for now incase we need to revert
+	// if( !portapack::cpld::update_if_necessary(portapack_cpld_config()) ) {
+	// 	shutdown_base();
+	// 	return false;
+	// }

-	if( !hackrf::cpld::load_sram() ) {
-		chSysHalt();
-	}
+	// if( !hackrf::cpld::load_sram() ) {
+	// 	chSysHalt();
+	// }
+	chThdSleepMilliseconds(100);

 	configure_pins_portapack();
 	
@@ -335,8 +413,9 @@ bool init() {

 	i2c0.stop();

-	set_clock_config(clock_config_irc);
+	chThdSleepMilliseconds(10);

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

 	/* Incantation from LPC43xx UM10503 section 12.2.1.1, to bring the M4
@@ -376,21 +455,46 @@ bool init() {
 	cgu::pll1::direct();

 	i2c0.start(i2c_config_fast_clock);
+	chThdSleepMilliseconds(10);
+
+	touch::adc::init();
+	controls_init();
+	chThdSleepMilliseconds(10);

 	clock_manager.set_reference_ppb(persistent_memory::correction_ppb());
-
-	audio::init(portapack_audio_codec());
-	
 	clock_manager.enable_first_if_clock();
 	clock_manager.enable_second_if_clock();
 	clock_manager.enable_codec_clocks();
 	radio::init();

-	touch::adc::init();
+	sdcStart(&SDCD1, nullptr);
+	sd_card::poll_inserted();
+	
+	chThdSleepMilliseconds(10);
+
+	if( !portapack::cpld::update_if_necessary(portapack_cpld_config()) ) {
+		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){
+			shutdown_base();
+			return false;
+		}
+	}
+
+	if( !hackrf::cpld::load_sram() ) {
+		chSysHalt();
+	}
+
+	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());
+	
+
 	return true;
 }

@@ -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) {
    
 }
-*/
+*/
@@ -129,6 +129,11 @@ std::string to_string_decimal(float decimal, int8_t precision) {
 	return result;
 }

+std::string to_string_freq(const uint64_t f) {
+	auto final_str = to_string_dec_int(f / 1000000,4) + to_string_dec_int(f % 1000000, 6, '0');
+	return final_str;
+}
+
 std::string to_string_short_freq(const uint64_t f) {
 	auto final_str = to_string_dec_int(f / 1000000,4) + "." + to_string_dec_int((f / 100) % 10000, 4, '0');
 	return final_str;
@@ -48,6 +48,7 @@ std::string to_string_decimal(float decimal, int8_t precision);
 std::string to_string_hex(const uint64_t n, const int32_t l = 0);
 std::string to_string_hex_array(uint8_t * const array, const int32_t l = 0);

+std::string to_string_freq(const uint64_t f);
 std::string to_string_short_freq(const uint64_t f);
 std::string to_string_time_ms(const uint32_t ms);

@@ -109,7 +109,7 @@ void Manager::feed(const Frame& frame) {

 	switch(state) {
 	case State::NoTouch:
-		if( touch_stable && touch_pressure ) {
+		if( touch_stable && touch_pressure && !persistent_memory::disable_touchscreen()) {
 			if( point_stable() ) {
 				state = State::TouchDetected;
 				touch_started();
@@ -253,14 +253,16 @@ void GeoMapView::focus() {
 		nav_.display_modal("No map", "No world_map.bin file in\n/ADSB/ directory", ABORT, nullptr);
 }

-void GeoMapView::update_position(float lat, float lon, uint16_t angle) {
+void GeoMapView::update_position(float lat, float lon, uint16_t angle, int32_t altitude) {
 	lat_ = lat;
 	lon_ = lon;
+	altitude_ = altitude;
 	
 	// Stupid hack to avoid an event loop
 	geopos.set_report_change(false);
 	geopos.set_lat(lat_);
 	geopos.set_lon(lon_);
+	geopos.set_altitude(altitude_);
 	geopos.set_report_change(true);

 	geomap.set_angle(angle);
@@ -177,7 +177,7 @@ public:
 	
 	void focus() override;
 	
-	void update_position(float lat, float lon, uint16_t angle);
+	void update_position(float lat, float lon, uint16_t angle, int32_t altitude);
 	
 	std::string title() const override { return "Map view"; };

@@ -23,6 +23,7 @@
 #include "ui_qrcode.hpp"
 #include "qrcodegen.hpp"
 #include "portapack.hpp"
+#include "portapack_persistent_memory.hpp"

 #include <cstring>
 #include <stdio.h>
@@ -42,26 +43,74 @@ 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;
-	int qr_version = 10; // bigger versions aren't handled very well
-
-	// Allocate a chunk of memory to store the QR code
-	uint8_t qrcodeBytes[qrcode_getBufferSize(qr_version)];
-
-	qrcode_initText(&qrcode, qrcodeBytes, qr_version, ECC_HIGH, qr_text_);


-	display.fill_rectangle(Rect(92, 97, 63, 63), Color::white());
+	//Either small or large QR code can be shown..

-	for (uint8_t y = 0; y < qrcode.size; y++) {
-    		for (uint8_t x = 0; x < qrcode.size; x++) {
-        		if (qrcode_getModule(&qrcode, x, y)) {
-            			display.draw_pixel(Point(95+x,100+y), Color::black());
+	if(portapack::persistent_memory::show_bigger_qr_code()) { // show large QR code
+		int qr_version =  2; 
+
+		// Allocate a chunk of memory to store the QR code
+		uint8_t qrcodeBytes[qrcode_getBufferSize(qr_version)];
+
+		qrcode_initText(&qrcode, qrcodeBytes, qr_version, ECC_HIGH, qr_text_);
+
+
+		display.fill_rectangle(Rect(10, 30, 220, 220), Color::white());
+
+		for (uint8_t y = 0; y < qrcode.size; y++) {
+    			for (uint8_t x = 0; x < qrcode.size; x++) {
+        			if (qrcode_getModule(&qrcode, x, y)) {
+            				display.fill_rectangle(Rect(20+(x*8), 40+(y*8), 8, 8), Color::black());
+
+        			} 
+    			}
+		}
+
+	}
+
+	else { // show small QR code
+		int qr_version =  10; 
+
+		// Allocate a chunk of memory to store the QR code
+		uint8_t qrcodeBytes[qrcode_getBufferSize(qr_version)];
+
+		qrcode_initText(&qrcode, qrcodeBytes, qr_version, ECC_HIGH, qr_text_);
+
+
+		display.fill_rectangle(Rect(92, 97, 63, 63), Color::white());
+
+		for (uint8_t y = 0; y < qrcode.size; y++) {
+    			for (uint8_t x = 0; x < qrcode.size; x++) {
+        			if (qrcode_getModule(&qrcode, x, y)) {
+            				display.draw_pixel(Point(95+x,100+y), Color::black());
+
+        			} 
+    			}
+		}

-        		} 
-    		}
 	}
 }

@@ -84,10 +133,9 @@ QRCodeView::QRCodeView(


        add_children({
-		&text_qr,
 		&qr_code,
 		&button_close});
-        text_qr.set(qr_text);	
+        //text_qr.set(qr_text);	
 	qr_code.set_text(qr_text);

 	button_close.on_select =  [&nav](Button&){
@@ -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 {
@@ -74,13 +77,13 @@ private:
 		{ 50, 100, 100, 100  }
 	};

-	Text text_qr {
-		{ 0 * 8, 10 * 16, 32 * 8, 1 * 8 },
-		"-"
-	};
+	//Text text_qr {
+	//	{ 0 * 8, 10 * 16, 32 * 8, 1 * 8 },
+	//	"-"
+	//};

 	Button button_close {
-		{ 9 * 8, 15 * 16, 12 * 8, 3 * 16 },
+		{ 9 * 8, 31 * 8, 12 * 8, 3 * 16 },
 		"Back"
 	};
 };
@@ -464,8 +464,11 @@ void NavigationView::focus() {
 /* ReceiversMenuView *****************************************************/

 ReceiversMenuView::ReceiversMenuView(NavigationView& nav) {
-	add_items({
-		//{ "..", 		ui::Color::light_grey(),&bitmap_icon_previous,	[&nav](){ nav.pop(); } },
+    if( portapack::persistent_memory::show_gui_return_icon() )
+    {
+        add_items( { { "..", ui::Color::light_grey(),&bitmap_icon_previous , [&nav](){ nav.pop(); } } } );
+    }
+    add_items( {
 		{ "ADS-B", 		ui::Color::green(),		&bitmap_icon_adsb,		[&nav](){ nav.push<ADSBRxView>(); }, },
 		//{ "ACARS", 		ui::Color::yellow(),	&bitmap_icon_adsb,		[&nav](){ nav.push<ACARSAppView>(); }, },
 		{ "AIS Boats",	ui::Color::green(),		&bitmap_icon_ais,		[&nav](){ nav.push<AISAppView>(); } },
@@ -485,16 +488,19 @@ ReceiversMenuView::ReceiversMenuView(NavigationView& nav) {
 		{ "LoRa", 		ui::Color::dark_grey(),	&bitmap_icon_lora,		[&nav](){ nav.push<NotImplementedView>(); } },
 		{ "SSTV", 		ui::Color::dark_grey(), &bitmap_icon_sstv,		[&nav](){ nav.push<NotImplementedView>(); } },
 		{ "TETRA", 		ui::Color::dark_grey(),	&bitmap_icon_tetra,		[&nav](){ nav.push<NotImplementedView>(); } },*/
-	});
-	
-	//set_highlighted(4);		// Default selection is "Audio"
+	} );
+
+	//set_highlighted(0);		// Default selection is "Audio"
 }

 /* TransmittersMenuView **************************************************/

 TransmittersMenuView::TransmittersMenuView(NavigationView& nav) {
-	add_items({
-		//{ "..",				ui::Color::light_grey(),&bitmap_icon_previous,	[&nav](){ nav.pop(); } },
+    if( portapack::persistent_memory::show_gui_return_icon() )
+    {
+        add_items( { { "..", ui::Color::light_grey(),&bitmap_icon_previous , [&nav](){ nav.pop(); } } } );
+    }
+    add_items({
 		{ "ADS-B [S]",		ui::Color::yellow(), 	&bitmap_icon_adsb,		[&nav](){ nav.push<ADSBTxView>(); } },
 		{ "APRS", 			ui::Color::green(),		&bitmap_icon_aprs,		[&nav](){ nav.push<APRSTXView>(); } },
 		{ "BHT Xy/EP", 		ui::Color::green(), 	&bitmap_icon_bht,		[&nav](){ nav.push<BHTView>(); } },
@@ -519,17 +525,20 @@ TransmittersMenuView::TransmittersMenuView(NavigationView& nav) {
 /* UtilitiesMenuView *****************************************************/

 UtilitiesMenuView::UtilitiesMenuView(NavigationView& nav) {
+    if( portapack::persistent_memory::show_gui_return_icon() )
+    {
+        add_items( { { "..", ui::Color::light_grey(),&bitmap_icon_previous , [&nav](){ nav.pop(); } } } );
+    }
 	add_items({
 		//{ "Test app", 		ui::Color::dark_grey(),	nullptr,				[&nav](){ nav.push<TestView>(); } },
-		//{ "..", 			ui::Color::light_grey(),&bitmap_icon_previous,		[&nav](){ nav.pop(); } },
-		{ "Freq manager",	ui::Color::green(), 	&bitmap_icon_freqman,		[&nav](){ nav.push<FrequencyManagerView>(); } },
+		{ "Freq. manager",	ui::Color::green(), 	&bitmap_icon_freqman,		[&nav](){ nav.push<FrequencyManagerView>(); } },
 		{ "File manager", 	ui::Color::yellow(),	&bitmap_icon_dir,			[&nav](){ nav.push<FileManagerView>(); } },
 		//{ "Notepad",		ui::Color::dark_grey(),	&bitmap_icon_notepad,		[&nav](){ nav.push<NotImplementedView>(); } },
 		{ "Signal gen", 	ui::Color::green(), 	&bitmap_icon_cwgen,			[&nav](){ nav.push<SigGenView>(); } },
 		//{ "Tone search",	ui::Color::dark_grey(), nullptr,					[&nav](){ nav.push<ToneSearchView>(); } },
-		{ "Wave viewer",	ui::Color::yellow(),	&bitmap_icon_soundboard,	[&nav](){ nav.push<ViewWavView>(); } },
+		{ "WAV viewer",	ui::Color::yellow(),	&bitmap_icon_soundboard,	[&nav](){ nav.push<ViewWavView>(); } },
 		{ "Antenna length",	ui::Color::green(),		&bitmap_icon_tools_antenna,	[&nav](){ nav.push<WhipCalcView>(); } },
-		{ "Wipe SD card",	ui::Color::red(),		&bitmap_icon_tools_wipesd,	[&nav](){ nav.push<WipeSDView>(); } },
+		{ "Wipe SD Card",	ui::Color::red(),		&bitmap_icon_tools_wipesd,	[&nav](){ nav.push<WipeSDView>(); } },
 	});
 	set_max_rows(2); // allow wider buttons
 }
@@ -553,12 +562,12 @@ SystemMenuView::SystemMenuView(NavigationView& nav) {
 		{ "Transmit", 	ui::Color::cyan(),			&bitmap_icon_transmit,	[&nav](){ nav.push<TransmittersMenuView>(); } },
 		{ "Capture",	ui::Color::red(),			&bitmap_icon_capture,	[&nav](){ nav.push<CaptureAppView>(); } },
 		{ "Replay",		ui::Color::green(),			&bitmap_icon_replay,	[&nav](){ nav.push<ReplayAppView>(); } },
-		{ "Calls",		ui::Color::yellow(),	    &bitmap_icon_search,	[&nav](){ nav.push<SearchView>(); } },
+		{ "Search",		ui::Color::yellow(),	    &bitmap_icon_search,	[&nav](){ nav.push<SearchView>(); } },
 		{ "Scanner",	ui::Color::yellow(),			&bitmap_icon_scanner,	[&nav](){ nav.push<ScannerView>(); } },
 		{ "Microphone",	ui::Color::yellow(),		&bitmap_icon_microphone,[&nav](){ nav.push<MicTXView>(); } },
 		{ "Looking Glass",	ui::Color::yellow(),		&bitmap_icon_looking,	[&nav](){ nav.push<GlassView>(); } },
-		{ "Tools",		ui::Color::cyan(),			&bitmap_icon_utilities,	[&nav](){ nav.push<UtilitiesMenuView>(); } },
-		{ "Options", 	ui::Color::cyan(),			&bitmap_icon_setup,	  	[&nav](){ nav.push<SettingsMenuView>(); } },
+		{ "Utilities",		ui::Color::cyan(),			&bitmap_icon_utilities,	[&nav](){ nav.push<UtilitiesMenuView>(); } },
+		{ "Settings", 	ui::Color::cyan(),			&bitmap_icon_setup,	  	[&nav](){ nav.push<SettingsMenuView>(); } },
 		{ "Debug",		ui::Color::light_grey(),	&bitmap_icon_debug,		[&nav](){ nav.push<DebugMenuView>(); } },
 		{ "HackRF", 	ui::Color::cyan(),			&bitmap_icon_hackrf,	[this, &nav](){ hackrf_mode(nav); } },
 		//{ "About", 		ui::Color::cyan(),			nullptr,				[&nav](){ nav.push<AboutView>(); } }
@@ -190,7 +190,7 @@ namespace ui
 		void on_speaker();
 		void on_stealth();
 		void on_bias_tee();
-		//void on_textentry();
+		// void on_textentry();
 		void on_camera();
 		void on_title();
 		void refresh();
@@ -212,7 +212,7 @@ namespace ui
 		void refresh();

 	private:
-		static constexpr auto version_string = "v1.4.3";
+		// static constexpr auto version_string = "v1.4.4"; // This is commented out as we are now setting the version via ENV (VERSION_STRING=v1.0.0)
 		NavigationView &nav_;

 		Rectangle backdrop{
@@ -221,7 +221,7 @@ namespace ui

 		Text version{
 			{2, 0, 11 * 8, 16},
-			version_string};
+			VERSION_STRING};

 		LiveDateTime ltime{
 			{86, 0, 19 * 8, 16}};
@@ -248,14 +248,14 @@ namespace ui
 	{
 	public:
 		ReceiversMenuView(NavigationView &nav);
-		std::string title() const override { return "Receivers"; };
+		std::string title() const override { return "Receive"; };
 	};

 	class TransmittersMenuView : public BtnGridView
 	{
 	public:
 		TransmittersMenuView(NavigationView &nav);
-		std::string title() const override { return "Transmitters"; };
+		std::string title() const override { return "Transmit"; };
 	};

 	class UtilitiesMenuView : public BtnGridView
@@ -99,13 +99,13 @@ void RecordView::focus() {

 void RecordView::set_sampling_rate(const size_t new_sampling_rate) {
    
-	/* We are changing "REC" icon background to yellow in  BW rec Options >600Khz 
+	/* We are changing "REC" icon background to yellow in  BW rec Options >600kHz 
 	where we are NOT recording full IQ .C16 files (recorded files are decimated ones).
 	Those decimated recorded files,has not the full IQ  samples . 
 	are ok as recorded spectrum indication, but they  should not be used by Replay app. 
 	 	
 	We keep original black  background in all the correct IQ .C16 files BW's Options */ 
-	if (new_sampling_rate > 4800000) {   // > BW >600Khz  (fs=8*BW), (750Khz ...2750Khz)
+	if (new_sampling_rate > 4800000) {   // > BW >600kHz  (fs=8*BW), (750kHz ...2750kHz)
 		button_record.set_background(ui::Color::yellow());		
 	} else {
 		button_record.set_background(ui::Color::black());				
@@ -127,6 +127,11 @@ void RecordView::set_sampling_rate(const size_t new_sampling_rate) {
 	}
 }

+// Setter for datetime and frequency filename
+void RecordView::set_filename_date_frequency(bool set) {
+	filename_date_frequency = set;
+}
+
 bool RecordView::is_active() const {
 	return (bool)capture_thread;
 }
@@ -149,7 +154,24 @@ void RecordView::start() {
 		return;
 	}

-	auto base_path = next_filename_stem_matching_pattern(filename_stem_pattern);
+	 
+    std::filesystem::path base_path;
+	if(filename_date_frequency) {
+     	rtcGetTime(&RTCD1, &datetime);
+
+		//ISO 8601 
+		std::string date_time = to_string_dec_uint(datetime.year(), 4, '0')  +
+			                    to_string_dec_uint(datetime.month(), 2, '0') + 
+			                    to_string_dec_uint(datetime.day(), 2, '0')   + "T" +
+								to_string_dec_uint(datetime.hour())          +
+								to_string_dec_uint(datetime.minute())        +
+								to_string_dec_uint(datetime.second());
+
+		base_path = filename_stem_pattern.string() + "_" + date_time + "_" + to_string_freq(receiver_model.tuning_frequency()) + "Hz";
+	} else {
+		base_path = next_filename_stem_matching_pattern(filename_stem_pattern);
+	}
+
 	if( base_path.empty() ) {
 		return;
 	}
@@ -63,6 +63,8 @@ public:

 	bool is_active() const;

+	void set_filename_date_frequency(bool set);
+
 private:
 	void toggle();
 	//void toggle_pitch_rssi();
@@ -75,6 +77,11 @@ private:
 	void handle_error(const File::Error error);

 	//bool pitch_rssi_enabled = false;
+	
+	// Time Stamp
+	bool filename_date_frequency = false;
+    rtc::RTC datetime { };
+
 	const std::filesystem::path filename_stem_pattern;
 	const FileType file_type;
 	const size_t write_size;
@@ -38,6 +38,8 @@ public:

 	void focus() override;

+	std::string title() const override { return "SD Card"; };
+
 private:
 	SignalToken sd_card_status_signal_token { };

@@ -35,8 +35,8 @@ public:

 private:
 	uint8_t			n = 0;
-	SOSFilter<5>	sos_i;
-	SOSFilter<5>	sos_q;
+	SOSFilter<5>	sos_i = {};
+	SOSFilter<5>	sos_q = {};
 };

 } /* namespace dsp */
@@ -120,7 +120,7 @@ void ADSBRXProcessor::execute(const buffer_c8_t& buffer) {
 			// the high levels as signals can be out of phase so part of the
 			// energy can be in the near samples
 			int32_t thisAmp = (shifter[1] + shifter[3] + shifter[8] + shifter[10]);
-			int32_t high = thisAmp / 9;
+			uint32_t high = thisAmp / 9;
 			if (
 				shifter[5] < high &&
 				shifter[6] < high &&
@@ -125,18 +125,18 @@ private:
 	uint32_t sample_bits { 0 };
 	uint32_t phase { }, phase_inc { };
 	int32_t sample_mixed { }, prev_mixed { }, sample_filtered { }, prev_filtered { };
-	uint8_t last_bit;
-	uint8_t ones_count = 0;
+	uint8_t last_bit = 0;
+	uint8_t ones_count = 0 ;
 	uint8_t current_byte = 0;
 	uint8_t byte_index = 0;
 	uint8_t packet_buffer[256];
 	size_t packet_buffer_size = 0;

 	bool configured { false };
-	bool wait_start { };
-	bool bit_value { };
+	bool wait_start { 0 };
+	bool bit_value { 0 };

-	aprs::APRSPacket aprs_packet;
+	aprs::APRSPacket aprs_packet { };

 	void configure(const APRSRxConfigureMessage& message);
 	void capture_config(const CaptureConfigMessage& message);
@@ -51,7 +51,7 @@ private:
 	AudioInput audio_input { };
 	ToneGen tone_gen { };
 	ToneGen beep_gen { };
-	dsp::modulate::Modulator *modulator;
+	dsp::modulate::Modulator *modulator = NULL ;

 	bool am_enabled { false };
 	bool fm_enabled { true };
@@ -68,6 +68,16 @@ public:
 		delete[] m_lastVals;
 	}

+    SmoothVals(const SmoothVals<float, float>&)
+    {
+
+    }
+
+    SmoothVals & operator=(const SmoothVals<float, float>&)
+    {
+        return *this ;
+    }
+
 	// --------------------------------------------------
 	// Set size of smoothing
 	// --------------------------------------------------
@@ -154,7 +164,7 @@ private:
 	dsp::decimate::FIRC16xR16x32Decim8 decim_1 { };
 	dsp::decimate::FIRAndDecimateComplex channel_filter { };
 	dsp::demodulate::FM demod { };
-	SmoothVals<float, float> smooth;
+	SmoothVals<float, float> smooth = { };
 	
 	AudioOutput audio_output { };

@@ -84,7 +84,7 @@ bool Packet::crc_ok() const {
 		acars_fcs.process_byte(field_crc.read(i, 8));
 	}

-	return (acars_fcs.checksum() == field_crc.read(data_length(), fcs_length));
+	return (acars_fcs.checksum() == (unsigned)field_crc.read(data_length(), fcs_length));
 }

 size_t Packet::data_and_fcs_length() const {
@@ -191,7 +191,7 @@ bool Packet::crc_ok() const {
 		ais_fcs.process_byte(field_crc.read(i, 8));
 	}

-	return (ais_fcs.checksum() == field_crc.read(data_length(), fcs_length));
+	return (ais_fcs.checksum() == (unsigned)field_crc.read(data_length(), fcs_length));
 }

 size_t Packet::data_and_fcs_length() const {
@@ -115,6 +115,10 @@ void AK4951::init() {
 	// update(Register::DigitalFilterMode);
 }

+bool AK4951::detected() {
+	return reset();
+}
+
 bool AK4951::reset() {
 	io.audio_reset_state(true);

@@ -212,90 +216,347 @@ void AK4951::speaker_disable() {
 	set_speaker_power(false);
 }

-void AK4951::microphone_enable() {
-// map.r.digital_mic.DMIC = 0;
-// update(Register::DigitalMic);
+void AK4951::microphone_enable(int8_t alc_mode) {
+// alc_mode =0 = (OFF =same as original code = NOT using AK4951 Programmable digital filter block), 
+// alc_mode >1 (with  DIGITAL FILTER BLOCK , example :  1:(+12dB) , 2:(+9dB)", 3:(+6dB), ...) 
+
+// map.r.digital_mic.DMIC = 0;		// originally commented code 
+// update(Register::DigitalMic);	// originally commented code 
+
+uint_fast8_t mgain =0b0111;   			// Pre-amp mic (Original code,  =0b0111 (+21dB's=7x3dBs),(Max is NOT 0b1111!, it is 0b1010=+30dBs=10x3dBs) 
+
+map.r.signal_select_2.INL = 0b01;		// Lch input signal = LIN2 , our ext. MONO MIC is connected here LIN2 in Portapack.
+map.r.signal_select_2.INR = 0b01;		// Rch input signal = RIN2 , Not used ,not connected ,but no problem. 
+map.r.signal_select_2.MICL = 0;			// MPWR = 2.4V  (it has two possible settings , 2.4V or 2.0V) , (majority smarthphones around 2V , range 1V-5V)
+update(Register::SignalSelect2);
+
+// ------Common code part, =  original setting  conditions, it is fine for all user-GUI alc_modes: OFF , and ALC modes .*/
+map.r.digital_filter_select_1.HPFAD = 1;	// HPF1 ON (after ADC);page 40 datasheet, HPFAD bit controls the ON/OFF of the HPF1 (HPF ON is recommended).
+map.r.digital_filter_select_1.HPFC = 0b11;	// HPF Cut off frequency of high pass filter from 236.8 Hz @fs=48k  ("00":3.7Hz, "01":14,8Hz, "10":118,4Hz) 
+update(Register::DigitalFilterSelect1);
+
+// map.r.r_ch_mic_gain_setting.MGR = 0x80;	// Microphone sensitivity correction = 0dB.,  (not used by now , original code cond.)
+// update(Register::RchMicGainSetting);		// (those two lines , not activated, same as original)	
+
+// pre-load 4 byes LPF coefficicients (.lpf_coefficient_0,1,2,3), FSA 14..0, FSB 14..0 , (fcut initial 6kHz, fs 48Khz). 	
+// it will be default pre-loading coeff. for al  ALC modes,  LPF bit is activated down, for all ALC digital modes.
+map.r.lpf_coefficient_0.l = 0x5F;		// Pre-loading here LPF 6kHz, 1st Order from digital Block , Fc=6000 Hz,  fs = 48khz
+map.r.lpf_coefficient_1.h = 0x09;		// LPF bit is activated down, for all ALC digital modes.
+map.r.lpf_coefficient_2.l = 0xBF;		// Writting reg to AK4951,  with "update", following instructions.
+map.r.lpf_coefficient_3.h = 0x32;
+
+update(Register::LPFCoefficient0);	// Writing  pre-loaded  4 bytes LPF  CoefFiecients 14 bits (FSA13..0,  FSB13..0
+update(Register::LPFCoefficient1);	// In this case , LPF 6KHz , when we activate the LPF block.
+update(Register::LPFCoefficient2);
+update(Register::LPFCoefficient3);
+
+// Reset , setting OFF all 5 x Digital Equalizer filters 
+map.r.digital_filter_select_3.EQ1 = 0;	  // EQ1 Coeffic Setting , (0: Disable-default, audio data passes  EQ1 block by 0dB gain). When EQ1="1”, the settings of E1A15-0, E1B15-0 and E1C15-0 bits are enabled
+map.r.digital_filter_select_3.EQ2 = 0;	  // EQ2 Coeffic Setting , (0: Disable-default, audio data passes  EQ2 block by 0dB gain). When EQ2="1”, the settings of E2A15-0, E2B15-0 and E2C15-0 bits are enabled
+map.r.digital_filter_select_3.EQ3 = 0;    // EQ3 Coeffic Setting , (0: Disable-default, audio data passes  EQ3 block by 0dB gain). When EQ3="1”, the settings of E3A15-0, E3B15-0 and E3C15-0 bits are enabled
+map.r.digital_filter_select_3.EQ4 = 0;    // EQ4 Coeffic Setting , (0: Disable-default, audio data passes  EQ4 block by 0dB gain). When EQ4="1”, the settings of E4A15-0, E4B15-0 and E4C15-0 bits are enabled
+map.r.digital_filter_select_3.EQ5 = 0;    // EQ5 Coeffic Setting , (0: Disable-default, audio data passes  EQ5 block by 0dB gain). When EQ5="1”, the settings of E5A15-0, E5B15-0 and E5C15-0 bits are enabled
+update(Register::DigitalFilterSelect3);		// A,B,C EQ1 Coefficients are already pre-loaded in ak4951.hpp
+
+
+  if (alc_mode==0) { 		// Programmable Digital Filter OFF,  same as original condition., no Digital ALC, nor Wind Noise Filter, LPF , EQ 
+
+		map.r.digital_filter_select_2.LPF = 0;	  // LPF-Block, Coeffic Setting Enable (OFF-Default), When LPF bit is “0”, audio data passes the LPF block by 0dB gain. 
+		update(Register::DigitalFilterSelect2);
+
+	  	// Pre-loading AUDIO PATH with all DIGITAL BLOCK by pased, see, audio path block diagramm AK4951 datasheet + Table  Playback mode  -Recording mode. 
+		// Digital filter block PATH is BY PASSED (we can swith off DIG. BLOCK power , PMPFIL=0) .The Path in Recording Mode 2 & Playback Mode 2  (NO DIG FILTER BLOCK AT ALL, not for MIC recording, nor for Playback)
+		map.r.digital_filter_mode.ADCPF = 1;	// ADCPF bit swith ("0" Mic  after ADC Output connected (recording mode) to the DIGITAL FILTER  BLOCK. ("1" Playback mode)  
+		map.r.digital_filter_mode.PFSDO = 0;	// ADC bit switch ("0" : 1st order HPF) connectedto the  Output. By bass DIGITAL block .
+    	map.r.digital_filter_mode.PFDAC = 0b00;	// (Input selector for DAC (not used in MIC), SDTI= Audio Serial Data Input Pin)
+		update(Register::DigitalFilterMode);		// Writing the Audio Path :  NO DIGITAL BLOCK or DIG BLOCK FOR  MIC ,   Audio mode path : Playback mode /-Recording mode.
+
+		map.r.power_management_1.PMADL  = 1;	// ADC Lch = Lch input signal. Mic Amp Lch and ADC Lch Power Management
+		map.r.power_management_1.PMADR  = 1;	// ADC Rch = Rch input signal. Mic Amp Rch and ADC Rch Power Management
+		map.r.power_management_1.PMPFIL = 0;	// Pre-loading , Programmable Dig. filter OFF ,filter unused, routed around.(original value = 0 ) 
+		update(Register::PowerManagement1);		// Activating the Power management of the used blocks . (Mic ADC always + Dig Block filter , when used )
+
+		// 1059/fs, 22ms @ 48kHz
+		chThdSleepMilliseconds(22);
+
+  } else {    // ( alc_mode !=0) 
+
+	switch(alc_mode) { 	// Pre-loading register values depending on user-GUI selection (they will be sended below, with "update(Register_name::xxx )".
+	 
+		case 1: 	// ALC-> on, (+12dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz + Pre-amp Mic (+21dB=original)
+			map.r.alc_mode_control_2.REF = 0xC0;    	// REF7-0 bits,max gain at ALC recovery operation,(FFH +36dBs , D0H +18dBs, A0H 0dBs, C0H=+12dBs) 
+			map.r.l_ch_input_volume_control.IV = 0xC0; 	// Left, Input Digital Volume Setting, (FFH +36dBs , D0H +18dBs, A0H 0dBs, 70H=-18dBs)
+			map.r.r_ch_input_volume_control.IV = 0xC0; 	// Right Input Dig Vol Setting, same comment as above , The value of IVOL should be <= than REF’s
+
+			// Already Pre-loaded, "map.r.lpf_coefficient", 6Khz - LPF 1st Order from digital Block,Fc=6000Hz,fs = 48khz
+			// LPF bit is activated down, for all ALC digital modes.
+			break;
+
+		case 2: 	// ALC-> on, (+09dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz + Pre-amp Mic (+21dB=original)
+			map.r.alc_mode_control_2.REF = 0xB8;    	// REF7-0 bits,max gain at ALC recoveryoperation,(FFH +36dBs , D0H +18dBs, A0H 0dBs, B8H= +9dBs) 
+			map.r.l_ch_input_volume_control.IV = 0xB8; 	// Left, Input Digital Volume Setting, (FFH +36dBs , D0H +18dBs, A0H 0dBs, 70H=-18dBs)
+			map.r.r_ch_input_volume_control.IV = 0xB8; 	// Right Input Dig Vol Setting, same comment as above , The value of IVOL should be <= than REF’s
+
+			// Already Pre-loaded, "map.r.lpf_coefficient", 6Khz - LPF 1st Order from digital Block,Fc=6000Hz,fs = 48khz
+			// LPF bit is activated down, for all ALC digital modes.
+			break;
+
+	    case 3: 	// ALC-> on, (+06dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz + Pre-amp Mic (+21dB=original)
+			map.r.alc_mode_control_2.REF = 0xB0;    	// 0xB8 , REF7-0 bits,max gain at ALC recoveryoperation,(FFH +36dBs , D0H +18dBs, A0H 0dBs, B0H= +6dBs) 
+			map.r.l_ch_input_volume_control.IV = 0xB0; 	// Left, Input Digital Volume Setting, (FFH +36dBs , D0H +18dBs, A0H 0dBs, 70H=-18dBs)
+			map.r.r_ch_input_volume_control.IV = 0xB0; 	// Right Input Dig Vol Setting, same comment as above , Then value of IVOL should be <= than REF’s
+		
+			// Already Pre-loaded, "map.r.lpf_coefficient", 6Khz - LPF 1st Order from digital Block,Fc=6000Hz,fs = 48khz
+			// LPF bit is activated down, for all ALC digital modes.
+			break;
+
+	    case 4: 	// ALC-> on, (+03dB's) Auto Vol max + Wind Noise cancel + Pre-amp Mic (+21dB=original)
+					// + EQ boosting ~<2kHz (f0:1,1k, fb:1,7K, k=1,8)   && + LPF 3,5k 
+			map.r.alc_mode_control_2.REF = 0xA8;    	// 0xA8 , REF7-0 bits,max gain at ALC recoveryoperation,(FFH +36dBs , D0H +18dBs, A0H 0dBs, A8H= +3dBs) 
+			map.r.l_ch_input_volume_control.IV = 0xA8; 	// Left, Input Digital Volume Setting, (FFH +36dBs , D0H +18dBs, A0H 0dBs, 70H=-18dBs)
+			map.r.r_ch_input_volume_control.IV = 0xA8; 	// Right Input Dig Vol Setting, same comment as above , Then value of IVOL should be <= than REF’s
+
+			//The EQn (n=1, 2, 3, 4 or 5) coefficient must be set when EQn bit = “0” or PMPFIL bit = “0”.
+			map.r.digital_filter_select_3.EQ1 = 1;	    // EQ1 Coeffic Setting , (0: Disable-default, audio data passes  EQ1 block by 0dB gain). When EQ1="1”, the settings of E1A15-0, E1B15-0 and E1C15-0 bits are enabled
+			update(Register::DigitalFilterSelect3);		// A,B,C EQ1 Coefficients are already pre-loaded in ak4951.hpp
+
+			map.r.lpf_coefficient_0.l = 0x0D;		// Pre-loading here LPF 3,5k  ,  1st Order from digital Block , Fc=3.500 Hz,  fs = 48khz
+		   	map.r.lpf_coefficient_1.h = 0x06;		// LPF bit is activated down, for all ALC digital modes.
+       		map.r.lpf_coefficient_2.l = 0x1A;		// Writting reg to AK4951 , down with update....
+	   		map.r.lpf_coefficient_3.h = 0x2C;
+   			// LPF bit is activated down, for all ALC digital modes.			
+ 			break;
+
+	  	case 5: 	// ALC-> on, (+03dB's) Auto Vol max + Wind Noise cancel + Pre-amp Mic (+21dB=original)
+		  			// + EQ boosting ~<3kHz (f0~1k4,fb~2,4k,k=1,8)   && LPF 4kHz 
+			map.r.alc_mode_control_2.REF = 0xA8;    	// 0xA0 , REF7-0 bits,max gain at ALC recoveryoperation,(FFH +36dBs , D0H +18dBs, A0H 0dBs, A8H= +3dBs) 
+			map.r.l_ch_input_volume_control.IV = 0xA8; 	// Left, Input Digital Volume Setting, (FFH +36dBs , D0H +18dBs, A0H 0dBs, 70H=-18dBs)
+			map.r.r_ch_input_volume_control.IV = 0xA8; 	// Right Input Dig Vol Setting, same comment as above , Then value of IVOL should be <= than REF’s
+		
+			map.r.digital_filter_select_3.EQ2 = 1;	  // EQ2 Coeffic Setting , (0: Disable-default, audio data passes  EQ2 block by 0dB gain). When EQ2="1”, the settings of E2A15-0, E2B15-0 and E2C15-0 bits are enabled
+			update(Register::DigitalFilterSelect3);
+
+			map.r.lpf_coefficient_0.l = 0xC3;		// Pre-loading here LPF 4k  ,  1st Order from digital Block , Fc=4000 Hz,  fs = 48khz
+	   		map.r.lpf_coefficient_1.h = 0x06;		// LPF bit is activated down, for all ALC digital modes.
+       		map.r.lpf_coefficient_2.l = 0x86;		// Writting reg to AK4951 , down with update....
+	   		map.r.lpf_coefficient_3.h = 0x2D;
+   			// LPF bit is activated down, for all ALC digital modes.
+			break;
+
+		 case 6: 	// ALC-> on, (+03dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz + Pre-amp Mic (+21dB=original)
+			map.r.alc_mode_control_2.REF = 0xA8;    	// REF7-0 bits,max gain at ALC recoveryoperation,(FFH +36dBs , D0H +18dBs, A0H 0dBs, A0H= 0dBs) 
+			map.r.l_ch_input_volume_control.IV = 0xA8; 	// Left, Input Digital Volume Setting, (FFH +36dBs , D0H +18dBs, A0H 0dBs, 70H=-18dBs)
+			map.r.r_ch_input_volume_control.IV = 0xA8; 	// Right Input Dig Vol Setting, same comment as above , Then value of IVOL should be <= than REF’s
+
+			// Already Pre-loaded, "map.r.lpf_coefficient", 6Khz - LPF 1st Order from digital Block,Fc=6000Hz,fs = 48khz
+			// LPF bit is activated down, for all ALC digital modes.
+			break;
+
+		 case 7: 	// ALC-> on, (+00dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz + Pre-amp Mic (+21dB=original)
+			map.r.alc_mode_control_2.REF = 0xA0;    	// REF7-0 bits,max gain at ALC recoveryoperation,(FFH +36dBs , D0H +18dBs, A0H 0dBs, A0H= 0dBs) 
+			map.r.l_ch_input_volume_control.IV = 0xA0; 	// Left, Input Digital Volume Setting, (FFH +36dBs , D0H +18dBs, A0H 0dBs, 70H=-18dBs)
+			map.r.r_ch_input_volume_control.IV = 0xA0; 	// Right Input Dig Vol Setting, same comment as above , Then value of IVOL should be <= than REF’s
+
+			// Already Pre-loaded, "map.r.lpf_coefficient", 6Khz - LPF 1st Order from digital Block,Fc=6000Hz,fs = 48khz
+			// LPF bit is activated down, for all ALC digital modes.
+			break;
+
+		case 8:		// ALC-> on, (-03dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz + Pre-amp Mic (+21dB=original)
+			map.r.alc_mode_control_2.REF = 0x98;    	//REF7-0 bits,max gain at ALC recovery operation,(FFH +36dBs , D0H +18dBs, A0H 0dBs, 98H=-03dBs) 
+			map.r.l_ch_input_volume_control.IV = 0x98; 	// Left, Input Digital Volume Setting, (FFH +36dBs , D0H +18dBs, A0H 0dBs, 70H=-18dBs)
+			map.r.r_ch_input_volume_control.IV = 0x98; 	// Right Input Dig Vol Setting, same comment as above , Then value of IVOL should be <= than REF’s
 	
-	const uint_fast8_t mgain = 0b0111;
-	map.r.signal_select_1.MGAIN20 = mgain & 7;
-	map.r.signal_select_1.PMMP = 1;
-	map.r.signal_select_1.MPSEL = 1;	// MPWR2 pin
-	map.r.signal_select_1.MGAIN3 = (mgain >> 3) & 1;
-	update(Register::SignalSelect1);
+			// Already Pre-loaded, "map.r.lpf_coefficient", 6Khz - LPF 1st Order from digital Block,Fc=6000Hz,fs = 48khz
+			// LPF bit is activated down, for all ALC digital modes.
+			break;

-	map.r.signal_select_2.INL = 0b01;	// Lch input signal = LIN2
-	map.r.signal_select_2.INR = 0b01;	// Rch input signal = RIN2
-	map.r.signal_select_2.MICL = 0;		// MPWR = 2.4V
-	update(Register::SignalSelect2);
+		case 9: 	// ALC-> on, (-06dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz + Pre-amp Mic (+21dB=original)
+			map.r.alc_mode_control_2.REF = 0x90;    	// REF7-0 bits,max gain at ALC recovery operation,(FFH +36dBs , D0H +18dBs, A0H 0dBs, 90H=-06dBs) 
+			map.r.l_ch_input_volume_control.IV = 0x90; 	// Left, Input Digital Volume Setting, (FFH +36dBs , D0H +18dBs, A0H 0dBs, 70H=-18dBs)
+			map.r.r_ch_input_volume_control.IV = 0x90; 	// Right Input Dig Vol Setting, same comment as above , Then value of IVOL should be <= than REF’s

-// map.r.r_ch_mic_gain_setting.MGR = 0x80;	// Microphone sensitivity correction = 0dB.
-// update(Register::RchMicGainSetting);
-/*
-	map.r.timer_select.FRN = ?;
-	map.r.timer_select.FRATT = ?;
-	map.r.timer_select.ADRST = 0b??;
-	update(Register::TimerSelect);
+			// Already Pre-loaded, "map.r.lpf_coefficient", 6Khz - LPF 1st Order from digital Block,Fc=6000Hz,fs = 48khz
+			// LPF bit is activated down, for all ALC digital modes.
+			break;

-	map.r.alc_timer_select. = ?;
-	update(Register::ALCTimerSelect);
-	map.r.alc_mode_control_1. = ?;
-	map.r.alc_mode_control_1.ALC = 1;
+		case 10: 	// ALC-> on, (-09dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz - Pre-amp MIC -3dB (18dB's) 
+			// Reduce also Pre-amp Mic -3dB's (+18dB's)		
+			mgain = 0b0110;		// Pre-amp mic Mic Gain Pre-amp (+18dB), Original=0b0111 (+21dB's =7x3dBs),
+	
+			map.r.alc_mode_control_2.REF = 0x88;    	// REF7-0 bits,max gain at ALC recovery operation,(FFH +36dBs , D0H +18dBs, A0H 0dBs, 88H=-09dBs) 
+			map.r.l_ch_input_volume_control.IV = 0x88; 	// Left, Input Digital Volume Setting, (FFH +36dBs , D0H +18dBs, A0H 0dBs, 70H=-18dBs)
+			map.r.r_ch_input_volume_control.IV = 0x88; 	// Right Input Dig Vol Setting, same comment as above , Then value of IVOL should be <= than REF’s
+ 	
+			// Already Pre-loaded, "map.r.lpf_coefficient", 6Khz - LPF 1st Order from digital Block,Fc=6000Hz,fs = 48khz
+			// LPF bit is activated down, for all ALC digital modes.
+			break;
+
+		case 11: // ALC-> on, (-12dB's) Auto Vol max + Wind Noise cancel + LPF 6kHz - Pre-amp MIC -6dB (15dB's) 	
+			// Reduce also Pre-amp Mic -6dB's (+15dB's)  	
+			mgain = 0b0101;		// Pre-amp mic Mic Gain Pre-amp (+15dB), (Original=0b0111 (+21dB's= 7x3dBs),
+
+			map.r.alc_mode_control_2.REF = 0x80;    	// REF7-0 bits,max gain at ALC recovery operation,(FFH +36dBs , D0H +18dBs, A0H 0dBs, 80H=-12dBs) 
+			map.r.l_ch_input_volume_control.IV = 0x80; 	// Left, Input Digital Volume Setting, (FFH +36dBs , D0H +18dBs, A0H 0dBs, 70H=-18dBs)
+			map.r.r_ch_input_volume_control.IV = 0x80; 	// Right Input Dig Vol Setting, same comment as above , Then value of IVOL should be <= than REF’s
+
+			// Already Pre-loaded, "map.r.lpf_coefficient", 6Khz - LPF 1st Order from digital Block,Fc=6000Hz,fs = 48khz
+			// LPF bit is activated down, for all ALC digital modes.
+			break;
+	}
+
+	//-------------------------------DIGITAL  ALC  (Automatic Level Control ) --- --------
+	map.r.alc_mode_control_1.ALC = 0;  // LMTH2-0, WTM1-0, RGAIN2-0, REF7-0, RFST1-0, EQFC1-0, FRATT, FRN and ALCEQN bits (needs to be set up with  ALC disable = 0) 
 	update(Register::ALCModeControl1);

-	map.r.alc_mode_control_2.REF = ?;
+	map.r.timer_select.FRN = 0;      	// (FRN= 0  Fast Recovery mode , enable ) 
+	map.r.timer_select.FRATT = 0;    	// Fast Recovery Ref. Volume Atten. Amount -0,00106dB's, timing 4/fs (default)
+	map.r.timer_select.ADRST = 0b00; 	// initial offset ADC cycles , 22ms @fs=48Khz.
+	update(Register::TimerSelect);
+
+	map.r.alc_timer_select.RFST = 0b00;   // RFST1-0: ALC Fast Recovery Speed Default: “00” (0.0032dB)
+	map.r.alc_timer_select.WTM = 0b00;    // ALC Recovery Operation Waiting Period 128/fs = 2,7 mseg (min=default)
+	map.r.alc_timer_select.EQFC = 0b10;   // Selecting default, fs 48Khz , ALCEQ: First order zero pole high pass filter fc2=100Hz, fc1=150Hz
+	map.r.alc_timer_select.IVTM = 0;      // IVTM bit set the vol transition time ,236/fs = 4,9msecs (min) (default was 19,7msegs.)
+	update(Register::ALCTimerSelect);
+
+	map.r.alc_mode_control_1.LMTH10 = 0b11;  // ALC Limiter Detec Level/ Recovery Counter Reset; lower 2 bits (Ob111=-8,4dbs), (default 0b000=-2,5dBs)
+	map.r.alc_mode_control_1.RGAIN  = 0b000; // ALC Recovery Gain Step, max step , max speed. Default: “000” (0.00424dB)
+	map.r.alc_mode_control_1.ALC = 1;		 // ALC Enable .  (we are now, NOT in MANUAL volume mode, only becomes manual when (ALC=“0” while ADCPF=“1”. )
+	map.r.alc_mode_control_1.LMTH2 = 1;      // ALC Limiter Detection Level/ Recovery Counter Reset Level,Upper bit,default 0b000      
+	map.r.alc_mode_control_1.ALCEQN = 1;     // ALC EQ Off =1 not used by now,   0: ALC EQ On (default) 
+	update(Register::ALCModeControl1);
+
+	//   map.r.alc_mode_control_2.REF = 0x??;   	// Pre-loaded in top part. Maximum gain at ALC recovery operation,.(FFH +36dBs , D0H +18dBs, A0H 0dBs, 70H=-18dBs) 
 	update(Register::ALCModeControl2);
-*/
-// map.r.l_ch_input_volume_control.IV = 0xe1;
-// update(Register::LchInputVolumeControl);
-// map.r.r_ch_input_volume_control.IV = 0xe1;
-// update(Register::RchInputVolumeControl);
-/*
-	map.r.auto_hpf_control.STG = 0b00;
-	map.r.auto_hpf_control.SENC = 0b011;
-	map.r.auto_hpf_control.AHPF = 0;
-	update(Register::AutoHPFControl);
-*/
-	map.r.digital_filter_select_1.HPFAD = 1;	// HPF1 (after ADC) = on
-	map.r.digital_filter_select_1.HPFC = 0b11;	// 2336.8 Hz @ fs=48k
-	update(Register::DigitalFilterSelect1);
-/*
-	map.r.digital_filter_select_2.HPF = 0;
-	map.r.digital_filter_select_2.LPF = 0;
-	map.r.digital_filter_select_2.FIL3 = 0;
-	map.r.digital_filter_select_2.EQ0 = 0;
-	map.r.digital_filter_select_2.GN = 0b00;
+
+	//   map.r.l_ch_input_volume_control.IV = 0x??; // Pre-loaded in top part. Left, Input Digital Volume Setting,  (FFH +36dBs , D0H +18dBs, A0H 0dBs, 70H=-18dBs)
+    update(Register::LchInputVolumeControl);
+	
+	//   map.r.r_ch_input_volume_control.IV = 0x??; // Pre-loaded in top part. Right,Input Digital Volume Setting, (FFH +36dBs , D0H +18dBs, A0H 0dBs, 70H=-18dBs) 
+    update(Register::RchInputVolumeControl);
+	
+	
+	//---------------Switch ON, Digital Automatic Wind Noise Filter reduction  -------------------     
+	// Difficult to realise that Dynamic HPF Wind noise filter benefit, maybe because we have another fixed HPF 236.8 Hz .
+	// Anyway ,  we propose to  activate it , with default  setting conditions.
+	map.r.power_management_1.PMPFIL = 0;	// (*1) To programm SENC, STG , we need PMPFIL = 0 . (but this disconnect Digital block power supply.
+	update(Register::PowerManagement1);		//  Updated PMPFIL to 0 . (*1)
+
+	map.r.auto_hpf_control.STG = 0b00;		//  (00=LOW ATTENUATION Level), lets put 11 (HIGH ATTENUATION Level) (default 00)
+	map.r.auto_hpf_control.SENC = 0b011;	//  (000=LOW sensitivity detection)… 111((MAX sensitivity detection) (default 011)
+	map.r.auto_hpf_control.AHPF = 1;    	//  Autom. Wind noise filter ON  (AHPF bit=“1”).It atten. wind noise when detecting ,and adjusts the atten. level dynamically.
+	update(Register::AutoHPFControl);       
+
+	//  We are in Digital Block ON , (Wind Noise Filter+ALC+LPF+EQ),==>  needs at the end , PMPFIL=1 , Program. Dig.filter ON   
+	//  map.r.power_management_1.PMPFIL = 1;	// that instruction is at the end , we can skp pre-loading Programmable Dig. filter ON (*1)
+	//---------------------------------------------------------------------
+ 	    
+	// Writing AUDIO PATH diagramm, Changing  Audio mode path : Playback mode1 /-Recording mode2. (Figure 37 AK4951 datasheet, Table 27. Recording Playback Mode)
+	// When changing those modes, PMPFIL bit must be “0”, it is OK (*1)
+	map.r.digital_filter_mode.ADCPF = 1;	// ADCPF bit swith ("0" Mic  after ADC Output connected (recording mode) to the DIGITAL FILTER  BLOCK. ("1" Playback mode)  
+	map.r.digital_filter_mode.PFSDO = 1;	// ADC (+ 1st order HPF) Output
+    map.r.digital_filter_mode.PFDAC = 0b00;	// (Input selector for DAC (not used in MIC), SDTI= Audio Serial Data Input Pin)
+	update(Register::DigitalFilterMode);	// Writing the Audio Path :  NO DIGITAL BLOCK or DIG BLOCK FOR  MIC ,   Audio mode path : Playback mode /-Recording mode.
+
+	// The EQn (n=1, 2, 3, 4 or 5) coefficient must be set when EQn bit = “0” or PMPFIL bit = “0”., but we are already (*1) 
+	// map.r.power_management_1.PMPFIL = 0;		// In the previous Wind Noise Filter , we already set up PPFIL = 0
+	// update(Register::PowerManagement1);		// Activating the Power management of the used blocks . (Mic ADC always + Dig Block filter , when used )
+
+	// ... Set EQ & LPF  coefficients ---------------------------------
+
+	// writting to the IC ak4951 reg. settings defined in Ak4951.hpp ,  the 30 bytes ,  EQ coefficient =  5 (EQ1,2,3,4,5) x 3 (A,B,C coefficients) x 2 bytes (16 bits)
+    update(Register::E1Coefficient0);	// we could pre-load here,ex ,"map.r.e1_coefficient_0.l = 0x50;" , EQ1 Coefficient A  : A7...A0, but already done in ak4951.hpp
+    update(Register::E1Coefficient1);	// we could pre-load here,ex ,"map.r.e1_coefficient_1.h = 0xFE;" , EQ1 Coefficient A  : A15..A8,  "   "
+    update(Register::E1Coefficient2);	// we could pre-load here,ex ,"map.r.e1_coefficient_2.l = 0x29;" , EQ1 Coefficient B  : B7...B0,  "   "   
+    update(Register::E1Coefficient3);	// we could pre-load here,ex ,"map.r.e1_coefficient_3.h = 0xC5;" , EQ1 Coefficient B  : B15..B8,  "   "
+    update(Register::E1Coefficient4);	// we could pre-load here,ex ,"map.r.e1_coefficient_4.l = 0xA0;" , EQ1 Coefficient C  : C7...C0,  "   "
+    update(Register::E1Coefficient5);	// we could pre-load here,ex ,"map.r.e1_coefficient_5.h = 0x1C;" , EQ1 Coefficient C  : C15..C8,  "   "
+		
+	update(Register::E2Coefficient0);	// writing  pre-loaded EQ2 coefficcients
+    update(Register::E2Coefficient1);	
+    update(Register::E2Coefficient2);
+    update(Register::E2Coefficient3);
+    update(Register::E2Coefficient4);
+    update(Register::E2Coefficient5);
+
+	// Already pre-loaded LPF coefficients to 6k, 3,5k or 4k  ,(LPF 6Khz all digital alc modes top , except when  3k5 , 4k) 
+	update(Register::LPFCoefficient0);	// Writing  pre-loaded  4 bytes  LPF  CoefFiecients 14 bits (FSA13..0,  FSB13..0
+	update(Register::LPFCoefficient1);
+	update(Register::LPFCoefficient2);
+	update(Register::LPFCoefficient3);
+
+    // Activating LPF block , (and re-configuring the rest of bits of the same register)
+	map.r.digital_filter_select_2.HPF = 0;    // HPF2-Block, Coeffic Setting Enable (OFF-Default), When HPF bit is “0”, audio data passes the HPF2 block by is 0dB gain. 
+	map.r.digital_filter_select_2.LPF = 1;	  // LPF-Block, Coeffic Setting Enable (OFF-Default), When LPF bit is “0”, audio data passes the LPF block by 0dB gain. 	
+	map.r.digital_filter_select_2.FIL3 = 0;	  // Stereo_Emphasis_Filter-Block,(OFF-Default)  Coefficient Setting Enable , OFF , Disable.	
+	map.r.digital_filter_select_2.EQ0 = 0;    // Gain Compensation-Block, (OFF-Default) Coeffic Setting Enable, When EQ0 bit = “0” audio data passes the EQ0 block by 0dB gain. 
+	map.r.digital_filter_select_2.GN = 0b00;  // Gain Setting of the Gain Compensation Block Default: “00”-Default (0dB)	
 	update(Register::DigitalFilterSelect2);

-	map.r.digital_filter_select_3.EQ1 = 0;
-	map.r.digital_filter_select_3.EQ2 = 0;
-	map.r.digital_filter_select_3.EQ3 = 0;
-	map.r.digital_filter_select_3.EQ4 = 0;
-	map.r.digital_filter_select_3.EQ5 = 0;
-	update(Register::DigitalFilterSelect3);
-*/
-	map.r.digital_filter_mode.PFSDO = 0;	// ADC (+ 1st order HPF) Output
-	map.r.digital_filter_mode.ADCPF = 1;	// ADC Output (default)
-	update(Register::DigitalFilterMode);
-
-	// ... Set coefficients ...
-
-	map.r.power_management_1.PMADL = 1;		// ADC Lch = Lch input signal
-	map.r.power_management_1.PMADR = 1;		// ADC Rch = Rch input signal
-	map.r.power_management_1.PMPFIL = 0;	// Programmable filter unused, routed around.
-	update(Register::PowerManagement1);
+		// Acitivating digital block , power supply 
+	map.r.power_management_1.PMADL  = 1;	// ADC Lch = Lch input signal. Mic Amp Lch and ADC Lch Power Management
+	map.r.power_management_1.PMADR  = 1;	// ADC Rch = Rch input signal. Mic Amp Rch and ADC Rch Power Management
+	map.r.power_management_1.PMPFIL = 1;	// Pre-loaded in top part.  Orig value=0, Programmable Digital filter unused (not power up), routed around. 
+	update(Register::PowerManagement1);		// Activating the Power management of the used blocks . (Mic ADC always + Dig Block filter , when used )

 	// 1059/fs, 22ms @ 48kHz
 	chThdSleepMilliseconds(22);
+
+  } 
+
+  // Common  part  for all alc_mode , --------------------------
+  // const uint_fast8_t mgain = 0b0111;		// Already pre-loaded , in above switch case . 
+  map.r.signal_select_1.MGAIN20 = mgain & 7;  // writing 3 lower bits of mgain , (pre-amp mic gain).  
+  map.r.signal_select_1.PMMP = 1;				// Activating DC Mic Power supply through 2kohms res., similar majority  smartphones  headphone+mic jack, "plug-in-power"
+  map.r.signal_select_1.MPSEL = 1;			// MPWR2 pin ,selecting output voltage to  MPWR2 pin, that we are using in portapack ext. MIC)
+  map.r.signal_select_1.MGAIN3 = (mgain >> 3) & 1; // writing 4th upper bit of mgain  (pre-amp mic gain).
+  update(Register::SignalSelect1);
+	
 }

+
+
 void AK4951::microphone_disable() {
-	map.r.power_management_1.PMADL = 0;
-	map.r.power_management_1.PMADR = 0;
-	map.r.power_management_1.PMPFIL = 0;
+	map.r.power_management_1.PMADL = 0;		// original code  , disable Power managem.Mic  ADC L
+	map.r.power_management_1.PMADR = 0;		// original code  , disable Power managem.Mic  ADC R
+	map.r.power_management_1.PMPFIL = 0;	// original code  , disable Power managem. all Programmable Dig. block  
 	update(Register::PowerManagement1);

-	map.r.alc_mode_control_1.ALC = 0;
+	map.r.alc_mode_control_1.ALC = 0;		// original code  , Restore , disable ALC block.
 	update(Register::ALCModeControl1);
+
+	map.r.auto_hpf_control.AHPF = 0;    	//----------- new code addition , Restore disable Wind noise filter OFF (AHPF bit=“0”). 
+	update(Register::AutoHPFControl); 
+
+	//Restore original AUDIO PATH , condition,  (Digital filter block PATH is BY PASSED)  (we can also swith off DIG. BLOCK power , PMPFIL=0)
+	// The Path in Recording Mode 2 & Playback Mode 2 , (NO DIG FILTER BLOCK AT ALL, not for MIC recording, nor for Playback)
+	map.r.digital_filter_mode.ADCPF = 1;	// new code addition , ADCPF bit swith ("0" Mic  after ADC Output connected (recording mode) to the DIGITAL FILTER  BLOCK. ("1" Playback mode)  
+	map.r.digital_filter_mode.PFSDO = 0;	// new code addition , ADC bit switch ("0" : 1st order HPF) connectedto the  Output. By bass DIGITAL block .
+   	map.r.digital_filter_mode.PFDAC = 0b00;	// new code addition , (Input selector for DAC (not used in MIC), SDTI= Audio Serial Data Input Pin)
+	update(Register::DigitalFilterMode);	// Writing the Audio Path :  NO DIGITAL BLOCK or DIG BLOCK FOR  MIC ,   Audio mode path : Playback mode /-Recording mode.
+	
+	// Restore original condition , LPF , OFF . same as when not using DIGITAL Programmable block
+	map.r.digital_filter_select_2.LPF = 0;	  // LPF-Block, Coeffic Setting Enable (OFF-Default), When LPF bit is “0”, audio data passes the LPF block by 0dB gain. 
+	update(Register::DigitalFilterSelect2);
+
+	map.r.lpf_coefficient_0.l = 0x00;		// Pre-loading here LPF 6k  ,  1st Order from digital Block , Fc=6000 Hz,  fs = 48khz
+	map.r.lpf_coefficient_1.h = 0x00;		// LPF bit is activated down, for all ALC digital modes.
+	map.r.lpf_coefficient_2.l = 0x00;		// Writting reg to AK4951 , down with update....
+	map.r.lpf_coefficient_3.h = 0x00;
+
+	update(Register::LPFCoefficient0);		// Writing  pre-loaded  4 bytes  LPF  CoefFiecients 14 bits (FSA13..0,  FSB13..0
+	update(Register::LPFCoefficient1);
+	update(Register::LPFCoefficient2);
+	update(Register::LPFCoefficient3);
+
+	// Switch off all EQ 1,2,3,4,5
+	map.r.digital_filter_select_3.EQ1 = 0;	  // EQ1 Coeffic Setting , (0: Disable-default, audio data passes  EQ1 block by 0dB gain). When EQ1="1”, the settings of E1A15-0, E1B15-0 and E1C15-0 bits are enabled
+	map.r.digital_filter_select_3.EQ2 = 0;	  // EQ2 Coeffic Setting , (0: Disable-default, audio data passes  EQ2 block by 0dB gain). When EQ2="1”, the settings of E2A15-0, E2B15-0 and E2C15-0 bits are enabled
+	map.r.digital_filter_select_3.EQ3 = 0;    // EQ3 Coeffic Setting , (0: Disable-default, audio data passes  EQ3 block by 0dB gain). When EQ3="1”, the settings of E3A15-0, E3B15-0 and E3C15-0 bits are enabled
+	map.r.digital_filter_select_3.EQ4 = 0;    // EQ4 Coeffic Setting , (0: Disable-default, audio data passes  EQ4 block by 0dB gain). When EQ4="1”, the settings of E4A15-0, E4B15-0 and E4C15-0 bits are enabled
+	map.r.digital_filter_select_3.EQ5 = 0;    // EQ5 Coeffic Setting , (0: Disable-default, audio data passes  EQ5 block by 0dB gain). When EQ5="1”, the settings of E5A15-0, E5B15-0 and E5C15-0 bits are enabled
+	update(Register::DigitalFilterSelect3);
+
 }

 reg_t AK4951::read(const address_t reg_address) {
@@ -773,40 +773,41 @@ constexpr RegisterMap default_after_reset { Register_Type {
 		.REV = 0b1100,
 	},
 	
-	.e1_coefficient_0 = { .l = 0x00 },
-	.e1_coefficient_1 = { .h = 0x00 },
-	.e1_coefficient_2 = { .l = 0x00 },
-	.e1_coefficient_3 = { .h = 0x00 },
-	.e1_coefficient_4 = { .l = 0x00 },
-	.e1_coefficient_5 = { .h = 0x00 },
+	// just pre-loading into memory, 30 bytes =  EQ 1,2,3,4,5  x A,B,C (2 x bytes) coefficients, but it will be written from ak4951.cpp 
+	.e1_coefficient_0 = { .l = 0xCA },		//EQ1 Coefficient A  : A7...A0,		BW : 300Hz - 1700Hz  (fo = 1150Hz , fb= 1700Hz) , k=1,8 peaking 
+	.e1_coefficient_1 = { .h = 0x05 },		//EQ1 Coefficient A  : A15..A8
+	.e1_coefficient_2 = { .l = 0xEB },		//EQ1 Coefficient B  : B7...B0
+	.e1_coefficient_3 = { .h = 0x38 },		//EQ1 Coefficient B  : B15...B8
+	.e1_coefficient_4 = { .l = 0x6F },		//EQ1 Coefficient C  : C7...C0
+	.e1_coefficient_5 = { .h = 0xE6 },		//EQ1 Coefficient C  : C15..C8
 	
-	.e2_coefficient_0 = { .l = 0x00 },
-	.e2_coefficient_1 = { .h = 0x00 },
-	.e2_coefficient_2 = { .l = 0x00 },
-	.e2_coefficient_3 = { .h = 0x00 },
-	.e2_coefficient_4 = { .l = 0x00 },
-	.e2_coefficient_5 = { .h = 0x00 },
+	.e2_coefficient_0 = { .l = 0x05 },		//EQ2 Coefficient A  : A7...A0,		BW : 250Hz - 2700Hz  (fo = 1475Hz , fb= 2450Hz) , k=1,8 peaking  
+	.e2_coefficient_1 = { .h = 0x08 },		//EQ2 Coefficient A  : A15..A8
+	.e2_coefficient_2 = { .l = 0x11 },		//EQ2 Coefficient B  : B7...B0
+	.e2_coefficient_3 = { .h = 0x36 },		//EQ2 Coefficient B  : B15...B8
+	.e2_coefficient_4 = { .l = 0xE9 },		//EQ2 Coefficient C  : C7...C0
+	.e2_coefficient_5 = { .h = 0xE8 },		//EQ2 Coefficient C  : C15..C8
 	
-	.e3_coefficient_0 = { .l = 0x00 },
-	.e3_coefficient_1 = { .h = 0x00 },
-	.e3_coefficient_2 = { .l = 0x00 },
-	.e3_coefficient_3 = { .h = 0x00 },
-	.e3_coefficient_4 = { .l = 0x00 },
-	.e3_coefficient_5 = { .h = 0x00 },
+	.e3_coefficient_0 = { .l = 0x00 },		//EQ3 Coefficient A  : A7...A0,		not used  currently 
+	.e3_coefficient_1 = { .h = 0x00 },		//EQ3 Coefficient A  : A15..A8
+	.e3_coefficient_2 = { .l = 0x00 },		//EQ3 Coefficient B  : B7...B0
+	.e3_coefficient_3 = { .h = 0x00 },		//EQ3 Coefficient B  : B15...B8
+	.e3_coefficient_4 = { .l = 0x00 },		//EQ3 Coefficient C  : C7...C0
+	.e3_coefficient_5 = { .h = 0x00 },		//EQ3 Coefficient C  : C15..C8
 	
-	.e4_coefficient_0 = { .l = 0x00 },
-	.e4_coefficient_1 = { .h = 0x00 },
-	.e4_coefficient_2 = { .l = 0x00 },
-	.e4_coefficient_3 = { .h = 0x00 },
-	.e4_coefficient_4 = { .l = 0x00 },
-	.e4_coefficient_5 = { .h = 0x00 },
+	.e4_coefficient_0 = { .l = 0x00 },		//EQ4 Coefficient A  : A7...A0,		not used  currently
+	.e4_coefficient_1 = { .h = 0x00 },		//EQ4 Coefficient A  : A15..A8
+	.e4_coefficient_2 = { .l = 0x00 },		//EQ4 Coefficient B  : B7...B0
+	.e4_coefficient_3 = { .h = 0x00 },		//EQ4 Coefficient B  : B15...B8
+	.e4_coefficient_4 = { .l = 0x00 },		//EQ4 Coefficient C  : C7...C0
+	.e4_coefficient_5 = { .h = 0x00 },		//EQ4 Coefficient C  : C15..C8

-	.e5_coefficient_0 = { .l = 0x00 },
-	.e5_coefficient_1 = { .h = 0x00 },
-	.e5_coefficient_2 = { .l = 0x00 },
-	.e5_coefficient_3 = { .h = 0x00 },
-	.e5_coefficient_4 = { .l = 0x00 },
-	.e5_coefficient_5 = { .h = 0x00 },
+	.e5_coefficient_0 = { .l = 0x00 },		//EQ5 Coefficient A  : A7...A0,		not used currently
+	.e5_coefficient_1 = { .h = 0x00 },		//EQ5 Coefficient A  : A15..A8
+	.e5_coefficient_2 = { .l = 0x00 },		//EQ5 Coefficient B  : B7...B0
+	.e5_coefficient_3 = { .h = 0x00 },		//EQ5 Coefficient B  : B15...B8
+	.e5_coefficient_4 = { .l = 0x00 },		//EQ5 Coefficient C  : C7...C0
+	.e5_coefficient_5 = { .h = 0x00 },		//EQ5 Coefficient C  : C15..C8
 } };

 class AK4951 : public audio::Codec  {
@@ -822,6 +823,8 @@ public:
 	std::string name() const override {
 		return "AK4951";
 	}
+
+	bool detected();
 	
 	void init() override;
 	bool reset() override;
@@ -839,7 +842,7 @@ public:
 	void set_headphone_volume(const volume_t volume) override;
 	void headphone_mute();

-	void microphone_enable();
+	void microphone_enable(int8_t alc_mode); 	// added user GUI parameter , to set up AK4951 ALC mode.
 	void microphone_disable();

 	size_t reg_count() const override {
@@ -259,7 +259,7 @@ private:
 	bool valid_checksum = false;
 	uint8_t payload[256];
 	char address_buffer[15];
-	uint8_t payload_size;
+	uint8_t payload_size = 0 ;
 	Timestamp timestamp_ { };

 	float parse_lat_str_cmp(const std::string& lat_str){
@@ -81,39 +81,34 @@ public:
 		SamplerateConfig = 24,
 		BTLERxConfigure = 25,
 		NRFRxConfigure = 26,
-
-		TXProgress = 30,
-		Retune = 31,
-		
-		TonesConfigure = 32,
-		AFSKTxConfigure = 33,
-		PitchRSSIConfigure = 34,
-		OOKConfigure = 35,
-		RDSConfigure = 36,
-		AudioTXConfig = 37,
-		POCSAGConfigure = 38,
-		DTMFTXConfig = 39,
-		ADSBConfigure = 40,
-		JammerConfigure = 41,
-		WidebandSpectrumConfig = 42,
-		FSKConfigure = 43,
-		SSTVConfigure = 44,
-		SigGenConfig = 43,
-		SigGenTone = 44,
-		
-		POCSAGPacket = 45,
-		ADSBFrame = 46,
-		AFSKData = 47,
-		TestAppPacket = 48,
-		
-		RequestSignal = 49,
-		FIFOData = 50,
-		
-		AudioLevelReport = 51,
-		CodedSquelch = 52,
-		AudioSpectrum = 53,
-		APRSPacket = 54,
-		APRSRxConfigure = 55,
+		TXProgress = 27,
+		Retune = 28,
+		TonesConfigure = 29,
+		AFSKTxConfigure = 30,
+		PitchRSSIConfigure = 31,
+		OOKConfigure = 32,
+		RDSConfigure = 33,
+		AudioTXConfig = 34,
+		POCSAGConfigure = 35,
+		DTMFTXConfig = 36,
+		ADSBConfigure = 37,
+		JammerConfigure = 38,
+		WidebandSpectrumConfig = 39,
+		FSKConfigure = 40,
+		SSTVConfigure = 41,
+		SigGenConfig = 42,
+		SigGenTone = 43,
+		POCSAGPacket = 44,
+		ADSBFrame = 45,
+		AFSKData = 46,
+		TestAppPacket = 47,
+		RequestSignal = 48,
+		FIFOData = 49,
+		AudioLevelReport = 50,
+		CodedSquelch = 51,
+		AudioSpectrum = 52,
+		APRSPacket = 53,
+		APRSRxConfigure = 54,
 		MAX
 	};

@@ -82,7 +82,7 @@ struct data_t {
 	int32_t afsk_space_freq;
 	int32_t modem_baudrate;
 	int32_t modem_repeat;
-	
+
 	// Play dead unlock
 	uint32_t playdead_magic;
 	uint32_t playing_dead;
@@ -95,6 +95,9 @@ struct data_t {
 	uint32_t pocsag_ignore_address;
 	
 	int32_t tone_mix;
+
+	// Hardware
+	uint32_t hardware_config;
 };

 static_assert(sizeof(data_t) <= backup_ram.size(), "Persistent memory structure too large for VBAT-maintained region");
@@ -197,35 +200,31 @@ void set_serial_format(const serial_format_t new_value) {
 	data->serial_format = new_value;
 }

-/* static constexpr uint32_t playdead_magic = 0x88d3bb57;
-
-uint32_t playing_dead() {
-	return data->playing_dead;
-}
-
-void set_playing_dead(const uint32_t new_value) {
-	if( data->playdead_magic != playdead_magic ) {
-		set_playdead_sequence(0x8D1);	// U D L R
-	}
-	data->playing_dead = new_value;
-}
-
-uint32_t playdead_sequence() {
-	if( data->playdead_magic != playdead_magic ) {
-		set_playdead_sequence(0x8D1);	// U D L R
-	}
-	return data->playdead_sequence;
-}
-
-void set_playdead_sequence(const uint32_t new_value) {
-	data->playdead_sequence = new_value;
-	data->playdead_magic = playdead_magic;
-} */
-
 // ui_config is an uint32_t var storing information bitwise
-// bits 0,1,2 store the backlight timer
-// bits 31, 30,29,28,27, 26, 25 stores the different single bit configs depicted below
-// bits on position 4 to 19 (16 bits) store the clkout frequency
+// bits 0-2 store the backlight timer
+// bits 4-19 (16 bits) store the clkout frequency
+// bits 21-31 store the different single bit configs depicted below
+// bit 20 store the display state of the gui return icon, hidden (0) or shown (1)
+
+bool show_gui_return_icon(){ // add return icon in touchscreen menue
+return data->ui_config & (1 << 20);
+}
+
+bool load_app_settings() { // load (last saved) app settings on startup of app
+	return data->ui_config & (1 << 21);
+}
+
+bool save_app_settings() { // save app settings when closing app
+	return data->ui_config & (1 << 22);
+}
+  
+bool show_bigger_qr_code() { // show bigger QR code
+	return data->ui_config & (1 << 23);
+}
+
+bool disable_touchscreen() { // Option to disable touch screen
+	return data->ui_config & (1 << 24);
+}

 bool hide_clock() { // clock hidden from main menu
 	return data->ui_config & (1 << 25);
@@ -254,11 +253,35 @@ bool config_splash() {
 	return data->ui_config & (1 << 31);
 }

+uint8_t config_cpld() {
+	return data->hardware_config;
+}
+
 uint32_t config_backlight_timer() {
 	const uint32_t timer_seconds[8] = { 0, 5, 15, 30, 60, 180, 300, 600 };
 	return timer_seconds[data->ui_config & 7]; //first three bits, 8 possible values
 }

+void set_gui_return_icon(bool v) {
+	data->ui_config = (data->ui_config & ~(1 << 20)) | (v << 20);
+}
+
+void set_load_app_settings(bool v) {
+	data->ui_config = (data->ui_config & ~(1 << 21)) | (v << 21);
+}
+
+void set_save_app_settings(bool v) {
+	data->ui_config = (data->ui_config & ~(1 << 22)) | (v << 22);
+}
+
+void set_show_bigger_qr_code(bool v) {
+	data->ui_config = (data->ui_config & ~(1 << 23)) | (v << 23);
+}
+
+void set_disable_touchscreen(bool v) {
+	data->ui_config = (data->ui_config & ~(1 << 24)) | (v << 24);
+}
+
 void set_clock_hidden(bool v) {
 	data->ui_config = (data->ui_config & ~(1 << 25)) | (v << 25);
 }
@@ -287,6 +310,10 @@ void set_config_splash(bool v) {
 	data->ui_config = (data->ui_config & ~(1 << 31)) | (v << 31);
 }

+void set_config_cpld(uint8_t i) {
+	data->hardware_config = i;
+}
+
 void set_config_backlight_timer(uint32_t i) {
 	data->ui_config = (data->ui_config & ~7) | (i & 7);
 }
@@ -74,19 +74,32 @@ void set_playdead_sequence(const uint32_t new_value);
 bool stealth_mode();
 void set_stealth_mode(const bool v);

+uint8_t config_cpld();
+void set_config_cpld(uint8_t i);
+
 bool config_splash();
+bool show_gui_return_icon();
+bool load_app_settings();
+bool save_app_settings();
+bool show_bigger_qr_code();
 bool hide_clock();
 bool clock_with_date();
 bool config_login();
 bool config_speaker();
 uint32_t config_backlight_timer();
+bool disable_touchscreen();

+void set_gui_return_icon(bool v);
+void set_load_app_settings(bool v);
+void set_save_app_settings(bool v);
+void set_show_bigger_qr_code(bool v);
 void set_config_splash(bool v);
 void set_clock_hidden(bool v);
 void set_clock_with_date(bool v);
 void set_config_login(bool v);
 void set_config_speaker(bool v); 
 void set_config_backlight_timer(uint32_t i);
+void set_disable_touchscreen(bool v);

 //uint8_t ui_config_textentry();
 //void set_config_textentry(uint8_t new_value);
@@ -40,7 +40,7 @@ Optional<Reading> Packet::reading_fsk_19k2_schrader() const {
 	case 64:
 		return Reading {
 			Reading::Type::FLM_64,
-			reader_.read(0, 32),
+			(uint32_t)reader_.read(0, 32),
 			Pressure { static_cast<int>(reader_.read(32, 8)) * 4 / 3 },
 			Temperature { static_cast<int>(reader_.read(40, 8) & 0x7f) - 56 }
 		};
@@ -48,7 +48,7 @@ Optional<Reading> Packet::reading_fsk_19k2_schrader() const {
 	case 72:
 		return Reading {
 			Reading::Type::FLM_72,
-			reader_.read(0, 32),
+			(uint32_t)reader_.read(0, 32),
 			Pressure { static_cast<int>(reader_.read(40, 8)) * 4 / 3 },
 			Temperature { static_cast<int>(reader_.read(48, 8)) - 56 }
 		};
@@ -56,7 +56,7 @@ Optional<Reading> Packet::reading_fsk_19k2_schrader() const {
 	case 80:
 		return Reading {
 			Reading::Type::FLM_80,
-			reader_.read(8, 32),
+			(uint32_t)reader_.read(8, 32),
 			Pressure { static_cast<int>(reader_.read(48, 8)) * 4 / 3 },
 			Temperature { static_cast<int>(reader_.read(56, 8)) - 56 }
 		};
@@ -85,7 +85,7 @@ Optional<Reading> Packet::reading_ook_8k192_schrader() const {
 	if( (checksum_calculated & 3) == 3 ) {
 		return Reading {
 			Reading::Type::Schrader,
-			reader_.read(3, 24),
+			(uint32_t)reader_.read(3, 24),
 			Pressure { static_cast<int>(reader_.read(27, 8)) * 4 / 3 },
 			{ },
 			Flags { static_cast<Flags>((flags << 4) | checksum) }
@@ -122,7 +122,7 @@ Optional<Reading> Packet::reading_ook_8k4_schrader() const {
 	if( checksum_calculated == checksum ) {
 		return Reading {
 			Reading::Type::GMC_96,
-			id,
+			(uint32_t)id,
 			Pressure { static_cast<int>(value_1) * 4 / 3 },
 			Temperature { static_cast<int>(value_0) - 56 }
 		};
@@ -39,7 +39,7 @@ namespace tpms {

 using Flags = uint8_t;

-enum SignalType : uint32_t {
+enum SignalType {
 	FSK_19k2_Schrader = 1,
 	OOK_8k192_Schrader = 2,
 	OOK_8k4_Schrader = 3,
@@ -142,7 +142,23 @@ static int32_t rect_distances(
 		return -1;
 	}

-	return (std::abs(perpendicular_axis_end - perpendicular_axis_start) + 1) * (on_axis_distance + 1);
+
+	switch(direction) {
+	case KeyEvent::Right:
+	case KeyEvent::Left:
+		return ((std::abs(perpendicular_axis_end - perpendicular_axis_start) + 1) ^ 3) * sqrt((on_axis_distance + 1));
+		break;
+
+	case KeyEvent::Up:
+	case KeyEvent::Down:
+		return (sqrt(std::abs(perpendicular_axis_end - perpendicular_axis_start) + 1)) * ((on_axis_distance + 1) ^ 3);
+		break;
+
+	default:
+		return 0;
+	}
+
+	
 }

 void FocusManager::update(
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Erwin Ried	c9db1aab30	Merge pull request #630 from TQMatvey/next Fix KeyFob (beta) being off-screen	2022-05-05 14:57:35 +02:00
TqMatvey	367cb318cd	Fix KeyFob (beta) being off-screen	2022-05-05 18:06:15 +07:00
jLynx	fe33c12111	Sound/white noise Clock fix (#625 )	2022-05-05 08:31:54 +12:00
ArjanOnwezen	8957d692ea	Merge pull request #623 from GullCode/touch_return_option Added a ui_config flag to manage gui return icon status	2022-05-04 13:47:34 +02:00
GullCode	5551c6a676	Fixing branch, moving block, adding quote	2022-05-04 10:29:12 +02:00
GullCode	2b7b0d028a	Merge branch 'touch_return_option' of github.com:GullCode/portapack-mayhem into touch_return_option	2022-05-03 14:42:40 +02:00
GullCode	7b42d9ec94	changed label to fit the screen	2022-05-03 14:34:55 +02:00
GullCode	0580a528e4	Merge branch 'next' into touch_return_option	2022-05-03 14:31:03 +02:00
GullCode	c75c4685cd	Added a ui_config flag to manage gui return icon status	2022-05-03 14:23:58 +02:00
ArjanOnwezen	da49743cc4	Merge pull request #619 from ArjanOnwezen/save-app-settings Save individual app settings.	2022-05-01 21:19:09 +02:00
Arjan Onwezen	799a473b36	Save individual app settings. Currently only for apps in Receive section and basic settings like, LNA, VGA, Rx Amp and Frequency.	2022-05-01 06:09:02 -04:00
ArjanOnwezen	dccc68a4e0	Merge pull request #610 from zigad/fix-title-inconsistancy Fix #494 - Change App Titles	2022-04-27 12:49:03 +02:00
Žiga Deisinger	ee9b4c89bd	Fix #494 - Change App Titles I choose what I think are the best Titles based on existing titles/class names and so on. There were also inconsistencies between TX and Transmit and RX and receive. I renamed them to shorter version TX and RX also added it as suffix where possible to make it clearer in what mode you are in. If you have any other title suggestions or changes please use Add comment on Files Changed Screen so I can change it.	2022-04-26 23:09:24 +02:00
Erwin Ried	a91bbe6a2e	Merge pull request #596 from GullCode/proc-adsbrx-warning-fix Fix for warning: comparison of integer expressions of different signedness	2022-04-22 10:00:05 +02:00
Erwin Ried	a5a9bc85f8	Merge pull request #597 from GullCode/proc-aprsrx-warning-fix Fix for proc_aprsrx and aprs_packet warnings, they are related	2022-04-22 09:59:31 +02:00
Erwin Ried	b23addd452	Merge pull request #598 from GullCode/tpms-warning-fix Fix for warning: narrowing conversion	2022-04-22 09:59:21 +02:00
Erwin Ried	6467e5e7e6	Merge pull request #599 from GullCode/proc_mictx-warning-fix Fix for warning: 'MicTXProcessor::modulator' should be initialized	2022-04-22 09:59:08 +02:00
Erwin Ried	35ed394b37	Merge pull request #601 from GullCode/ais_app-warning-fix Added missing contructors/operators/etc in ais_app	2022-04-22 09:59:01 +02:00
Erwin Ried	4c98cf16a1	Merge pull request #600 from GullCode/ui_qrcode-warning-fix Fix for weffc++	2022-04-22 08:19:43 +02:00
Erwin Ried	18be6750e5	Merge pull request #602 from GullCode/ui_adsb_rx-warning-fix Added missing initializer	2022-04-22 08:19:03 +02:00
Erwin Ried	4f58be737a	Merge pull request #603 from GullCode/proc_pocsag-warning-fix Fix warning for proc_pocsag	2022-04-22 01:04:22 +02:00
GullCode	3fa190324b	Fix warning for proc_pocsag	2022-04-21 23:25:58 +02:00
GullCode	de042df7eb	Added missing initializer	2022-04-21 23:12:37 +02:00
GullCode	2fbf96425a	Added missing contructors/operators/etc in ais_app	2022-04-21 22:52:17 +02:00
GullCode	85d5a8fdba	Fix for weffc++	2022-04-21 22:27:20 +02:00
GullCode	f13d1f8b9c	Fix for warning: 'MicTXProcessor::modulator' should be initialized	2022-04-21 21:46:55 +02:00
GullCode	f804d7997c	Fix for warning: narrowing conversion	2022-04-21 21:41:02 +02:00
GullCode	2108ea53fa	Fix for proc_aprsrx and aprs_packet warnings, they are related	2022-04-21 17:38:49 +02:00
GullCode	90d38af705	Fix for warning: comparison of integer expressions of different signedness	2022-04-21 17:29:42 +02:00
Erwin Ried	d617618dcd	Merge pull request #592 from GullCode/ui-aprs-rx-warning-fix Fix for warning XXX should be initialized	2022-04-21 09:15:53 +02:00
GullCode	c37df0c6fd	Fix for warning XXX should be initialized in the member initialization list	2022-04-19 17:23:30 +02:00
Erwin Ried	cdba4fa5bf	Merge pull request #590 from GullCode/a-packet-warning-fix Fixed warning: comparison of integer expressions of different signedness	2022-04-18 23:29:41 +02:00
Erwin Ried	1537b1eccb	Merge pull request #589 from GullCode/qrcode-warning-fix Qrcode warning fix	2022-04-18 23:29:08 +02:00
GullCode	048b254354	Fixed uninitialized class members	2022-04-18 22:45:16 +02:00
GullCode	4b87a8a7dd	Fixed warning: comparison of integer expressions of different signedness	2022-04-18 22:38:29 +02:00
GullCode	5cdaac6b82	Fix uneeded negative test because type is uint ( warning: comparison is always false due to limited range of data type)	2022-04-18 22:33:10 +02:00
GullCode	17aa58bbf8	Changed pramga to comments to fix warning: ignoring #pragma mark [-Wunknown-pragmas]	2022-04-18 22:32:43 +02:00
Erwin Ried	e93a5820a2	Merge pull request #587 from notpike/grc Added GRC C16 to complex script	2022-04-17 20:45:54 +02:00
notpike	0e9c7448c0	Added GRC C16 to complex script	2022-04-17 11:05:20 -07:00
jLynx	9f54f4b5eb	Added stable release pipeline (#573 )	2022-04-13 18:02:43 +12:00
jLynx	178528ef96	Fixed no audio issue v2 (#567 ) * Fixed no audio issue v2 (#567)	2022-04-12 09:28:36 +12:00
jLynx	5d9a2e560b	SD card backup storage (#565 ) * Got SD card mounting during boot * Cleaned up comments * Now loads settings from SD as backup * Now loads settings from SD as backup * linting * refactoring	2022-04-11 21:42:56 +12:00
ArjanOnwezen	b02329019c	Merge pull request #556 from ArjanOnwezen/settings-cancel-button Added cancel button in UI settings.	2022-04-08 23:57:03 +02:00
Arjan Onwezen	8c1593fab9	Added cancel button in UI settings.	2022-04-08 17:50:21 -04:00
ArjanOnwezen	1f27af660d	Merge pull request #482 from zigad/feature/disableTouch Enable / Disable Touchscreen	2022-04-08 22:59:18 +02:00
ArjanOnwezen	a9d2b2ff8a	Merge branch 'next' into feature/disableTouch	2022-04-08 16:10:55 +02:00
ArjanOnwezen	a81d630d93	Merge pull request #555 from ArjanOnwezen/fix-scanner-only-audio-output-the-first-tim Quick fix (as figures out by @bluegizmo83) to make sure WM8731S chips…	2022-04-08 15:59:18 +02:00
Arjan Onwezen	efdefa85be	Quick fix (as figures out by @bluegizmo83) to make sure WM8731S chips don't stay silent after pause in scanner app.	2022-04-08 09:51:41 -04:00
ArjanOnwezen	f25ce9ed45	Merge pull request #554 from ArjanOnwezen/bigger-qr-code Option to set bigger qr code (used in RadioSonde app)	2022-04-08 14:59:03 +02:00
Arjan Onwezen	6697d2533c	Added support for LARGE qr code.	2022-04-08 08:38:32 -04:00
ArjanOnwezen	6cf5990b0e	Merge pull request #38 from eried/next [pull] next from eried:next	2022-04-08 12:35:42 +02:00
jLynx	c97e1042b1	Merge pull request #550 from jLynx/QFP_fix QFP100 Fix pt. 2	2022-04-08 12:45:49 +12:00
jLynx	9d5ed65f6b	Added the most random fix	2022-04-08 12:42:12 +12:00
jLynx	2ba74d0413	What did I change?	2022-04-08 12:31:06 +12:00
jLynx	a824e30420	Merge pull request #547 from jLynx/FM_fix Fixed broken radio offset	2022-04-08 08:21:11 +12:00
jLynx	59d08a4203	Enabled auto detection again	2022-04-07 21:30:37 +12:00
jLynx	51bc0f0100	Fixed broken radio offset	2022-04-07 21:22:47 +12:00
jLynx	d2e185a1fb	2021/12 QFP100 Fix 2021/12 QFP100 fix	2022-04-07 09:20:37 +12:00
jLynx	2d3cb426ba	Stores in memory	2022-04-07 09:11:10 +12:00
jLynx	dd2fdecb21	removed commented lines	2022-04-07 08:48:00 +12:00
jLynx	a37ba1ee2b	2021/12 QFP100 fix	2022-04-07 08:41:46 +12:00
ArjanOnwezen	9fbcab4224	Update README.md	2022-04-06 17:59:32 +02:00
Jimi Sanchez	505f26c98a	Merge pull request #540 from jLynx/next Nightlys now include flashing software	2022-04-06 05:45:20 -04:00
jLynx	dc18e340ab	Update create_nightly_release.yml	2022-04-06 21:34:35 +12:00
jLynx	3e86f83099	Merge pull request #539 from jLynx/flashing Added exe's to flashing folder	2022-04-06 20:52:23 +12:00
jLynx	d98f2b40df	Added exe's	2022-04-06 20:52:01 +12:00
jLynx	e26d026216	Merge pull request #536 from jLynx/gen1 Fixed R1_20150901 vs R2_20170522 boot & detection issues. Read up about it here https://github.com/eried/portapack-mayhem/wiki/Won't-boot	2022-04-06 13:52:00 +12:00
jLynx	0c0d47b0d2	Added persistent memory of save state	2022-04-06 13:28:10 +12:00
jLynx	50821bab55	Added button on boot detection	2022-04-06 08:16:57 +12:00
jLynx	796d9ca854	Updated comments	2022-04-05 14:44:32 +12:00
jLynx	fd8bc177ad	Added support for H2+	2022-04-05 14:41:12 +12:00
jLynx	eab832396b	Merge pull request #537 from jLynx/flashing Added flashing tools	2022-04-05 11:14:16 +12:00
jLynx	3bb7ba59ae	Added flashing tools	2022-04-05 11:13:12 +12:00
jLynx	f6c496d1d3	removed comments	2022-04-05 10:56:09 +12:00
jLynx	b4a6b958e5	Fixed R1_20150901 vs R2_20170522 boot & detection issues	2022-04-05 10:53:52 +12:00
jLynx	43e9ce4704	Fixed R1_20150901 vs R2_20170522 boot & detection issues	2022-04-05 10:52:42 +12:00
Erwin Ried	b4e5fb7483	Merge pull request #534 from jLynx/changelog Added changelog to release notes v2	2022-04-04 12:03:14 +02:00
jLynx	29d3a0f1dd	Added python script to parse changelog	2022-04-04 09:00:41 +12:00
jLynx	1e413d034f	WIP python	2022-04-04 08:54:43 +12:00
jLynx	5627634da1	Removed usernames for the moment	2022-04-04 07:33:14 +12:00
jLynx	719e7d42fd	Removed usernames for the moment	2022-04-04 07:32:55 +12:00
jLynx	71d9fd1c87	Update with next	2022-04-04 07:15:24 +12:00
Erwin Ried	58bdd358c6	Merge pull request #529 from jLynx/version_automation Version automation/injection	2022-04-03 12:28:14 +02:00
Erwin Ried	27c93e144b	Merge pull request #530 from jLynx/stop_duplicate_nightly Stops duplicate nightly builds	2022-04-03 12:27:36 +02:00
Erwin Ried	04f781ff52	Merge pull request #532 from eried/revert-531-changelog Revert "Added changelog to release notes"	2022-04-03 12:27:14 +02:00
Erwin Ried	7a8637fb96	Revert "Added changelog to release notes"	2022-04-03 12:26:57 +02:00
Erwin Ried	054a931967	Merge pull request #531 from jLynx/changelog Added changelog to release notes	2022-04-03 12:23:46 +02:00
jLynx	0a660aa5c0	Synced up SD card file name	2022-04-03 21:22:32 +12:00
jLynx	9c5bf8dcc0	Added changelog to release notes	2022-04-03 21:07:20 +12:00
jLynx	57df9dd2b7	Wont run if no changes in the last 24 hours	2022-04-03 15:36:37 +12:00
jLynx	b33ef608ee	Updated nightly release script	2022-04-03 09:15:06 +12:00
jLynx	a17eb47657	Fixed typo in cmake	2022-04-03 08:50:08 +12:00
jLynx	250553e4ba	Updated format	2022-04-02 22:40:00 +13:00
jLynx	9200db24be	WIP	2022-04-02 22:02:05 +13:00
jLynx	03057546e1	WIP	2022-04-02 22:00:46 +13:00
Erwin Ried	486b064e08	Merge pull request #528 from jLynx/actions Added nightly release pipeline	2022-04-02 03:34:45 +02:00
jLynx	e4836a5e5c	Removed comments	2022-04-02 12:46:51 +13:00
jLynx	ad742a84e3	Added nightly pipeline	2022-04-02 12:38:19 +13:00
ArjanOnwezen	eec4cd8778	Delete icao24.db delete duplicated icao24.db, since it should only be placed in /sdcard/ASDB folder	2022-04-01 14:02:03 +02:00
ArjanOnwezen	d7a795b8f2	Delete mids.db delete duplicate mids.db, since it should only be placed in /sdcard/AIS folder	2022-04-01 14:00:57 +02:00
ArjanOnwezen	579caa93b2	Merge pull request #527 from jLynx/TPMS_433 Updated TPMS 433 label	2022-04-01 11:39:37 +02:00
jLynx	3601545712	Updated to say 433 as it's not 434	2022-04-01 22:22:25 +13:00
ArjanOnwezen	f7b219fc2b	README.md added	2022-04-01 10:48:51 +02:00
eried	85cfdd75cc	Rename the sample files	2022-04-01 10:05:06 +02:00
Erwin Ried	deef2ebdc2	Merge pull request #526 from jLynx/Tesla_Charger Added Tesla charge door open samples	2022-03-31 10:54:08 +02:00
jLynx	79a2c3a372	Added Tesla charge door open samples	2022-03-31 08:57:15 +13:00
eried	759c4d9d51	Contributors update	2022-03-29 08:28:31 +02:00
eried	77a0d255dd	Version bump	2022-03-29 08:15:44 +02:00
eried	671fc12cf7	Tesla charge port open example Thanks to @jLynx	2022-03-29 08:14:39 +02:00
Erwin Ried	e1446598a8	Merge pull request #521 from notpike/audio_datetime_freq Added Datetime + Freq Filename to Audio App	2022-03-29 08:10:09 +02:00
NotPike	7066f931a8	Update ui_record_view.cpp cleanup	2022-03-29 01:16:16 -04:00
NotPike	aa2c5a4c84	Update analog_audio_app.hpp Forgot to take that include out. >_<	2022-03-29 00:34:52 -04:00
notpike	d70e1a6fac	Added Datetime + Freq Filename to Audio App	2022-03-28 20:53:09 -07:00
Erwin Ried	477e6d65df	Merge pull request #488 from ArjanOnwezen/improve-screen-navigation Improvements to screen navigation	2022-03-28 10:10:46 +02:00
Erwin Ried	a55e5d4fc0	Merge pull request #497 from Brumi-2021/Solving_mic_saturation_and_spectrum_armonics_Mic_App Solving_mic_saturation_and_spectrum_harmonics_Mic_App	2022-03-28 10:10:08 +02:00
Erwin Ried	8da0dbe36b	Merge pull request #519 from notpike/replay_antenna_bias Replay App Enable Bias-tee	2022-03-28 10:09:51 +02:00
Erwin Ried	8688ac0e05	Merge pull request #520 from ArjanOnwezen/add-country-info-to-ais-app Added country to AIS app, so you know from which country a vessel is.	2022-03-28 10:08:39 +02:00
Erwin Ried	82732a3f73	Merge pull request #512 from jLynx/PSI TPMS toggle between PSI and kPa (v1)	2022-03-28 10:07:41 +02:00
Arjan Onwezen	be0427889f	Added country to AIS app, so you know from which country a vessel is. It's using the MID database, which is also part of the PR. mids.db should be placed in /AIS folder on SD card.	2022-03-27 12:34:26 -04:00
NotPike	37a40cbeda	Delete ui_newapp.hpp	2022-03-27 00:40:45 -04:00
notpike	4ef98e2928	Added Bias Tee support for Replay and fixed file error logic bug	2022-03-26 21:20:55 -07:00
notpike	434c559861	Added Bias Tee support for Replay and fixed file error logic bug	2022-03-26 21:20:49 -07:00
Erwin Ried	3cb3c95349	Merge pull request #516 from ArjanOnwezen/updated-airlines.db updated airlines.db	2022-03-25 15:44:32 +01:00
Erwin Ried	979b5126a6	Merge pull request #517 from ArjanOnwezen/updated-icao24.db updated icao24.db	2022-03-25 15:43:56 +01:00
Arjan Onwezen	8e3fa0b9ea	updated icao24.db	2022-03-25 10:18:22 -04:00
Arjan Onwezen	00b43299ad	updated airlines.db	2022-03-25 08:47:47 -04:00
Erwin Ried	1f31e9b983	Merge pull request #514 from jLynx/NZ_APRS Added NZ to APRS app	2022-03-24 08:44:24 +01:00
jLynx	5c97c24b48	Added NZ to APRS	2022-03-24 20:36:39 +13:00
jLynx	4a8458d812	refactoring	2022-03-24 19:51:08 +13:00
jLynx	165efd7355	refactoring	2022-03-24 19:44:26 +13:00
jLynx	d1d1198b1b	refactoring	2022-03-24 19:43:26 +13:00
jLynx	0025ad2507	refactoring	2022-03-24 19:19:02 +13:00
jLynx	32f957cead	WIP updating header	2022-03-24 19:08:07 +13:00
jLynx	2030118d9f	WIP can now switch between kPa and PSI	2022-03-24 17:05:38 +13:00
jLynx	0523aabe91	WIP PSI selector	2022-03-24 16:10:55 +13:00
jLynx	1c81c7a8ba	Revert "Added NZ to APRS" This reverts commit `9df1cfa670`.	2022-03-23 21:32:32 +13:00
jLynx	9df1cfa670	Added NZ to APRS	2022-03-23 20:51:10 +13:00
eried	68d40ebce8	Revert "Open the Tesla charge port" This reverts commit `c2856ce089`.	2022-03-21 11:47:05 +01:00
Erwin Ried	901af22de5	Merge pull request #506 from ArjanOnwezen/#484-add-consecutive-ids-in-message.hpp Added consecutive id's in message.hpp, as mentioned in #484.	2022-03-21 11:45:46 +01:00
Arjan Onwezen	d9c1b6b61f	Added consecutive id's in message.hpp, as mentioned in #484 .	2022-03-20 13:38:53 -04:00
Erwin Ried	8774ee0acd	Merge pull request #485 from ArjanOnwezen/centralize-database-functions centralize-db-retrieval-functions	2022-03-18 22:05:09 +01:00
eried	c2856ce089	Open the Tesla charge port files from https://github.com/HackingIntoYourHeart/Tesla-Charging-Port-Opener	2022-03-14 08:52:36 +01:00
Brumi-2021	d5a1733c1c	Solving_mic_saturation_and_spectrum_armonics_Mic_App	2022-03-05 21:39:53 +01:00
Erwin Ried	98c0ff1e47	Merge pull request #490 from notpike/file Added return codes for delete_file() and rename_file() in file.hpp	2022-02-03 01:51:34 +01:00
notpike	e00d91e1d2	Added return codes for delete_file() and rename_file() for file.hpp	2022-02-01 10:37:38 -08:00
Erwin Ried	459b8efc52	Merge pull request #487 from Brumi-2021/Add_Gain_TX_control_to_GPS_Simulator_issue#480 Add_Gain_TX_to_GPS_sim_App_issue_480	2022-01-31 09:43:20 +01:00
Erwin Ried	db3f645131	Merge pull request #489 from Brumi-2021/“Antenna_DC_Bias_missing_in_AIS_and_RADIOSONDE” “antenna dc bias missing in ais and radiosonde”	2022-01-31 09:41:11 +01:00
Brumi-2021	b84820963b	Revert "Revert "“Antenna_DC_Bias_missing_in_AIS_and_RADIOSONDE”"" This reverts commit `4de25a2039`.	2022-01-30 11:37:46 +01:00
Arjan Onwezen	ec23dd8edf	some improvements to screen navigation	2022-01-30 05:12:46 -05:00
Brumi-2021	4de25a2039	Revert "“Antenna_DC_Bias_missing_in_AIS_and_RADIOSONDE”" This reverts commit `4a57af64ce`.	2022-01-30 10:58:43 +01:00
Brumi-2021	a11b9c492f	Add_Gain_TX_to_GPS_sim_App_issue_480 Add Gain control to the GPS Sim App . (we are clonning the two previous PR's n #395 and #446 of the Replay App, correcting TX Gain control to this GPS Sim App )	2022-01-29 23:29:17 +01:00
Arjan Onwezen	867539ce9c	centralize-db-retrieval-functions	2022-01-28 10:24:49 -05:00
Erwin Ried	799a701fc3	Merge pull request #479 from MichalLeonBorsuk/next Some frequencies were shitfed by a few kHz	2022-01-27 20:02:12 +01:00
Žiga Deisinger	cebbc12084	Enable / Disable Touchscreen #481 This commit will reverse the logic of touch screen as suggested by @ArjanOnwezen	2022-01-27 14:23:22 +01:00
Žiga Deisinger	4a0d42ed34	Add code for feature "Disable Touch"	2022-01-26 21:52:08 +01:00
Michał Borsuk	0d5af740a5	correction of spelling of units	2022-01-26 18:08:56 +01:00
Michał Borsuk	0da0431e5e	Some frequencies were shitfed by a few kHz I worked with DAB and noticed that some frequencies were not correct. I've imported data from http://www.wohnort.org/dab/freqs.html, which is a reliable source that I've used in the past.	2022-01-26 17:51:38 +01:00
Žiga Deisinger	96879d3664	Add code for feature "Disable Touch"	2022-01-26 14:53:31 +01:00
Erwin Ried	ea251a87c0	Merge pull request #477 from zigad/bugfix-#473 Fix ADS-B not updating Altitude in Map #473	2022-01-24 09:26:05 +01:00
Erwin Ried	7fa64a3f76	Merge pull request #475 from zigad/ZARE Added Slovenian Emergency Frequencies (ZARE)	2022-01-24 01:07:21 +01:00
Žiga Deisinger	7af7279ea4	Fix ADS-B not updating Altitude in Map #473 This commit will fix altitude not automatically updating when in Map mode. Also set default altitude for AIS to 0.	2022-01-23 22:34:01 +01:00
Žiga Deisinger	9726a50533	Added Slovenian Emergency Frequencies (ZARE)	2022-01-23 01:13:50 +01:00
Erwin Ried	f42479c190	Merge pull request #470 from ArjanOnwezen/prepadding-MMSI-in-AIS Prepadded MMSI in AIS app with zeros, so it's always 9 chars long	2022-01-17 10:35:07 +01:00
Arjan Onwezen	dcb67049af	Prepadded MMSI in AIS app with zeros, so it's always 9 chars long as in the specs.	2022-01-16 05:06:53 -05:00
Brumi-2021	4a57af64ce	“Antenna_DC_Bias_missing_in_AIS_and_RADIOSONDE”	2022-01-15 23:09:42 +01:00
Erwin Ried	30449e0adf	Merge pull request #467 from ArjanOnwezen/gui-glitch-in-adsb-rx Small GUI glitch in ADSB RX	2022-01-12 19:06:14 +01:00
Arjan Onwezen	c9a813fbd6	GUI glitch in ADSB RX	2022-01-12 10:31:59 -05:00