v2.0.1 (#2090 )

* Update version.txt * Update past_version.txt
removed dead link (#2089 )
2026-08-21 15:09:03 +00:00 · 2024-04-07 16:24:01 +12:00 · 2024-04-07 00:59:40 +08:00 · 2024-04-05 16:29:18 -05:00 · 2024-04-05 16:04:39 +02:00 · 2024-04-05 08:52:14 +02:00
262 changed files with 7198 additions and 1525 deletions
@@ -0,0 +1,48 @@
+name: Bug report
+description: File a bug reports regarding the firmware.
+labels: ['bug']
+body:
+- type: markdown
+  attributes:
+    value: |
+      Thank you for taking the time to fill out an issue, this template is meant for any issues related to the Mayhem firmware.
+      Please try the latest nightly release before submitting this. You can find the latest nightly version here: https://github.com/portapack-mayhem/mayhem-firmware/releases
+- type: textarea
+  id: description
+  attributes:
+    label: Describe the bug.
+    description: "A clear and concise description of what the bug is."
+  validations:
+    required: true
+- type: textarea
+  id: repro
+  attributes: 
+    label: Reproduction
+    description: "How can this bug be reproduced?"
+    placeholder: |
+      1. Switch on...
+      2. Press button '....'
+      3. Wait for the end of the universe
+      4. It burns
+  validations:
+    required: true
+- type: textarea
+  id: expected
+  attributes: 
+    label: Expected behavior
+    description: "A clear and concise description of what you expected to happen"
+    placeholder: |
+      1. Generates file on...
+      2. I get a cheeseburger...
+  validations:
+    required: true
+- type: input
+  id: target
+  attributes:
+    label: Environment/versions
+    description: Specify extra details about versions and environments affected
+- type: textarea
+  id: anything-else
+  attributes:
+    label: Anything else?
+    description: Let us know if you have anything else to share.
@@ -0,0 +1,24 @@
+name: Feature Request
+description: For feature requests regarding the firmware.
+labels: ['feature request']
+body:
+- type: markdown
+  attributes:
+    value: |
+      Thank you for taking the time to fill out an issue, this template is meant for any feature suggestions.
+      Please try the latest nightly release before submitting this, make sure it has not been implemented already. You can find the latest nightly version here: https://github.com/portapack-mayhem/mayhem-firmware/releases
+- type: textarea
+  id: proposal
+  attributes:
+    label: "Description of the feature you're suggesting."
+    description: |
+      Please describe your feature request in as many details as possible.
+        - Describe what it should do.
+        - Note whether it is to extend existing functionality or introduce new functionality.
+  validations:
+    required: true
+- type: textarea
+  id: anything-else
+  attributes:
+    label: Anything else?
+    description: Let us know if you have anything else to share.
@@ -1,35 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve the software
-title: ''
-labels: bug
-assignees: ''
-
---
-
----
-
-(Please try the latest nightly release before submitting this. You can find the latest nightly version here: https://github.com/portapack-mayhem/mayhem-firmware/releases)
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is. 
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Tap on '....'
-3. 
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Affected versions**
-Please write any difference related with the Expected behavior, on the following versions:
-* Latest Stable release:
-* Latest Nightly release:
-* Previous working release:
-
-**Additional**
-If the bug is difficult to explain, additionally to the text please include images and videos.
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Need more help?
+    url: https://discord.com/invite/tuwVMv3
+    about: For any question that does not fit as an issue, check our discord.
@@ -1,20 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen. Remember that adding stuff is always possible, but time is a limited resource for everyone. Check the wiki for more information how to compile the firmware and try to explore modifying the code yourself.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional**
-If the suggestion is difficult to explain, additionally to the text please include images and videos.
@@ -1 +1 @@
-v1.9.0
+v2.0.0
@@ -1 +1 @@
-v1.9.1
+v2.0.1
@@ -55,7 +55,7 @@ CMakeFiles/
 # Debugging
 .gdbinit*

-# Editor/IDE files
+# Editor/ IDE files
 *.sublime-project
 *.sublime-workspace
 .vscode
@@ -68,8 +68,15 @@ CMakeFiles/
 .DS_Store
 /firmware/CMakeCache.txt

-# Python env
+# Python env/ venv and cache
 env/
+venv/
+**/__pycache__/
+*.pyc

 # Other
 *.bak
+
+# generated bitmap arr file
+# TODO: generate bitmap during build, since we use python during build anyway, lemme know if this is a bad idea @zxkmm
+/firmware/tools/bitmap.hpp
@@ -72,5 +72,12 @@ set(HACKRF_CPLD_XSVF_PATH ${HACKRF_PATH}/firmware/cpld/sgpio_if/${HACKRF_CPLD_XS
 set(HACKRF_FIRMWARE_DFU_IMAGE ${hackrf_usb_BINARY_DIR}/${HACKRF_FIRMWARE_DFU_FILENAME})
 set(HACKRF_FIRMWARE_BIN_IMAGE ${hackrf_usb_BINARY_DIR}/${HACKRF_FIRMWARE_BIN_FILENAME})

+find_program(CCACHE "ccache")
+if(CCACHE)
+    set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE})
+    set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
+    set(ENV{CCACHE_SLOPPINESS} pch_defines,time_macros)
+endif(CCACHE)
+
 enable_testing()
 add_subdirectory(firmware)
@@ -1,5 +1,6 @@
-> [!IMPORTANT]  
-> this repository **has just been moved** from my personal GitHub [eried/portapack-mayhem](https://github.com/eried/portapack-mayhem) to an organization: [portapack-mayhem](https://github.com/portapack-mayhem/mayhem-firmware). Please keep this in mind to **update your links** accordingly.
+> [!WARNING]
+> __IF YOU'VE PAID FOR MAYHEM OR ANY PREPACKAGED PACKAGES, YOU'RE BEING SCAMMED.__ 
+> The only legitimate link leading to our repositories is the organization [portapack-mayhem](https://github.com/portapack-mayhem/mayhem-firmware).

 # PortaPack Mayhem

@@ -13,11 +14,11 @@ This is a fork of the [Havoc](https://github.com/furrtek/portapack-havoc/) firmw

 # What is this?

-If you are new to *HackRF+PortaPack+Mayhem*, check this video:
+If you are new to *HackRF+PortaPack+Mayhem*, check these:

-[![Beginner's Guide To The HackRF & Portapak With Mayhem](https://img.youtube.com/vi/H-bqdWfbhpg/0.jpg)](https://www.youtube.com/watch?v=H-bqdWfbhpg)
+[<img alt="HackRF 101 : Everything You Need to Know to Get Started!" src="https://img.youtube.com/vi/xGR_PMD9LeU/maxresdefault.jpg" width="512">](https://grabify.link/C0J6ZR)

-For people familiar with the [Flipper Zero](https://github.com/flipperdevices/flipperzero-firmware), this one might be interesting:<br>[What is the HackRF One Portapack H2+?](https://www.youtube.com/watch?v=alrFbY5vxt4)
+[<img alt="Beginner's Guide To The HackRF & Portapak With Mayhem" src="https://img.youtube.com/vi/H-bqdWfbhpg/maxresdefault.jpg" width="254">](https://grabify.link/5MU2VH) [<img alt="What is the HackRF One Portapack H2+?" src="https://img.youtube.com/vi/alrFbY5vxt4/maxresdefault.jpg" width="254">](https://grabify.link/9UZGEW)

 # Frequently Asked Questions

@@ -29,8 +30,6 @@ This repository expands upon the previous work by many people and aims to consta

 :heavy_check_mark: Our friends at OpenSourceSDRLab give away five units every three months in our discord (check the badge on top) of their [PortaPack H2](https://www.aliexpress.com/item/4000247041639.html?gatewayAdapt=4itemAdapt), you can support them too by ordering.

-:heavy_check_mark: Another popular option is the clone of the [PortaPack H1](https://s.click.aliexpress.com/e/_Dkbqs2X).
-
 :warning: Be cautious , *ask* the seller about compatibility with the latest releases. Look out for the description of the item, if they provide the firmware files for an older version or they have custom setup instructions, this means it might be **NOT compatible**, for example:

 ![image](https://user-images.githubusercontent.com/1091420/214579017-9ad970b9-0917-48f6-a550-588226d3f89b.png)
@@ -35,13 +35,6 @@ RUN mkdir /opt/build \
 && mkdir armbin \
 && tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin

-# Configure CCACHE
-RUN mkdir ~/bin \
- && cd ~/bin \
- && for tool in gcc g++ cpp c++; do \
- 		ln -s $(which ccache) arm-none-eabi-$tool \
-	 ; done
-
 ADD firmware/tools/docker-entrypoint.sh /usr/local/bin/entrypoint.sh
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

@@ -19,9 +19,5 @@ RUN apk add --no-cache g++ gcc clang clang-static clang-dev llvm-dev llvm-static
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8

-# Configure CCACHE
-RUN mkdir ~/bin && cd ~/bin && \
-    for tool in gcc g++ cpp c++;do ln -s $(which ccache) arm-none-eabi-$tool;done
-
 CMD cd .. && cd build && \
    cmake .. && make ppfw
@@ -35,13 +35,6 @@ RUN mkdir /opt/build \
 && mkdir armbin \
 && tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin

-# Configure CCACHE
-RUN mkdir ~/bin \
- && cd ~/bin \
- && for tool in gcc g++ cpp c++; do \
- 		ln -s $(which ccache) arm-none-eabi-$tool \
-	 ; done
-
 ADD firmware/tools/docker-entrypoint.sh /usr/local/bin/entrypoint.sh
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

@@ -44,7 +44,7 @@ if(cpp20_supported)
 else()
 	set(USE_CPPOPT "-std=c++17")
 endif()
-set(USE_CPPOPT "${USE_CPPOPT} -flto -fno-rtti -fno-exceptions -Weffc++ -Wuninitialized -Wno-volatile")
+set(USE_CPPOPT "${USE_CPPOPT} -fno-rtti -fno-exceptions -Weffc++ -Wuninitialized -Wno-volatile")

 # Enable this if you want the linker to remove unused code and data
 set(USE_LINK_GC yes)
@@ -52,7 +52,7 @@ set(USE_LINK_GC yes)
 # Linker extra options here.
 set(USE_LDOPT)

-# Enable this if you want link time optimizations (LTO)
+# Enable this if you want link time optimizations (LTO) - this flag affects chibios only
 set(USE_LTO no)

 # If enabled, this option allows to compile the application in THUMB mode.
@@ -190,6 +190,7 @@ set(CPPSRC
 	event_m0.cpp
 	file_reader.cpp
 	file.cpp
+	file_path.cpp
 	freqman_db.cpp
 	freqman.cpp
 	io_convert.cpp
@@ -293,7 +294,7 @@ set(CPPSRC
 	# apps/ui_jammer.cpp
    # apps/ui_keyfob.cpp
 	# apps/ui_lcr.cpp
-	apps/ui_level.cpp  
+	apps/ui_level.cpp
 	apps/ui_looking_glass_app.cpp
 	apps/ui_mictx.cpp
 	apps/ui_modemsetup.cpp
@@ -304,7 +305,7 @@ set(CPPSRC
 	apps/ui_pocsag_tx.cpp
 	apps/ui_rds.cpp
 	apps/ui_recon_settings.cpp
-	apps/ui_recon.cpp  
+	apps/ui_recon.cpp
 	apps/ui_remote.cpp
 	apps/ui_scanner.cpp
 	apps/ui_sd_over_usb.cpp
@@ -347,10 +348,12 @@ set(CPPSRC
 	${HACKRF_CPLD_DATA_CPP}
 	ui_external_items_menu_loader.cpp
 	view_factory_base.cpp
-
-	${EXTCPPSRC}
 )

+set_source_files_properties(${CPPSRC} PROPERTIES COMPILE_FLAGS -flto) # Add lto flag to the non-external sources only
+
+list (APPEND CPPSRC ${EXTCPPSRC}) # Append external sources after setting lto flag to internal ones
+
 # C sources to be compiled in ARM mode regardless of the global setting.
 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
 #       option that results in lower performance and larger code size.
@@ -30,6 +30,7 @@
 #include "portapack.hpp"
 #include "portapack_persistent_memory.hpp"
 #include "utility.hpp"
+#include "file_path.hpp"

 #include <algorithm>
 #include <cstring>
@@ -40,7 +41,7 @@ using namespace portapack;

 namespace {
 fs::path get_settings_path(const std::string& app_name) {
-    return fs::path{SETTINGS_DIR} / app_name + u".ini";
+    return settings_dir / app_name + u".ini";
 }
 }  // namespace

@@ -156,7 +157,7 @@ bool save_settings(std::string_view store_name, const SettingBindings& bindings)
    File f;
    auto path = get_settings_path(std::string{store_name});

-    ensure_directory(SETTINGS_DIR);
+    ensure_directory(settings_dir);
    auto error = f.create(path);
    if (error)
        return false;
@@ -174,16 +175,12 @@ void copy_to_radio_model(const AppSettings& settings) {
    // Specifically 'modulation' which requires a running baseband.

    if (flags_enabled(settings.mode, Mode::TX)) {
-        if (!flags_enabled(settings.options, Options::UseGlobalTargetFrequency))
-            persistent_memory::set_target_frequency(settings.tx_frequency);
-
+        persistent_memory::set_target_frequency(settings.tx_frequency);
        transmitter_model.configure_from_app_settings(settings);
    }

    if (flags_enabled(settings.mode, Mode::RX)) {
-        if (!flags_enabled(settings.options, Options::UseGlobalTargetFrequency))
-            persistent_memory::set_target_frequency(settings.rx_frequency);
-
+        persistent_memory::set_target_frequency(settings.rx_frequency);
        receiver_model.configure_from_app_settings(settings);
        receiver_model.set_configuration_without_update(
            static_cast<ReceiverModel::Mode>(settings.modulation),
@@ -36,9 +36,6 @@
 #include "max283x.hpp"
 #include "string_format.hpp"

-// Folder to store app settings, pmem_fileflag, and date_fileflag
-#define SETTINGS_DIR u"/SETTINGS"
-
 // Bring in the string_view literal.
 using std::literals::operator""sv;

@@ -113,6 +110,7 @@ bool save_settings(std::string_view store_name, const SettingBindings& bindings)
 namespace app_settings {

 enum class Mode : uint8_t {
+    NO_RF = 0x00,
    RX = 0x01,
    TX = 0x02,
    RX_TX = 0x03,  // Both TX/RX
@@ -120,9 +118,6 @@ enum class Mode : uint8_t {

 enum class Options {
    None = 0x0000,
-
-    /* Don't use target frequency from app settings. */
-    UseGlobalTargetFrequency = 0x0001,
 };

 /* NB: See RX/TX model headers for default values. */
@@ -24,6 +24,7 @@

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

 using namespace portapack;
 using namespace acars;
@@ -77,7 +78,7 @@ ACARSAppView::ACARSAppView(NavigationView& nav)

    logger = std::make_unique<ACARSLogger>();
    if (logger)
-        logger->append(LOG_ROOT_DIR "/ACARS.TXT");
+        logger->append(logs_dir / u"ACARS.TXT");
 }

 ACARSAppView::~ACARSAppView() {
@@ -35,7 +35,7 @@

 class ACARSLogger {
   public:
-    Optional<File::Error> append(const std::string& filename) {
+    Optional<File::Error> append(const std::filesystem::path& filename) {
        return log_file.append(filename);
    }

@@ -20,9 +20,11 @@
 */

 #include "ais_app.hpp"
+#include "audio.hpp"

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

 #include "baseband_api.hpp"

@@ -31,6 +33,8 @@ using namespace portapack;

 #include <algorithm>

+namespace pmem = portapack::persistent_memory;
+
 namespace ais {
 namespace format {

@@ -64,9 +68,9 @@ static std::string mmsi(

 static std::string mid(
    const ais::MMSI& mmsi) {
-    std::database db;
+    database db;
    std::string mid_code = "";
-    std::database::MidDBRecord mid_record = {};
+    database::MidDBRecord mid_record = {};
    int return_code = 0;

    // Try getting the country name from mids.db using MID code for given MMSI
@@ -189,6 +193,10 @@ void AISLogger::on_packet(const ais::Packet& packet) {
    }

    log_file.write_entry(packet.received_at(), entry);
+
+    if (pmem::beep_on_packets()) {
+        baseband::request_audio_beep(1000, 24000, 60);
+    }
 }

 void AISRecentEntry::update(const ais::Packet& packet) {
@@ -376,6 +384,7 @@ AISAppView::AISAppView(NavigationView& nav)
        &field_lna,
        &field_vga,
        &rssi,
+        &field_volume,
        &channel,
        &recent_entries_view,
        &recent_entry_detail_view,
@@ -399,11 +408,17 @@ AISAppView::AISAppView(NavigationView& nav)

    logger = std::make_unique<AISLogger>();
    if (logger) {
-        logger->append(LOG_ROOT_DIR "/AIS.TXT");
+        logger->append(logs_dir / u"AIS.TXT");
+    }
+
+    if (pmem::beep_on_packets()) {
+        audio::set_rate(audio::Rate::Hz_24000);
+        audio::output::start();
    }
 }

 AISAppView::~AISAppView() {
+    audio::output::stop();
    receiver_model.disable();
    baseband::shutdown();
 }
@@ -209,6 +209,9 @@ class AISAppView : public View {
        {21 * 8, 0, 6 * 8, 4},
    };

+    AudioVolumeField field_volume{
+        {28 * 8, 0 * 16}};
+
    Channel channel{
        {21 * 8, 5, 6 * 8, 4},
    };
@@ -30,6 +30,7 @@
 #include "string_format.hpp"
 #include "ui_freqman.hpp"
 #include "utility.hpp"
+#include "radio.hpp"

 using namespace portapack;
 using namespace tonekey;
@@ -112,10 +113,14 @@ SPECOptionsView::SPECOptionsView(
    : View{parent_rect} {
    set_style(style);

-    add_children({&label_config,
-                  &options_config,
-                  &text_speed,
-                  &field_speed});
+    add_children({
+        &label_config,
+        &options_config,
+        &text_speed,
+        &field_speed,
+        &text_rx_cal,
+        &field_rx_iq_phase_cal,
+    });

    options_config.set_selected_index(view->get_spec_bw_index());
    options_config.on_change = [this, view](size_t n, OptionsField::value_t bw) {
@@ -126,6 +131,14 @@ SPECOptionsView::SPECOptionsView(
    field_speed.on_change = [this, view](int32_t v) {
        view->set_spec_trigger(v);
    };
+
+    field_rx_iq_phase_cal.set_range(0, hackrf_r9 ? 63 : 31);                       // max2839 has 6 bits [0..63],  max2837 has 5 bits [0..31]
+    field_rx_iq_phase_cal.set_value(view->get_spec_iq_phase_calibration_value());  // using  accessor function of AnalogAudioView to read iq_phase_calibration_value from rx_audio.ini
+    field_rx_iq_phase_cal.on_change = [this, view](int32_t v) {
+        view->set_spec_iq_phase_calibration_value(v);  // using  accessor function of AnalogAudioView to write inside SPEC submenu, register value to max283x and save it to rx_audio.ini
+    };
+
+    view->set_spec_iq_phase_calibration_value(view->get_spec_iq_phase_calibration_value());  // initialize iq_phase_calibration in radio
 }

 /* AnalogAudioView *******************************************************/
@@ -195,7 +208,9 @@ AnalogAudioView::AnalogAudioView(
    NavigationView& nav,
    ReceiverModel::settings_t override)
    : AnalogAudioView(nav) {
+    // Settings to override when launched from another app (versus from AppSettings .ini file)
    // TODO: Which other settings make sense to override?
+    field_frequency.set_value(override.frequency_app_override);
    on_frequency_step_changed(override.frequency_step);
    options_modulation.set_by_value(toUType(override.mode));
 }
@@ -213,6 +228,15 @@ void AnalogAudioView::set_spec_bw(size_t index, uint32_t bw) {
    receiver_model.set_baseband_bandwidth(bw / 2);
 }

+uint8_t AnalogAudioView::get_spec_iq_phase_calibration_value() {  // define accessor functions inside AnalogAudioView to read & write real iq_phase_calibration_value
+    return iq_phase_calibration_value;
+}
+
+void AnalogAudioView::set_spec_iq_phase_calibration_value(uint8_t cal_value) {  // define accessor functions
+    iq_phase_calibration_value = cal_value;
+    radio::set_rx_max283x_iq_phase_calibration(iq_phase_calibration_value);
+}
+
 uint16_t AnalogAudioView::get_spec_trigger() {
    return spec_trigger;
 }
@@ -133,6 +133,16 @@ class SPECOptionsView : public View {
        1,
        ' ',
    };
+    Text text_rx_cal{
+        {19 * 8, 0 * 16, 11 * 8, 1 * 16},  // 18 (x col.) x char_size,  12 (length) x 8 blanking space to delete previous chars.
+        "Rx_IQ_CAL  "};
+    NumberField field_rx_iq_phase_cal{
+        {28 * 8, 0 * 16},
+        2,
+        {0, 63},  // 5 or 6 bits IQ CAL phase adjustment (range updated later)
+        1,
+        ' ',
+    };
 };

 class AnalogAudioView : public View {
@@ -152,14 +162,21 @@ class AnalogAudioView : public View {
    uint16_t get_spec_trigger();
    void set_spec_trigger(uint16_t trigger);

+    uint8_t get_spec_iq_phase_calibration_value();
+    void set_spec_iq_phase_calibration_value(uint8_t cal_value);
+
   private:
    static constexpr ui::Dim header_height = 3 * 16;

    NavigationView& nav_;
    RxRadioState radio_state_{};
+    uint8_t iq_phase_calibration_value{15};  // initial default RX IQ phase calibration value , used for both max2837 & max2839
    app_settings::SettingsManager settings_{
-        "rx_audio", app_settings::Mode::RX,
-        app_settings::Options::UseGlobalTargetFrequency};
+        "rx_audio",
+        app_settings::Mode::RX,
+        {
+            {"iq_phase_calibration"sv, &iq_phase_calibration_value},  // we are saving and restoring that CAL from 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};
@@ -32,6 +32,7 @@
 #include "string_format.hpp"
 #include "portapack_persistent_memory.hpp"
 #include "ui_text.hpp"
+#include "file_path.hpp"

 using namespace portapack;
 using namespace modems;
@@ -100,7 +101,7 @@ BLECommView::BLECommView(NavigationView& nav)
        logging = v;

        if (logger && logging)
-            logger->append(LOG_ROOT_DIR "/BLELOG_" + to_string_timestamp(rtc_time::now()) + ".TXT");
+            logger->append(logs_dir.string() + "/BLELOG_" + to_string_timestamp(rtc_time::now()) + ".TXT");
    };

    options_channel.on_change = [this](size_t, int32_t i) {
@@ -42,7 +42,7 @@

 class BLECommLogger {
   public:
-    Optional<File::Error> append(const std::string& filename) {
+    Optional<File::Error> append(const std::filesystem::path& filename) {
        return log_file.append(filename);
    }

@@ -470,10 +470,7 @@ BLERxView::BLERxView(NavigationView& nav)
        logging = v;

        if (logger && logging)
-            logger->append(
-                "BLERX/Logs"
-                "/BLELOG_" +
-                to_string_timestamp(rtc_time::now()) + ".TXT");
+            logger->append(blerx_dir.string() + "/Logs/BLELOG_" + to_string_timestamp(rtc_time::now()) + ".TXT");
    };
    check_log.set_value(logging);

@@ -768,7 +765,7 @@ void BLERxView::on_filter_change(std::string value) {
 }

 void BLERxView::on_file_changed(const std::filesystem::path& new_file_path) {
-    file_path = fs::path(u"/") + new_file_path;
+    file_path = new_file_path;
    found_count = 0;
    total_count = 0;
    searchList.clear();
@@ -36,12 +36,13 @@
 #include "log_file.hpp"
 #include "utility.hpp"
 #include "usb_serial_thread.hpp"
+#include "file_path.hpp"

 #include "recent_entries.hpp"

 class BLELogger {
   public:
-    Optional<File::Error> append(const std::string& filename) {
+    Optional<File::Error> append(const std::filesystem::path& filename) {
        return log_file.append(filename);
    }

@@ -133,7 +134,7 @@ class BleRecentEntryDetailView : public View {
    void on_save_file(const std::string value, BLETxPacket packetToSave);
    bool saveFile(const std::filesystem::path& path, BLETxPacket packetToSave);
    std::string packetFileBuffer{};
-    std::filesystem::path packet_save_path{u"BLERX/Lists/????.csv"};
+    std::filesystem::path packet_save_path{blerx_dir / u"Lists/????.csv"};

    static constexpr uint8_t total_data_lines{5};

@@ -250,9 +251,9 @@ class BLERxView : public View {
    uint64_t total_count = 0;
    std::vector<std::string> searchList{};

-    std::filesystem::path find_packet_path{u"BLERX/Find/????.TXT"};
-    std::filesystem::path log_packets_path{u"BLERX/Logs/????.TXT"};
-    std::filesystem::path packet_save_path{u"BLERX/Lists/????.csv"};
+    std::filesystem::path find_packet_path{blerx_dir / u"Find/????.TXT"};
+    std::filesystem::path log_packets_path{blerx_dir / u"Logs/????.TXT"};
+    std::filesystem::path packet_save_path{blerx_dir / u"Lists/????.csv"};

    static constexpr auto header_height = 4 * 16;
    static constexpr auto switch_button_height = 3 * 16;
@@ -34,6 +34,7 @@
 #include "portapack_persistent_memory.hpp"
 #include "rtc_time.hpp"
 #include "string_format.hpp"
+#include "file_path.hpp"

 using namespace portapack;
 using namespace modems;
@@ -448,7 +449,7 @@ BLETxView::BLETxView(
 }

 void BLETxView::on_file_changed(const fs::path& new_file_path) {
-    file_path = fs::path(u"/") + new_file_path;
+    file_path = new_file_path;
    num_packets = 0;

    {  // Get the size of the data file.
@@ -36,6 +36,7 @@
 #include "replay_thread.hpp"
 #include "log_file.hpp"
 #include "utility.hpp"
+#include "file_path.hpp"

 #include "recent_entries.hpp"

@@ -44,7 +45,7 @@

 class BLELoggerTx {
   public:
-    Optional<File::Error> append(const std::string& filename) {
+    Optional<File::Error> append(const std::filesystem::path& filename) {
        return log_file.append(filename);
    }

@@ -138,7 +139,7 @@ class BLETxView : public View {
    uint32_t prev_value{0};

    std::filesystem::path file_path{};
-    std::filesystem::path packet_save_path{u"BLETX/BLETX_????.TXT"};
+    std::filesystem::path packet_save_path{bletx_dir / u"BLETX_????.TXT"};
    uint8_t channel_number = 37;
    bool auto_channel = false;

@@ -165,7 +166,7 @@ class BLETxView : public View {

    std::unique_ptr<FileWrapper> dataFileWrapper{};
    File dataFile{};
-    std::filesystem::path dataTempFilePath{u"BLETX/dataFileTemp.TXT"};
+    std::filesystem::path dataTempFilePath{bletx_dir / u"dataFileTemp.TXT"};
    std::vector<uint16_t> markedBytes{};
    CursorPos cursor_pos{};
    uint8_t marked_counter = 0;
@@ -104,6 +104,14 @@ CaptureAppView::CaptureAppView(NavigationView& nav)
    };
 }

+CaptureAppView::CaptureAppView(
+    NavigationView& nav,
+    ReceiverModel::settings_t override)
+    : CaptureAppView(nav) {
+    // Settings to override when launched from another app (versus from AppSettings .ini file)
+    field_frequency.set_value(override.frequency_app_override);
+}
+
 CaptureAppView::~CaptureAppView() {
    receiver_model.disable();
    baseband::shutdown();
@@ -31,12 +31,14 @@
 #include "ui_spectrum.hpp"
 #include "app_settings.hpp"
 #include "radio_state.hpp"
+#include "file_path.hpp"

 namespace ui {

 class CaptureAppView : public View {
   public:
    CaptureAppView(NavigationView& nav);
+    CaptureAppView(NavigationView& nav, ReceiverModel::settings_t override);
    ~CaptureAppView();

    void focus() override;
@@ -51,8 +53,7 @@ class CaptureAppView : public View {
    NavigationView& nav_;
    RxRadioState radio_state_{ReceiverModel::Mode::Capture};
    app_settings::SettingsManager settings_{
-        "rx_capture", app_settings::Mode::RX,
-        app_settings::Options::UseGlobalTargetFrequency};
+        "rx_capture", app_settings::Mode::RX};

    Labels labels{
        {{0 * 8, 1 * 16}, "Rate:", Color::light_grey()},
@@ -101,7 +102,7 @@ class CaptureAppView : public View {
    RecordView record_view{
        {0 * 8, 2 * 16, 30 * 8, 1 * 16},
        u"BBD_????.*",
-        u"CAPTURES",
+        captures_dir,
        RecordView::FileType::RawS16,
        16384,
        3};
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -22,7 +23,7 @@
 #include "ert_app.hpp"

 #include "baseband_api.hpp"
-
+#include "audio.hpp"
 #include "portapack.hpp"
 using namespace portapack;

@@ -30,6 +31,9 @@ using namespace portapack;

 #include "crc.hpp"
 #include "string_format.hpp"
+#include "file_path.hpp"
+
+namespace pmem = portapack::persistent_memory;

 namespace ert {

@@ -119,6 +123,7 @@ ERTAppView::ERTAppView(NavigationView& nav)
        &field_lna,
        &field_vga,
        &rssi,
+        &field_volume,
        &recent_entries_view,
    });

@@ -128,11 +133,17 @@ ERTAppView::ERTAppView(NavigationView& nav)

    logger = std::make_unique<ERTLogger>();
    if (logger) {
-        logger->append(LOG_ROOT_DIR "/ERT.TXT");
+        logger->append(logs_dir / u"ERT.TXT");
+    }
+
+    if (pmem::beep_on_packets()) {
+        audio::set_rate(audio::Rate::Hz_24000);
+        audio::output::start();
    }
 }

 ERTAppView::~ERTAppView() {
+    audio::output::stop();
    receiver_model.disable();
    baseband::shutdown();
 }
@@ -156,6 +167,10 @@ void ERTAppView::on_packet(const ert::Packet& packet) {
        entry.update(packet);
        recent_entries_view.set_dirty();
    }
+
+    if (pmem::beep_on_packets()) {
+        baseband::request_audio_beep(1000, 24000, 60);
+    }
 }

 void ERTAppView::on_show_list() {
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -164,6 +165,9 @@ class ERTAppView : public View {
        {21 * 8, 0, 6 * 8, 4},
    };

+    AudioVolumeField field_volume{
+        {28 * 8, 0 * 16}};
+
    MessageHandlerRegistration message_handler_packet{
        Message::ID::ERTPacket,
        [this](Message* const p) {
@@ -27,6 +27,7 @@
 #include "portapack_persistent_memory.hpp"
 #include "string_format.hpp"
 #include "utility.hpp"
+#include "file_path.hpp"

 using namespace portapack;
 using namespace pocsag;
@@ -115,7 +116,7 @@ POCSAGAppView::POCSAGAppView(NavigationView& nav)
                                    : FILTER_DROP;
    }

-    logger.append(LOG_ROOT_DIR "/POCSAG.TXT");
+    logger.append(logs_dir / u"POCSAG.TXT");

    field_squelch.set_value(receiver_model.squelch_level());
    field_squelch.on_change = [this](int32_t v) {
@@ -135,6 +136,10 @@ POCSAGAppView::POCSAGAppView(NavigationView& nav)
    };

    refresh_ui();
+
+    if (pmem::beep_on_packets())
+        audio::set_rate(audio::Rate::Hz_24000);
+
    audio::output::start();
    receiver_model.enable();
    baseband::set_pocsag();
@@ -303,6 +308,10 @@ void POCSAGAppView::on_packet(const POCSAGPacketMessage* message) {

    // Set status icon color to indicate state machine state.
    image_status.set_foreground(get_status_color(pocsag_state));
+
+    if (pmem::beep_on_packets()) {
+        baseband::request_audio_beep(1000, 24000, 60);
+    }
 }

 void POCSAGAppView::on_stats(const POCSAGStatsMessage* stats) {
@@ -39,7 +39,7 @@

 class POCSAGLogger {
   public:
-    Optional<File::Error> append(const std::string& filename) {
+    Optional<File::Error> append(const std::filesystem::path& filename) {
        return log_file.append(filename);
    }

@@ -44,7 +44,7 @@ void ReplayAppView::set_ready() {
 }

 void ReplayAppView::on_file_changed(const fs::path& new_file_path) {
-    file_path = fs::path(u"/") + new_file_path;
+    file_path = new_file_path;
    File::Size file_size{};

    {  // Get the size of the data file.
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -27,6 +28,7 @@
 #include "tonesets.hpp"
 #include "ui_tone_key.hpp"
 #include "audio.hpp"
+#include "file_path.hpp"

 using namespace tonekey;
 using namespace portapack;
@@ -51,7 +53,7 @@ void SoundBoardView::stop() {

 void SoundBoardView::handle_replay_thread_done(const uint32_t return_code) {
    stop();
-    // progressbar.set_value(0);
+    progressbar.set_value(0);

    if (return_code == ReplayThread::END_OF_FILE) {
        if (check_random.value()) {
@@ -89,6 +91,7 @@ void SoundBoardView::start_tx(const uint32_t id) {

    uint32_t tone_key_index = options_tone_key.selected_index();
    uint32_t sample_rate;
+    uint8_t bits_per_sample;

    stop();

@@ -99,11 +102,12 @@ void SoundBoardView::start_tx(const uint32_t id) {

    playing_id = id;

-    // progressbar.set_max(reader->sample_count());
+    progressbar.set_max(reader->sample_count());

    // button_play.set_bitmap(&bitmap_stop);

    sample_rate = reader->sample_rate();
+    bits_per_sample = reader->bits_per_sample();

    replay_thread = std::make_unique<ReplayThread>(
        std::move(reader),
@@ -116,15 +120,16 @@ void SoundBoardView::start_tx(const uint32_t id) {

    // TODO: Delete all this and use tx model.
    baseband::set_audiotx_config(
-        TONES_SAMPLERATE / 20,  // Update vu-meter at 20Hz
+        1536000 / 20,  // Update vu-meter at 20Hz
        transmitter_model.channel_bandwidth(),
        0,  // Gain is unused
-        8,  // shift_bits_s16, default 8 bits, but  also unused
+        8,  // shift_bits_s16, default 8 bits, but also unused
+        bits_per_sample,
        TONES_F2D(tone_key_frequency(tone_key_index), TONES_SAMPLERATE),
-        0,  // AM
-        0,  // DSB
-        0,  // USB
-        0   // LSB
+        false,  // AM
+        false,  // DSB
+        false,  // USB
+        false   // LSB
    );
    baseband::set_sample_rate(sample_rate);

@@ -145,8 +150,7 @@ void SoundBoardView::start_tx(const uint32_t id) {
 }*/

 void SoundBoardView::on_tx_progress(const uint32_t progress) {
-    (void)progress;  // avoid warning
-                     // progressbar.set_value(progress);
+    progressbar.set_value(progress);
 }

 void SoundBoardView::on_select_entry() {
@@ -161,7 +165,7 @@ void SoundBoardView::refresh_list() {

    // List directories and files, put directories up top
    uint32_t count = 0;
-    for (const auto& entry : std::filesystem::directory_iterator(u"WAV", u"*")) {
+    for (const auto& entry : std::filesystem::directory_iterator(wav_dir, u"*")) {
        if (std::filesystem::is_regular_file(entry.status())) {
            if (entry.path().string().length()) {
                auto entry_extension = entry.path().extension().string();
@@ -170,8 +174,8 @@ void SoundBoardView::refresh_list() {
                    c = toupper(c);

                if (entry_extension == ".WAV") {
-                    if (reader->open(u"/WAV/" + entry.path().native())) {
-                        if ((reader->channels() == 1) && (reader->bits_per_sample() == 8)) {
+                    if (reader->open(wav_dir / entry.path())) {
+                        if ((reader->channels() == 1) && ((reader->bits_per_sample() == 8) || (reader->bits_per_sample() == 16))) {
                            // sounds[c].ms_duration = reader->ms_duration();
                            // sounds[c].path = u"WAV/" + entry.path().native();
                            if (count >= (page - 1) * 100 && count < page * 100) {
@@ -210,7 +214,7 @@ void SoundBoardView::refresh_list() {

        for (size_t n = 0; n < file_list.size(); n++) {
            menu_view.add_item({file_list[n].string().substr(0, 30),
-                                ui::Color::white(),
+                                ui::Color::dark_magenta(),
                                nullptr,
                                [this](KeyEvent) {
                                    on_select_entry();
@@ -237,7 +241,7 @@ SoundBoardView::SoundBoardView(
                  &options_tone_key,
                  //&text_title,
                  //&text_duration,
-                  //&progressbar,
+                  &progressbar,
                  &field_volume,
                  &text_volume_disabled,
                  &page_info,
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -103,7 +104,7 @@ class SoundBoardView : public View {
        "<="};

    Text page_info{
-        {0, 30 * 8 - 4, 30 * 8, 16}};
+        {0, 29 * 8, 30 * 8, 16}};

    MenuView menu_view{
        {0, 0, 240, 175},
@@ -142,9 +143,8 @@ class SoundBoardView : public View {
        6,
        "Random"};

-    // ProgressBar progressbar {
-    //	{ 0 * 8, 30 * 8 - 4, 30 * 8, 16 }
-    // };
+    ProgressBar progressbar{
+        {0 * 8, 31 * 8 + 2, 30 * 8, 4}};

    TransmitterView tx_view{
        16 * 16,
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -22,13 +23,16 @@
 #include "tpms_app.hpp"

 #include "baseband_api.hpp"
-
+#include "audio.hpp"
 #include "portapack.hpp"
 using namespace portapack;

 #include "string_format.hpp"

 #include "utility.hpp"
+#include "file_path.hpp"
+
+namespace pmem = portapack::persistent_memory;

 namespace tpms {

@@ -145,6 +149,7 @@ TPMSAppView::TPMSAppView(NavigationView&) {
    baseband::run_image(portapack::spi_flash::image_tag_tpms);

    add_children({&rssi,
+                  &field_volume,
                  &channel,
                  &options_band,
                  &options_pressure,
@@ -175,11 +180,17 @@ TPMSAppView::TPMSAppView(NavigationView&) {

    logger = std::make_unique<TPMSLogger>();
    if (logger) {
-        logger->append(LOG_ROOT_DIR "/TPMS.TXT");
+        logger->append(logs_dir / u"TPMS.TXT");
+    }
+
+    if (pmem::beep_on_packets()) {
+        audio::set_rate(audio::Rate::Hz_24000);
+        audio::output::start();
    }
 }

 TPMSAppView::~TPMSAppView() {
+    audio::output::stop();
    receiver_model.disable();
    baseband::shutdown();
 }
@@ -212,6 +223,10 @@ void TPMSAppView::on_packet(const tpms::Packet& packet) {
        entry.update(reading);
        recent_entries_view.set_dirty();
    }
+
+    if (pmem::beep_on_packets()) {
+        baseband::request_audio_beep(1000, 24000, 60);
+    }
 }

 void TPMSAppView::on_show_list() {
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -142,6 +143,9 @@ class TPMSAppView : public View {
        {21 * 8, 0, 6 * 8, 4},
    };

+    AudioVolumeField field_volume{
+        {28 * 8, 0 * 16}};
+
    Channel channel{
        {21 * 8, 5, 6 * 8, 4},
    };
@@ -13,7 +13,7 @@ AboutView::AboutView(NavigationView& nav) {
 }

 void AboutView::update() {
-    if (++timer > 200) {
+    if (++timer > 400) {
        timer = 0;

        switch (++frame) {
@@ -23,7 +23,7 @@ void AboutView::update() {
                console.writeln(STR_COLOR_DARK_YELLOW "Mayhem:");
                console.writeln("eried,euquiq,gregoryfenton");
                console.writeln("johnelder,jwetzell,nnemanjan00");
-                console.writeln("N0vaPixel,klockee,GullCode");
+                console.writeln("N0vaPixel,klockee,gullradriel");
                console.writeln("jamesshao8,ITAxReal,rascafr");
                console.writeln("mcules,dqs105,strijar");
                console.writeln("zhang00963,RedFox-Fr,aldude999");
@@ -2,6 +2,7 @@
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2017 Furrtek
 * Copyright (C) 2023 Kyle Reed
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -30,9 +31,13 @@
 #include "portapack_persistent_memory.hpp"
 #include "rtc_time.hpp"
 #include "string_format.hpp"
+#include "file_path.hpp"
+#include "audio.hpp"

 using namespace portapack;

+namespace pmem = portapack::persistent_memory;
+
 namespace ui {

 static std::string get_map_tag(const AircraftRecentEntry& entry) {
@@ -102,7 +107,8 @@ void ADSBLogger::log(const ADSBLogEntry& log_entry) {
        log_line += " Type:" + to_string_dec_uint(log_entry.vel_type) +
                    " Hdg:" + to_string_dec_uint(log_entry.vel.heading) +
                    " Spd: " + to_string_dec_int(log_entry.vel.speed);
-
+    if (log_entry.sil != 0)
+        log_line += " Sil:" + to_string_dec_uint(log_entry.sil);
    log_file.write_entry(log_line);
 }

@@ -127,8 +133,8 @@ ADSBRxAircraftDetailsView::ADSBRxAircraftDetailsView(
    text_icao_address.set(entry.icao_str);

    // Try getting the aircraft information from icao24.db
-    std::database db{};
-    std::database::AircraftDBRecord aircraft_record;
+    database db{};
+    database::AircraftDBRecord aircraft_record;
    auto return_code = db.retrieve_aircraft_record(&aircraft_record, entry.icao_str);
    switch (return_code) {
        case DATABASE_RECORD_FOUND:
@@ -199,6 +205,10 @@ ADSBRxAircraftDetailsView::ADSBRxAircraftDetailsView(
            }
            break;

+        case DATABASE_RECORD_NOT_FOUND:
+            // Defaults should be filled by the constructor
+            break;
+
        case DATABASE_NOT_FOUND:
            text_manufacturer.set("No icao24.db file");
            break;
@@ -233,24 +243,6 @@ ADSBRxDetailsView::ADSBRxDetailsView(
         &button_aircraft_details,
         &button_see_map});

-    // The following won't change for a given airborne aircraft.
-    // Try getting the airline's name from airlines.db.
-    // NB: Only works once callsign has been read and won't be updated.
-    std::database db;
-    std::database::AirlinesDBRecord airline_record;
-    std::string airline_code = entry_.callsign.substr(0, 3);
-    auto 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_icao_address.set(entry_.icao_str);

    button_aircraft_details.on_select = [this, &nav](Button&) {
@@ -330,6 +322,31 @@ void ADSBRxDetailsView::on_orientation(const OrientationDataMessage* msg) {
 }

 void ADSBRxDetailsView::refresh_ui() {
+    // The following won't change for a given airborne aircraft.
+    // Try getting the airline's name from airlines.db.
+    if (!airline_checked && !entry_.callsign.empty()) {
+        airline_checked = true;
+
+        database db;
+        database::AirlinesDBRecord airline_record;
+        std::string airline_code = entry_.callsign.substr(0, 3);
+        auto 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_RECORD_NOT_FOUND:
+                // text_airline.set("-"); // It's what it is constructed with
+                // text_country.set("-"); // It's what it is constructed with
+                break;
+            case DATABASE_NOT_FOUND:
+                text_airline.set("No airlines.db file");
+                break;
+        }
+    }
+
    auto age = entry_.age;
    if (age < 60)
        text_last_seen.set(to_string_dec_uint(age) + " seconds ago");
@@ -338,11 +355,12 @@ void ADSBRxDetailsView::refresh_ui() {

    text_callsign.set(entry_.callsign);
    text_infos.set(entry_.info_string);
+    std::string str_sil = (entry_.sil > 0) ? " Sil:" + to_string_dec_uint(entry_.sil) : "";
    if (entry_.velo.heading < 360 && entry_.velo.speed >= 0)
        text_info2.set("Hdg:" + to_string_dec_uint(entry_.velo.heading) +
-                       " Spd:" + to_string_dec_int(entry_.velo.speed));
+                       " Spd:" + to_string_dec_int(entry_.velo.speed) + str_sil);
    else
-        text_info2.set("");
+        text_info2.set(str_sil);

    text_frame_pos_even.set(to_string_hex_array(entry_.frame_pos_even.get_raw_data(), 14));
    text_frame_pos_odd.set(to_string_hex_array(entry_.frame_pos_odd.get_raw_data(), 14));
@@ -360,7 +378,8 @@ ADSBRxView::ADSBRxView(NavigationView& nav) {
         &rssi,
         &recent_entries_view,
         &status_frame,
-         &status_good_frame});
+         &status_good_frame,
+         &field_volume});

    recent_entries_view.set_parent_rect({0, 16, 240, 272});
    recent_entries_view.on_select = [this, &nav](const AircraftRecentEntry& entry) {
@@ -378,14 +397,20 @@ ADSBRxView::ADSBRxView(NavigationView& nav) {
    };

    logger = std::make_unique<ADSBLogger>();
-    logger->append(LOG_ROOT_DIR "/ADSB.TXT");
+    logger->append(logs_dir / u"ADSB.TXT");

    receiver_model.enable();
    baseband::set_adsb();
+
+    if (pmem::beep_on_packets()) {
+        audio::set_rate(audio::Rate::Hz_24000);
+        audio::output::start();
+    }
 }

 ADSBRxView::~ADSBRxView() {
    rtc_time::signal_tick_second -= signal_token_tick_second;
+    audio::output::stop();
    receiver_model.disable();
    baseband::shutdown();
 }
@@ -448,7 +473,6 @@ void ADSBRxView::on_frame(const ADSBFrameMessage* message) {
                    "Alt:" + to_string_dec_int(entry.pos.altitude) +
                    " Lat:" + to_string_decimal(entry.pos.latitude, 2) +
                    " Lon:" + to_string_decimal(entry.pos.longitude, 2);
-
                entry.set_info_string(std::move(str_info));
            }

@@ -456,10 +480,16 @@ void ADSBRxView::on_frame(const ADSBFrameMessage* message) {
            entry.set_frame_velo(frame);
            log_entry.vel = entry.velo;
            log_entry.vel_type = msg_sub;
+        } else if (msg_type == AIRBORNE_OP_STATUS) {  // for ver 1
+            entry.sil = frame.get_sil_value();
        }
    }

    logger->log(log_entry);
+
+    if (pmem::beep_on_packets()) {
+        baseband::request_audio_beep(1000, 24000, 60);
+    }
 }

 void ADSBRxView::on_tick_second() {
@@ -2,6 +2,7 @@
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2017 Furrtek
 * Copyright (C) 2023 Kyle Reed
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -53,6 +54,8 @@ namespace ui {
 #define AIRBORNE_POS_GPS_L 20  // airborne position (lowest type id)
 #define AIRBORNE_POS_GPS_H 22  // airborne position (highest type id)

+#define AIRBORNE_OP_STATUS 31  // Aircraft operation status
+
 #define RESERVED_L 23  // reserved for other uses
 #define RESERVED_H 31  // reserved for other uses

@@ -101,6 +104,8 @@ struct AircraftRecentEntry {
    std::string callsign{};
    std::string info_string{};

+    uint8_t sil{0};  // Surveillance integrity level
+
    AircraftRecentEntry(const uint32_t ICAO_address)
        : ICAO_address{ICAO_address} {
        this->icao_str = to_string_hex(ICAO_address, 6);
@@ -172,6 +177,7 @@ struct ADSBLogEntry {
    adsb_pos pos{};
    adsb_vel vel{};
    uint8_t vel_type{};
+    uint8_t sil{};
 };

 // TODO: Make logging optional.
@@ -280,6 +286,7 @@ class ADSBRxDetailsView : public View {
    // NB: Keeping a copy so that it doesn't end up dangling
    // if removed from the recent entries list.
    AircraftRecentEntry entry_{AircraftRecentEntry::invalid_key};
+    bool airline_checked{false};

    Labels labels{
        {{0 * 8, 1 * 16}, "ICAO:", Color::light_grey()},
@@ -419,19 +426,22 @@ class ADSBRxView : public View {
        {18 * 8, 0 * 16}};

    RSSI rssi{
-        {20 * 8, 4, 10 * 7, 8},
+        {20 * 8, 4, 7 * 8, 8},
    };

    ActivityDot status_frame{
-        {screen_width - 3, 5, 2, 2},
+        {27 * 8 + 2, 5, 2, 2},
        Color::white(),
    };

    ActivityDot status_good_frame{
-        {screen_width - 3, 9, 2, 2},
+        {27 * 8 + 2, 9, 2, 2},
        Color::green(),
    };

+    AudioVolumeField field_volume{
+        {28 * 8, 0 * 16}};
+
    MessageHandlerRegistration message_handler_frame{
        Message::ID::ADSBFrame,
        [this](Message* const p) {
@@ -27,6 +27,7 @@
 #include "baseband_api.hpp"
 #include "string_format.hpp"
 #include "portapack_persistent_memory.hpp"
+#include "file_path.hpp"

 using namespace portapack;

@@ -111,7 +112,7 @@ APRSRxView::APRSRxView(NavigationView& nav, Rect parent_rect)

    logger = std::make_unique<APRSLogger>();
    if (logger)
-        logger->append(LOG_ROOT_DIR "/APRS.TXT");
+        logger->append(logs_dir / u"APRS.TXT");

    baseband::set_aprs(1200);

@@ -36,10 +36,11 @@

 #include "log_file.hpp"
 #include "utility.hpp"
+#include "file_path.hpp"

 class APRSLogger {
   public:
-    Optional<File::Error> append(const std::string& filename) {
+    Optional<File::Error> append(const std::filesystem::path& filename) {
        return log_file.append(filename);
    }

@@ -232,7 +233,7 @@ class APRSRxView : public View {
    RecordView record_view{
        {0 * 8, 1 * 16, 30 * 8, 1 * 16},
        u"AFS_????.WAV",
-        u"APRS",
+        aprs_dir,
        RecordView::FileType::WAV,
        4096,
        4};
@@ -1,5 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2024 Mark Thompson
+ * Copyright (C) 2024 u-foka
 *
 * This file is part of PortaPack.
 *
@@ -322,6 +324,11 @@ bool ControlsSwitchesWidget::on_key(const KeyEvent key) {
    return true;
 }

+bool ControlsSwitchesWidget::on_encoder(const EncoderEvent delta) {
+    last_delta = delta;
+    return true;
+}
+
 void ControlsSwitchesWidget::paint(Painter& painter) {
    const auto pos = screen_pos();

@@ -404,6 +411,8 @@ void ControlsSwitchesWidget::paint(Painter& painter) {

        switches_event >>= 1;
    }
+
+    painter.draw_string({5 * 8, 12 * 16}, Styles::light_grey, to_string_dec_int(last_delta, 3));
 }

 void ControlsSwitchesWidget::on_frame_sync() {
@@ -437,43 +446,66 @@ void DebugControlsView::focus() {

 /* DebugPeripheralsMenuView **********************************************/

-DebugPeripheralsMenuView::DebugPeripheralsMenuView(NavigationView& nav) {
+DebugPeripheralsMenuView::DebugPeripheralsMenuView(NavigationView& nav)
+    : nav_(nav) {
+    set_max_rows(2);  // allow wider buttons
+}
+
+void DebugPeripheralsMenuView::on_populate() {
    const char* max283x = hackrf_r9 ? "MAX2839" : "MAX2837";
    const char* si5351x = hackrf_r9 ? "Si5351A" : "Si5351C";
    add_items({
-        {"RFFC5072", ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav]() { nav.push<RegistersView>("RFFC5072", RegistersWidgetConfig{CT_RFFC5072, 31, 31, 16}); }},
-        {max283x, ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav, max283x]() { nav.push<RegistersView>(max283x, RegistersWidgetConfig{CT_MAX283X, 32, 32, 10}); }},
-        {si5351x, ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav, si5351x]() { nav.push<RegistersView>(si5351x, RegistersWidgetConfig{CT_SI5351, 188, 96, 8}); }},
-        {audio::debug::codec_name(), ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav]() { nav.push<RegistersView>(audio::debug::codec_name(), RegistersWidgetConfig{CT_AUDIO, audio::debug::reg_count(), audio::debug::reg_count(), audio::debug::reg_bits()}); }},
+        {"RFFC5072", ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [this]() { nav_.push<RegistersView>("RFFC5072", RegistersWidgetConfig{CT_RFFC5072, 31, 31, 16}); }},
+        {max283x, ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [this, max283x]() { nav_.push<RegistersView>(max283x, RegistersWidgetConfig{CT_MAX283X, 32, 32, 10}); }},
+        {si5351x, ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [this, si5351x]() { nav_.push<RegistersView>(si5351x, RegistersWidgetConfig{CT_SI5351, 188, 96, 8}); }},
+        {audio::debug::codec_name(), ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [this]() { nav_.push<RegistersView>(audio::debug::codec_name(), RegistersWidgetConfig{CT_AUDIO, audio::debug::reg_count(), audio::debug::reg_count(), audio::debug::reg_bits()}); }},
    });
    set_max_rows(2);  // allow wider buttons
 }

+/* DebugReboot **********************************************/
+
+DebugReboot::DebugReboot(NavigationView& nav) {
+    (void)nav;
+
+    LPC_RGU->RESET_CTRL[0] = (1 << 0);
+
+    while (1)
+        __WFE();
+}
+
+void DebugReboot::on_populate() {
+}
+
 /* DebugMenuView *********************************************************/

-DebugMenuView::DebugMenuView(NavigationView& nav) {
+DebugMenuView::DebugMenuView(NavigationView& nav)
+    : nav_(nav) {
+    set_max_rows(2);  // allow wider buttons
+}
+
+void DebugMenuView::on_populate() {
    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, [this]() { nav_.pop(); }}});
    }
    add_items({
-        {"Buttons Test", ui::Color::dark_cyan(), &bitmap_icon_controls, [&nav]() { nav.push<DebugControlsView>(); }},
-        {"Debug Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { portapack::persistent_memory::debug_dump(); }},
-        {"M0 Stack Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { stack_dump(); }},
-        {"Memory Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { nav.push<DebugMemoryDumpView>(); }},
-        {"Memory Usage", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { nav.push<DebugMemoryView>(); }},
-        {"Peripherals", ui::Color::dark_cyan(), &bitmap_icon_peripherals, [&nav]() { nav.push<DebugPeripheralsMenuView>(); }},
-        {"Pers. Memory", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { nav.push<DebugPmemView>(); }},
-        //{ "Radio State",	ui::Color::white(),	nullptr,	[&nav](){ nav.push<NotImplementedView>(); } },
-        {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [&nav]() { nav.push<SDCardDebugView>(); }},
-        {"Temperature", ui::Color::dark_cyan(), &bitmap_icon_temperature, [&nav]() { nav.push<TemperatureView>(); }},
-        {"Touch Test", ui::Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<DebugScreenTest>(); }},
+        {"Buttons Test", ui::Color::dark_cyan(), &bitmap_icon_controls, [this]() { nav_.push<DebugControlsView>(); }},
+        {"Debug Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { portapack::persistent_memory::debug_dump(); }},
+        {"M0 Stack Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { stack_dump(); }},
+        {"Memory Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { nav_.push<DebugMemoryDumpView>(); }},
+        //{"Memory Usage", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { nav_.push<DebugMemoryView>(); }},
+        {"Peripherals", ui::Color::dark_cyan(), &bitmap_icon_peripherals, [this]() { nav_.push<DebugPeripheralsMenuView>(); }},
+        {"Pers. Memory", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { nav_.push<DebugPmemView>(); }},
+        //{ "Radio State",	ui::Color::white(),	nullptr,	[this](){ nav_.push<NotImplementedView>(); } },
+        {"Reboot", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<DebugReboot>(); }},
+        {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [this]() { nav_.push<SDCardDebugView>(); }},
+        {"Temperature", ui::Color::dark_cyan(), &bitmap_icon_temperature, [this]() { nav_.push<TemperatureView>(); }},
+        {"Touch Test", ui::Color::dark_cyan(), &bitmap_icon_notepad, [this]() { nav_.push<DebugScreenTest>(); }},
    });

-    for (auto const& gridItem : ExternalItemsMenuLoader::load_external_items(app_location_t::DEBUG, nav)) {
+    for (auto const& gridItem : ExternalItemsMenuLoader::load_external_items(app_location_t::DEBUG, nav_)) {
        add_item(gridItem);
    };
-
-    set_max_rows(2);  // allow wider buttons
 }

 /* DebugMemoryDumpView *********************************************************/
@@ -552,6 +584,7 @@ void DebugPmemView::update() {
 DebugScreenTest::DebugScreenTest(NavigationView& nav)
    : nav_{nav} {
    set_focusable(true);
+    std::srand(LPC_RTC->CTIME0);
 }

 bool DebugScreenTest::on_key(const KeyEvent key) {
@@ -561,10 +594,10 @@ bool DebugScreenTest::on_key(const KeyEvent key) {
            nav_.pop();
            break;
        case KeyEvent::Down:
-            painter.fill_rectangle({0, 0, screen_width, screen_height}, semirand());
+            painter.fill_rectangle({0, 0, screen_width, screen_height}, std::rand());
            break;
        case KeyEvent::Left:
-            pen_color = semirand();
+            pen_color = std::rand();
            break;
        default:
            break;
@@ -584,17 +617,10 @@ bool DebugScreenTest::on_touch(const TouchEvent event) {
    return true;
 }

-uint16_t DebugScreenTest::semirand() {
-    static uint64_t seed{0x0102030405060708};
-    seed = seed * 137;
-    seed = (seed >> 1) | ((seed & 0x01) << 63);
-    return (uint16_t)seed;
-}
-
 void DebugScreenTest::paint(Painter& painter) {
    painter.fill_rectangle({0, 16, screen_width, screen_height - 16}, Color::white());
    painter.draw_string({10 * 8, screen_height / 2}, Styles::white, "Use Stylus");
-    pen_color = semirand();
+    pen_color = std::rand();
 }

 /* DebugLCRView *******************************************************/
@@ -1,5 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2024 Mark Thompson
+ * Copyright (C) 2024 u-foka
 *
 * This file is part of PortaPack.
 *
@@ -251,18 +253,21 @@ class ControlsSwitchesWidget : public Widget {
        Rect parent_rect)
        : Widget{parent_rect},
          key_event_mask(0),
-          long_press_key_event_mask{0} {
+          long_press_key_event_mask{0},
+          last_delta{0} {
        set_focusable(true);
    }

    void on_show() override;
    bool on_key(const KeyEvent key) override;
+    bool on_encoder(const EncoderEvent delta) override;

    void paint(Painter& painter) override;

   private:
    uint8_t key_event_mask;
    uint8_t long_press_key_event_mask;
+    EncoderEvent last_delta;

    MessageHandlerRegistration message_handler_frame_sync{
        Message::ID::DisplayFrameSync,
@@ -284,6 +289,7 @@ class DebugControlsView : public View {
   private:
    Labels labels{
        {{8 * 8, 1 * 16}, "Controls State", Color::white()},
+        {{0 * 8, 11 * 16}, "Dial:", Color::grey()},
        {{0 * 8, 14 * 16}, "Long-Press Mode:", Color::grey()}};

    ControlsSwitchesWidget switches_widget{
@@ -385,7 +391,6 @@ class DebugScreenTest : public View {
    bool on_key(KeyEvent key) override;
    bool on_encoder(EncoderEvent delta) override;
    bool on_touch(TouchEvent event) override;
-    uint16_t semirand();
    void paint(Painter& painter) override;

   private:
@@ -418,12 +423,28 @@ class DebugPeripheralsMenuView : public BtnGridView {
   public:
    DebugPeripheralsMenuView(NavigationView& nav);
    std::string title() const override { return "Peripherals"; };
+
+   private:
+    NavigationView& nav_;
+    void on_populate() override;
+};
+
+class DebugReboot : public BtnGridView {
+   public:
+    DebugReboot(NavigationView& nav);
+
+   private:
+    void on_populate() override;
 };

 class DebugMenuView : public BtnGridView {
   public:
    DebugMenuView(NavigationView& nav);
    std::string title() const override { return "Debug"; };
+
+   private:
+    NavigationView& nav_;
+    void on_populate() override;
 };

 } /* namespace ui */
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2023 Bernd Herzog
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -37,23 +38,29 @@ DfuMenu::DfuMenu(NavigationView& nav)
                  &text_info_line_5,
                  &text_info_line_6,
                  &text_info_line_7,
-                  &text_info_line_8});
+                  &text_info_line_8,
+                  &text_info_line_9,
+                  &text_info_line_10});
 }

 void DfuMenu::paint(Painter& painter) {
    auto utilisation = get_cpu_utilisation_in_percent();
+    size_t m0_fragmented_free_space = 0;
+    const auto m0_fragments = chHeapStatus(NULL, &m0_fragmented_free_space);

    text_info_line_1.set(to_string_dec_uint(chCoreStatus(), 6));
-    text_info_line_2.set(to_string_dec_uint((uint32_t)get_free_stack_space(), 6));
-    text_info_line_3.set(to_string_dec_uint(utilisation, 6));
-    text_info_line_4.set(to_string_dec_uint(shared_memory.m4_heap_usage, 6));
-    text_info_line_5.set(to_string_dec_uint(shared_memory.m4_stack_usage, 6));
-    text_info_line_6.set(to_string_dec_uint(shared_memory.m4_performance_counter, 6));
-    text_info_line_7.set(to_string_dec_uint(shared_memory.m4_buffer_missed, 6));
-    text_info_line_8.set(to_string_dec_uint(chTimeNow() / 1000, 6));
+    text_info_line_2.set(to_string_dec_uint(m0_fragmented_free_space, 6));
+    text_info_line_3.set(to_string_dec_uint(m0_fragments, 6));
+    text_info_line_4.set(to_string_dec_uint((uint32_t)get_free_stack_space(), 6));
+    text_info_line_5.set(to_string_dec_uint(utilisation, 6));
+    text_info_line_6.set(to_string_dec_uint(shared_memory.m4_heap_usage, 6));
+    text_info_line_7.set(to_string_dec_uint(shared_memory.m4_stack_usage, 6));
+    text_info_line_8.set(to_string_dec_uint(shared_memory.m4_performance_counter, 6));
+    text_info_line_9.set(to_string_dec_uint(shared_memory.m4_buffer_missed, 6));
+    text_info_line_10.set(to_string_dec_uint(chTimeNow() / 1000, 6));

    constexpr auto margin = 5;
-    constexpr auto lines = 8 + 2;
+    constexpr auto lines = 10 + 2;

    painter.fill_rectangle(
        {{6 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin},
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2023 Bernd Herzog
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -48,14 +49,16 @@ class DfuMenu : public View {
    Text text_head{{6 * CHARACTER_WIDTH, 3 * LINE_HEIGHT, 11 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, "Performance"};

    Labels labels{
-        {{6 * CHARACTER_WIDTH, 5 * LINE_HEIGHT}, "M0 heap:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 6 * LINE_HEIGHT}, "M0 stack:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 7 * LINE_HEIGHT}, "M0 cpu %:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 8 * LINE_HEIGHT}, "M4 heap:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 9 * LINE_HEIGHT}, "M4 stack:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 10 * LINE_HEIGHT}, "M4 cpu %:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 11 * LINE_HEIGHT}, "M4 miss:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 12 * LINE_HEIGHT}, "uptime:", Color::dark_cyan()}};
+        {{6 * CHARACTER_WIDTH, 5 * LINE_HEIGHT}, "M0 core:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 6 * LINE_HEIGHT}, "M0 heap:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 7 * LINE_HEIGHT}, "M0 frags:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 8 * LINE_HEIGHT}, "M0 stack:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 9 * LINE_HEIGHT}, "M0 cpu %:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 10 * LINE_HEIGHT}, "M4 heap:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 11 * LINE_HEIGHT}, "M4 stack:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 12 * LINE_HEIGHT}, "M4 cpu %:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 13 * LINE_HEIGHT}, "M4 miss:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 14 * LINE_HEIGHT}, "uptime:", Color::dark_cyan()}};

    Text text_info_line_1{{15 * CHARACTER_WIDTH, 5 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
    Text text_info_line_2{{15 * CHARACTER_WIDTH, 6 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
@@ -65,6 +68,8 @@ class DfuMenu : public View {
    Text text_info_line_6{{15 * CHARACTER_WIDTH, 10 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
    Text text_info_line_7{{15 * CHARACTER_WIDTH, 11 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
    Text text_info_line_8{{15 * CHARACTER_WIDTH, 12 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
+    Text text_info_line_9{{15 * CHARACTER_WIDTH, 13 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
+    Text text_info_line_10{{15 * CHARACTER_WIDTH, 14 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
 };

 class DfuMenu2 : public View {
@@ -62,7 +62,7 @@ std::string truncate(const fs::path& path, size_t max_length) {
 }

 // Inserts the entry into the entry list sorted directories first then by file name.
-void insert_sorted(std::vector<fileman_entry>& entries, fileman_entry&& entry) {
+void insert_sorted(std::list<fileman_entry>& entries, fileman_entry&& entry) {
    auto it = std::lower_bound(
        std::begin(entries), std::end(entries), entry,
        [](const fileman_entry& lhs, const fileman_entry& rhs) {
@@ -146,9 +146,82 @@ namespace ui {

 /* FileManBaseView ***********************************************************/

-void FileManBaseView::load_directory_contents(const fs::path& dir_path) {
+void FileManBaseView::load_directory_contents_unordered(const fs::path& dir_path, size_t file_cnt) {
    current_path = dir_path;
    entry_list.clear();
+    menu_view.clear();
+    auto filtering = !extension_filter.empty();
+    bool cxx_file = path_iequal(cxx_ext, extension_filter);
+
+    text_current.set(dir_path.empty() ? "(sd root)" : truncate(dir_path, 24));
+
+    nb_pages = 1 + (file_cnt / items_per_page);
+    size_t start = pagination * items_per_page;
+    size_t stop = start + items_per_page;
+    if (file_cnt < stop) stop = file_cnt;
+    if (start > file_cnt) start = 0;  // shouldn't hapen but check against it won't hurt
+
+    size_t curr = 0;
+
+    for (const auto& entry : fs::directory_iterator(dir_path, u"*")) {
+        if (entry_list.size() >= items_per_page) {
+            break;
+        }
+        // Hide files starting with '.' (hidden / tmp).
+        if (!show_hidden_files && is_hidden_file(entry.path()))
+            continue;
+
+        if (fs::is_regular_file(entry.status())) {
+            if (!filtering || path_iequal(entry.path().extension(), extension_filter) || (cxx_file && is_cxx_capture_file(entry.path()))) {
+                curr++;
+                if (curr >= start) insert_sorted(entry_list, {entry.path().string(), (uint32_t)entry.size(), false});
+            }
+
+        } else if (fs::is_directory(entry.status())) {
+            curr++;
+            if (curr >= start) insert_sorted(entry_list, {entry.path().string(), 0, true});
+        }
+    }
+
+    // Add "parent" directory if not at the root.
+    if (!dir_path.empty() && pagination == 0)
+        entry_list.insert(entry_list.begin(), {parent_dir_path.string(), 0, true});
+
+    // add next page
+    if (file_cnt > start + items_per_page) {
+        entry_list.push_back({str_next, (uint32_t)pagination + 1, true});
+    }
+
+    // add prev page
+    if (pagination > 0) {
+        entry_list.insert(entry_list.begin(), {str_back, (uint32_t)pagination - 1, true});
+    }
+}
+
+int FileManBaseView::file_count_filtered(const fs::path& directory) {
+    int count{0};
+    auto filtering = !extension_filter.empty();
+    bool cxx_file = path_iequal(cxx_ext, extension_filter);
+
+    for (auto& entry : std::filesystem::directory_iterator(directory, (const TCHAR*)u"*")) {
+        if (fs::is_regular_file(entry.status())) {
+            if (!filtering || path_iequal(entry.path().extension(), extension_filter) || (cxx_file && is_cxx_capture_file(entry.path())))
+                ++count;
+        } else
+            ++count;
+    }
+    return count;
+}
+
+void FileManBaseView::load_directory_contents(const fs::path& dir_path) {
+    size_t file_cnt = file_count_filtered(dir_path);
+    if (file_cnt >= max_items_loaded) {
+        load_directory_contents_unordered(dir_path, file_cnt);
+        return;
+    }
+    current_path = dir_path;
+    entry_list.clear();
+    menu_view.clear();
    auto filtering = !extension_filter.empty();
    bool cxx_file = path_iequal(cxx_ext, extension_filter);

@@ -161,19 +234,41 @@ void FileManBaseView::load_directory_contents(const fs::path& dir_path) {

        if (fs::is_regular_file(entry.status())) {
            if (!filtering || path_iequal(entry.path().extension(), extension_filter) || (cxx_file && is_cxx_capture_file(entry.path())))
-                insert_sorted(entry_list, {entry.path(), (uint32_t)entry.size(), false});
+                insert_sorted(entry_list, {entry.path().string(), (uint32_t)entry.size(), false});
        } else if (fs::is_directory(entry.status())) {
-            insert_sorted(entry_list, {entry.path(), 0, true});
+            insert_sorted(entry_list, {entry.path().string(), 0, true});
        }
    }

+    // paginating
+    auto list_size = entry_list.size();
+    nb_pages = 1 + (list_size / items_per_page);
+    size_t start = pagination * items_per_page;
+    size_t stop = start + items_per_page;
+    if (list_size > start) {
+        if (list_size < stop)
+            stop = list_size;
+        entry_list.erase(std::next(entry_list.begin(), stop), entry_list.end());
+        entry_list.erase(entry_list.begin(), std::next(entry_list.begin(), start));
+    }
+
    // Add "parent" directory if not at the root.
-    if (!dir_path.empty())
-        entry_list.insert(entry_list.begin(), {parent_dir_path, 0, true});
+    if (!dir_path.empty() && pagination == 0)
+        entry_list.insert(entry_list.begin(), {parent_dir_path.string(), 0, true});
+
+    // add next page
+    if (list_size > start + items_per_page) {
+        entry_list.push_back({str_next, (uint32_t)pagination + 1, true});
+    }
+
+    // add prev page
+    if (pagination > 0) {
+        entry_list.insert(entry_list.begin(), {str_back, (uint32_t)pagination - 1, true});
+    }
 }

 fs::path FileManBaseView::get_selected_full_path() const {
-    if (get_selected_entry().path == parent_dir_path)
+    if (get_selected_entry().path == parent_dir_path.string())
        return current_path.parent_path();

    return current_path / get_selected_entry().path;
@@ -181,7 +276,10 @@ fs::path FileManBaseView::get_selected_full_path() const {

 const fileman_entry& FileManBaseView::get_selected_entry() const {
    // TODO: return reference to an "empty" entry on OOB?
-    return entry_list[menu_view.highlighted_index()];
+    auto it = entry_list.begin();
+    if (menu_view.highlighted_index() >= 1) std::advance(it, menu_view.highlighted_index());
+    return *it;
+    // return entry_list[menu_view.highlighted_index()];
 }

 FileManBaseView::FileManBaseView(
@@ -230,7 +328,7 @@ void FileManBaseView::push_dir(const fs::path& path) {
        current_path /= path;
        saved_index_stack.push_back(menu_view.highlighted_index());
        menu_view.set_highlighted(0);
-        reload_current();
+        reload_current(true);
    }
 }

@@ -239,29 +337,56 @@ void FileManBaseView::pop_dir() {
        return;

    current_path = current_path.parent_path();
-    reload_current();
+    reload_current(true);
    menu_view.set_highlighted(saved_index_stack.back());
    saved_index_stack.pop_back();
 }

+std::string get_extension(std::string t) {
+    const auto index = t.find_last_of(u'.');
+    if (index == t.npos) {
+        return {};
+    } else {
+        return t.substr(index);
+    }
+}
+
+std::string get_stem(std::string t) {
+    const auto index = t.find_last_of(u'.');
+    if (index == t.npos) {
+        return t;
+    } else {
+        return t.substr(0, index);
+    }
+}
+std::string get_filename(std::string _s) {
+    const auto index = _s.find_last_of("/");
+    if (index == _s.npos) {
+        return _s;
+    } else {
+        return _s.substr(index + 1);
+    }
+}
 void FileManBaseView::refresh_list() {
    if (on_refresh_widgets)
        on_refresh_widgets(false);

-    auto prev_highlight = menu_view.highlighted_index();
+    prev_highlight = menu_view.highlighted_index();
    menu_view.clear();

    for (const auto& entry : entry_list) {
-        auto entry_name = truncate(entry.path, 20);
+        auto entry_name = std::string{entry.path.length() <= 20 ? entry.path : entry.path.substr(0, 20)};

        if (entry.is_directory) {
-            auto size_str =
-                (entry.path == parent_dir_path)
-                    ? ""
-                    : to_string_dec_uint(file_count(current_path / entry.path));
+            std::string size_str{};
+            if (entry.path == str_next || entry.path == str_back) {
+                size_str = to_string_dec_uint(1 + entry.size) + "/" + to_string_dec_uint(nb_pages);  // show computed number of pages
+            } else {
+                size_str = (entry.path == parent_dir_path.string()) ? "" : to_string_dec_uint(file_count(current_path / entry.path));
+            }

            menu_view.add_item(
-                {entry_name + std::string(21 - entry_name.length(), ' ') + size_str,
+                {entry_name.substr(0, max_filename_length) + std::string(21 - entry_name.length(), ' ') + size_str,
                 ui::Color::yellow(),
                 &bitmap_icon_dir,
                 [this](KeyEvent key) {
@@ -270,11 +395,11 @@ void FileManBaseView::refresh_list() {
                 }});

        } else {
-            const auto& assoc = get_assoc(entry.path.extension());
+            const auto& assoc = get_assoc(get_extension(entry.path));
            auto size_str = to_string_file_size(entry.size);

            menu_view.add_item(
-                {entry_name + std::string(21 - entry_name.length(), ' ') + size_str,
+                {entry_name.substr(0, max_filename_length) + std::string(21 - entry_name.length(), ' ') + size_str,
                 assoc.color,
                 assoc.icon,
                 [this](KeyEvent key) {
@@ -282,16 +407,13 @@ void FileManBaseView::refresh_list() {
                         on_select_entry(key);
                 }});
        }
-
-        // HACK: Should page menu items instead of limiting the number.
-        if (menu_view.item_count() >= max_items_shown)
-            break;
    }

    menu_view.set_highlighted(prev_highlight);
 }

-void FileManBaseView::reload_current() {
+void FileManBaseView::reload_current(bool reset_pagination) {
+    if (reset_pagination) pagination = 0;
    load_directory_contents(current_path);
    refresh_list();
 }
@@ -327,6 +449,21 @@ FileLoadView::FileLoadView(

    on_select_entry = [this](KeyEvent) {
        if (get_selected_entry().is_directory) {
+            if (get_selected_entry().path == str_full) {
+                return;
+            }
+            if (get_selected_entry().path == str_back) {
+                pagination--;
+                menu_view.set_highlighted(0);
+                reload_current(false);
+                return;
+            }
+            if (get_selected_entry().path == str_next) {
+                pagination++;
+                menu_view.set_highlighted(0);
+                reload_current(false);
+                return;
+            }
            push_dir(get_selected_entry().path);
        } else {
            if (on_changed)
@@ -402,6 +539,7 @@ void FileSaveView::refresh_widgets() {
 void FileManagerView::refresh_widgets(const bool v) {
    button_rename.hidden(v);
    button_delete.hidden(v);
+    button_clean.hidden(v);
    button_cut.hidden(v);
    button_copy.hidden(v);
    button_paste.hidden(v);
@@ -415,10 +553,10 @@ void FileManagerView::on_rename(std::string_view hint) {
    auto& entry = get_selected_entry();

    // Append the hint to the filename stem as a rename suggestion.
-    name_buffer = entry.path.stem().string();
+    name_buffer = get_stem(entry.path);
    if (!hint.empty())
        name_buffer += "_" + std::string{hint};
-    name_buffer += entry.path.extension().string();
+    name_buffer += get_extension(entry.path);

    // Set the rename cursor to before the extension to make renaming simpler.
    uint32_t cursor_pos = (uint32_t)name_buffer.length();
@@ -439,21 +577,21 @@ void FileManagerView::on_rename(std::string_view hint) {
                        auto new_name = renamed_path.replace_extension(partner.extension());
                        rename_file(partner, current_path / new_name);
                    }
-                    reload_current();
+                    reload_current(false);
                });

            if (!has_partner)
-                reload_current();
+                reload_current(false);
        });
 }

 void FileManagerView::on_delete() {
    if (is_directory(get_selected_full_path()) && !is_empty_directory(get_selected_full_path())) {
-        nav_.display_modal("Delete", "Directory not empty!");
+        nav_.display_modal("Delete", " Folder is not empty;\n Use \"Clean\" button to\n empty it first.");
        return;
    }

-    auto name = get_selected_entry().path.filename().string();
+    auto name = get_filename(get_selected_entry().path);
    nav_.push<ModalMessageView>(
        "Delete", "Delete " + name + "\nAre you sure?", YESNO,
        [this](bool choice) {
@@ -465,11 +603,36 @@ void FileManagerView::on_delete() {
                    [this](const fs::path& partner, bool should_delete) {
                        if (should_delete)
                            delete_file(partner);
-                        reload_current();
+                        reload_current(true);
                    });

                if (!has_partner)
-                    reload_current();
+                    reload_current(true);
+            }
+        });
+}
+
+void FileManagerView::on_clean() {
+    if (is_empty_directory(get_selected_full_path())) {
+        nav_.display_modal("Clean", "Folder is Empty;\nUse \"Delete\" button instead\nof \"Clean\" button to delete\nit.");
+        return;
+    }
+
+    auto path_name = is_directory(get_selected_full_path()) ? get_selected_full_path() : get_selected_full_path().parent_path();
+
+    // selected either a single file (delete files in this directory) or a directory that is not empty (del sub files)
+    nav_.push<ModalMessageView>(
+        "Clean", " ALL FILES in this folder\n (excluding sub-folders)\n will be DELETED!\n\n Delete all files?", YESNO,
+        [this, path_name](bool choice) {
+            if (choice) {
+                std::vector<std::filesystem::path> file_list;
+                file_list = scan_root_files(path_name, u"*");
+
+                for (const auto& file_name : file_list) {
+                    std::filesystem::path current_full_path = path_name / file_name;
+                    delete_file(current_full_path);
+                }
+                reload_current(true);
            }
        });
 }
@@ -478,7 +641,7 @@ void FileManagerView::on_new_dir() {
    name_buffer = "";
    text_prompt(nav_, name_buffer, max_filename_length, [this](std::string& dir_name) {
        make_new_directory(current_path / dir_name);
-        reload_current();
+        reload_current(true);
    });
 }

@@ -488,7 +651,10 @@ void FileManagerView::on_paste() {
    fs::filesystem_error result;

    if (clipboard_mode == ClipboardMode::Cut)
-        result = rename_file(clipboard_path, current_path / new_name);
+        if ((current_path / clipboard_path.filename()) == clipboard_path)
+            result = FR_OK;  // Skip paste to avoid renaming if path is unchanged
+        else
+            result = rename_file(clipboard_path, current_path / new_name);

    else if (clipboard_mode == ClipboardMode::Copy)
        result = copy_file(clipboard_path, current_path / new_name);
@@ -499,14 +665,14 @@ void FileManagerView::on_paste() {
    clipboard_path = fs::path{};
    clipboard_mode = ClipboardMode::None;
    menu_view.focus();
-    reload_current();
+    reload_current(true);
 }

 void FileManagerView::on_new_file() {
    name_buffer = "";
    text_prompt(nav_, name_buffer, max_filename_length, [this](std::string& file_name) {
        make_new_file(current_path / file_name);
-        reload_current();
+        reload_current(true);
    });
 }

@@ -529,7 +695,7 @@ bool FileManagerView::handle_file_open() {
        return true;
    } else if (path_iequal(bmp_ext, ext)) {
        nav_.push<SplashViewer>(path);
-        reload_current();
+        reload_current(false);
        return true;
    } else if (path_iequal(rem_ext, ext)) {
        nav_.push<RemoteView>(path);
@@ -541,7 +707,7 @@ bool FileManagerView::handle_file_open() {

 bool FileManagerView::selected_is_valid() const {
    return !entry_list.empty() &&
-           get_selected_entry().path != parent_dir_path;
+           get_selected_entry().path != parent_dir_path.string();
 }

 FileManagerView::FileManagerView(
@@ -560,6 +726,7 @@ FileManagerView::FileManagerView(
        &text_date,
        &button_rename,
        &button_delete,
+        &button_clean,
        &button_cut,
        &button_copy,
        &button_paste,
@@ -572,7 +739,7 @@ FileManagerView::FileManagerView(
    });

    menu_view.on_highlight = [this]() {
-        if (menu_view.highlighted_index() >= max_items_shown - 1) {
+        if (menu_view.highlighted_index() >= max_items_loaded - 1) {  // todo check this if correct
            text_date.set_style(&Styles::red);
            text_date.set("Too many files!");
        } else {
@@ -587,13 +754,30 @@ FileManagerView::FileManagerView(
    refresh_list();

    on_select_entry = [this](KeyEvent key) {
-        if (key == KeyEvent::Select && get_selected_entry().is_directory) {
-            push_dir(get_selected_entry().path);
-        } else if (key == KeyEvent::Select && handle_file_open()) {
-            return;
-        } else {
-            button_rename.focus();
+        if (key == KeyEvent::Select) {
+            if (get_selected_entry().is_directory) {
+                if (get_selected_entry().path == str_full) {
+                    return;
+                }
+                if (get_selected_entry().path == str_back) {
+                    pagination--;
+                    menu_view.set_highlighted(0);
+                    reload_current(false);
+                    return;
+                }
+                if (get_selected_entry().path == str_next) {
+                    pagination++;
+                    menu_view.set_highlighted(0);
+                    reload_current(false);
+                    return;
+                }
+                push_dir(get_selected_entry().path);
+                return;
+            } else if (handle_file_open()) {
+                return;
+            }
        }
+        button_rename.focus();
    };

    button_rename.on_select = [this]() {
@@ -606,8 +790,13 @@ FileManagerView::FileManagerView(
            on_delete();
    };

+    button_clean.on_select = [this]() {
+        if (selected_is_valid())
+            on_clean();
+    };
+
    button_cut.on_select = [this]() {
-        if (selected_is_valid() && !get_selected_entry().is_directory) {
+        if (selected_is_valid()) {
            clipboard_path = get_selected_full_path();
            clipboard_mode = ClipboardMode::Cut;
        } else
@@ -626,7 +815,7 @@ FileManagerView::FileManagerView(
        if (clipboard_mode != ClipboardMode::None)
            on_paste();
        else
-            nav_.display_modal("Paste", "Cut or copy a file first.");
+            nav_.display_modal("Paste", "    Cut or copy a file,\n  or cut a folder, first.");
    };

    button_new_dir.on_select = [this]() {
@@ -646,7 +835,7 @@ FileManagerView::FileManagerView(
    };

    button_rename_timestamp.on_select = [this]() {
-        if (selected_is_valid() && !get_selected_entry().is_directory) {
+        if (selected_is_valid()) {
            on_rename(::truncate(to_string_timestamp(rtc_time::now()), 8));
        } else
            nav_.display_modal("Timestamp Rename", "Can't rename that.");
@@ -31,7 +31,7 @@
 namespace ui {

 struct fileman_entry {
-    std::filesystem::path path{};
+    std::string path{};
    uint32_t size{};
    bool is_directory{};
 };
@@ -61,8 +61,12 @@ class FileManBaseView : public View {
    void push_dir(const std::filesystem::path& path);

   protected:
-    static constexpr size_t max_filename_length = 64;
-    static constexpr size_t max_items_shown = 100;
+    uint32_t prev_highlight = 0;
+    uint8_t pagination = 0;
+    uint8_t nb_pages = 1;
+    static constexpr size_t max_filename_length = 20;
+    static constexpr size_t max_items_loaded = 75;  // too memory hungry, so won't sort it
+    static constexpr size_t items_per_page = 20;

    struct file_assoc_t {
        std::filesystem::path extension;
@@ -85,10 +89,12 @@ class FileManBaseView : public View {
    std::filesystem::path get_selected_full_path() const;
    const fileman_entry& get_selected_entry() const;

+    int file_count_filtered(const std::filesystem::path& directory);
    void pop_dir();
    void refresh_list();
-    void reload_current();
+    void reload_current(bool reset_pagination = false);
    void load_directory_contents(const std::filesystem::path& dir_path);
+    void load_directory_contents_unordered(const std::filesystem::path& dir_path, size_t file_cnt);
    const file_assoc_t& get_assoc(const std::filesystem::path& ext) const;

    NavigationView& nav_;
@@ -97,11 +103,14 @@ class FileManBaseView : public View {
    std::function<void(KeyEvent)> on_select_entry{nullptr};
    std::function<void(bool)> on_refresh_widgets{nullptr};

+    const std::string str_back{"<--"};
+    const std::string str_next{"-->"};
+    const std::string str_full{"Can't load more.."};
    const std::filesystem::path parent_dir_path{u".."};
    std::filesystem::path current_path{u""};
    std::filesystem::path extension_filter{u""};

-    std::vector<fileman_entry> entry_list{};
+    std::list<fileman_entry> entry_list{};
    std::vector<uint32_t> saved_index_stack{};

    bool show_hidden_files{false};
@@ -207,6 +216,7 @@ class FileManagerView : public FileManBaseView {
    void refresh_widgets(const bool v);
    void on_rename(std::string_view hint);
    void on_delete();
+    void on_clean();
    void on_paste();
    void on_new_dir();
    void on_new_file();
@@ -227,11 +237,17 @@ class FileManagerView : public FileManBaseView {
        Color::dark_blue()};

    NewButton button_delete{
-        {4 * 8, 29 * 8, 4 * 8, 32},
+        {9 * 8, 34 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_trash,
        Color::red()};

+    NewButton button_clean{
+        {13 * 8, 34 * 8, 4 * 8, 32},
+        {},
+        &bitmap_icon_clean,
+        Color::red()};
+
    NewButton button_cut{
        {9 * 8, 29 * 8, 4 * 8, 32},
        {},
@@ -269,20 +285,22 @@ class FileManagerView : public FileManBaseView {
        Color::orange()};

    NewButton button_rename_timestamp{
-        {4 * 8, 34 * 8, 4 * 8, 32},
+
+        {4 * 8, 29 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_options_datetime,
-        Color::orange(),
+        Color::dark_blue(),
        /*vcenter*/ true};

    NewButton button_open_iq_trim{
-        {9 * 8, 34 * 8, 4 * 8, 32},
+
+        {4 * 8, 34 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_trim,
        Color::orange()};

    NewButton button_show_hidden_files{
-        {13 * 8, 34 * 8, 4 * 8, 32},
+        {17 * 8, 34 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_hide,
        Color::dark_grey()};
@@ -23,32 +23,53 @@
 #include "ui_flash_utility.hpp"
 #include "ui_styles.hpp"
 #include "portapack_shared_memory.hpp"
+#include "file_path.hpp"

 namespace ui {

-static const char16_t* firmware_folder = u"/FIRMWARE";
+// Firmware image validation
+static const char* hackrf_magic = "HACKRFFW";
+#define FIRMWARE_INFO_AREA_OFFSET 0x400
+#define FIRST_CHECKSUM_NIGHTLY 240125

 Thread* FlashUtilityView::thread{nullptr};
 static constexpr size_t max_filename_length = 26;

 bool valid_firmware_file(std::filesystem::path::string_type path) {
    File firmware_file;
+    bool require_checksum{false};
    uint32_t read_buffer[128];
-    uint32_t checksum{(uint32_t)~FLASH_EXPECTED_CHECKSUM};  // initializing to invalid checksum in case file can't be read
+    uint32_t checksum{FLASH_CHECKSUM_ERROR};  // initializing to invalid checksum in case file can't be read
+
+    static_assert((FIRMWARE_INFO_AREA_OFFSET % sizeof(read_buffer)) == 0, "Read buffer size must divide evenly into FIRMWARE_INFO_AREA_OFFSET");

    // test read of the whole file just to validate checksum (baseband flash code will re-read when flashing)
    auto result = firmware_file.open(path.c_str());
    if (!result.is_valid()) {
        checksum = 0;
-        for (uint32_t i = 0; i < FLASH_ROM_SIZE / sizeof(read_buffer); i++) {
+        for (uint32_t offset = 0; offset < FLASH_ROM_SIZE; offset += sizeof(read_buffer)) {
            auto readResult = firmware_file.read(&read_buffer, sizeof(read_buffer));

-            // if file is smaller than 1MB, assume it's a downgrade to an old FW version and ignore the checksum
            if ((!readResult) || (readResult.value() != sizeof(read_buffer))) {
-                checksum = FLASH_EXPECTED_CHECKSUM;
+                // File was smaller than 1MB:
+                // If version is such that the file SHOULD have been 1MB, call it a checksum error (otherwise say it's OK).
+                checksum = (require_checksum) ? FLASH_CHECKSUM_ERROR : FLASH_EXPECTED_CHECKSUM;
                break;
            }

+            // Did we just read the firmware info area?
+            if (offset == FIRMWARE_INFO_AREA_OFFSET) {
+                // If there's no info area (missing HACKRFFW signature), it could be an ancient FW version (so skipping check)
+                if (memcmp(read_buffer, hackrf_magic, 8) == 0) {
+                    char* version_string = (char*)&read_buffer[4];
+
+                    // Require a 1MB firmware image with a valid checksum if release version >=v2.x or nightly >n_240125
+                    if (((version_string[0] == 'v') && (std::atoi(&version_string[1]) >= 2)) ||
+                        ((version_string[0] == 'n') && (version_string[1] == '_') && (std::atoi(&version_string[2]) >= FIRST_CHECKSUM_NIGHTLY)))
+                        require_checksum = true;
+                }
+            }
+
            checksum += simple_checksum((uint32_t)read_buffer, sizeof(read_buffer));
        }
    }
@@ -62,30 +83,29 @@ FlashUtilityView::FlashUtilityView(NavigationView& nav)

    menu_view.set_parent_rect({0, 3 * 8, 240, 33 * 8});

-    ensure_directory(firmware_folder);
+    ensure_directory(firmware_dir);

-    for (const auto& entry : std::filesystem::directory_iterator(firmware_folder, u"*.bin")) {
-        auto filename = entry.path().filename();
-        auto path = entry.path().native();
+    auto add_firmware_items = [&](
+                                  const std::filesystem::path& folder_path,
+                                  const std::filesystem::path& wild,
+                                  ui::Color color) {
+        for (const auto& entry : std::filesystem::directory_iterator(folder_path, wild)) {
+            auto filename = entry.path().filename();
+            auto path = entry.path().native();

-        menu_view.add_item({filename.string().substr(0, max_filename_length),
-                            ui::Color::red(),
-                            &bitmap_icon_temperature,
-                            [this, path](KeyEvent) {
-                                this->firmware_selected(path);
-                            }});
-    }
-    for (const auto& entry : std::filesystem::directory_iterator(firmware_folder, u"*.tar")) {
-        auto filename = entry.path().filename();
-        auto path = entry.path().native();
+            menu_view.add_item({filename.string().substr(0, max_filename_length),
+                                color,
+                                &bitmap_icon_temperature,
+                                [this, path](KeyEvent) {
+                                    this->firmware_selected(path);
+                                }});
+        }
+    };

-        menu_view.add_item({filename.string().substr(0, max_filename_length),
-                            ui::Color::purple(),
-                            &bitmap_icon_temperature,
-                            [this, path](KeyEvent) {
-                                this->firmware_selected(path);
-                            }});
-    }
+    add_firmware_items(firmware_dir, u"*.bin", ui::Color::red());
+    add_firmware_items(firmware_dir, u"*.tar", ui::Color::purple());
+
+    // add_firmware_items(user_firmware_folder,u"*.bin", ui::Color::purple());
 }

 void FlashUtilityView::firmware_selected(std::filesystem::path::string_type path) {
@@ -95,7 +115,7 @@ void FlashUtilityView::firmware_selected(std::filesystem::path::string_type path
        YESNO,
        [this, path](bool choice) {
            if (choice) {
-                std::u16string full_path = std::u16string(u"FIRMWARE/") + path;
+                std::filesystem::path::string_type full_path = firmware_dir.native() + u"/" + path;
                this->flash_firmware(full_path);
            }
        });
@@ -157,4 +177,4 @@ void FlashUtilityView::focus() {
    menu_view.focus();
 }

-} /* namespace ui */
+} /* namespace ui */
@@ -35,6 +35,7 @@
 #define FLASH_ROM_SIZE 1048576
 #define FLASH_STARTING_ADDRESS 0x00000000
 #define FLASH_EXPECTED_CHECKSUM 0x00000000
+#define FLASH_CHECKSUM_ERROR 0xFFFFFFFF

 namespace ui {

@@ -31,6 +31,7 @@
 #include "ui_receiver.hpp"
 #include "ui_styles.hpp"
 #include "utility.hpp"
+#include "file_path.hpp"

 #include <memory>

@@ -228,7 +229,7 @@ void FrequencyManagerView::on_edit_freq() {

 void FrequencyManagerView::on_edit_desc() {
    temp_buffer_ = current_entry().description;
-    text_prompt(nav_, temp_buffer_, desc_edit_max, [this](std::string& new_desc) {
+    text_prompt(nav_, temp_buffer_, freqman_max_desc_size, [this](std::string& new_desc) {
        auto entry = current_entry();
        entry.description = std::move(new_desc);
        db_.replace_entry(current_index(), entry);
@@ -40,8 +40,6 @@ class FreqManBaseView : public View {

    void focus() override;

-    static constexpr size_t desc_edit_max = 0x80;
-
   protected:
    using options_t = OptionsField::options_t;

@@ -63,11 +61,11 @@ class FreqManBaseView : public View {

    /* The top section (category) is 20px tall. */
    Labels label_category{
-        {{0, 2}, "Category:", Color::light_grey()}};
+        {{0, 2}, "F:", Color::light_grey()}};

    OptionsField options_category{
-        {9 * 8, 2},
-        14 /* length */,
+        {3 * 8, 2},
+        20 /* length */,
        {}};

    FreqManUIList freqlist_view{
@@ -27,6 +27,7 @@
 #include "portapack_persistent_memory.hpp"
 #include "string_format.hpp"
 #include "utility.hpp"
+#include "file_path.hpp"

 #include "ui_freqman.hpp"

@@ -134,7 +135,7 @@ FskxRxMainView::FskxRxMainView(NavigationView& nav)
    field_frequency.set_value(initial_target_frequency);
    deviation_frequency.set_value(initial_deviation);

-    logger.append(LOG_ROOT_DIR "/FSKRX.TXT");
+    logger.append(logs_dir / u"FSKRX.TXT");

    baseband::set_fsk(initial_deviation);

@@ -42,7 +42,7 @@

 class FskRxLogger {
   public:
-    Optional<File::Error> append(const std::string& filename) {
+    Optional<File::Error> append(const std::filesystem::path& filename) {
        return log_file.append(filename);
    }

@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2023 Kyle Reed
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -24,6 +25,7 @@
 #include "complex.hpp"
 #include "portapack.hpp"
 #include "ui_fileman.hpp"
+#include "file_path.hpp"

 using namespace portapack;
 namespace fs = std::filesystem;
@@ -46,7 +48,7 @@ IQTrimView::IQTrimView(NavigationView& nav)

    field_path.on_select = [this](TextField&) {
        auto open_view = nav_.push<FileLoadView>(".C*");
-        open_view->push_dir(u"CAPTURES");
+        open_view->push_dir(captures_dir);
        open_view->on_changed = [this](fs::path path) {
            open_file(path);
        };
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2023 Kyle Reed
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -27,6 +27,7 @@
 #include "baseband_api.hpp"
 #include "file.hpp"
 #include "oversample.hpp"
+#include "ui_font_fixed_8x16.hpp"

 using namespace portapack;
 using namespace tonekey;
@@ -34,11 +35,37 @@ using portapack::memory::map::backup_ram;

 namespace ui {

+// Function to map the value from one range to another
+int32_t LevelView::map(int32_t value, int32_t fromLow, int32_t fromHigh, int32_t toLow, int32_t toHigh) {
+    return toLow + (value - fromLow) * (toHigh - toLow) / (fromHigh - fromLow);
+}
+
+void LevelView::m4_manage_stat_update() {
+    if (audio_mode) {
+        if (radio_mode == WFM_MODULATION || radio_mode == SPEC_MODULATION) {
+            shared_memory.request_m4_performance_counter = 1;
+        } else {
+            shared_memory.request_m4_performance_counter = 2;
+        }
+        if (radio_mode == SPEC_MODULATION) {
+            beep = true;
+        }
+    } else {
+        shared_memory.request_m4_performance_counter = 2;
+        if (radio_mode == SPEC_MODULATION) {
+            beep = false;
+            baseband::request_beep_stop();
+        }
+    }
+}
+
 void LevelView::focus() {
    button_frequency.focus();
 }

 LevelView::~LevelView() {
+    // reset performance counters request to default
+    shared_memory.request_m4_performance_counter = 0;
    receiver_model.disable();
    baseband::shutdown();
 }
@@ -58,16 +85,17 @@ LevelView::LevelView(NavigationView& nav)
                  &text_ctcss,
                  &freq_stats_rssi,
                  &freq_stats_db,
-                  &audio_mode,
+                  &freq_stats_rx,
+                  &text_beep_squelch,
+                  &field_beep_squelch,
+                  &field_audio_mode,
                  &peak_mode,
                  &rssi,
                  &rssi_graph});

+    // activate vertical bar mode
    rssi.set_vertical_rssi(true);

-    change_mode(NFM_MODULATION);              // Start on AM
-    field_mode.set_by_value(NFM_MODULATION);  // Reflect the mode into the manual selector
-
    freq_ = receiver_model.target_frequency();
    button_frequency.set_text("<" + to_string_short_freq(freq_) + " MHz>");

@@ -80,6 +108,11 @@ LevelView::LevelView(NavigationView& nav)
        };
    };

+    field_beep_squelch.set_value(beep_squelch);
+    field_beep_squelch.on_change = [this](int32_t v) {
+        beep_squelch = v;
+    };
+
    button_frequency.on_change = [this]() {
        int64_t def_step = freqman_entry_get_step_value(step_mode.selected_index());
        freq_ = freq_ + (button_frequency.get_encoder_delta() * def_step);
@@ -95,17 +128,14 @@ LevelView::LevelView(NavigationView& nav)
        button_frequency.set_text("<" + to_string_short_freq(freq_) + " MHz>");
    };

+    freqman_set_modulation_option(field_mode);
    field_mode.on_change = [this](size_t, OptionsField::value_t v) {
        if (v != -1) {
-            receiver_model.disable();
-            baseband::shutdown();
            change_mode(v);
-            if (audio_mode.selected_index() != 0) {
-                audio::output::start();
-            }
-            receiver_model.enable();
        }
    };
+    field_mode.set_by_value(radio_mode);  // Reflect the mode into the manual selector
+    field_bw.set_selected_index(radio_bw);

    rssi_resolution.on_change = [this](size_t, OptionsField::value_t v) {
        if (v != -1) {
@@ -113,15 +143,18 @@ LevelView::LevelView(NavigationView& nav)
        }
    };

-    audio_mode.on_change = [this](size_t, OptionsField::value_t v) {
+    field_audio_mode.on_change = [this](size_t, OptionsField::value_t v) {
+        audio_mode = v;
        if (v == 0) {
            audio::output::stop();
        } else if (v == 1) {
+            audio::set_rate(audio_sampling_rate);
            audio::output::start();
            receiver_model.set_headphone_volume(receiver_model.headphone_volume());  // WM8731 hack.
-        } else {
        }
+        m4_manage_stat_update();  // rx_sat hack
    };
+    field_audio_mode.set_selected_index(audio_mode);

    peak_mode.on_change = [this](size_t, OptionsField::value_t v) {
        if (v == 0) {
@@ -135,17 +168,18 @@ LevelView::LevelView(NavigationView& nav)
    peak_mode.set_selected_index(2);
    rssi_resolution.set_selected_index(1);
    // FILL STEP OPTIONS
-    freqman_set_modulation_option(field_mode);
    freqman_set_step_option_short(step_mode);
    freq_stats_rssi.set_style(&Styles::white);
    freq_stats_db.set_style(&Styles::white);
+    freq_stats_rx.set_style(&Styles::white);
 }

 void LevelView::on_statistics_update(const ChannelStatistics& statistics) {
-    static int16_t last_max_db = -1000;
-    static int16_t last_min_rssi = -1000;
-    static int16_t last_avg_rssi = -1000;
-    static int16_t last_max_rssi = -1000;
+    static int16_t last_max_db = 0;
+    static uint8_t last_min_rssi = 0;
+    static uint8_t last_avg_rssi = 0;
+    static uint8_t last_max_rssi = 0;
+    static uint8_t last_rx_sat = 0;

    rssi_graph.add_values(rssi.get_min(), rssi.get_avg(), rssi.get_max(), statistics.max_db);

@@ -159,51 +193,99 @@ void LevelView::on_statistics_update(const ChannelStatistics& statistics) {
        last_min_rssi = rssi_graph.get_graph_min();
        last_avg_rssi = rssi_graph.get_graph_avg();
        last_max_rssi = rssi_graph.get_graph_max();
-        freq_stats_rssi.set("RSSI: " + to_string_dec_int(last_min_rssi) + "/" + to_string_dec_int(last_avg_rssi) + "/" + to_string_dec_int(last_max_rssi) + ",dt: " + to_string_dec_int(rssi_graph.get_graph_delta()));
+        freq_stats_rssi.set("RSSI: " + to_string_dec_uint(last_min_rssi) + "/" + to_string_dec_uint(last_avg_rssi) + "/" + to_string_dec_uint(last_max_rssi));
    }
+
+    if (beep && statistics.max_db > beep_squelch) {
+        baseband::request_audio_beep(map(statistics.max_db, -100, 20, 400, 2600), 24000, 150);
+    }
+
+    // refresh sat
+    if (radio_mode == SPEC_MODULATION || (radio_mode == WFM_MODULATION && audio_mode == 1)) {
+        Style style_freq_stats_rx{
+            .font = font::fixed_8x16,
+            .background = {55, 55, 55},
+            .foreground = {155, 155, 155},
+        };
+        freq_stats_rx.set_style(&style_freq_stats_rx);
+        freq_stats_rx.set("RxSat off");
+        return;
+    }
+    uint8_t rx_sat = ((uint32_t)shared_memory.m4_performance_counter) * 100 / 127;
+    if (last_rx_sat != rx_sat) {
+        last_rx_sat = rx_sat;
+
+        uint8_t br = 0;
+        uint8_t bg = 0;
+        uint8_t bb = 0;
+        if (rx_sat <= 80) {
+            bg = (255 * rx_sat) / 80;
+            bb = 255 - bg;
+        } else if (rx_sat > 80) {
+            br = (255 * (rx_sat - 80)) / 20;
+            bg = 255 - br;
+        }
+        Style style_freq_stats_rx{
+            .font = font::fixed_8x16,
+            .background = {br, bg, bb},
+            .foreground = {255, 255, 255},
+        };
+        freq_stats_rx.set_style(&style_freq_stats_rx);
+        freq_stats_rx.set("RxSat: " + to_string_dec_uint(rx_sat) + "%");
+    }
+
 } /* on_statistic_updates */

 size_t LevelView::change_mode(freqman_index_t new_mod) {
    field_bw.on_change = [this](size_t n, OptionsField::value_t) { (void)n; };

+    radio_mode = new_mod;
+
+    audio::output::stop();
+    receiver_model.disable();
+    baseband::shutdown();
+
    switch (new_mod) {
        case AM_MODULATION:
+            audio_sampling_rate = audio::Rate::Hz_12000;
            freqman_set_bandwidth_option(new_mod, field_bw);
            baseband::run_image(portapack::spi_flash::image_tag_am_audio);
            receiver_model.set_modulation(ReceiverModel::Mode::AMAudio);
-            receiver_model.set_am_configuration(field_bw.selected_index_value());
-            field_bw.on_change = [this](size_t, OptionsField::value_t n) { receiver_model.set_am_configuration(n); };
            // bw DSB (0) default
            field_bw.set_by_value(0);
-            text_ctcss.set("             ");
+            receiver_model.set_am_configuration(0);
+            field_bw.on_change = [this](size_t index, OptionsField::value_t n) { radio_bw = index ; receiver_model.set_am_configuration(n); };
            break;
        case NFM_MODULATION:
+            audio_sampling_rate = audio::Rate::Hz_24000;
            freqman_set_bandwidth_option(new_mod, field_bw);
            baseband::run_image(portapack::spi_flash::image_tag_nfm_audio);
            receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio);
            receiver_model.set_nbfm_configuration(field_bw.selected_index_value());
-            field_bw.on_change = [this](size_t, OptionsField::value_t n) { receiver_model.set_nbfm_configuration(n); };
            // bw 16k (2) default
            field_bw.set_by_value(2);
+            field_bw.on_change = [this](size_t index, OptionsField::value_t n) { radio_bw = index ; receiver_model.set_nbfm_configuration(n); };
            break;
        case WFM_MODULATION:
+            audio_sampling_rate = audio::Rate::Hz_48000;
            freqman_set_bandwidth_option(new_mod, field_bw);
            baseband::run_image(portapack::spi_flash::image_tag_wfm_audio);
            receiver_model.set_modulation(ReceiverModel::Mode::WidebandFMAudio);
            receiver_model.set_wfm_configuration(field_bw.selected_index_value());
-            field_bw.on_change = [this](size_t, OptionsField::value_t n) { receiver_model.set_wfm_configuration(n); };
-            // bw 200k (0) only/default
+            // bw 200k (0) default
            field_bw.set_by_value(0);
-            text_ctcss.set("             ");
+            field_bw.on_change = [this](size_t index, OptionsField::value_t n) { radio_bw = index ; receiver_model.set_wfm_configuration(n); };
            break;
        case SPEC_MODULATION:
+            audio_sampling_rate = audio::Rate::Hz_24000;
            freqman_set_bandwidth_option(new_mod, field_bw);
            baseband::run_image(portapack::spi_flash::image_tag_capture);
            receiver_model.set_modulation(ReceiverModel::Mode::Capture);
-            field_bw.on_change = [this](size_t, OptionsField::value_t sampling_rate) {
+            // 12k5 (0) default
+            field_bw.on_change = [this](size_t index, OptionsField::value_t sampling_rate) {
+                radio_bw = index;
                // Baseband needs to know the desired sampling and oversampling rates.
                baseband::set_sample_rate(sampling_rate, get_oversample_rate(sampling_rate));
-
                // The radio needs to know the effective sampling rate.
                auto actual_sampling_rate = get_actual_sample_rate(sampling_rate);
                receiver_model.set_sampling_rate(actual_sampling_rate);
@@ -218,6 +300,18 @@ size_t LevelView::change_mode(freqman_index_t new_mod) {
        receiver_model.set_sampling_rate(3072000);
        receiver_model.set_baseband_bandwidth(1750000);
    }
+    if (new_mod != NFM_MODULATION) {
+        text_ctcss.set("             ");
+    }
+
+    m4_manage_stat_update();  // rx_sat hack
+
+    if (audio_mode) {
+        audio::set_rate(audio_sampling_rate);
+        audio::output::start();
+        receiver_model.set_headphone_volume(receiver_model.headphone_volume());  // WM8731 hack.
+    }
+    receiver_model.enable();

    return step_mode.selected_index();
 }
@@ -55,16 +55,30 @@ class LevelView : public View {
    NavigationView& nav_;

    RxRadioState radio_state_{};
-    app_settings::SettingsManager settings_{
-        "rx_level", app_settings::Mode::RX};

+    int32_t map(int32_t value, int32_t fromLow, int32_t fromHigh, int32_t toLow, int32_t toHigh);
    size_t change_mode(freqman_index_t mod_type);
    void on_statistics_update(const ChannelStatistics& statistics);
    void set_display_freq(int64_t freq);
+    void m4_manage_stat_update();  // to finely adjust the RxSaturation usage

-    // TODO: needed?
-    int32_t db{0};
    rf::Frequency freq_ = {0};
+    bool beep = false;
+    uint8_t radio_mode = 0;
+    uint8_t radio_bw = 0;
+    uint8_t audio_mode = 0;
+    int32_t beep_squelch = 0;
+    audio::Rate audio_sampling_rate = audio::Rate::Hz_48000;
+
+    app_settings::SettingsManager settings_{
+        "rx_level",
+        app_settings::Mode::RX,
+        {
+            {"beep_squelch"sv, &beep_squelch},
+            {"audio_mode"sv, &audio_mode},
+            {"radio_mode"sv, &radio_mode},
+            {"radio_bw"sv, &radio_bw},
+        }};

    Labels labels{
        {{0 * 8, 0 * 16}, "LNA:   VGA:   AMP:  VOL:     ", Color::light_grey()},
@@ -102,28 +116,32 @@ class LevelView : public View {
        {0 * 8, 2 * 16 + 8, 15 * 8, 1 * 8},
        ""};

-    OptionsField audio_mode{
+    OptionsField field_audio_mode{
        {21 * 8, 1 * 16},
        9,
-        {
-            {"audio off", 0},
-            {"audio on", 1}
-            //{"tone on", 2},
-            //{"tone off", 3},
-        }};
+        {{"audio off", 0},
+         {"audio on", 1}}};

-    Text text_ctcss{
-        {22 * 8, 3 * 16 + 4, 8 * 8, 1 * 8},
-        ""};
+    Text text_beep_squelch{
+        {21 * 8, 3 * 16 + 4, 4 * 8, 1 * 8},
+        "Bip>"};

-    // RSSI: XX/XX/XXX,dt: XX
+    NumberField field_beep_squelch{
+        {25 * 8, 3 * 16 + 4},
+        4,
+        {-100, 20},
+        1,
+        ' ',
+    };
+
+    // RSSI: XX/XX/XXX
    Text freq_stats_rssi{
-        {0 * 8, 3 * 16 + 4, 22 * 8, 14},
+        {0 * 8, 3 * 16 + 4, 15 * 8, 1 * 16},
    };

    // Power: -XXX db
    Text freq_stats_db{
-        {0 * 8, 4 * 16 + 4, 14 * 8, 14},
+        {0 * 8, 4 * 16 + 4, 15 * 8, 1 * 16},
    };

    OptionsField peak_mode{
@@ -138,6 +156,7 @@ class LevelView : public View {
            {"peak:5s", 5000},
            {"peak:10s", 10000},
        }};
+
    OptionsField rssi_resolution{
        {44 + 20 * 8, 4 * 16 + 4},
        4,
@@ -149,14 +168,23 @@ class LevelView : public View {
            {"240x", 240},
        }};

+    // RxSat: XX%
+    Text freq_stats_rx{
+        {0 * 8, 5 * 16 + 4, 10 * 8, 1 * 16},
+    };
+
+    Text text_ctcss{
+        {12 * 8, 5 * 16 + 4, 8 * 8, 1 * 8},
+        ""};
+
    RSSIGraph rssi_graph{
        // 240x320  =>
-        {0, 5 * 16 + 4, 240 - 5 * 8, 320 - (5 * 16 + 4)},
+        {0, 6 * 16 + 8, 240 - 5 * 8, 320 - (6 * 16)},
    };

    RSSI rssi{
        // 240x320  =>
-        {240 - 5 * 8, 5 * 16 + 4, 5 * 8, 320 - (5 * 16 + 4)},
+        {240 - 5 * 8, 6 * 16 + 8, 5 * 8, 320 - (6 * 16)},
    };

    void handle_coded_squelch(const uint32_t value);
@@ -25,6 +25,8 @@
 #include "convert.hpp"
 #include "file_reader.hpp"
 #include "string_format.hpp"
+#include "audio.hpp"
+#include "file_path.hpp"

 using namespace portapack;

@@ -34,11 +36,39 @@ void GlassView::focus() {
 }

 GlassView::~GlassView() {
+    audio::output::stop();
    receiver_model.set_sampling_rate(3072000);  // Just a hack to avoid hanging other apps
    receiver_model.disable();
    baseband::shutdown();
 }

+// Function to map the value from one range to another
+int32_t GlassView::map(int32_t value, int32_t fromLow, int32_t fromHigh, int32_t toLow, int32_t toHigh) {
+    return toLow + (value - fromLow) * (toHigh - toLow) / (fromHigh - fromLow);
+}
+
+void GlassView::update_display_beep() {
+    if (beep_enabled) {
+        button_beep_squelch.set_style(&Styles::green);
+        // bip-XXdb
+        button_beep_squelch.set_text("bip" + to_string_dec_int(beep_squelch, 3) + "db");
+        receiver_model.set_headphone_volume(receiver_model.headphone_volume());  // WM8731 hack.
+    } else {
+        button_beep_squelch.set_style(&Styles::white);
+        button_beep_squelch.set_text("bip OFF ");
+    }
+}
+
+void GlassView::manage_beep_audio() {
+    if (beep_enabled) {
+        audio::set_rate(audio::Rate::Hz_24000);
+        audio::output::start();
+    } else {
+        baseband::request_beep_stop();
+        audio::output::stop();
+    }
+}
+
 void GlassView::get_max_power(const ChannelSpectrum& spectrum, uint8_t bin, uint8_t& max_power) {
    if (mode == LOOKING_GLASS_SINGLEPASS) {
        // <20MHz spectrum mode
@@ -173,6 +203,8 @@ void GlassView::on_channel_spectrum(const ChannelSpectrum& spectrum) {
    // we actually need SCREEN_W (240) of those bins
    for (uint8_t bin = 0; bin < bin_length; bin++) {
        get_max_power(spectrum, bin, max_power);
+        if (max_power > range_max_power)
+            range_max_power = max_power;
        // process dc spike if enable
        if (bin == 119) {
            uint8_t next_max_power = 0;
@@ -184,14 +216,21 @@ void GlassView::on_channel_spectrum(const ChannelSpectrum& spectrum) {
            }
        }
        // process actual bin
-        if (process_bins(&max_power) == true)
+        if (process_bins(&max_power)) {
+            int8_t power = map(range_max_power, 0, 255, -100, 20);
+            if (power >= beep_squelch) {
+                baseband::request_audio_beep(map(range_max_power, 0, 256, 400, 2600), 24000, 250);
+            }
+            range_max_power = 0;
            return;  // new line signaled, return
+        }
    }
    if (mode != LOOKING_GLASS_SINGLEPASS) {
        f_center += looking_glass_step;
        retune();
-    } else
+    } else {
        baseband::spectrum_streaming_start();
+    }
 }

 void GlassView::on_hide() {
@@ -327,17 +366,20 @@ GlassView::GlassView(
                  &field_lna,
                  &field_vga,
                  &field_range,
-                  &steps_config,
+                  //&steps_config,
                  &scan_type,
                  &view_config,
                  &level_integration,
+                  &field_volume,
                  &filter_config,
                  &field_rf_amp,
                  &range_presets,
+                  &button_beep_squelch,
                  &field_marker,
                  &field_trigger,
                  &button_jump,
                  &button_rst,
+                  &field_rx_iq_phase_cal,
                  &freq_stats});

    load_presets();  // Load available presets from TXT files (or default).
@@ -369,12 +411,12 @@ GlassView::GlassView(
        };
    };

-    steps_config.on_change = [this](size_t, OptionsField::value_t v) {
+    /*steps_config.on_change = [this](size_t, OptionsField::value_t v) {
        field_frequency_min.set_step(v);
        field_frequency_max.set_step(v);
        steps = v;
    };
-    steps_config.set_selected_index(0);  // 1 Mhz step.
+    steps_config.set_selected_index(0);  // 1 Mhz step.*/

    scan_type.on_change = [this](size_t, OptionsField::value_t v) {
        mode = v;
@@ -474,6 +516,13 @@ GlassView::GlassView(
        reset_live_view();
    };

+    field_rx_iq_phase_cal.set_range(0, hackrf_r9 ? 63 : 31);                 // max2839 has 6 bits [0..63],  max2837 has 5 bits [0..31]
+    field_rx_iq_phase_cal.set_value(get_spec_iq_phase_calibration_value());  // using  accessor function of AnalogAudioView to read iq_phase_calibration_value from rx_audio.ini
+    field_rx_iq_phase_cal.on_change = [this](int32_t v) {
+        set_spec_iq_phase_calibration_value(v);  // using  accessor function of AnalogAudioView to write inside SPEC submenu, register value to max283x and save it to rx_audio.ini
+    };
+    set_spec_iq_phase_calibration_value(get_spec_iq_phase_calibration_value());  // initialize iq_phase_calibration in radio
+
    display.scroll_set_area(109, 319);

    // trigger:
@@ -489,11 +538,41 @@ GlassView::GlassView(
    receiver_model.set_baseband_bandwidth(looking_glass_bandwidth);  // possible values: 1.75/2.5/3.5/5/5.5/6/7/8/9/10/12/14/15/20/24/28MHz
    receiver_model.set_squelch_level(0);
    receiver_model.enable();
+
+    button_beep_squelch.on_select = [this](ButtonWithEncoder& button) {
+        (void)button;
+        beep_enabled = 1 - beep_enabled;
+        manage_beep_audio();
+        update_display_beep();
+    };
+
+    button_beep_squelch.on_change = [this]() {
+        int new_beep_squelch = beep_squelch + button_beep_squelch.get_encoder_delta();
+        if (new_beep_squelch < -99)
+            new_beep_squelch = -99;
+        if (new_beep_squelch > 20)
+            new_beep_squelch = 20;
+        beep_squelch = new_beep_squelch;
+        button_beep_squelch.set_encoder_delta(0);
+        update_display_beep();
+    };
+
+    manage_beep_audio();
+    update_display_beep();
+}
+
+uint8_t GlassView::get_spec_iq_phase_calibration_value() {  // define accessor functions inside AnalogAudioView to read & write real iq_phase_calibration_value
+    return iq_phase_calibration_value;
+}
+
+void GlassView::set_spec_iq_phase_calibration_value(uint8_t cal_value) {  // define accessor functions
+    iq_phase_calibration_value = cal_value;
+    radio::set_rx_max283x_iq_phase_calibration(iq_phase_calibration_value);
 }

 void GlassView::load_presets() {
    File presets_file;
-    auto error = presets_file.open("LOOKINGGLASS/PRESETS.TXT");
+    auto error = presets_file.open(looking_glass_dir / u"PRESETS.TXT");
    presets_db.clear();

    // Add the "Manual" entry.
@@ -69,6 +69,9 @@ class GlassView : public View {
    void on_hide() override;
    void focus() override;

+    uint8_t get_spec_iq_phase_calibration_value();
+    void set_spec_iq_phase_calibration_value(uint8_t cal_value);
+
   private:
    NavigationView& nav_;
    RxRadioState radio_state_{ReceiverModel::Mode::SpectrumAnalysis};
@@ -79,8 +82,11 @@ class GlassView : public View {
    uint8_t filter_index = 0;  // OFF
    uint8_t trigger = 32;
    uint8_t mode = LOOKING_GLASS_FASTSCAN;
-    uint8_t live_frequency_view = 0;       // Spectrum
-    uint8_t live_frequency_integrate = 3;  // Default (3 * old value + new_value) / 4
+    uint8_t live_frequency_view = 0;         // Spectrum
+    uint8_t live_frequency_integrate = 3;    // Default (3 * old value + new_value) / 4
+    uint8_t iq_phase_calibration_value{15};  // initial default RX IQ phase calibration value , used for both max2837 & max2839
+    int32_t beep_squelch = 20;               // range from -100 to +20, >=20 disabled
+    bool beep_enabled = false;               // activate on bip button click
    app_settings::SettingsManager settings_{
        "rx_glass"sv,
        app_settings::Mode::RX,
@@ -93,6 +99,9 @@ class GlassView : public View {
            {"scan_mode"sv, &mode},
            {"freq_view"sv, &live_frequency_view},
            {"freq_integrate"sv, &live_frequency_integrate},
+            {"iq_phase_calibration"sv, &iq_phase_calibration_value},  // we are saving and restoring that CAL from Settings.
+            {"beep_squelch"sv, &beep_squelch},
+            {"beep_enabled"sv, &beep_enabled},
        }};

    struct preset_entry {
@@ -101,7 +110,10 @@ class GlassView : public View {
        std::string label{};
    };

+    int32_t map(int32_t value, int32_t fromLow, int32_t fromHigh, int32_t toLow, int32_t toHigh);
    std::vector<preset_entry> presets_db{};
+    void manage_beep_audio();
+    void update_display_beep();
    void update_min(int32_t v);
    void update_max(int32_t v);
    void update_range_field();
@@ -148,6 +160,8 @@ class GlassView : public View {
    int32_t steps = 1;
    bool locked_range = false;

+    uint8_t range_max_power = 0;
+    uint8_t range_max_power_counter = 0;
    uint8_t max_power = 0;
    rf::Frequency max_freq_hold = 0;
    rf::Frequency last_max_freq = 0;
@@ -159,9 +173,10 @@ class GlassView : public View {
    Labels labels{
        {{0, 0 * 16}, "MIN:     MAX:     LNA   VGA  ", Color::light_grey()},
        {{0, 1 * 16}, "RANGE:       FILTER:     AMP:", Color::light_grey()},
-        {{0, 2 * 16}, "PRESET:", Color::light_grey()},
-        {{0, 3 * 16}, "MARKER:          MHz", Color::light_grey()},
-        {{0, 4 * 16}, "RES:    STEP:", Color::light_grey()}};
+        {{0, 2 * 16}, "P:", Color::light_grey()},
+        {{0, 3 * 16}, "MARKER:          MHz RXIQCAL", Color::light_grey()},
+        //{{0, 4 * 16}, "RES:    STEPS:", Color::light_grey()}};
+        {{0, 4 * 16}, "RES:     VOL:", Color::light_grey()}};

    NumberField field_frequency_min{
        {4 * 8, 0 * 16},
@@ -200,14 +215,26 @@ class GlassView : public View {
        {28 * 8, 1 * 16}};

    OptionsField range_presets{
-        {7 * 8, 2 * 16},
+        {2 * 8, 2 * 16},
        20,
        {}};

+    ButtonWithEncoder button_beep_squelch{
+        {240 - 8 * 8, 2 * 16 + 4, 8 * 8, 1 * 8},
+        ""};
+
    TextField field_marker{
        {7 * 8, 3 * 16, 9 * 8, 16},
        ""};

+    NumberField field_rx_iq_phase_cal{
+        {28 * 8, 3 * 16},
+        2,
+        {0, 63},  // 5 or 6 bits IQ CAL phase adjustment (range updated later)
+        1,
+        ' ',
+    };
+
    NumberField field_trigger{
        {4 * 8, 4 * 16},
        3,
@@ -215,7 +242,10 @@ class GlassView : public View {
        2,
        ' '};

-    OptionsField steps_config{
+    AudioVolumeField field_volume{
+        {13 * 8, 4 * 16}};
+
+    /*OptionsField steps_config{
        {13 * 8, 4 * 16},
        3,
        {
@@ -225,7 +255,7 @@ class GlassView : public View {
            {"100", 100},
            {"250", 250},
            {"500", 500},
-        }};
+        }};*/

    OptionsField scan_type{
        {17 * 8, 4 * 16},
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -31,6 +32,7 @@
 #include "tonesets.hpp"
 #include "ui_tone_key.hpp"
 #include "wm8731.hpp"
+#include "radio.hpp"

 #include <cstring>

@@ -105,6 +107,7 @@ void MicTXView::configure_baseband() {
        transmitting ? transmitter_model.channel_bandwidth() : 0,
        mic_gain_x10 / 10.0,
        shift_bits(),  // to be used in dsp_modulate
+        8,             // bits per sample
        TONES_F2D(tone_key_frequency(tone_key_index), sampling_rate),
        (mic_mod_index == MIC_MOD_AM),
        (mic_mod_index == MIC_MOD_DSB),
@@ -127,9 +130,9 @@ void MicTXView::set_tx(bool enable) {
        portapack::pin_i2s0_rx_sda.mode(3);  // This is already done in audio::init but gets changed by the CPLD overlay reprogramming
    } else {
        if (transmitting && rogerbeep_enabled) {
-            baseband::request_beep();  // Transmit the roger beep
-            transmitting = false;      // And flag the end of the transmission so ...
-        } else {                       // (if roger beep was enabled, this will be executed after the beep ends transmitting.
+            baseband::request_roger_beep();  // Transmit the roger beep
+            transmitting = false;            // Flag the end of the transmission (transmitter will be disabled after the beep)
+        } else {
            transmitting = false;
            configure_baseband();
            transmitter_model.disable();
@@ -335,6 +338,7 @@ MicTXView::MicTXView(
                  &field_rxlna,
                  &field_rxvga,
                  &field_rxamp,
+                  &field_tx_iq_phase_cal,
                  &tx_button,
                  &tx_icon});

@@ -367,6 +371,14 @@ MicTXView::MicTXView(
        receiver_model.set_rf_amp(v);
    };

+    radio::set_tx_max283x_iq_phase_calibration(iq_phase_calibration_value);
+    field_tx_iq_phase_cal.set_range(0, hackrf_r9 ? 63 : 31);  // max2839 has 6 bits [0..63],  max2837 has 5 bits [0..31]
+    field_tx_iq_phase_cal.set_value(iq_phase_calibration_value);
+    field_tx_iq_phase_cal.on_change = [this](int32_t v) {
+        iq_phase_calibration_value = v;
+        radio::set_tx_max283x_iq_phase_calibration(iq_phase_calibration_value);
+    };
+
    options_gain.on_change = [this](size_t, int32_t v) {
        mic_gain_x10 = v;
        configure_baseband();
@@ -511,21 +523,6 @@ MicTXView::MicTXView(
    };
    check_mic_to_HP.set_value(mic_to_HP_enabled);

-    check_rxactive.on_select = [this](Checkbox&, bool v) {
-        //		vumeter.set_value(0);	//Start with a clean vumeter
-        rx_enabled = v;
-        check_mic_to_HP.hidden(rx_enabled);  // Toggle Hide / show "Hear Mic" checkbox depending if we activate or not the receiver. (if RX on => no visible "Mic Hear" option)
-        if ((rx_enabled) && (transmitting))
-            check_mic_to_HP.set_value(transmitting);  // Once we activate the "Rx audio" in reception time we disable "Hear Mic", but we allow it again in TX time.
-
-        if (rx_enabled)
-            check_va.set_value(false);  // Disallow voice activation during RX audio (for now) - Future TODO: Should allow VOX during RX audio
-
-        rxaudio(v);   // Activate-Deactivate audio RX (receiver) accordingly
-        set_dirty();  // Refresh interface
-    };
-    check_rxactive.set_value(rx_enabled);
-
    tx_button.on_select = [this](Button&) {
        if (!transmitting) {
            set_tx(true);
@@ -578,12 +575,28 @@ MicTXView::MicTXView(
    // Trigger receiver to update modulation.
    if (rx_enabled)
        receiver_model.set_squelch_level(receiver_model.squelch_level());
+
+    check_rxactive.on_select = [this](Checkbox&, bool v) {
+        //		vumeter.set_value(0);	//Start with a clean vumeter
+        rx_enabled = v;
+        check_mic_to_HP.hidden(rx_enabled);  // Toggle Hide / show "Hear Mic" checkbox depending if we activate or not the receiver. (if RX on => no visible "Mic Hear" option)
+        if ((rx_enabled) && (transmitting))
+            check_mic_to_HP.set_value(transmitting);  // Once we activate the "Rx audio" in reception time we disable "Hear Mic", but we allow it again in TX time.
+
+        if (rx_enabled)
+            check_va.set_value(false);  // Disallow voice activation during RX audio (for now) - Future TODO: Should allow VOX during RX audio
+
+        rxaudio(v);   // Activate-Deactivate audio RX (receiver) accordingly
+        set_dirty();  // Refresh interface
+    };
+    check_rxactive.set_value(rx_enabled);
 }

 MicTXView::MicTXView(
    NavigationView& nav,
    ReceiverModel::settings_t override)
    : MicTXView(nav) {
+    // Settings to override when launched from another app (versus from AppSettings .ini file)
    // Try to use the modulation/bandwidth from RX settings.
    // TODO: These concepts should be merged so there's only one.
    switch (override.mode) {
@@ -604,6 +617,7 @@ MicTXView::MicTXView(
            break;
    }

+    field_frequency.set_value(override.frequency_app_override);
    check_common_freq_tx_rx.set_value(true);  // freq passed from other app is in tx_frequency, so set rx_frequency=tx_frequency

    // TODO: bandwidth selection is tied too tightly to the UI
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -113,10 +114,10 @@ class MicTXView : public View {
    uint32_t va_level{40};
    uint32_t attack_ms{500};
    uint32_t decay_ms{1000};
+    uint8_t iq_phase_calibration_value{15};
    app_settings::SettingsManager settings_{
        "tx_mic",
        app_settings::Mode::RX_TX,
-        app_settings::Options::UseGlobalTargetFrequency,
        {
            {"mic_mod_index"sv, &mic_mod_index},
            {"rxbw_index"sv, &rxbw_index},
@@ -132,6 +133,7 @@ class MicTXView : public View {
            {"vox"sv, &va_enabled},
            {"rogerbeep"sv, &rogerbeep_enabled},
            {"tone_key_index"sv, &tone_key_index},
+            {"iq_phase_calibration"sv, &iq_phase_calibration_value},
        }};

    rf::Frequency tx_frequency{0};
@@ -160,7 +162,8 @@ class MicTXView : public View {
        {{5 * 8, (25 * 8) + 2}, "F_RX:", Color::light_grey()},
        {{5 * 8, (27 * 8) + 2}, "LNA:", Color::light_grey()},
        {{12 * 8, (27 * 8) + 2}, "VGA:", Color::light_grey()},
-        {{19 * 8, (27 * 8) + 2}, "AMP:", Color::light_grey()}};
+        {{19 * 8, (27 * 8) + 2}, "AMP:", Color::light_grey()},
+        {{21 * 8, (31 * 8)}, "TX-IQ-CAL:", Color::light_grey()}};
    Labels labels_WM8731{
        {{17 * 8, 1 * 8}, "Boost", Color::light_grey()}};
    Labels labels_AK4951{
@@ -338,6 +341,14 @@ class MicTXView : public View {
        ' ',
    };

+    NumberField field_tx_iq_phase_cal{
+        {24 * 8, (33 * 8)},
+        2,
+        {0, 63},  // 5 or 6 bits IQ CAL phase adjustment (range updated later)
+        1,
+        ' ',
+    };
+
    Button tx_button{
        {10 * 8, 30 * 8, 10 * 8, 5 * 8},
        "PTT TX",
@@ -3,6 +3,7 @@
 * Copyright (C) 2016 Furrtek
 * Copyleft  (ↄ) 2022 NotPike
 * Copyright (C) 2023 Kyle Reed, zxkmm
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -35,6 +36,7 @@
 #include "string_format.hpp"
 #include "ui_fileman.hpp"
 #include "utility.hpp"
+#include "file_path.hpp"

 #include <unistd.h>
 #include <fstream>
@@ -129,7 +131,7 @@ void PlaylistView::open_file(bool prompt_save) {
    }

    auto open_view = nav_.push<FileLoadView>(".PPL");
-    open_view->push_dir(u"PLAYLIST");
+    open_view->push_dir(playlist_dir);
    open_view->on_changed = [this](fs::path new_file_path) {
        on_file_changed(new_file_path);
    };
@@ -168,7 +170,7 @@ void PlaylistView::save_file(bool show_dialogs) {

 void PlaylistView::add_entry(fs::path&& path) {
    if (playlist_path_.empty()) {
-        playlist_path_ = next_filename_matching_pattern(u"/PLAYLIST/PLAY_????.PPL");
+        playlist_path_ = next_filename_matching_pattern(playlist_dir / u"PLAY_????.PPL");

        // Hack around focus getting called by ctor before parent is set.
        if (parent())
@@ -386,10 +388,10 @@ PlaylistView::PlaylistView(
        &waterfall,
    });

-    ensure_directory(u"PLAYLIST");
+    ensure_directory(playlist_dir);
    waterfall.show_audio_spectrum_view(false);

-    field_frequency.set_value(100'000'000);
+    field_frequency.set_value(transmitter_model.target_frequency());
    field_frequency.on_change = [this](rf::Frequency f) {
        if (current())
            current()->metadata.center_frequency = f;
@@ -409,7 +411,7 @@ PlaylistView::PlaylistView(
        if (is_active())
            return;
        auto open_view = nav_.push<FileLoadView>(".C*");
-        open_view->push_dir(u"CAPTURES");
+        open_view->push_dir(captures_dir);
        open_view->on_changed = [this](fs::path path) {
            add_entry(std::move(path));
        };
@@ -2,6 +2,7 @@
 * Copyright (C) 2016 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
 * Copyright (C) 2023 Kyle Reed, zxkmm
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -56,7 +57,7 @@ class PlaylistView : public View {
    NavigationView& nav_;
    TxRadioState radio_state_{};
    app_settings::SettingsManager settings_{
-        "tx_playlist", app_settings::Mode::TX};
+        "tx_replay", app_settings::Mode::TX};

    // More header == less spectrum view.
    static constexpr ui::Dim header_height = 6 * 16;
@@ -49,7 +49,13 @@ namespace fs = std::filesystem;
 namespace ui {

 void ReconView::reload_restart_recon() {
+    // force reload of current
+    change_mode(field_mode.selected_index_value());
+    uint8_t previous_index = current_index;
+    reset_indexes();
    frequency_file_load();
+    current_index = previous_index;
+    handle_retune();
    if (frequency_list.size() > 0) {
        if (fwd) {
            button_dir.set_text("FW>");
@@ -104,18 +110,19 @@ void ReconView::set_loop_config(bool v) {

 void ReconView::recon_stop_recording(bool exiting) {
    if (is_recording) {
-        if (field_mode.selected_index_value() == SPEC_MODULATION)
-            button_audio_app.set_text("RAW");
-        else
-            button_audio_app.set_text("AUDIO");
-        button_audio_app.set_style(&Styles::white);
        record_view->stop();
-        button_config.set_style(&Styles::white);
        is_recording = false;
-        // repeater mode
-        if (!exiting && persistent_memory::recon_repeat_recorded()) {
-            start_repeat();
+        if (field_mode.selected_index_value() == SPEC_MODULATION) {
+            button_audio_app.set_text("RAW");
+            // repeater mode
+            if (!exiting && persistent_memory::recon_repeat_recorded()) {
+                start_repeat();
+            }
+        } else {
+            button_audio_app.set_text("AUDIO");
        }
+        button_audio_app.set_style(&Styles::white);
+        button_config.set_style(&Styles::white);
    }
 }

@@ -330,7 +337,7 @@ ReconView::ReconView(NavigationView& nav)

    // set record View
    record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
-                                               u"AUTO_AUDIO", u"AUDIO",
+                                               u"AUTO_AUDIO", audio_dir,
                                               RecordView::FileType::WAV, 4096, 4);
    record_view->set_filename_date_frequency(true);
    record_view->set_auto_trim(false);
@@ -501,7 +508,7 @@ ReconView::ReconView(NavigationView& nav)
        auto settings = receiver_model.settings();
        settings.frequency_step = step_mode.selected_index_value();
        if (field_mode.selected_index_value() == SPEC_MODULATION)
-            nav_.replace<CaptureAppView>();
+            nav_.replace<CaptureAppView>(settings);
        else
            nav_.replace<AnalogAudioView>(settings);
    };
@@ -532,7 +539,7 @@ ReconView::ReconView(NavigationView& nav)
            }
        }

-        // MicTX wants Modulation and Bandwidth overrides, but that's only stored on the RX model.
+        // MicTX wants Frequency, Modulation and Bandwidth overrides, but that's only stored on the RX model.
        nav_.replace<MicTXView>(receiver_model.settings());
    };

@@ -1148,7 +1155,7 @@ void ReconView::on_stepper_delta(int32_t v) {
 }

 size_t ReconView::change_mode(freqman_index_t new_mod) {
-    if (recon_tx || is_repeat_active())
+    if (recon_tx || is_repeat_active() || is_recording)
        return 0;
    field_mode.on_change = [this](size_t, OptionsField::value_t) {};
    field_bw.on_change = [this](size_t, OptionsField::value_t) {};
@@ -1157,19 +1164,24 @@ size_t ReconView::change_mode(freqman_index_t new_mod) {
        remove_child(record_view.get());
        record_view.reset();
    }
-    if (persistent_memory::recon_repeat_recorded()) {
-        record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
-                                                   u"RECON_REPEAT.C16", u"CAPTURES",
-                                                   RecordView::FileType::RawS16, 16384, 3);
-        record_view->set_filename_as_is(true);
-    } else if (new_mod == SPEC_MODULATION) {
+    if (field_mode.selected_index_value() != SPEC_MODULATION) {
        audio::output::stop();
-        record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
-                                                   u"AUTO_RAW", u"CAPTURES",
-                                                   RecordView::FileType::RawS16, 16384, 3);
+    }
+    if (new_mod == SPEC_MODULATION) {
+        if (persistent_memory::recon_repeat_recorded()) {
+            record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
+                                                       u"RECON_REPEAT.C16", captures_dir,
+                                                       RecordView::FileType::RawS16, 16384, 3);
+            record_view->set_filename_as_is(true);
+        } else {
+            record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
+                                                       u"AUTO_RAW", captures_dir,
+                                                       RecordView::FileType::RawS16, 16384, 3);
+            record_view->set_filename_date_frequency(true);
+        }
    } else {
        record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
-                                                   u"AUTO_AUDIO", u"AUDIO",
+                                                   u"AUTO_AUDIO", audio_dir,
                                                   RecordView::FileType::WAV, 4096, 4);
        record_view->set_filename_date_frequency(true);
    }
@@ -1314,9 +1326,6 @@ bool ReconView::is_repeat_active() const {

 void ReconView::start_repeat() {
    // Prepare to send a file.
-    std::filesystem::path rawfile = u"/" + repeat_rec_path + u"/" + repeat_rec_file;
-    std::filesystem::path rawmeta = u"/" + repeat_rec_path + u"/" + repeat_rec_meta;
-
    if (recon_tx == false) {
        recon_tx = true;

@@ -1434,6 +1443,12 @@ void ReconView::stop_repeat(const bool do_loop) {
    } else {
        repeat_cur_rep = 0;
        recon_tx = false;
+        if (persistent_memory::recon_repeat_recorded_file_mode() == RECON_REPEAT_AND_KEEP) {
+            // rename file here to keep
+            std::filesystem::path base_path = next_filename_matching_pattern(repeat_rec_path / u"REC_????.*");
+            rename_file(rawfile, base_path.replace_extension(u".C16"));
+            rename_file(rawmeta, base_path.replace_extension(u".TXT"));
+        }
        reload_restart_recon();
        progressbar.hidden(true);
        set_dirty();  // fix progressbar no hiding
@@ -1445,7 +1460,7 @@ void ReconView::handle_repeat_thread_done(const uint32_t return_code) {
        stop_repeat(true);
    } else if (return_code == ReplayThread::READ_ERROR) {
        stop_repeat(false);
-        repeat_file_error(u"/" + repeat_rec_path + u"/" + repeat_rec_file, "Can't open file to send.");
+        repeat_file_error(rawfile, "Can't open file to send.");
    }
 }

@@ -38,6 +38,7 @@
 #include "baseband_api.hpp"
 #include "string_format.hpp"
 #include "file.hpp"
+#include "file_path.hpp"
 #include "app_settings.hpp"
 #include "radio_state.hpp"
 #include "ui_recon_settings.hpp"
@@ -181,7 +182,6 @@ class ReconView : public View {

    const std::filesystem::path repeat_rec_file = u"RECON_REPEAT.C16";
    const std::filesystem::path repeat_rec_meta = u"RECON_REPEAT.TXT";
-    const std::filesystem::path repeat_rec_path = u"CAPTURES";
    const size_t repeat_read_size{16384};
    const size_t repeat_buffer_count{3};
    int8_t repeat_cur_rep = 0;
@@ -198,6 +198,9 @@ class ReconView : public View {
    bool repeat_ready_signal{false};
    bool recon_tx{false};

+    std::filesystem::path rawfile = u"/" + repeat_rec_path + u"/" + repeat_rec_file;
+    std::filesystem::path rawmeta = u"/" + repeat_rec_path + u"/" + repeat_rec_meta;
+
    // Persisted settings.
    SettingsStore ui_settings{
        "recon"sv,
@@ -30,6 +30,7 @@
 #include "freqman_db.hpp"
 #include "portapack.hpp"
 #include "portapack_persistent_memory.hpp"
+#include "file_path.hpp"

 using namespace std;
 using namespace portapack;
@@ -58,7 +59,7 @@ ReconSetupViewMain::ReconSetupViewMain(NavigationView& nav, Rect parent_rect, st
        auto open_view = nav.push<FileLoadView>(".TXT");
        open_view->push_dir(freqman_dir);
        open_view->on_changed = [this, &nav](std::filesystem::path new_file_path) {
-            if (new_file_path.native().find(freqman_dir.native()) == 0) {
+            if (new_file_path.native().find((u"/" / freqman_dir).native()) == 0) {
                _input_file = new_file_path.stem().string();
                text_input_file.set(_input_file);
            } else {
@@ -71,7 +72,7 @@ ReconSetupViewMain::ReconSetupViewMain(NavigationView& nav, Rect parent_rect, st
        auto open_view = nav.push<FileLoadView>(".TXT");
        open_view->push_dir(freqman_dir);
        open_view->on_changed = [this, &nav](std::filesystem::path new_file_path) {
-            if (new_file_path.native().find(freqman_dir.native()) == 0) {
+            if (new_file_path.native().find((u"/" / freqman_dir).native()) == 0) {
                _output_file = new_file_path.stem().string();
                button_choose_output_name.set_text(_output_file);
            } else {
@@ -103,6 +104,7 @@ void ReconSetupViewMore::save() {
    persistent_memory::set_recon_update_ranges_when_recon(checkbox_update_ranges_when_recon.value());
    persistent_memory::set_recon_auto_record_locked(checkbox_auto_record_locked.value());
    persistent_memory::set_recon_repeat_recorded(checkbox_repeat_recorded.value());
+    persistent_memory::set_recon_repeat_recorded_file_mode(field_repeat_file_mode.selected_index_value());
    persistent_memory::set_recon_repeat_nb(field_repeat_nb.value());
    persistent_memory::set_recon_repeat_amp(checkbox_repeat_amp.value());
    persistent_memory::set_recon_repeat_gain(field_repeat_gain.value());
@@ -125,6 +127,7 @@ ReconSetupViewMore::ReconSetupViewMore(NavigationView& nav, Rect parent_rect)
                  &checkbox_update_ranges_when_recon,
                  &checkbox_auto_record_locked,
                  &checkbox_repeat_recorded,
+                  &field_repeat_file_mode,
                  &text_repeat_nb,
                  &field_repeat_nb,
                  &checkbox_repeat_amp,
@@ -135,6 +138,7 @@ ReconSetupViewMore::ReconSetupViewMore(NavigationView& nav, Rect parent_rect)

    // tx options have to be in yellow to inform the users that activating them will make the device transmit
    checkbox_repeat_recorded.set_style(&Styles::yellow);
+    field_repeat_file_mode.set_style(&Styles::yellow);
    text_repeat_nb.set_style(&Styles::yellow);
    field_repeat_nb.set_style(&Styles::yellow);
    checkbox_repeat_amp.set_style(&Styles::yellow);
@@ -150,6 +154,7 @@ ReconSetupViewMore::ReconSetupViewMore(NavigationView& nav, Rect parent_rect)
    checkbox_update_ranges_when_recon.set_value(persistent_memory::recon_update_ranges_when_recon());
    checkbox_auto_record_locked.set_value(persistent_memory::recon_auto_record_locked());
    checkbox_repeat_recorded.set_value(persistent_memory::recon_repeat_recorded());
+    field_repeat_file_mode.set_selected_index(persistent_memory::recon_repeat_recorded_file_mode());
    checkbox_repeat_amp.set_value(persistent_memory::recon_repeat_amp());
    field_repeat_nb.set_value(persistent_memory::recon_repeat_nb());
    field_repeat_gain.set_value(persistent_memory::recon_repeat_gain());
@@ -38,16 +38,19 @@
 #endif
 #define OneMHz 1000000

-// modes
+// main app mode
 #define RECON_MATCH_CONTINUOUS 0
 #define RECON_MATCH_SPARSE 1

+// repeater mode
+#define RECON_REPEAT_AND_DELETE 0
+#define RECON_REPEAT_AND_KEEP 1
+
 // statistics update interval in ms (change here if the statistics API is changing it's pace)
 #define STATS_UPDATE_INTERVAL 100

 // maximum lock duration
 #define RECON_MAX_LOCK_DURATION 9900
-
 #define RECON_DEF_SQUELCH -14

 // default number of match to have a lock
@@ -150,15 +153,21 @@ class ReconSetupViewMore : public View {

    Checkbox checkbox_repeat_recorded{
        {1 * 8, 162},
-        3,
-        "repeater,"};
+        0,
+        ""};
+
+    OptionsField field_repeat_file_mode{
+        {4 * 8 + 3, 165},
+        13,
+        {{"repeat,delete", RECON_REPEAT_AND_DELETE},
+         {"repeat,keep  ", RECON_REPEAT_AND_KEEP}}};

    Text text_repeat_nb{
-        {14 * 8, 165, 3 * 8, 22},
+        {20 * 8, 165, 3 * 8, 22},
        "nb:"};

    NumberField field_repeat_nb{
-        {17 * 8, 165},
+        {23 * 8, 165},
        2,
        {1, 99},
        1,
@@ -32,6 +32,7 @@
 #include "ui_receiver.hpp"
 #include "ui_textentry.hpp"
 #include "utility.hpp"
+#include "file_path.hpp"

 using namespace portapack;
 namespace fs = std::filesystem;
@@ -246,7 +247,7 @@ RemoteEntryEditView::RemoteEntryEditView(

    field_path.on_select = [this, &nav](TextField&) {
        auto open_view = nav.push<FileLoadView>(".C*");
-        open_view->push_dir(u"CAPTURES");
+        open_view->push_dir(captures_dir);
        open_view->on_changed = [this](fs::path path) {
            load_path(std::move(path));
            refresh_ui();
@@ -355,7 +356,7 @@ RemoteView::RemoteView(
    Dim waterfall_height = waterfall_bottom - waterfall_top;
    waterfall.set_parent_rect({0, waterfall_top, screen_width, waterfall_height});

-    ensure_directory(u"REMOTES");
+    ensure_directory(remotes_dir);

    // Load the previously loaded remote if exists.
    if (!load_remote(settings_.remote_path))
@@ -527,7 +528,7 @@ void RemoteView::new_remote() {

 void RemoteView::open_remote() {
    auto open_view = nav_.push<FileLoadView>(".REM");
-    open_view->push_dir(u"REMOTES");
+    open_view->push_dir(remotes_dir);
    open_view->on_changed = [this](fs::path path) {
        save_remote();
        load_remote(std::move(path));
@@ -538,7 +539,7 @@ void RemoteView::open_remote() {
 void RemoteView::init_remote() {
    model_ = {"<Unnamed Remote>", {}};
    reset_buttons();
-    set_remote_path(next_filename_matching_pattern(u"/REMOTES/REMOTE_????.REM"));
+    set_remote_path(next_filename_matching_pattern(remotes_dir / u"REMOTE_????.REM"));
    set_needs_save(false);

    if (remote_path_.empty())
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2018 Furrtek
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -25,6 +26,7 @@
 #include "optional.hpp"
 #include "ui_fileman.hpp"
 #include "ui_freqman.hpp"
+#include "file_path.hpp"

 using namespace portapack;
 namespace fs = std::filesystem;
@@ -336,7 +338,7 @@ ScannerView::ScannerView(
        auto open_view = nav.push<FileLoadView>(".TXT");
        open_view->push_dir(freqman_dir);
        open_view->on_changed = [this, &nav](std::filesystem::path new_file_path) {
-            if (new_file_path.native().find(freqman_dir.native()) == 0) {
+            if (new_file_path.native().find((u"/" / freqman_dir).native()) == 0) {
                scan_pause();
                frequency_file_load(new_file_path);
            } else {
@@ -411,7 +413,7 @@ ScannerView::ScannerView(
    button_mic_app.on_select = [this](Button&) {
        if (scan_thread)
            scan_thread->stop();
-        // MicTX wants Modulation and Bandwidth overrides, but that's only stored on the RX model.
+        // MicTX wants Frequency, Modulation and Bandwidth overrides, but that's only stored on the RX model.
        nav_.replace<MicTXView>(receiver_model.settings());
    };

@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2018 Furrtek
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -3,6 +3,9 @@
 * Copyright (C) 2016 Furrtek
 * Copyright (C) 2023 gullradriel, Nilorea Studio Inc.
 * Copyright (C) 2023 Kyle Reed
+ * Copyright (C) 2024 Mark Thompson
+ * Copyright (C) 2024 u-foka
+ * Copyleft (ɔ) 2024 zxkmm under GPL license
 *
 * This file is part of PortaPack.
 *
@@ -28,6 +31,7 @@
 #include "ui_receiver.hpp"
 #include "ui_touch_calibration.hpp"
 #include "ui_text_editor.hpp"
+#include "ui_external_items_menu_loader.hpp"

 #include "portapack_persistent_memory.hpp"
 #include "lpc43xx_cpp.hpp"
@@ -38,10 +42,12 @@ using namespace lpc43xx;
 using namespace portapack;

 #include "file.hpp"
+#include "file_path.hpp"
 namespace fs = std::filesystem;

 #include "string_format.hpp"
 #include "ui_styles.hpp"
+#include "ui_font_fixed_8x16.hpp"
 #include "cpld_update.hpp"
 #include "config_mode.hpp"

@@ -81,6 +87,7 @@ SetDateTimeView::SetDateTimeView(
        &field_second,
        &text_weekday,
        &text_day_of_year,
+        &text_in_dst_range,
        &checkbox_dst_enable,
        &options_dst_start_which,
        &options_dst_start_weekday,
@@ -100,18 +107,25 @@ SetDateTimeView::SetDateTimeView(
    options_dst_start_month.set_options(month_options);
    options_dst_end_month.set_options(month_options);

+    const auto dst_changed_fn = [this](size_t, uint32_t) {
+        handle_date_field_update();
+    };
+
    const auto date_changed_fn = [this](int32_t) {
-        auto weekday = rtc_time::day_of_week(field_year.value(), field_month.value(), field_day.value());
-        auto doy = rtc_time::day_of_year(field_year.value(), field_month.value(), field_day.value());
-        bool valid_date = (field_day.value() <= rtc_time::days_per_month(field_year.value(), field_month.value()));
-        text_weekday.set(valid_date ? weekday_options[weekday].first : "-");
-        text_day_of_year.set(valid_date ? to_string_dec_uint(doy, 3) : "-");
+        handle_date_field_update();
    };

    field_year.on_change = date_changed_fn;
    field_month.on_change = date_changed_fn;
    field_day.on_change = date_changed_fn;

+    options_dst_start_which.on_change = dst_changed_fn;
+    options_dst_start_weekday.on_change = dst_changed_fn;
+    options_dst_start_month.on_change = dst_changed_fn;
+    options_dst_end_which.on_change = dst_changed_fn;
+    options_dst_end_weekday.on_change = dst_changed_fn;
+    options_dst_end_month.on_change = dst_changed_fn;
+
    rtc::RTC datetime;
    rtc_time::now(datetime);
    SetDateTimeModel model{
@@ -146,6 +160,17 @@ void SetDateTimeView::form_init(const SetDateTimeModel& model) {
 }

 SetDateTimeModel SetDateTimeView::form_collect() {
+    return {
+        .year = static_cast<uint16_t>(field_year.value()),
+        .month = static_cast<uint8_t>(field_month.value()),
+        .day = static_cast<uint8_t>(field_day.value()),
+        .hour = static_cast<uint8_t>(field_hour.value()),
+        .minute = static_cast<uint8_t>(field_minute.value()),
+        .second = static_cast<uint8_t>(field_second.value()),
+        .dst = dst_collect()};
+}
+
+pmem::dst_config_t SetDateTimeView::dst_collect() {
    pmem::dst_config_t dst;
    dst.b.dst_enabled = static_cast<uint8_t>(checkbox_dst_enable.value());
    dst.b.start_which = static_cast<uint8_t>(options_dst_start_which.selected_index_value());
@@ -154,14 +179,16 @@ SetDateTimeModel SetDateTimeView::form_collect() {
    dst.b.end_which = static_cast<uint8_t>(options_dst_end_which.selected_index_value());
    dst.b.end_weekday = static_cast<uint8_t>(options_dst_end_weekday.selected_index_value());
    dst.b.end_month = static_cast<uint8_t>(options_dst_end_month.selected_index_value());
-    return {
-        .year = static_cast<uint16_t>(field_year.value()),
-        .month = static_cast<uint8_t>(field_month.value()),
-        .day = static_cast<uint8_t>(field_day.value()),
-        .hour = static_cast<uint8_t>(field_hour.value()),
-        .minute = static_cast<uint8_t>(field_minute.value()),
-        .second = static_cast<uint8_t>(field_second.value()),
-        .dst = dst};
+    return dst;
+}
+
+void SetDateTimeView::handle_date_field_update() {
+    auto weekday = rtc_time::day_of_week(field_year.value(), field_month.value(), field_day.value());
+    auto doy = rtc_time::day_of_year(field_year.value(), field_month.value(), field_day.value());
+    bool valid_date = (field_day.value() <= rtc_time::days_per_month(field_year.value(), field_month.value()));
+    text_weekday.set(valid_date ? weekday_options[weekday].first : "-");
+    text_day_of_year.set(valid_date ? to_string_dec_uint(doy, 3) : "-");
+    text_in_dst_range.set(checkbox_dst_enable.value() && rtc_time::dst_test_date_range(field_year.value(), doy, dst_collect()) ? "DST" : "");
 }

 /* SetRadioView ******************************************/
@@ -293,6 +320,7 @@ SetUIView::SetUIView(NavigationView& nav) {
                  &toggle_bias_tee,
                  &toggle_clock,
                  &toggle_mute,
+                  &toggle_fake_brightness,
                  &toggle_sd_card,
                  &button_save,
                  &button_cancel});
@@ -326,6 +354,7 @@ SetUIView::SetUIView(NavigationView& nav) {
    toggle_clock.set_value(!pmem::ui_hide_clock());
    toggle_speaker.set_value(!pmem::ui_hide_speaker());
    toggle_mute.set_value(!pmem::ui_hide_mute());
+    toggle_fake_brightness.set_value(!pmem::ui_hide_fake_brightness());
    toggle_sd_card.set_value(!pmem::ui_hide_sd_card());

    button_save.on_select = [&nav, this](Button&) {
@@ -352,6 +381,7 @@ SetUIView::SetUIView(NavigationView& nav) {
        pmem::set_ui_hide_clock(!toggle_clock.value());
        pmem::set_ui_hide_speaker(!toggle_speaker.value());
        pmem::set_ui_hide_mute(!toggle_mute.value());
+        pmem::set_ui_hide_fake_brightness(!toggle_fake_brightness.value());
        pmem::set_ui_hide_sd_card(!toggle_sd_card.value());
        send_system_refresh();

@@ -543,17 +573,17 @@ SetPersistentMemoryView::SetPersistentMemoryView(NavigationView& nav) {
    check_use_sdcard_for_pmem.on_select = [this](Checkbox&, bool v) {
        File pmem_flag_file_handle;
        if (v) {
-            if (fs::file_exists(PMEM_FILEFLAG)) {
+            if (fs::file_exists(settings_dir / PMEM_FILEFLAG)) {
                text_pmem_status.set("P.Mem flag file present.");
            } else {
-                auto error = pmem_flag_file_handle.create(PMEM_FILEFLAG);
+                auto error = pmem_flag_file_handle.create(settings_dir / PMEM_FILEFLAG);
                if (error)
                    text_pmem_status.set("Error creating P.Mem File!");
                else
                    text_pmem_status.set("P.Mem flag file created.");
            }
        } else {
-            auto result = delete_file(PMEM_FILEFLAG);
+            auto result = delete_file(settings_dir / PMEM_FILEFLAG);
            if (result.code() != FR_OK)
                text_pmem_status.set("Error deleting P.Mem flag!");
            else
@@ -586,6 +616,8 @@ SetPersistentMemoryView::SetPersistentMemoryView(NavigationView& nav) {
            [this](bool choice) {
                if (choice) {
                    pmem::cache::defaults();
+                    // Refresh status bar
+                    send_system_refresh();
                }
            });
    };
@@ -604,13 +636,17 @@ void SetPersistentMemoryView::focus() {
 SetAudioView::SetAudioView(NavigationView& nav) {
    add_children({&labels,
                  &field_tone_mix,
+                  &checkbox_beep_on_packets,
                  &button_save,
                  &button_cancel});

    field_tone_mix.set_value(pmem::tone_mix());

+    checkbox_beep_on_packets.set_value(pmem::beep_on_packets());
+
    button_save.on_select = [&nav, this](Button&) {
        pmem::set_tone_mix(field_tone_mix.value());
+        pmem::set_beep_on_packets(checkbox_beep_on_packets.value());
        audio::output::update_audio_mute();
        nav.pop();
    };
@@ -655,13 +691,16 @@ void SetQRCodeView::focus() {
 SetEncoderDialView::SetEncoderDialView(NavigationView& nav) {
    add_children({&labels,
                  &field_encoder_dial_sensitivity,
+                  &field_encoder_rate_multiplier,
                  &button_save,
                  &button_cancel});

-    field_encoder_dial_sensitivity.set_by_value(pmem::config_encoder_dial_sensitivity());
+    field_encoder_dial_sensitivity.set_by_value(pmem::encoder_dial_sensitivity());
+    field_encoder_rate_multiplier.set_value(pmem::encoder_rate_multiplier());

    button_save.on_select = [&nav, this](Button&) {
        pmem::set_encoder_dial_sensitivity(field_encoder_dial_sensitivity.selected_index_value());
+        pmem::set_encoder_rate_multiplier(field_encoder_rate_multiplier.value());
        nav.pop();
    };

@@ -684,10 +723,10 @@ AppSettingsView::AppSettingsView(

    menu_view.set_parent_rect({0, 3 * 8, 240, 33 * 8});

-    ensure_directory(SETTINGS_DIR);
+    ensure_directory(settings_dir);

-    for (const auto& entry : std::filesystem::directory_iterator(SETTINGS_DIR, u"*.ini")) {
-        auto path = (std::filesystem::path)SETTINGS_DIR / entry.path();
+    for (const auto& entry : std::filesystem::directory_iterator(settings_dir, u"*.ini")) {
+        auto path = settings_dir / entry.path();

        menu_view.add_item({path.filename().string().substr(0, 26),
                            ui::Color::dark_cyan(),
@@ -726,28 +765,164 @@ void SetConfigModeView::focus() {
    button_save.focus();
 }

+/* SetFakeBrightnessView ************************************/
+
+SetFakeBrightnessView::SetFakeBrightnessView(NavigationView& nav) {
+    add_children({&labels,
+                  &field_fake_brightness,
+                  &button_save,
+                  &button_cancel,
+                  &checkbox_brightness_switch});
+
+    field_fake_brightness.set_by_value(pmem::fake_brightness_level());
+    checkbox_brightness_switch.set_value(pmem::apply_fake_brightness());
+
+    button_save.on_select = [&nav, this](Button&) {
+        pmem::set_apply_fake_brightness(checkbox_brightness_switch.value());
+        pmem::set_fake_brightness_level(field_fake_brightness.selected_index_value());
+        send_system_refresh();
+        nav.pop();
+    };
+
+    button_cancel.on_select = [&nav, this](Button&) {
+        nav.pop();
+    };
+}
+
+void SetFakeBrightnessView::focus() {
+    button_save.focus();
+}
+
+/* SetMenuColorView ************************************/
+
+void SetMenuColorView::paint_sample() {
+    Color c = Color(field_red_level.value(), field_green_level.value(), field_blue_level.value());
+    button_sample.set_bg_color(c);
+}
+
+SetMenuColorView::SetMenuColorView(NavigationView& nav) {
+    add_children({&labels,
+                  &button_sample,
+                  &field_red_level,
+                  &field_green_level,
+                  &field_blue_level,
+                  &button_save,
+                  &button_cancel});
+
+    button_sample.set_focusable(false);
+
+    Color c = pmem::menu_color();
+    field_red_level.set_value(c.r());
+    field_green_level.set_value(c.g());
+    field_blue_level.set_value(c.b());
+    paint_sample();
+
+    const auto color_changed_fn = [this](int32_t) {
+        paint_sample();
+    };
+    field_red_level.on_change = color_changed_fn;
+    field_green_level.on_change = color_changed_fn;
+    field_blue_level.on_change = color_changed_fn;
+
+    button_save.on_select = [&nav, this](Button&) {
+        Color c = Color(field_red_level.value(), field_green_level.value(), field_blue_level.value());
+        pmem::set_menu_color(c);
+        send_system_refresh();
+        nav.pop();
+    };
+
+    button_cancel.on_select = [&nav, this](Button&) {
+        nav.pop();
+    };
+}
+
+void SetMenuColorView::focus() {
+    button_save.focus();
+}
+
+/* SetAutoStartView ************************************/
+
+SetAutostartView::SetAutostartView(NavigationView& nav) {
+    add_children({&labels,
+                  &button_save,
+                  &button_cancel,
+                  &options});
+
+    button_save.on_select = [&nav, this](Button&) {
+        autostart_app = "";
+        if (selected != 0) {
+            auto it = full_app_list.find(selected);
+            if (it != full_app_list.end())
+                autostart_app = it->second;
+        }
+        nav.pop();
+    };
+
+    button_cancel.on_select = [&nav, this](Button&) {
+        nav.pop();
+    };
+
+    // options
+    i = 0;
+    OptionsField::option_t o{"-none-", i};
+    opts.emplace_back(o);
+    for (auto& app : NavigationView::appList) {
+        if (app.id == nullptr) continue;
+        i++;
+        o = {app.displayName, i};
+        opts.emplace_back(o);
+        full_app_list.emplace(i, app.id);
+        if (autostart_app == app.id) selected = i;
+    }
+    ExternalItemsMenuLoader::load_all_external_items_callback([this](ui::AppInfoConsole& app) {
+        if (app.appCallName == nullptr) return;
+        i++;
+        OptionsField::option_t o = {app.appFriendlyName, i};
+        opts.emplace_back(o);
+        full_app_list.emplace(i, app.appCallName);
+        if (autostart_app == app.appCallName) selected = i;
+    });
+
+    options.set_options(opts);
+    options.on_change = [this](size_t, OptionsField::value_t v) {
+        selected = v;
+    };
+    options.set_selected_index(selected);
+}
+
+void SetAutostartView::focus() {
+    options.focus();
+}
+
 /* SettingsMenuView **************************************/

-SettingsMenuView::SettingsMenuView(NavigationView& nav) {
-    if (pmem::show_gui_return_icon()) {
-        add_items({{"..", ui::Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
-    }
-    add_items({
-        {"App Settings", ui::Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<AppSettingsView>(); }},
-        {"Audio", ui::Color::dark_cyan(), &bitmap_icon_speaker, [&nav]() { nav.push<SetAudioView>(); }},
-        {"Calibration", ui::Color::dark_cyan(), &bitmap_icon_options_touch, [&nav]() { nav.push<TouchCalibrationView>(); }},
-        {"Config Mode", ui::Color::dark_cyan(), &bitmap_icon_clk_ext, [&nav]() { nav.push<SetConfigModeView>(); }},
-        {"Converter", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [&nav]() { nav.push<SetConverterSettingsView>(); }},
-        {"Date/Time", ui::Color::dark_cyan(), &bitmap_icon_options_datetime, [&nav]() { nav.push<SetDateTimeView>(); }},
-        {"Encoder Dial", ui::Color::dark_cyan(), &bitmap_icon_setup, [&nav]() { nav.push<SetEncoderDialView>(); }},
-        {"Freq. Correct", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [&nav]() { nav.push<SetFrequencyCorrectionView>(); }},
-        {"P.Memory Mgmt", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { nav.push<SetPersistentMemoryView>(); }},
-        {"Radio", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [&nav]() { nav.push<SetRadioView>(); }},
-        {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [&nav]() { nav.push<SetSDCardView>(); }},
-        {"User Interface", ui::Color::dark_cyan(), &bitmap_icon_options_ui, [&nav]() { nav.push<SetUIView>(); }},
-        {"QR Code", ui::Color::dark_cyan(), &bitmap_icon_qr_code, [&nav]() { nav.push<SetQRCodeView>(); }},
-    });
+SettingsMenuView::SettingsMenuView(NavigationView& nav)
+    : nav_(nav) {
    set_max_rows(2);  // allow wider buttons
 }

+void SettingsMenuView::on_populate() {
+    if (pmem::show_gui_return_icon()) {
+        add_items({{"..", ui::Color::light_grey(), &bitmap_icon_previous, [this]() { nav_.pop(); }}});
+    }
+    add_items({
+        {"App Settings", ui::Color::dark_cyan(), &bitmap_icon_notepad, [this]() { nav_.push<AppSettingsView>(); }},
+        {"Audio", ui::Color::dark_cyan(), &bitmap_icon_speaker, [this]() { nav_.push<SetAudioView>(); }},
+        {"Calibration", ui::Color::dark_cyan(), &bitmap_icon_options_touch, [this]() { nav_.push<TouchCalibrationView>(); }},
+        {"Config Mode", ui::Color::dark_cyan(), &bitmap_icon_clk_ext, [this]() { nav_.push<SetConfigModeView>(); }},
+        {"Converter", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [this]() { nav_.push<SetConverterSettingsView>(); }},
+        {"Date/Time", ui::Color::dark_cyan(), &bitmap_icon_options_datetime, [this]() { nav_.push<SetDateTimeView>(); }},
+        {"Encoder Dial", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<SetEncoderDialView>(); }},
+        {"Freq. Correct", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [this]() { nav_.push<SetFrequencyCorrectionView>(); }},
+        {"P.Memory Mgmt", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { nav_.push<SetPersistentMemoryView>(); }},
+        {"Radio", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [this]() { nav_.push<SetRadioView>(); }},
+        {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [this]() { nav_.push<SetSDCardView>(); }},
+        {"User Interface", ui::Color::dark_cyan(), &bitmap_icon_options_ui, [this]() { nav_.push<SetUIView>(); }},
+        //{"QR Code", ui::Color::dark_cyan(), &bitmap_icon_qr_code, [this]() { nav_.push<SetQRCodeView>(); }},
+        {"Brightness", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetFakeBrightnessView>(); }},
+        {"Menu Color", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetMenuColorView>(); }},
+        {"Autostart", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<SetAutostartView>(); }},
+    });
+}
+
 } /* namespace ui */
@@ -3,6 +3,9 @@
 * Copyright (C) 2016 Furrtek
 * Copyright (C) 2023 gullradriel, Nilorea Studio Inc.
 * Copyright (C) 2023 Kyle Reed
+ * Copyright (C) 2024 Mark Thompson
+ * Copyright (C) 2024 u-foka
+ * Copyleft (ɔ) 2024 zxkmm under GPL license
 *
 * This file is part of PortaPack.
 *
@@ -126,6 +129,9 @@ class SetDateTimeView : public View {
    Text text_day_of_year{
        {26 * 8, 6 * 16, 3 * 8, 16},
        ""};
+    Text text_in_dst_range{
+        {17 * 8, 7 * 16, 3 * 8, 16},
+        ""};

    Checkbox checkbox_dst_enable{
        {2 * 8, 9 * 16},
@@ -171,6 +177,8 @@ class SetDateTimeView : public View {

    void form_init(const SetDateTimeModel& model);
    SetDateTimeModel form_collect();
+    portapack::persistent_memory::dst_config_t dst_collect();
+    void handle_date_field_update();
 };

 struct SetFrequencyCorrectionModel {
@@ -315,39 +323,43 @@ class SetUIView : public View {
    };

    ImageToggle toggle_camera{
-        {7 * 8, 14 * 16 + 2, 16, 16},
+        {6 * 8, 14 * 16 + 2, 16, 16},
        &bitmap_icon_camera};

    ImageToggle toggle_sleep{
-        {9 * 8, 14 * 16 + 2, 16, 16},
+        {8 * 8, 14 * 16 + 2, 16, 16},
        &bitmap_icon_sleep};

    ImageToggle toggle_stealth{
-        {11 * 8, 14 * 16 + 2, 16, 16},
+        {10 * 8, 14 * 16 + 2, 16, 16},
        &bitmap_icon_stealth};

    ImageToggle toggle_converter{
-        {13 * 8, 14 * 16 + 2, 16, 16},
+        {12 * 8, 14 * 16 + 2, 16, 16},
        &bitmap_icon_upconvert};

    ImageToggle toggle_bias_tee{
-        {15 * 8, 14 * 16 + 2, 16, 16},
+        {14 * 8, 14 * 16 + 2, 16, 16},
        &bitmap_icon_biast_off};

    ImageToggle toggle_clock{
-        {17 * 8, 14 * 16 + 2, 8, 16},
+        {16 * 8, 14 * 16 + 2, 8, 16},
        &bitmap_icon_clk_ext};

    ImageToggle toggle_mute{
-        {18 * 8, 14 * 16 + 2, 16, 16},
+        {17 * 8, 14 * 16 + 2, 16, 16},
        &bitmap_icon_speaker_and_headphones_mute};

    ImageToggle toggle_speaker{
-        {20 * 8, 14 * 16 + 2, 16, 16},
+        {19 * 8, 14 * 16 + 2, 16, 16},
        &bitmap_icon_speaker_mute};

+    ImageToggle toggle_fake_brightness{
+        {21 * 8, 14 * 16 + 2, 16, 16},
+        &bitmap_icon_brightness};
+
    ImageToggle toggle_sd_card{
-        {22 * 8, 14 * 16 + 2, 16, 16},
+        {23 * 8, 14 * 16 + 2, 16, 16},
        &bitmap_sd_card_ok};

    Button button_save{
@@ -494,8 +506,12 @@ class SetAudioView : public View {
    Labels labels{
        {{1 * 8, 1 * 16}, "Controls the volume of the", Color::light_grey()},
        {{1 * 8, 2 * 16}, "tone when transmitting in", Color::light_grey()},
-        {{1 * 8, 3 * 16}, "Soundboard or Mic apps.", Color::light_grey()},
+        {{1 * 8, 3 * 16}, "Soundboard or Mic apps:", Color::light_grey()},
        {{2 * 8, 5 * 16}, "Tone key mix:   %", Color::light_grey()},
+        {{1 * 8, 8 * 16}, "Controls whether apps should", Color::light_grey()},
+        {{1 * 8, 9 * 16}, "beep on speaker & headphone", Color::light_grey()},
+        {{1 * 8, 10 * 16}, "when a packet is received", Color::light_grey()},
+        {{1 * 8, 11 * 16}, "(not all apps support this):", Color::light_grey()},
    };

    NumberField field_tone_mix{
@@ -505,6 +521,11 @@ class SetAudioView : public View {
        1,
        '0'};

+    Checkbox checkbox_beep_on_packets{
+        {3 * 8, 13 * 16},
+        16,
+        "Beep on RX packets"};
+
    Button button_save{
        {2 * 8, 16 * 16, 12 * 8, 32},
        "Save"};
@@ -545,6 +566,7 @@ class SetQRCodeView : public View {
 };

 using portapack::persistent_memory::encoder_dial_sensitivity;
+using portapack::persistent_memory::encoder_rate_multiplier;

 class SetEncoderDialView : public View {
   public:
@@ -556,18 +578,30 @@ class SetEncoderDialView : public View {

   private:
    Labels labels{
-        {{1 * 8, 1 * 16}, "Adjusts how many steps to", Color::light_grey()},
-        {{1 * 8, 2 * 16}, "change the encoder value.", Color::light_grey()},
-        {{2 * 8, 4 * 16}, "Dial sensitivity:", Color::light_grey()},
+        {{1 * 8, 1 * 16}, "Adjusts sensitivity to dial", Color::light_grey()},
+        {{1 * 8, 2 * 16}, "rotation position (number of", Color::light_grey()},
+        {{1 * 8, 3 * 16}, "steps per full rotation):", Color::light_grey()},
+        {{2 * 8, 5 * 16}, "Dial sensitivity:", Color::light_grey()},
+        {{1 * 8, 8 * 16}, "Adjusts sensitivity to dial", Color::light_grey()},
+        {{1 * 8, 9 * 16}, "rotation rate (default 1", Color::light_grey()},
+        {{1 * 8, 10 * 16}, "means no rate dependency):", Color::light_grey()},
+        {{3 * 8, 12 * 16}, "Rate multiplier:", Color::light_grey()},
    };

    OptionsField field_encoder_dial_sensitivity{
-        {20 * 8, 4 * 16},
+        {20 * 8, 5 * 16},
        6,
        {{"LOW", encoder_dial_sensitivity::DIAL_SENSITIVITY_LOW},
         {"NORMAL", encoder_dial_sensitivity::DIAL_SENSITIVITY_NORMAL},
         {"HIGH", encoder_dial_sensitivity::DIAL_SENSITIVITY_HIGH}}};

+    NumberField field_encoder_rate_multiplier{
+        {20 * 8, 12 * 16},
+        2,
+        {1, 15},
+        1,
+        ' '};
+
    Button button_save{
        {2 * 8, 16 * 16, 12 * 8, 32},
        "Save"};
@@ -667,11 +701,148 @@ class SetConfigModeView : public View {
    };
 };

+using portapack::persistent_memory::fake_brightness_level_options;
+
+class SetFakeBrightnessView : public View {
+   public:
+    SetFakeBrightnessView(NavigationView& nav);
+
+    void focus() override;
+
+    std::string title() const override { return "Brightness"; };
+
+   private:
+    Labels labels{
+        {{1 * 8, 1 * 16}, "Limits screen brightness", Color::light_grey()},
+        {{1 * 8, 2 * 16}, "(has a small performance", Color::light_grey()},
+        {{1 * 8, 3 * 16}, "impact when enabled).", Color::light_grey()},
+        {{2 * 8, 8 * 16}, "Brightness:", Color::light_grey()},
+    };
+
+    OptionsField field_fake_brightness{
+        {20 * 8, 8 * 16},
+        6,
+        {{"12.5%", fake_brightness_level_options::BRIGHTNESS_12p5},
+         {"25%", fake_brightness_level_options::BRIGHTNESS_25},
+         {"50%", fake_brightness_level_options::BRIGHTNESS_50}}};
+
+    Checkbox checkbox_brightness_switch{
+        {1 * 8, 5 * 16},
+        16,
+        "Enable brightness adjust"};
+
+    Button button_save{
+        {2 * 8, 16 * 16, 12 * 8, 32},
+        "Save"};
+
+    Button button_cancel{
+        {16 * 8, 16 * 16, 12 * 8, 32},
+        "Cancel",
+    };
+};
+
+class SetMenuColorView : public View {
+   public:
+    SetMenuColorView(NavigationView& nav);
+
+    void focus() override;
+
+    std::string title() const override { return "Menu Color"; };
+
+   private:
+    void paint_sample();
+
+    Labels labels{
+        {{3 * 8, 1 * 16}, "Menu Button Color Scheme", Color::light_grey()},
+        {{2 * 8, 8 * 16}, "Red Level:", Color::light_grey()},
+        {{2 * 8, 9 * 16}, "Green Level:", Color::light_grey()},
+        {{2 * 8, 10 * 16}, "Blue Level:", Color::light_grey()},
+    };
+
+    NewButton button_sample{
+        {8 * 8, 4 * 16, 14 * 8, 3 * 16},
+        "New Color",
+        &bitmap_icon_brightness,
+    };
+
+    NumberField field_red_level{
+        {15 * 8, 8 * 16},
+        3,
+        {8, 248},
+        8,
+        ' ',
+    };
+
+    NumberField field_green_level{
+        {15 * 8, 9 * 16},
+        3,
+        {8, 248},
+        8,
+        ' ',
+    };
+
+    NumberField field_blue_level{
+        {15 * 8, 10 * 16},
+        3,
+        {8, 248},
+        8,
+        ' ',
+    };
+
+    Button button_save{
+        {2 * 8, 16 * 16, 12 * 8, 32},
+        "Save"};
+
+    Button button_cancel{
+        {16 * 8, 16 * 16, 12 * 8, 32},
+        "Cancel",
+    };
+};
+
+class SetAutostartView : public View {
+   public:
+    SetAutostartView(NavigationView& nav);
+
+    void focus() override;
+
+    std::string title() const override { return "Autostart"; };
+
+   private:
+    int32_t i = 0;
+    std::string autostart_app{""};
+    OptionsField::options_t opts{};
+    std::map<int32_t, std::string> full_app_list{};  // looking table
+    int32_t selected = 0;
+    SettingsStore nav_setting{
+        "nav"sv,
+        {{"autostart_app"sv, &autostart_app}}};
+    Labels labels{
+        {{1 * 8, 1 * 16}, "Select app to start on boot", Color::light_grey()},
+        {{2 * 8, 2 * 16}, "(an SD Card is required)", Color::light_grey()}};
+
+    Button button_save{
+        {2 * 8, 16 * 16, 12 * 8, 32},
+        "Save"};
+
+    OptionsField options{
+        {8 * 8, 4 * 16},
+        30,
+        {}};
+
+    Button button_cancel{
+        {16 * 8, 16 * 16, 12 * 8, 32},
+        "Cancel",
+    };
+};
+
 class SettingsMenuView : public BtnGridView {
   public:
    SettingsMenuView(NavigationView& nav);
-
    std::string title() const override { return "Settings"; };
+
+   private:
+    NavigationView& nav_;
+    void on_populate() override;
 };

 } /* namespace ui */
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2017 Furrtek
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -24,12 +25,14 @@
 #include "baseband_api.hpp"
 #include "audio.hpp"
 #include "app_settings.hpp"
+#include "file_path.hpp"

 #include "portapack.hpp"
 #include <cstring>
 #include <stdio.h>

 using namespace portapack;
+namespace pmem = portapack::persistent_memory;

 #include "string_format.hpp"
 #include "complex.hpp"
@@ -52,7 +55,6 @@ SondeView::SondeView(NavigationView& nav)
                  &field_vga,
                  &rssi,
                  &field_volume,
-                  &check_beep,
                  &check_log,
                  &check_crc,
                  &text_signature,
@@ -70,14 +72,12 @@ SondeView::SondeView(NavigationView& nav)

    geopos.set_read_only(true);

-    check_beep.on_select = [this](Checkbox&, bool v) {
-        beep = v;
-    };
-
+    check_log.set_value(logging);
    check_log.on_select = [this](Checkbox&, bool v) {
        logging = v;
    };

+    check_crc.set_value(use_crc);
    check_crc.on_select = [this](Checkbox&, bool v) {
        use_crc = v;
    };
@@ -86,17 +86,18 @@ SondeView::SondeView(NavigationView& nav)

    // QR code with geo URI
    button_see_qr.on_select = [this, &nav](Button&) {
-        nav.push<QRCodeView>(geo_uri);
+        std::string geo_uri = "geo:" + to_string_decimal(geopos.lat(), 5) + "," + to_string_decimal(geopos.lon(), 5);  // 5 decimal digits for ~1 meter accuracy
+        nav.push<QRCodeView>(geo_uri.data());
    };

    button_see_map.on_select = [this, &nav](Button&) {
        geomap_view_ = nav.push<GeoMapView>(
            sonde_id,
-            gps_info.alt,
+            geopos.altitude(),
            GeoPos::alt_unit::METERS,
            GeoPos::spd_unit::HIDDEN,
-            gps_info.lat,
-            gps_info.lon,
+            geopos.lat(),
+            geopos.lon(),
            999);  // set a dummy heading out of range to draw a cross...probably not ideal?
        nav.set_on_pop([this]() {
            geomap_view_ = nullptr;
@@ -105,9 +106,12 @@ SondeView::SondeView(NavigationView& nav)

    logger = std::make_unique<SondeLogger>();
    if (logger)
-        logger->append(LOG_ROOT_DIR "/SONDE.TXT");
+        logger->append(logs_dir / u"SONDE.TXT");

-    audio::output::start();
+    if (pmem::beep_on_packets()) {
+        audio::set_rate(audio::Rate::Hz_24000);
+        audio::output::start();
+    }

    // inject a PitchRSSIConfigureMessage in order to arm
    // the pitch rssi events that will be used by the
@@ -142,51 +146,9 @@ void SondeView::focus() {
    field_frequency.focus();
 }

-// used to convert float to character pointer, since unfortunately function like
-// sprintf and c_str aren't supported.
-char* SondeView::float_to_char(float x, char* p) {
-    char* s = p + 9;                             // go to end of buffer
-    uint16_t decimals;                           // variable to store the decimals
-    int units;                                   // variable to store the units (part to left of decimal place)
-    if (x < 0) {                                 // take care of negative numbers
-        decimals = (int)(x * -100000) % 100000;  // make 1000 for 3 decimals etc.
-        units = (int)(-1 * x);
-    } else {  // positive numbers
-        decimals = (int)(x * 100000) % 100000;
-        units = (int)x;
-    }
-
-    // TODO: more elegant solution (loop?)
-    *--s = (decimals % 10) + '0';
-    decimals /= 10;
-    *--s = (decimals % 10) + '0';
-    decimals /= 10;
-    *--s = (decimals % 10) + '0';
-    decimals /= 10;
-    *--s = (decimals % 10) + '0';
-    decimals /= 10;
-    *--s = (decimals % 10) + '0';
-    *--s = '.';
-
-    while (units > 0) {
-        *--s = (units % 10) + '0';
-        units /= 10;
-    }
-    if (x < 0) *--s = '-';  // unary minus sign for negative numbers
-    return s;
-}
-
 void SondeView::on_packet(const sonde::Packet& packet) {
    if (!use_crc || packet.crc_ok())  // euquiq: Reject bad packet if crc is on
    {
-        char buffer_lat[10] = {};
-        char buffer_lon[10] = {};
-
-        strcpy(geo_uri, "geo:");
-        strcat(geo_uri, float_to_char(gps_info.lat, buffer_lat));
-        strcat(geo_uri, ",");
-        strcat(geo_uri, float_to_char(gps_info.lon, buffer_lon));
-
        text_signature.set(packet.type_string());

        sonde_id = packet.serial_number();  // used also as tag on the geomap
@@ -219,8 +181,8 @@ void SondeView::on_packet(const sonde::Packet& packet) {
            logger->on_packet(packet);
        }

-        if (beep) {
-            baseband::request_beep();
+        if (pmem::beep_on_packets()) {
+            baseband::request_rssi_beep();
        }
    }
 }
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2017 Furrtek
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -74,15 +75,17 @@ class SondeView : public View {
        1750000 /* bandwidth */,
        2457600 /* sampling rate */
    };
-    app_settings::SettingsManager settings_{
-        "rx_sonde", app_settings::Mode::RX};
-
-    std::unique_ptr<SondeLogger> logger{};
    bool logging{false};
    bool use_crc{false};
-    bool beep{false};
+    app_settings::SettingsManager settings_{
+        "rx_sonde",
+        app_settings::Mode::RX,
+        {
+            {"logging"sv, &logging},
+            {"use_crc"sv, &use_crc},
+        }};

-    char geo_uri[32] = {};
+    std::unique_ptr<SondeLogger> logger{};

    sonde::GPS_data gps_info{};
    sonde::temp_humid temp_humid_info{};
@@ -119,11 +122,6 @@ class SondeView : public View {
    AudioVolumeField field_volume{
        {28 * 8, 0 * 16}};

-    Checkbox check_beep{
-        {22 * 8, 6 * 16},
-        3,
-        "Beep"};
-
    Checkbox check_log{
        {22 * 8, 8 * 16},
        3,
@@ -201,7 +199,6 @@ class SondeView : public View {
    void on_gps(const GPSPosDataMessage* msg);
    void on_orientation(const OrientationDataMessage* msg);
    void on_packet(const sonde::Packet& packet);
-    char* float_to_char(float x, char* p);
 };

 } /* namespace ui */
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2023 Kyle Reed
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2023 Kyle Reed
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -38,7 +38,7 @@

 class TestLogger {
   public:
-    Optional<File::Error> append(const std::string& filename) {
+    Optional<File::Error> append(const std::filesystem::path& filename) {
        return log_file.append(filename);
    }

@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2023 Kyle Reed
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -424,6 +425,9 @@ TextEditorView::TextEditorView(NavigationView& nav)
            &text_size,
        });

+    text_position.set_style(&Styles::bg_dark_blue);
+    text_size.set_style(&Styles::bg_dark_blue);
+
    viewer.set_font_zoom(enable_zoom);

    viewer.on_select = [this]() {
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2023 Kyle Reed
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2017 Furrtek
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -22,11 +23,12 @@

 #include "ui_view_wav.hpp"
 #include "ui_fileman.hpp"
+#include "audio.hpp"
+#include "baseband_api.hpp"
+#include "string_format.hpp"

 using namespace portapack;

-#include "string_format.hpp"
-
 namespace ui {

 void ViewWavView::update_scale(int32_t new_scale) {
@@ -37,9 +39,24 @@ void ViewWavView::update_scale(int32_t new_scale) {
 }

 void ViewWavView::refresh_waveform() {
+    // NB: We can't read from the file to update the waveform when playback is in progress, so defer til playback done.
+    // (This only happens if the user messes with position or scale fields while playback is occurring)
+    if (playback_in_progress) {
+        waveform_update_needed = true;
+        return;
+    }
+
+    uint8_t bits_per_sample = wav_reader->bits_per_sample();
+
    for (size_t i = 0; i < 240; i++) {
        wav_reader->data_seek(position + (i * scale));
-        wav_reader->read(&waveform_buffer[i], sizeof(int16_t));
+        if (bits_per_sample == 8) {
+            uint8_t sample;
+            wav_reader->read(&sample, 1);
+            waveform_buffer[i] = (sample - 0x80) * 256;
+        } else {
+            wav_reader->read(&waveform_buffer[i], 2);
+        }
    }

    waveform.set_dirty();
@@ -72,15 +89,33 @@ void ViewWavView::paint(Painter& painter) {
        painter.draw_vline({(Coord)i, 11 * 16}, 8, spectrum_rgb2_lut[amplitude_buffer[i] << 1]);
 }

-void ViewWavView::on_pos_changed() {
-    position = (field_pos_seconds.value() * wav_reader->sample_rate()) + field_pos_samples.value();
+void ViewWavView::on_pos_time_changed() {
+    position = (uint64_t)((field_pos_seconds.value() * 1000) + field_pos_milliseconds.value()) * wav_reader->sample_rate() / 1000;
+    field_pos_milliseconds.set_range(0, ((uint32_t)field_pos_seconds.value() == wav_reader->ms_duration() / 1000) ? wav_reader->ms_duration() % 1000 : 999);
+    if (!updating_position) {
+        updating_position = true;  // prevent recursion
+        field_pos_samples.set_value(position);
+        updating_position = false;
+    }
+    refresh_waveform();
+}
+
+void ViewWavView::on_pos_sample_changed() {
+    position = field_pos_samples.value();
+    if (!updating_position) {
+        updating_position = true;  // prevent recursion
+        field_pos_seconds.set_value(field_pos_samples.value() / wav_reader->sample_rate());
+        field_pos_milliseconds.set_value((field_pos_samples.value() * 1000ull / wav_reader->sample_rate()) % 1000);
+        updating_position = false;
+    }
    refresh_waveform();
 }

 void ViewWavView::load_wav(std::filesystem::path file_path) {
-    int16_t sample;
    uint32_t average;

+    wav_file_path = file_path;
+
    text_filename.set(file_path.filename().string());
    auto ms_duration = wav_reader->ms_duration();
    text_duration.set(unit_auto_scale(ms_duration, 2, 3) + "s");
@@ -88,18 +123,27 @@ void ViewWavView::load_wav(std::filesystem::path file_path) {
    wav_reader->rewind();

    text_samplerate.set(to_string_dec_uint(wav_reader->sample_rate()) + "Hz");
+    text_bits_per_sample.set(to_string_dec_uint(wav_reader->bits_per_sample(), 2));
    text_title.set(wav_reader->title());

    // Fill amplitude buffer, world's worst downsampling
    uint64_t skip = wav_reader->sample_count() / (240 * subsampling_factor);
+    uint8_t bits_per_sample = wav_reader->bits_per_sample();

    for (size_t i = 0; i < 240; i++) {
        average = 0;

        for (size_t s = 0; s < subsampling_factor; s++) {
            wav_reader->data_seek(((i * subsampling_factor) + s) * skip);
-            wav_reader->read(&sample, 2);
-            average += (abs(sample) >> 8);
+            if (bits_per_sample == 8) {
+                uint8_t sample;
+                wav_reader->read(&sample, 1);
+                average += sample / 2;
+            } else {
+                int16_t sample;
+                wav_reader->read(&sample, 2);
+                average += (abs(sample) >> 8);
+            }
        }

        amplitude_buffer[i] = average / subsampling_factor;
@@ -115,11 +159,109 @@ void ViewWavView::reset_controls() {
    field_pos_samples.set_value(0);
    field_cursor_a.set_value(0);
    field_cursor_b.set_value(0);
+    field_pos_seconds.set_range(0, wav_reader->ms_duration() / 1000);
+    field_pos_milliseconds.set_range(0, (wav_reader->ms_duration() < 1000) ? wav_reader->ms_duration() % 1000 : 999);
+    field_pos_samples.set_range(0, wav_reader->sample_count() - 1);
+    field_scale.set_range(1, std::min(99999ul, wav_reader->sample_count() / 240));
+}
+
+bool ViewWavView::is_active() {
+    return (bool)replay_thread;
+}
+
+void ViewWavView::stop() {
+    if (is_active())
+        replay_thread.reset();
+
+    audio::output::stop();
+
+    button_play.set_bitmap(&bitmap_play);
+    ready_signal = false;
+}
+
+void ViewWavView::handle_replay_thread_done(const uint32_t return_code) {
+    (void)return_code;
+
+    stop();
+    progressbar.set_value(0);
+
+    if (return_code == ReplayThread::READ_ERROR)
+        file_error();
+
+    // Playback complete - now it's safe to update waveform view
+    playback_in_progress = false;
+    if (waveform_update_needed) {
+        waveform_update_needed = false;
+        refresh_waveform();
+    }
+}
+
+void ViewWavView::set_ready() {
+    ready_signal = true;
+}
+
+void ViewWavView::file_error() {
+    nav_.display_modal("Error", "File read error.");
+}
+
+void ViewWavView::start_playback() {
+    uint32_t sample_rate;
+    uint8_t bits_per_sample;
+
+    auto reader = std::make_unique<WAVFileReader>();
+
+    stop();
+
+    if (!reader->open(wav_file_path)) {
+        file_error();
+        return;
+    }
+
+    playback_in_progress = true;
+
+    button_play.set_bitmap(&bitmap_stop);
+
+    sample_rate = reader->sample_rate();
+    bits_per_sample = reader->bits_per_sample();
+
+    progressbar.set_max(reader->sample_count());
+
+    replay_thread = std::make_unique<ReplayThread>(
+        std::move(reader),
+        read_size, buffer_count,
+        &ready_signal,
+        [](uint32_t return_code) {
+            ReplayThreadDoneMessage message{return_code};
+            EventDispatcher::send_message(message);
+        });
+
+    baseband::set_audiotx_config(
+        1536000 / 20,     // Rate of sending progress updates
+        0,                // Transmit BW = 0 = not transmitting
+        0,                // Gain - unused
+        8,                // shift_bits_s16, default 8 bits - unused
+        bits_per_sample,  // bits_per_sample
+        0,                // tone key disabled
+        false,            // AM
+        false,            // DSB
+        false,            // USB
+        false             // LSB
+    );
+    baseband::set_sample_rate(sample_rate);
+    transmitter_model.set_sampling_rate(1536000);
+
+    audio::output::start();
+}
+
+void ViewWavView::on_playback_progress(const uint32_t progress) {
+    progressbar.set_value(progress);
+    field_pos_samples.set_value(progress);
 }

 ViewWavView::ViewWavView(
    NavigationView& nav)
    : nav_(nav) {
+    baseband::run_image(portapack::spi_flash::image_tag_audio_tx);
    wav_reader = std::make_unique<WAVFileReader>();

    add_children({&labels,
@@ -127,26 +269,33 @@ ViewWavView::ViewWavView(
                  &text_samplerate,
                  &text_title,
                  &text_duration,
+                  &text_bits_per_sample,
                  &button_open,
+                  &button_play,
                  &waveform,
+                  &progressbar,
                  &field_pos_seconds,
+                  &field_pos_milliseconds,
                  &field_pos_samples,
                  &field_scale,
                  &field_cursor_a,
                  &field_cursor_b,
-                  &text_delta});
+                  &text_delta,
+                  &field_volume});
+
    reset_controls();
+
    button_open.on_select = [this, &nav](Button&) {
        auto open_view = nav.push<FileLoadView>(".WAV");
        open_view->on_changed = [this, &nav](std::filesystem::path file_path) {
            // Can't show new dialogs in an on_changed handler, so use continuation.
            nav.set_on_pop([this, &nav, file_path]() {
                if (!wav_reader->open(file_path)) {
-                    nav_.display_modal("Error", "Couldn't open file.");
+                    file_error();
                    return;
                }
-                if ((wav_reader->channels() != 1) || (wav_reader->bits_per_sample() != 16)) {
-                    nav_.display_modal("Error", "Wrong format.\nWav viewer only accepts\n16-bit mono files.");
+                if ((wav_reader->channels() != 1) || ((wav_reader->bits_per_sample() != 8) && (wav_reader->bits_per_sample() != 16))) {
+                    nav_.display_modal("Error", "Wrong format.\nWav viewer only accepts\n8 or 16-bit mono files.");
                    return;
                }
                load_wav(file_path);
@@ -155,14 +304,26 @@ ViewWavView::ViewWavView(
        };
    };

+    field_volume.set_value(field_volume.value());
+
+    button_play.on_select = [this, &nav](ImageButton&) {
+        if (this->is_active())
+            stop();
+        else
+            start_playback();
+    };
+
    field_scale.on_change = [this](int32_t value) {
        update_scale(value);
    };
    field_pos_seconds.on_change = [this](int32_t) {
-        on_pos_changed();
+        on_pos_time_changed();
+    };
+    field_pos_milliseconds.on_change = [this](int32_t) {
+        on_pos_time_changed();
    };
    field_pos_samples.on_change = [this](int32_t) {
-        on_pos_changed();
+        on_pos_sample_changed();
    };

    field_cursor_a.on_change = [this](int32_t v) {
@@ -179,4 +340,9 @@ void ViewWavView::focus() {
    button_open.focus();
 }

+ViewWavView::~ViewWavView() {
+    stop();
+    baseband::shutdown();
+}
+
 } /* namespace ui */
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2017 Furrtek
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -24,12 +25,15 @@
 #include "ui_navigation.hpp"
 #include "io_wave.hpp"
 #include "spectrum_color_lut.hpp"
+#include "ui_receiver.hpp"
+#include "replay_thread.hpp"

 namespace ui {

 class ViewWavView : public View {
   public:
    ViewWavView(NavigationView& nav);
+    ~ViewWavView();

    void focus() override;
    void paint(Painter&) override;
@@ -37,15 +41,33 @@ class ViewWavView : public View {
    std::string title() const override { return "WAV viewer"; };

   private:
+    app_settings::SettingsManager settings_{
+        "wav_viewer", app_settings::Mode::NO_RF};
+
    NavigationView& nav_;
    static constexpr uint32_t subsampling_factor = 8;

    void update_scale(int32_t new_scale);
    void refresh_waveform();
    void refresh_measurements();
-    void on_pos_changed();
+    void on_pos_time_changed();
+    void on_pos_sample_changed();
    void load_wav(std::filesystem::path file_path);
    void reset_controls();
+    bool is_active();
+    void stop();
+    void handle_replay_thread_done(const uint32_t return_code);
+    void set_ready();
+    void file_error();
+    void start_playback();
+    void on_playback_progress(const uint32_t progress);
+
+    std::filesystem::path wav_file_path{};
+    std::unique_ptr<ReplayThread> replay_thread{};
+    bool ready_signal{false};
+    const size_t read_size{2048};
+    const size_t buffer_count{3};
+    const uint32_t progress_interval_samples{1536000 / 20};

    std::unique_ptr<WAVFileReader> wav_reader{};

@@ -54,32 +76,47 @@ class ViewWavView : public View {
    int32_t scale{1};
    uint64_t ns_per_pixel{};
    uint64_t position{};
+    bool updating_position{false};
+    bool playback_in_progress{false};
+    bool waveform_update_needed{false};

    Labels labels{
        {{0 * 8, 0 * 16}, "File:", Color::light_grey()},
-        {{0 * 8, 1 * 16}, "Samplerate:", Color::light_grey()},
+        {{2 * 8, 1 * 16}, "-bit mono", Color::light_grey()},
        {{0 * 8, 2 * 16}, "Title:", Color::light_grey()},
        {{0 * 8, 3 * 16}, "Duration:", Color::light_grey()},
-        {{0 * 8, 11 * 16}, "Position:   s         Scale:", Color::light_grey()},
-        {{0 * 8, 12 * 16}, "Cursor A:", Color::dark_cyan()},
-        {{0 * 8, 13 * 16}, "Cursor B:", Color::dark_magenta()},
-        {{0 * 8, 14 * 16}, "Delta:", Color::light_grey()}};
+        {{0 * 8, 12 * 16}, "Position:    .   s Scale:", Color::light_grey()},
+        {{0 * 8, 13 * 16}, "  Sample:", Color::light_grey()},
+        {{0 * 8, 14 * 16}, "Cursor A:", Color::dark_cyan()},
+        {{0 * 8, 15 * 16}, "Cursor B:", Color::dark_magenta()},
+        {{0 * 8, 16 * 16}, "Delta:", Color::light_grey()},
+        {{24 * 8, 18 * 16}, "Vol:", Color::light_grey()}};

    Text text_filename{
-        {5 * 8, 0 * 16, 12 * 8, 16},
+        {5 * 8, 0 * 16, 18 * 8, 16},
        ""};
    Text text_samplerate{
-        {11 * 8, 1 * 16, 8 * 8, 16},
+        {12 * 8, 1 * 16, 10 * 8, 16},
        ""};
    Text text_title{
-        {6 * 8, 2 * 16, 18 * 8, 16},
+        {6 * 8, 2 * 16, 17 * 8, 16},
        ""};
    Text text_duration{
-        {9 * 8, 3 * 16, 18 * 8, 16},
+        {9 * 8, 3 * 16, 20 * 8, 16},
        ""};
+    Text text_bits_per_sample{
+        {0 * 8, 1 * 16, 2 * 8, 16},
+        "16"};
    Button button_open{
        {24 * 8, 8, 6 * 8, 2 * 16},
        "Open"};
+    ImageButton button_play{
+        {24 * 8, 17 * 16, 2 * 8, 1 * 16},
+        &bitmap_play,
+        Color::green(),
+        Color::black()};
+    AudioVolumeField field_volume{
+        {28 * 8, 18 * 16}};

    Waveform waveform{
        {0, 5 * 16, 240, 64},
@@ -89,27 +126,40 @@ class ViewWavView : public View {
        false,
        Color::white()};

+    ProgressBar progressbar{
+        {0 * 8, 11 * 16, 30 * 8, 4}};
+
    NumberField field_pos_seconds{
-        {9 * 8, 11 * 16},
+        {9 * 8, 12 * 16},
+        4,
+        {0, 0},
+        1,
+        ' ',
+        true};
+    NumberField field_pos_milliseconds{
+        {14 * 8, 12 * 16},
        3,
        {0, 999},
        1,
-        ' '};
+        '0',
+        true};
    NumberField field_pos_samples{
-        {14 * 8, 11 * 16},
-        6,
-        {0, 999999},
+        {9 * 8, 13 * 16},
+        9,
+        {0, 0},
        1,
-        '0'};
+        '0',
+        true};
    NumberField field_scale{
-        {28 * 8, 11 * 16},
-        2,
-        {1, 40},
+        {25 * 8, 12 * 16},
+        5,
+        {1, 1},
        1,
-        ' '};
+        ' ',
+        true};

    NumberField field_cursor_a{
-        {9 * 8, 12 * 16},
+        {9 * 8, 14 * 16},
        3,
        {0, 239},
        1,
@@ -117,7 +167,7 @@ class ViewWavView : public View {
        true};

    NumberField field_cursor_b{
-        {9 * 8, 13 * 16},
+        {9 * 8, 15 * 16},
        3,
        {0, 239},
        1,
@@ -125,8 +175,31 @@ class ViewWavView : public View {
        true};

    Text text_delta{
-        {6 * 8, 14 * 16, 30 * 8, 16},
+        {7 * 8, 16 * 16, 30 * 8, 16},
        "-"};
+
+    MessageHandlerRegistration message_handler_replay_thread_error{
+        Message::ID::ReplayThreadDone,
+        [this](const Message* const p) {
+            const auto message = *reinterpret_cast<const ReplayThreadDoneMessage*>(p);
+            this->handle_replay_thread_done(message.return_code);
+        }};
+
+    MessageHandlerRegistration message_handler_fifo_signal{
+        Message::ID::RequestSignal,
+        [this](const Message* const p) {
+            const auto message = static_cast<const RequestSignalMessage*>(p);
+            if (message->signal == RequestSignalMessage::Signal::FillRequest) {
+                this->set_ready();
+            }
+        }};
+
+    MessageHandlerRegistration message_handler_tx_progress{
+        Message::ID::TXProgress,
+        [this](const Message* const p) {
+            const auto message = *reinterpret_cast<const TXProgressMessage*>(p);
+            this->on_playback_progress(message.progress);
+        }};
 };

 } /* namespace ui */
@@ -30,6 +30,8 @@
 using namespace portapack;
 using namespace ui;

+namespace pmem = portapack::persistent_memory;
+
 namespace ui {

 void WeatherRecentEntryDetailView::update_data() {
@@ -91,6 +93,7 @@ WeatherView::WeatherView(NavigationView& nav)
                  &field_rf_amp,
                  &field_lna,
                  &field_vga,
+                  &field_volume,
                  &field_frequency,
                  &options_temperature,
                  &button_clear_list,
@@ -120,6 +123,11 @@ WeatherView::WeatherView(NavigationView& nav)
    signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
        on_tick_second();
    };
+
+    if (pmem::beep_on_packets()) {
+        audio::set_rate(audio::Rate::Hz_24000);
+        audio::output::start();
+    }
 }

 void WeatherView::on_tick_second() {
@@ -142,10 +150,15 @@ void WeatherView::on_data(const WeatherDataMessage* data) {
        truncate_entries(recent, 64);
    }
    recent_entries_view.set_dirty();
+
+    if (pmem::beep_on_packets()) {
+        baseband::request_audio_beep(1000, 24000, 60);
+    }
 }

 WeatherView::~WeatherView() {
    rtc_time::signal_tick_second -= signal_token_tick_second;
+    audio::output::stop();
    receiver_model.disable();
    baseband::shutdown();
 }
@@ -126,6 +126,10 @@ class WeatherView : public View {
        {18 * 8, 0 * 16}};
    RSSI rssi{
        {21 * 8, 0, 6 * 8, 4}};
+
+    AudioVolumeField field_volume{
+        {28 * 8, 0 * 16}};
+
    RxFrequencyField field_frequency{
        {0 * 8, 0 * 16},
        nav_};
@@ -27,6 +27,7 @@
 #include "event_m0.hpp"
 #include "file_reader.hpp"
 #include "portapack.hpp"
+#include "file_path.hpp"

 #include <cstring>

@@ -142,7 +143,7 @@ WhipCalcView::WhipCalcView(NavigationView& nav)

 void WhipCalcView::load_antenna_db() {
    File antennas_file;
-    auto error = antennas_file.open("/WHIPCALC/ANTENNAS.TXT");
+    auto error = antennas_file.open(whipcalc_dir / u"ANTENNAS.TXT");

    if (error)
        return;
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -211,6 +211,7 @@ void set_audiotx_config(
    const float deviation_hz,
    const float audio_gain,
    uint8_t audio_shift_bits_s16,
+    uint8_t bits_per_sample,
    const uint32_t tone_key_delta,
    const bool am_enabled,
    const bool dsb_enabled,
@@ -221,6 +222,7 @@ void set_audiotx_config(
        deviation_hz,
        audio_gain,
        audio_shift_bits_s16,
+        bits_per_sample,
        tone_key_delta,
        (float)persistent_memory::tone_mix() / 100.0f,
        am_enabled,
@@ -426,8 +428,25 @@ void replay_stop() {
    send_message(&message);
 }

-void request_beep() {
-    RequestSignalMessage message{RequestSignalMessage::Signal::BeepRequest};
+void request_beep(RequestSignalMessage::Signal beep_type) {
+    RequestSignalMessage message{beep_type};
+    send_message(&message);
+}
+
+void request_roger_beep() {
+    request_beep(RequestSignalMessage::Signal::RogerBeepRequest);
+}
+
+void request_rssi_beep() {
+    request_beep(RequestSignalMessage::Signal::RSSIBeepRequest);
+}
+
+void request_beep_stop() {
+    request_beep(RequestSignalMessage::Signal::BeepStopRequest);
+}
+
+void request_audio_beep(uint32_t freq, uint32_t sample_rate, uint32_t duration_ms) {
+    AudioBeepMessage message{freq, sample_rate, duration_ms};
    send_message(&message);
 }

@@ -63,7 +63,7 @@ void set_tone(const uint32_t index, const uint32_t delta, const uint32_t duratio
 void set_tones_config(const uint32_t bw, const uint32_t pre_silence, const uint16_t tone_count, const bool dual_tone, const bool audio_out);
 void kill_tone();
 void set_sstv_data(const uint8_t vis_code, const uint32_t pixel_duration);
-void set_audiotx_config(const uint32_t divider, const float deviation_hz, const float audio_gain, uint8_t audio_shift_bits_s16, const uint32_t tone_key_delta, const bool am_enabled, const bool dsb_enabled, const bool usb_enabled, const bool lsb_enabled);
+void set_audiotx_config(const uint32_t divider, const float deviation_hz, const float audio_gain, uint8_t audio_shift_bits_s16, uint8_t bits_per_sample, const uint32_t tone_key_delta, const bool am_enabled, const bool dsb_enabled, const bool usb_enabled, const bool lsb_enabled);
 void set_fifo_data(const int8_t* data);
 void set_pitch_rssi(int32_t avg, bool enabled);
 void set_afsk_data(const uint32_t afsk_samples_per_bit, const uint32_t afsk_phase_inc_mark, const uint32_t afsk_phase_inc_space, const uint8_t afsk_repeat, const uint32_t afsk_bw, const uint8_t symbol_count);
@@ -89,7 +89,11 @@ void set_siggen_tone(const uint32_t tone);
 void set_siggen_config(const uint32_t bw, const uint32_t shape, const uint32_t duration);
 void set_spectrum_painter_config(const uint16_t width, const uint16_t height, bool update, int32_t bw);
 void set_subghzd_config(uint8_t modulation, uint32_t sampling_rate);
-void request_beep();
+
+void request_roger_beep();
+void request_rssi_beep();
+void request_beep_stop();
+void request_audio_beep(uint32_t freq, uint32_t sample_rate, uint32_t duration_ms);

 void run_image(const portapack::spi_flash::image_tag_t image_tag);
 void run_prepared_image(const uint32_t m4_code);
@@ -5759,6 +5759,82 @@ static constexpr Bitmap bitmap_icon_thermometer{
    {16, 16},
    bitmap_icon_thermometer_data};

+static constexpr uint8_t bitmap_icon_brightness_data[] = {
+    0x00,
+    0x00,
+    0x80,
+    0x01,
+    0x84,
+    0x21,
+    0x08,
+    0x10,
+    0xC0,
+    0x03,
+    0xE0,
+    0x07,
+    0xF0,
+    0x0F,
+    0xF6,
+    0x6F,
+    0xF6,
+    0x6F,
+    0xF0,
+    0x0F,
+    0xE0,
+    0x07,
+    0xC0,
+    0x03,
+    0x08,
+    0x10,
+    0x84,
+    0x21,
+    0x80,
+    0x01,
+    0x00,
+    0x00,
+};
+static constexpr Bitmap bitmap_icon_brightness{
+    {16, 16},
+    bitmap_icon_brightness_data};
+
+static constexpr uint8_t bitmap_icon_clean_data[] = {
+    0x00,
+    0x00,
+    0xC0,
+    0x01,
+    0x20,
+    0x02,
+    0xFC,
+    0x1F,
+    0x00,
+    0x00,
+    0x08,
+    0x08,
+    0xE8,
+    0x08,
+    0xA8,
+    0x09,
+    0xA8,
+    0x0B,
+    0x28,
+    0x0A,
+    0x28,
+    0x0A,
+    0x28,
+    0x0A,
+    0xE8,
+    0x0B,
+    0x08,
+    0x08,
+    0xF0,
+    0x07,
+    0x00,
+    0x00,
+};
+static constexpr Bitmap bitmap_icon_clean{
+    {16, 16},
+    bitmap_icon_clean_data};
+
 } /* namespace ui */

 #endif /*__BITMAP_HPP__*/
@@ -23,41 +23,43 @@

 #include "database.hpp"
 #include "file.hpp"
+#include "file_path.hpp"
 #include <cstring>

-namespace std {
-
 int database::retrieve_mid_record(MidDBRecord* record, std::string search_term) {
-    file_path = "AIS/mids.db";
+    file_path = ais_dir / u"mids.db";
    index_item_length = 4;
    record_length = 32;

-    result = std::database::retrieve_record(file_path, index_item_length, record_length, record, search_term);
+    result = 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";
+    file_path = adsb_dir / u"airlines.db";
    index_item_length = 4;
    record_length = 64;

-    result = std::database::retrieve_record(file_path, index_item_length, record_length, record, search_term);
+    result = 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";
+    file_path = adsb_dir / u"icao24.db";
    index_item_length = 7;
    record_length = 146;

-    result = std::database::retrieve_record(file_path, index_item_length, record_length, record, search_term);
+    result = 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) {
+int database::retrieve_record(std::filesystem::path file_path, int index_item_length, int record_length, void* record, std::string search_term) {
+    if (search_term.empty())
+        return DATABASE_RECORD_NOT_FOUND;
+
    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
@@ -91,5 +93,3 @@ int database::retrieve_record(std::string file_path, int index_item_length, int
    } else
        return (DATABASE_NOT_FOUND);
 }
-
-} /* namespace std */
@@ -30,7 +30,6 @@

 #include "file.hpp"

-namespace std {
 class database {
   public:
 #define DATABASE_RECORD_FOUND 0       // record found in database
@@ -62,9 +61,9 @@ class database {
    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
+    std::filesystem::path file_path = "";  // path including 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;
@@ -75,8 +74,7 @@ class database {

    int result = 0;

-    int retrieve_record(std::string file_path, int index_item_length, int record_length, void* record, std::string search_term);
+    int retrieve_record(std::filesystem::path file_path, int index_item_length, int record_length, void* record, std::string search_term);
 };
-}  // namespace std

 #endif /*__DATABASE_H__*/
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2023 Bernd Herzog
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -31,6 +32,7 @@
 #include "string_format.hpp"
 #include "ui_styles.hpp"
 #include "irq_controls.hpp"
+#include "file_path.hpp"

 using namespace ui;

@@ -265,7 +267,6 @@ bool stack_dump() {

 bool memory_dump(uint32_t* addr_start, uint32_t num_words, bool stack_flag) {
    Painter painter;
-    std::string debug_dir = "DEBUG";
    std::filesystem::path filename{};
    File dump_file{};
    bool error;
@@ -276,7 +277,7 @@ bool memory_dump(uint32_t* addr_start, uint32_t num_words, bool stack_flag) {
    bool data_found{false};

    ensure_directory(debug_dir);
-    filename = next_filename_matching_pattern(debug_dir + "/" + (stack_flag ? "STACK" : "MEMORY") + "_DUMP_????.TXT");
+    filename = next_filename_matching_pattern(debug_dir + (stack_flag ? u"/STACK" : u"/MEMORY") + u"_DUMP_????.TXT");
    error = filename.empty();
    if (!error)
        error = dump_file.create(filename) != 0;
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2023 Bernd Herzog
+ * Copyright (C) 2023 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -44,6 +44,8 @@ using namespace lpc43xx;

 #include "ui_navigation.hpp"

+static int delayed_error = 0;
+
 extern "C" {

 CH_IRQ_HANDLER(M4Core_IRQHandler) {
@@ -161,6 +163,10 @@ void EventDispatcher::dispatch(const eventmask_t events) {
    }

    if (events & EVT_MASK_RTC_TICK) {
+        // delay error message by 2 seconds to wait for LCD being ready
+        if (portapack::init_error != nullptr && ++delayed_error > 1)
+            draw_guru_meditation(CORTEX_M4, portapack::init_error);
+
        handle_rtc_tick();
    }

@@ -29,6 +29,7 @@
 #include "baseband_api.hpp"
 #include "string_format.hpp"
 #include "portapack_persistent_memory.hpp"
+#include "file_path.hpp"

 using namespace portapack;
 using namespace modems;
@@ -84,7 +85,7 @@ AFSKRxView::AFSKRxView(NavigationView& nav)

    logger = std::make_unique<AFSKLogger>();
    if (logger)
-        logger->append(LOG_ROOT_DIR "/AFSK.TXT");
+        logger->append(logs_dir / u"AFSK.TXT");

    // Auto-configure modem for LCR RX (will be removed later)
    baseband::set_afsk(persistent_memory::modem_baudrate(), 8, 0, false);
@@ -40,7 +40,7 @@ namespace ui::external_app::afsk_rx {

 class AFSKLogger {
   public:
-    Optional<File::Error> append(const std::string& filename) {
+    Optional<File::Error> append(const std::filesystem::path& filename) {
        return log_file.append(filename);
    }

--- a/Show More
+++ b/Show More