fix gray box & remove multiple line text support for NewButton (#2426)

Co-authored-by: gullradriel <gullradriel@no-mail.com>

.github/workflows/create_nightly_release.yml

@@ -54,19 +54,22 @@ jobs:
         run: docker run -e VERSION_STRING=${{ steps.version_date.outputs.date }} -i -v ${{ github.workspace }}:/havoc portapack-dev
       - name: Create Small SD Card ZIP - No World Map
         run: |
-          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd ..
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_nightly_${{ steps.version_date.outputs.date }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd ..
       - name: Download world map
         run: |
           wget https://github.com/portapack-mayhem/mayhem-firmware/releases/download/world_map/world_map.zip
       - name: Unzip world map
         run: |
           unzip world_map.zip -d sdcard/ADSB
+      - name: Prepare Firmware ZIP
+        run: |
+          cp build/hackrf/firmware/hackrf_usb/hackrf_usb.dfu flashing/utils/hackrf_one_usb.dfu && cp build/hackrf/firmware/hackrf_usb/hackrf_usb.bin flashing/utils/hackrf_one_usb.bin
       - name: Create Firmware ZIP
         run: |
           zip -j firmware.zip build/firmware/portapack-mayhem-firmware.bin && cd flashing && zip -r ../firmware.zip *
       - name: Create SD Card ZIP
         run: |
-          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd ..
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_nightly_${{ steps.version_date.outputs.date }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd ..
       - name: Create changelog
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/create_stable_release.yml

@@ -38,19 +38,22 @@ jobs:
         run: docker run -e VERSION_STRING=${{ steps.version.outputs.version }} -i -v ${{ github.workspace }}:/havoc portapack-dev
       - name: Create Small SD Card ZIP - No World Map
         run: |
-          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd ..
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_${{ steps.version.outputs.version }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd ..
       - name: Download world map
         run: |
           wget https://github.com/portapack-mayhem/mayhem-firmware/releases/download/world_map/world_map.zip
       - name: Unzip world map
         run: |
           unzip world_map.zip -d sdcard/ADSB
+      - name: Prepare Firmware ZIP
+        run: |
+          cp build/hackrf/firmware/hackrf_usb/hackrf_usb.dfu flashing/utils/hackrf_one_usb.dfu && cp build/hackrf/firmware/hackrf_usb/hackrf_usb.bin flashing/utils/hackrf_one_usb.bin
       - name: Create Firmware ZIP
         run: |
           zip -j firmware.zip build/firmware/portapack-mayhem-firmware.bin && cd flashing && zip -r ../firmware.zip *
       - name: Create SD Card ZIP
         run: |
-          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd ..
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_${{ steps.version.outputs.version }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd ..
       - name: Create changelog
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "hackrf"]
 	path = hackrf
-	url = https://github.com/mossmann/hackrf.git
+	url = https://github.com/portapack-mayhem/hackrf.git

CMakeLists.txt

@@ -65,10 +65,11 @@ message("Building version: ${VERSION} MD5: ${VERSION_MD5}")
 set(LICENSE_PATH ${CMAKE_CURRENT_LIST_DIR}/LICENSE)
 set(HARDWARE_PATH ${CMAKE_CURRENT_LIST_DIR}/hardware)
 
-add_subdirectory(hackrf-portapack)
+add_subdirectory(hackrf/firmware)
 
 set(HACKRF_FIRMWARE_DFU_FILENAME hackrf_usb.dfu)
 set(HACKRF_FIRMWARE_BIN_FILENAME hackrf_usb_ram.bin)
+set(HACKRF_FIRMWARE_FILENAME hackrf_usb.bin)
 set(HACKRF_CPLD_XSVF_FILENAME default.xsvf)
 
 set(HACKRF_PATH ${CMAKE_CURRENT_LIST_DIR}/hackrf)

README.md

@@ -1,8 +1,8 @@
+<!---
 > [!WARNING]
 > __IF YOU'VE PAID FOR MAYHEM OR ANY PREPACKAGED VERSIONS, YOU'RE BEING SCAMMED.__ 
 >
-> The only legitimate link to our repositories is the [portapack-mayhem](https://github.com/portapack-mayhem/mayhem-firmware) organization on GitHub.
-
+> The only legitimate link to our repositories is the [portapack-mayhem](https://github.com/portapack-mayhem/mayhem-firmware) organization on GitHub.--->
 # PortaPack Mayhem
 
 [![Nightly Release](https://github.com/portapack-mayhem/mayhem-firmware/actions/workflows/create_nightly_release.yml/badge.svg?branch=next)](https://github.com/portapack-mayhem/mayhem-firmware/actions/workflows/create_nightly_release.yml) [![CodeScene Code Health](https://codescene.io/projects/8381/status-badges/code-health)](https://codescene.io/projects/8381) [![GitHub All Releases](https://img.shields.io/github/downloads/portapack-mayhem/mayhem-firmware/total)](https://github.com/portapack-mayhem/mayhem-firmware/releases) [![GitHub Releases](https://img.shields.io/github/downloads/portapack-mayhem/mayhem-firmware/latest/total)](https://github.com/portapack-mayhem/mayhem-firmware/releases/latest) [![Docker Hub Pulls](https://img.shields.io/docker/pulls/eried/portapack.svg)](https://hub.docker.com/r/eried/portapack) [![Discord Chat](https://dcbadge.vercel.app/api/server/tuwVMv3?style=flat)](https://discord.gg/tuwVMv3)
@@ -11,15 +11,15 @@ This is a fork of the [Havoc](https://github.com/furrtek/portapack-havoc/) firmw
 
 [<img src="https://raw.githubusercontent.com/wiki/portapack-mayhem/mayhem-firmware/img/hw_overview_h2_front.png" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview) [<img src="https://raw.githubusercontent.com/wiki/portapack-mayhem/mayhem-firmware/img/hw_overview_h2_inside.png" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview#portapack-internals)
 
-*[PortaPack H2+HackRF+battery](https://grabify.link/P9CO0J) (clone) with a custom [3d printed case](https://github.com/portapack-mayhem/mayhem-firmware/wiki/3d-printed-enclosure)*
+*[PortaPack H2+HackRF+battery](https://www.ebay.com/itm/116382397447) (clone) with a custom [3d printed case](https://github.com/portapack-mayhem/mayhem-firmware/wiki/3d-printed-enclosure)*
 
 # What is this?
 
 If you are new to *HackRF+PortaPack+Mayhem*, check these:
 
-[<img alt="HackRF Portapack H4M - Getting Started Guide" src="https://img.youtube.com/vi/wzP0zWi85SI/maxresdefault.jpg" width="701">](https://grabify.link/F9MPOO)
+[<img alt="The Latest HackRF & Portapak Combo - H4M The Flipper Zero Killer?" src="https://img.youtube.com/vi/Ew2qDgm2hf0/maxresdefault.jpg" width="701">](https://share.hackrf.app/6HKX9A)
 
-[<img alt="It’s TOO Easy to Accidentally Do Illegal Stuff with This" src="https://img.youtube.com/vi/OPckpjBSAOw/maxresdefault.jpg" width="172">](https://grabify.link/X4D5TF) [<img alt="What is the HackRF One Portapack H2+?" src="https://img.youtube.com/vi/alrFbY5vxt4/maxresdefault.jpg" width="172">](https://grabify.link/9UZGEW) [<img alt="The new HackRF Portapack H4M" src="https://img.youtube.com/vi/onQRdCITmuk/maxresdefault.jpg" width="172">](https://grabify.link/0JUHZ6) [<img alt="HackRF 101 : Everything You Need to Know to Get Started!" src="https://img.youtube.com/vi/xGR_PMD9LeU/maxresdefault.jpg" width="172">](https://grabify.link/C0J6ZR)
+[<img alt="It’s TOO Easy to Accidentally Do Illegal Stuff with This" src="https://img.youtube.com/vi/OPckpjBSAOw/maxresdefault.jpg" width="172">](https://share.hackrf.app/X4D5TF) [<img alt="HackRF Portapack H4M - Getting Started Guide" src="https://img.youtube.com/vi/wzP0zWi85SI/maxresdefault.jpg" width="172">](https://share.hackrf.app/F9MPOO) [<img alt="The new HackRF Portapack H4M" src="https://img.youtube.com/vi/onQRdCITmuk/maxresdefault.jpg" width="172">](https://share.hackrf.app/0JUHZ6) [<img alt="HackRF 101 : Everything You Need to Know to Get Started!" src="https://img.youtube.com/vi/xGR_PMD9LeU/maxresdefault.jpg" width="172">](https://share.hackrf.app/C0J6ZR)
 
 # Frequently Asked Questions
 
@@ -27,12 +27,12 @@ This repository expands upon the previous work by many people and aims to consta
 
 ## What to buy?
 
-<!---not direct to h4m but to opensourcesdrlab https://grabify.link/TUOLYI---> 
-:heavy_check_mark: ![Static Badge](https://img.shields.io/badge/NEW-yellow) The fabulous [PortaPack H4M Mayhem](https://grabify.link/0STXCA), featuring numerous improvements and accessories. Sold by our friends at [OpenSourceSDRLab](https://grabify.link/99SAMT). Join their giveaways on discord (check the badge on top).
+<!---not direct to h4m but to opensourcesdrlab https://share.hackrf.app/TUOLYI---> 
+:heavy_check_mark: ![Static Badge](https://img.shields.io/badge/NEW-yellow) The fabulous [PortaPack H4M Mayhem](https://share.hackrf.app/0STXCA), featuring numerous improvements and accessories. Sold by our friends at [OpenSourceSDRLab](https://share.hackrf.app/99SAMT). Join their giveaways on discord (check the badge on top).
 
-:heavy_check_mark: A recommended one is this [PortaPack H2](https://grabify.link/P9CO0J), that includes everything you need with the plastic case "inspired" on [this](https://github.com/portapack-mayhem/mayhem-firmware/wiki/3d-printed-enclosure).
+:heavy_check_mark: A recommended one is this [PortaPack H2](https://www.ebay.com/itm/116382397447), that includes everything you need with the plastic case "inspired" on [this](https://github.com/portapack-mayhem/mayhem-firmware/wiki/3d-printed-enclosure).
 
-:heavy_check_mark: Some individuals lean towards the [H2 with a metal enclosure](https://grabify.link/LZPBH9), but its advantages remain debated. Share your insights on our [wiki](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview). 
+:heavy_check_mark: Some individuals lean towards the [H2 with a metal enclosure](https://share.hackrf.app/LZPBH9), but its advantages remain debated. Share your insights on our [wiki](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview). 
 
 :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:
 

dockerfile-nogit

@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:noble
 
 # Set location to download ARM toolkit from.
 # This will need to be changed over time or replaced with a static link to the latest release.
@@ -11,19 +11,10 @@ WORKDIR /havoc/firmware
 
 # Fetch dependencies from APT
 RUN apt-get update \
- && apt-get install -y git tar wget dfu-util cmake python3 ccache bzip2 liblz4-tool curl ninja-build \
+ && apt-get install -y git tar wget dfu-util cmake python3 python3-pip python3-yaml ccache bzip2 liblz4-tool curl ninja-build \
  && apt-get -qy autoremove \
  && rm -rf /var/lib/apt/lists/*
 
-#Install current pip from PyPa
-RUN curl https://bootstrap.pypa.io/pip/3.4/get-pip.py -o get-pip.py && \
-	python3 get-pip.py
-
-#Fetch additional dependencies from Python 3.x pip
-RUN pip install pyyaml \
- && ln -s /usr/bin/python3 /usr/bin/python \
- && ln -s /usr/bin/pip3 /usr/bin/pip
-
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
 

dockerfile-nogit-arm

@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:noble
 
 # Set location to download ARM toolkit from.
 # This will need to be changed over time or replaced with a static link to the latest release.
@@ -11,19 +11,10 @@ WORKDIR /havoc/firmware
 
 # Fetch dependencies from APT
 RUN apt-get update \
- && apt-get install -y git tar wget dfu-util cmake python3 ccache bzip2 liblz4-tool curl ninja-build \
+ && apt-get install -y git tar wget dfu-util cmake python3 python3-pip python3-yaml ccache bzip2 liblz4-tool curl ninja-build \
  && apt-get -qy autoremove \
  && rm -rf /var/lib/apt/lists/*
 
-#Install current pip from PyPa
-RUN curl https://bootstrap.pypa.io/pip/3.4/get-pip.py -o get-pip.py && \
-	python3 get-pip.py
-
-#Fetch additional dependencies from Python 3.x pip
-RUN pip install pyyaml \
- && ln -s /usr/bin/python3 /usr/bin/python \
- && ln -s /usr/bin/pip3 /usr/bin/pip
-
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
 

firmware/CMakeLists.txt

@@ -64,7 +64,7 @@ add_custom_command(
 
 add_custom_target(
 	firmware
-	DEPENDS ${FIRMWARE_FILENAME} ${HACKRF_FIRMWARE_DFU_FILENAME}
+	DEPENDS ${FIRMWARE_FILENAME} ${HACKRF_FIRMWARE_DFU_FILENAME} ${HACKRF_FIRMWARE_FILENAME}
 )
 
 if(${GCC_VERSION_MISMATCH})

firmware/application/CMakeLists.txt

@@ -102,6 +102,21 @@ include(external/external.cmake)
 # Define linker script file here
 set(LDSCRIPT ${PORTLD}/LPC43xx_M0.ld)
 
+# Special case for these two files:
+# Originally these are compiled for M4 support, but in Mayhem we use them with M0
+# As a result they are generating a lot of noise warnings
+# Since they are not really using the defines stated in the warnings
+# Since the only used one (NVIC_USB0_IRQ) is having the same value in both M0 and M4 mode
+# => We are faking M4 mode on them
+set(NO_WARNINGS_USBFILES
+	${HACKRF_PATH}/firmware/common/usb.c
+	${HACKRF_PATH}/firmware/common/usb_queue.c
+)
+
+# -DLPC43XX_M4 kills the 'warning: "NVIC_XXXX..." redefined'
+# -D__ARM_ARCH_7M__ kills the 'warning: implicit declaration of function __ldrex && __sdrex'
+set_source_files_properties(${NO_WARNINGS_USBFILES} PROPERTIES COMPILE_FLAGS "-DLPC43XX_M4 -D__ARM_ARCH_7M__")
+
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
 set(CSRC
@@ -118,8 +133,7 @@ set(CSRC
 	usb_serial_endpoints.c
 	usb_serial_device_to_host.c
 	i2c_device_to_host.c
-	${HACKRF_PATH}/firmware/common/usb.c
-	${HACKRF_PATH}/firmware/common/usb_queue.c
+	${NO_WARNINGS_USBFILES}
 	${HACKRF_PATH}/firmware/hackrf_usb/usb_device.c
 	${HACKRF_PATH}/firmware/common/usb_request.c
 	${HACKRF_PATH}/firmware/common/usb_standard_request.c

firmware/application/apps/ui_debug.cpp

@@ -74,91 +74,6 @@ void DebugMemoryView::focus() {
     button_done.focus();
 }
 
-/* TemperatureWidget *****************************************************/
-
-void TemperatureWidget::paint(Painter& painter) {
-    const auto logger = portapack::temperature_logger;
-
-    const auto rect = screen_rect();
-    const Color color_background{0, 0, 64};
-    const Color color_foreground = Theme::getInstance()->fg_green->foreground;
-    const Color color_reticle{128, 128, 128};
-
-    const auto graph_width = static_cast<int>(logger.capacity()) * bar_width;
-    const Rect graph_rect{
-        rect.left() + (rect.width() - graph_width) / 2, rect.top() + 8,
-        graph_width, rect.height()};
-    const Rect frame_rect{
-        graph_rect.left() - 1, graph_rect.top() - 1,
-        graph_rect.width() + 2, graph_rect.height() + 2};
-    painter.draw_rectangle(frame_rect, color_reticle);
-    painter.fill_rectangle(graph_rect, color_background);
-
-    const auto history = logger.history();
-    for (size_t i = 0; i < history.size(); i++) {
-        const Coord x = graph_rect.right() - (history.size() - i) * bar_width;
-        const auto sample = history[i];
-        const auto temp = temperature(sample);
-        const auto y = screen_y(temp, graph_rect);
-        const Dim bar_height = graph_rect.bottom() - y;
-        painter.fill_rectangle({x, y, bar_width, bar_height}, color_foreground);
-    }
-
-    if (!history.empty()) {
-        const auto sample = history.back();
-        const auto temp = temperature(sample);
-        const auto last_y = screen_y(temp, graph_rect);
-        const Coord x = graph_rect.right() + 8;
-        const Coord y = last_y - 8;
-
-        painter.draw_string({x, y}, style(), temperature_str(temp));
-    }
-
-    const auto display_temp_max = display_temp_min + (graph_rect.height() / display_temp_scale);
-    for (auto temp = display_temp_min; temp <= display_temp_max; temp += 10) {
-        const int32_t tick_length = 6;
-        const auto tick_x = graph_rect.left() - tick_length;
-        const auto tick_y = screen_y(temp, graph_rect);
-        painter.fill_rectangle({tick_x, tick_y, tick_length, 1}, color_reticle);
-        const auto text_x = graph_rect.left() - temp_len * 8 - 8;
-        const auto text_y = tick_y - 8;
-        painter.draw_string({text_x, text_y}, style(), temperature_str(temp));
-    }
-}
-
-TemperatureWidget::temperature_t TemperatureWidget::temperature(const sample_t sensor_value) const {
-    // Scaling is different for MAX2837 vs MAX2839 so it's now done in the respective chip-specific module
-    return sensor_value;
-}
-
-std::string TemperatureWidget::temperature_str(const temperature_t temperature) const {
-    return to_string_dec_int(temperature, temp_len - 2) + STR_DEGREES_C;
-}
-
-Coord TemperatureWidget::screen_y(
-    const temperature_t temperature,
-    const Rect& rect) const {
-    int y_raw = rect.bottom() - ((temperature - display_temp_min) * display_temp_scale);
-    const auto y_limit = std::min(rect.bottom(), std::max(rect.top(), y_raw));
-    return y_limit;
-}
-
-/* TemperatureView *******************************************************/
-
-TemperatureView::TemperatureView(NavigationView& nav) {
-    add_children({
-        &text_title,
-        &temperature_widget,
-        &button_done,
-    });
-
-    button_done.on_select = [&nav](Button&) { nav.pop(); };
-}
-
-void TemperatureView::focus() {
-    button_done.focus();
-}
-
 /* RegistersWidget *******************************************************/
 
 RegistersWidget::RegistersWidget(
@@ -507,12 +422,9 @@ void DebugMenuView::on_populate() {
         {"Debug Dump", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_memory, [this]() { portapack::persistent_memory::debug_dump(); }},
         {"M0 Stack Dump", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_memory, [this]() { stack_dump(); }},
         {"Memory Dump", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_memory, [this]() { nav_.push<DebugMemoryDumpView>(); }},
-        //{"Memory Usage", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_memory, [this]() { nav_.push<DebugMemoryView>(); }},
         {"Peripherals", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_peripherals, [this]() { nav_.push<DebugPeripheralsMenuView>(); }},
         {"Pers. Memory", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_memory, [this]() { nav_.push<DebugPmemView>(); }},
-        //{ "Radio State",	ui::Theme::getInstance()->bg_darkest->foreground,	nullptr,	[this](){ nav_.push<NotImplementedView>(); } },
         {"SD Card", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_sdcard, [this]() { nav_.push<SDCardDebugView>(); }},
-        {"Temperature", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_temperature, [this]() { nav_.push<TemperatureView>(); }},
         {"Touch Test", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_notepad, [this]() { nav_.push<DebugScreenTest>(); }},
         {"Reboot", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_setup, [this]() { nav_.push<DebugReboot>(); }},
         {"Ext Module", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_peripherals_details, [this]() { nav_.push<ExternalModuleView>(); }},

firmware/application/apps/ui_debug.hpp

@@ -86,53 +86,6 @@ class DebugMemoryView : public View {
         "Done"};
 };
 
-class TemperatureWidget : public Widget {
-   public:
-    explicit TemperatureWidget(
-        Rect parent_rect)
-        : Widget{parent_rect} {
-    }
-
-    void paint(Painter& painter) override;
-
-   private:
-    using sample_t = uint32_t;
-    using temperature_t = int32_t;
-
-    temperature_t temperature(const sample_t sensor_value) const;
-    Coord screen_y(const temperature_t temperature, const Rect& screen_rect) const;
-
-    std::string temperature_str(const temperature_t temperature) const;
-
-    static constexpr temperature_t display_temp_min = -10;  // Accomodate negative values, present in cold startup cases
-    static constexpr temperature_t display_temp_scale = 3;
-    static constexpr int bar_width = 1;
-    static constexpr int temp_len = 5;  // Now scale shows up to 5 chars ("-10ºC")
-};
-
-class TemperatureView : public View {
-   public:
-    explicit TemperatureView(NavigationView& nav);
-
-    void focus() override;
-
-    std::string title() const override { return "Temperature"; };
-
-   private:
-    Text text_title{
-        {76, 16, 240, 16},
-        "Temperature",
-    };
-
-    TemperatureWidget temperature_widget{
-        {0, 40, 240, 180},
-    };
-
-    Button button_done{
-        {72, 264, 96, 24},
-        "Done"};
-};
-
 typedef enum {
     CT_PMEM,
     CT_RFFC5072,

firmware/application/apps/ui_fileman.cpp

@@ -751,10 +751,17 @@ FileManagerView::FileManagerView(
             text_date.set("Too many files!");
         } else {
             text_date.set_style(Theme::getInstance()->fg_medium);
-            if (selected_is_valid())
-                text_date.set((is_directory(get_selected_full_path()) ? "Created " : "Modified ") + to_string_FAT_timestamp(file_created_date(get_selected_full_path())));
-            else
+            if (selected_is_valid()) {
+                if (get_selected_entry().path == str_back) {
+                    text_date.set("Go page " + std::to_string(pagination + 1 - 1));  // for better explain, pagination start with 0 AKA real page - 1
+                } else if (get_selected_entry().path == str_next) {
+                    text_date.set("Go page " + std::to_string(pagination + 1 + 1));  // when show this, it should display current AKA (pagination + 1) + 1 AKA next page
+                } else {
+                    text_date.set((is_directory(get_selected_full_path()) ? "Created " : "Modified ") + to_string_FAT_timestamp(file_created_date(get_selected_full_path())));
+                }
+            } else {
                 text_date.set("");
+            }
         }
     };
 

firmware/application/apps/ui_flash_utility.cpp

@@ -95,7 +95,7 @@ FlashUtilityView::FlashUtilityView(NavigationView& nav)
 
             menu_view.add_item({filename.string().substr(0, max_filename_length),
                                 color,
-                                &bitmap_icon_temperature,
+                                &bitmap_icon_peripherals_details,
                                 [this, path](KeyEvent) {
                                     this->firmware_selected(path);
                                 }});

firmware/application/apps/ui_level.cpp

@@ -187,6 +187,7 @@ void LevelView::on_statistics_update(const ChannelStatistics& statistics) {
     if (last_max_db != statistics.max_db) {
         last_max_db = statistics.max_db;
         freq_stats_db.set("Power: " + to_string_dec_int(statistics.max_db) + " db");
+        rssi.set_db(statistics.max_db);
     }
     // refresh rssi
     if (last_min_rssi != rssi_graph.get_graph_min() || last_avg_rssi != rssi_graph.get_graph_avg() || last_max_rssi != rssi_graph.get_graph_max()) {

firmware/application/bitmap.hpp

@@ -2531,44 +2531,6 @@ static constexpr Bitmap bitmap_icon_batt_icon{
     {16, 16},
     bitmap_icon_batt_icon_data};
 
-static constexpr uint8_t bitmap_icon_temperature_data[] = {
-    0x00,
-    0x01,
-    0x80,
-    0x01,
-    0x80,
-    0x05,
-    0xC0,
-    0x0D,
-    0x40,
-    0x0D,
-    0xD0,
-    0x1F,
-    0x70,
-    0x15,
-    0xB0,
-    0x1A,
-    0x58,
-    0x35,
-    0xB8,
-    0x3A,
-    0x58,
-    0x34,
-    0x28,
-    0x28,
-    0x18,
-    0x30,
-    0x30,
-    0x18,
-    0x60,
-    0x0C,
-    0xC0,
-    0x07,
-};
-static constexpr Bitmap bitmap_icon_temperature{
-    {16, 16},
-    bitmap_icon_temperature_data};
-
 static constexpr uint8_t bitmap_tab_edge_data[] = {
     0x00,
     0x01,

firmware/application/external/external.cmake

@@ -130,6 +130,10 @@ set(EXTCPPSRC
 	#remote
 	external/remote/main.cpp
 	external/remote/ui_remote.cpp
+
+	#mcu_temperature
+	external/mcu_temperature/main.cpp
+	external/mcu_temperature/mcu_temperature.cpp
 )
 
 set(EXTAPPLIST
@@ -164,4 +168,5 @@ set(EXTAPPLIST
 	shoppingcart_lock
 	flippertx
     remote
+	mcu_temperature
 )

firmware/application/external/external.ld

@@ -54,6 +54,7 @@ MEMORY
     ram_external_app_flippertx(rwx) : org = 0xADCD0000, len = 32k 
     ram_external_app_ook_editor(rwx) : org = 0xADCE0000, len = 32k 
     ram_external_app_remote(rwx) : org = 0xADCF0000, len = 32k 
+    ram_external_app_mcu_temperature(rwx) : org = 0xADD00000, len = 32k 
 }
 
 SECTIONS
@@ -244,4 +245,10 @@ SECTIONS
         KEEP(*(.external_app.app_remote.application_information));
         *(*ui*external_app*remote*);
     } > ram_external_app_remote
+
+    .external_app_mcu_temperature : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_mcu_temperature.application_information));
+        *(*ui*external_app*mcu_temperature*);
+    } > ram_external_app_mcu_temperature
 }

firmware/application/external/mcu_temperature/main.cpp

@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2024 Bernd Herzog
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ui.hpp"
+#include "mcu_temperature.hpp"
+#include "ui_navigation.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::mcu_temperature {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<McuTemperatureView>();
+}
+}  // namespace ui::external_app::mcu_temperature
+
+extern "C" {
+
+__attribute__((section(".external_app.app_mcu_temperature.application_information"), used)) application_information_t _application_information_mcu_temperature = {
+    /*.memory_location = */ (uint8_t*)0x00000000,
+    /*.externalAppEntry = */ ui::external_app::mcu_temperature::initialize_app,
+    /*.header_version = */ CURRENT_HEADER_VERSION,
+    /*.app_version = */ VERSION_MD5,
+
+    /*.app_name = */ "Temperature",
+    /*.bitmap_data = */ {
+        0x00,
+        0x00,
+        0x20,
+        0x00,
+        0x70,
+        0x3E,
+        0x88,
+        0x00,
+        0x88,
+        0x00,
+        0x88,
+        0x3E,
+        0x88,
+        0x00,
+        0x88,
+        0x00,
+        0x88,
+        0x3E,
+        0x88,
+        0x00,
+        0x04,
+        0x01,
+        0x74,
+        0x01,
+        0x04,
+        0x01,
+        0x88,
+        0x00,
+        0x70,
+        0x00,
+        0x00,
+        0x00,
+    },
+    /*.icon_color = */ ui::Color::cyan().v,
+    /*.menu_location = */ app_location_t::DEBUG,
+    /*.desired_menu_position = */ -1,
+
+    /*.m4_app_tag = portapack::spi_flash::image_tag_none */ {0, 0, 0, 0},
+    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
+};
+}

firmware/application/external/mcu_temperature/mcu_temperature.cpp

@@ -0,0 +1,91 @@
+#include "mcu_temperature.hpp"
+
+#include "ui_painter.hpp"
+
+#include "portapack.hpp"
+
+using namespace portapack;
+namespace ui::external_app::mcu_temperature {
+
+void McuTemperatureWidget::paint(Painter& painter) {
+    const auto logger = portapack::temperature_logger;
+
+    const auto rect = screen_rect();
+    const Color color_background{0, 0, 64};
+    const Color color_foreground = Theme::getInstance()->fg_green->foreground;
+    const Color color_reticle{128, 128, 128};
+
+    const auto graph_width = static_cast<int>(logger.capacity()) * bar_width;
+    const Rect graph_rect{
+        rect.left() + (rect.width() - graph_width) / 2, rect.top() + 8,
+        graph_width, rect.height()};
+    const Rect frame_rect{
+        graph_rect.left() - 1, graph_rect.top() - 1,
+        graph_rect.width() + 2, graph_rect.height() + 2};
+    painter.draw_rectangle(frame_rect, color_reticle);
+    painter.fill_rectangle(graph_rect, color_background);
+
+    const auto history = logger.history();
+    for (size_t i = 0; i < history.size(); i++) {
+        const Coord x = graph_rect.right() - (history.size() - i) * bar_width;
+        const auto sample = history[i];
+        const auto temp = temperature(sample);
+        const auto y = screen_y(temp, graph_rect);
+        const Dim bar_height = graph_rect.bottom() - y;
+        painter.fill_rectangle({x, y, bar_width, bar_height}, color_foreground);
+    }
+
+    if (!history.empty()) {
+        const auto sample = history.back();
+        const auto temp = temperature(sample);
+        const auto last_y = screen_y(temp, graph_rect);
+        const Coord x = graph_rect.right() + 8;
+        const Coord y = last_y - 8;
+
+        painter.draw_string({x, y}, style(), temperature_str(temp));
+    }
+
+    const auto display_temp_max = display_temp_min + (graph_rect.height() / display_temp_scale);
+    for (auto temp = display_temp_min; temp <= display_temp_max; temp += 10) {
+        const int32_t tick_length = 6;
+        const auto tick_x = graph_rect.left() - tick_length;
+        const auto tick_y = screen_y(temp, graph_rect);
+        painter.fill_rectangle({tick_x, tick_y, tick_length, 1}, color_reticle);
+        const auto text_x = graph_rect.left() - temp_len * 8 - 8;
+        const auto text_y = tick_y - 8;
+        painter.draw_string({text_x, text_y}, style(), temperature_str(temp));
+    }
+}
+
+McuTemperatureWidget::temperature_t McuTemperatureWidget::temperature(const sample_t sensor_value) const {
+    // Scaling is different for MAX2837 vs MAX2839 so it's now done in the respective chip-specific module
+    return sensor_value;
+}
+
+std::string McuTemperatureWidget::temperature_str(const temperature_t temperature) const {
+    return to_string_dec_int(temperature, temp_len - 2) + STR_DEGREES_C;
+}
+
+Coord McuTemperatureWidget::screen_y(
+    const temperature_t temperature,
+    const Rect& rect) const {
+    int y_raw = rect.bottom() - ((temperature - display_temp_min) * display_temp_scale);
+    const auto y_limit = std::min(rect.bottom(), std::max(rect.top(), y_raw));
+    return y_limit;
+}
+
+McuTemperatureView::McuTemperatureView(NavigationView& nav) {
+    add_children({
+        &text_title,
+        &temperature_widget,
+        &button_done,
+    });
+
+    button_done.on_select = [&nav](Button&) { nav.pop(); };
+}
+
+void McuTemperatureView::focus() {
+    button_done.focus();
+}
+
+}  // namespace ui::external_app::mcu_temperature

firmware/application/external/mcu_temperature/mcu_temperature.hpp

@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __MCU_TEMPERATURE_H__
+#define __MCU_TEMPERATURE_H__
+
+#include "ui.hpp"
+#include "ui_widget.hpp"
+#include "ui_painter.hpp"
+#include "ui_menu.hpp"
+#include "ui_navigation.hpp"
+
+#include "rffc507x.hpp"
+#include "portapack.hpp"
+#include "memory_map.hpp"
+#include "irq_controls.hpp"
+
+#include <functional>
+#include <utility>
+
+namespace ui::external_app::mcu_temperature {
+
+class McuTemperatureWidget : public Widget {
+   public:
+    explicit McuTemperatureWidget(
+        Rect parent_rect)
+        : Widget{parent_rect} {
+    }
+
+    void paint(Painter& painter) override;
+
+   private:
+    using sample_t = uint32_t;
+    using temperature_t = int32_t;
+
+    temperature_t temperature(const sample_t sensor_value) const;
+    Coord screen_y(const temperature_t temperature, const Rect& screen_rect) const;
+
+    std::string temperature_str(const temperature_t temperature) const;
+
+    static constexpr temperature_t display_temp_min = -10;  // Accomodate negative values, present in cold startup cases
+    static constexpr temperature_t display_temp_scale = 3;
+    static constexpr int bar_width = 1;
+    static constexpr int temp_len = 5;  // Now scale shows up to 5 chars ("-10ºC")
+};
+
+class McuTemperatureView : public View {
+   public:
+    explicit McuTemperatureView(NavigationView& nav);
+
+    void focus() override;
+
+    std::string title() const override { return "Temperature"; };
+
+   private:
+    Text text_title{
+        {76, 16, 240, 16},
+        "Temperature",
+    };
+
+    McuTemperatureWidget temperature_widget{
+        {0, 40, 240, 180},
+    };
+
+    Button button_done{
+        {72, 264, 96, 24},
+        "Done"};
+};
+
+}  // namespace ui::external_app::mcu_temperature
+
+#endif /*__MCU_TEMPERATURE_H__*/

firmware/application/external/ook_editor/ui_ook_editor.cpp

@@ -57,6 +57,7 @@ void OOKEditorAppView::start_tx() {
 
 // `stop_tx` method: Stops the transmission and resets the progress bar.
 void OOKEditorAppView::stop_tx() {
+    // TODO: model stopped but message still spamming.
     is_transmitting = false;                                                 // set transmitting flag
     stop_ook_file_tx();                                                      // stop transmission
     progressbar.set_value(0);                                                // Reset progress bar to 0
@@ -82,7 +83,7 @@ void OOKEditorAppView::on_file_changed(const fs::path& new_file_path) {
 
 // `on_tx_progress` method: Updates the progress bar based on transmission progress.
 void OOKEditorAppView::on_tx_progress(const uint32_t progress, const bool done) {
-    progressbar.set_value(progress);  // Update progress bar value
+    if (is_transmitting) progressbar.set_value(progress);  // Update progress bar value
     if (done) {
         stop_tx();  // Stop transmission when progress reaches maximum
     }

firmware/application/external/remote/ui_remote.hpp

@@ -84,7 +84,7 @@ class RemoteIcons {
         &bitmap_icon_sonde,
         &bitmap_icon_stealth,
         &bitmap_icon_tetra,
-        &bitmap_icon_temperature};
+        &bitmap_icon_peripherals_details};
 };
 
 // TODO: Use RGB colors instead?

firmware/application/ui/ui_geomap.hpp

@@ -344,7 +344,7 @@ class GeoMapView : public View {
         {0, GeoMap::banner_height, GeoMap::geomap_rect_width, GeoMap::geomap_rect_height}};
 
     Button button_ok{
-        {20 * 8, 8, 8 * 8, 2 * 16},
+        {screen_width - 15 * 8, 0, 15 * 8, 1 * 16},
         "OK"};
 };
 

firmware/application/ui/ui_rssi.cpp

@@ -100,8 +100,19 @@ void RSSI::paint(Painter& painter) {
             const Rect r5{r.left() + peak - 3, r.top(), 3, r.height()};
             painter.fill_rectangle(
                 r5,
-                Theme::getInstance()->fg_green->foreground);
+                Theme::getInstance()->fg_orange->foreground);
         }
+
+        // dB - x
+        constexpr int db_min = -80;
+        constexpr int db_max = 10;
+        constexpr int db_delta = db_max - db_min;
+        const range_t<int> x_db_range{0, r.width() - 1};
+        const int16_t x_db = x_db_range.clip((db_ - db_min) * r.width() / db_delta);
+
+        const Rect r_db{r.left() + x_db, r.top(), 1, r.height()};
+
+        if (db_) painter.fill_rectangle(r_db, Color::green());
     } else {
         // vertical bottom to top level meters
         const range_t<int> y_avg_range{0, r.height() - 1};
@@ -115,7 +126,7 @@ void RSSI::paint(Painter& painter) {
 
         // y_min
         const Rect r0{r.left(), r.bottom() - y_min, r.width(), y_min};
-        painter.fill_rectangle(
+        painter.fill_rectangle(  // TODO: the blue plot is broken in vertical bars, not from the dB PR (#2403)
             r0,
             Color::blue());
 
@@ -149,8 +160,18 @@ void RSSI::paint(Painter& painter) {
             const Rect r5{r.left(), r.bottom() - peak - 3, r.width(), 3};
             painter.fill_rectangle(
                 r5,
-                Color::green());
+                Color::orange());
         }
+
+        // dB - y
+        constexpr int db_min = -80;
+        constexpr int db_max = 10;
+        constexpr int db_delta = db_max - db_min;
+        const range_t<int> y_db_range{0, r.height() - 1};
+        const int16_t y_db = y_db_range.clip((db_ - db_min) * r.height() / db_delta);
+
+        const Rect r_db{r.left(), r.bottom() - y_db, r.width(), 3};
+        if (db_) painter.fill_rectangle(r_db, Color::green());
     }
     if (pitch_rssi_enabled) {
         baseband::set_pitch_rssi((avg_ - raw_min) * 2000 / raw_delta, true);
@@ -159,7 +180,7 @@ void RSSI::paint(Painter& painter) {
         const Rect r6{r.left(), r.top(), r.width(), r.height()};
         painter.draw_rectangle(
             r6,
-            Color::white());
+            Color::white());  // TODO this and all the following Color struct call should satisfy the new "theme" system ref
     }
 }
 
@@ -500,4 +521,8 @@ bool RSSI::on_touch(const TouchEvent event) {
             return false;
     }
 }
+
+void RSSI::set_db(int16_t db) {
+    db_ = db;
+}
 } /* namespace ui */

firmware/application/ui/ui_rssi.hpp

@@ -61,6 +61,7 @@ class RSSI : public Widget {
     void on_focus() override;
     bool on_key(const KeyEvent key) override;
     bool on_touch(const TouchEvent event) override;
+    void set_db(int16_t db);
 
    private:
     int8_t min_ = 0;
@@ -68,6 +69,7 @@ class RSSI : public Widget {
     int8_t max_ = 0;
     int8_t peak_ = 0;
     size_t peak_duration_ = 0;
+    int16_t db_ = 0;
     bool instant_exec_{false};
 
     bool pitch_rssi_enabled = false;

firmware/application/ui_navigation.cpp

@@ -174,7 +174,7 @@ const NavigationView::AppList NavigationView::appList = {
 
     {"wavview", "Wav View", UTILITIES, Color::yellow(), &bitmap_icon_soundboard, new ViewFactory<ViewWavView>()},
     // Dangerous apps.
-    {nullptr, "Flash Utility", UTILITIES, Color::red(), &bitmap_icon_temperature, new ViewFactory<FlashUtilityView>()},
+    {nullptr, "Flash Utility", UTILITIES, Color::red(), &bitmap_icon_peripherals_details, new ViewFactory<FlashUtilityView>()},
     {nullptr, "Wipe SD card", UTILITIES, Color::red(), &bitmap_icon_tools_wipesd, new ViewFactory<WipeSDView>()},
 };
 
@@ -330,6 +330,7 @@ SystemStatusView::SystemStatusView(
 
     audio::output::stop();
     audio::output::update_audio_mute();
+
     refresh();
 }
 
@@ -761,10 +762,10 @@ static void add_apps(NavigationView& nav, BtnGridView& grid, app_location_t loc)
 }
 
 // clang-format off
-void add_external_items(NavigationView& nav, app_location_t location, BtnGridView& grid, uint8_t notice_pos) {
+void add_external_items(NavigationView& nav, app_location_t location, BtnGridView& grid, uint8_t error_tile_pos) {
     auto externalItems = ExternalItemsMenuLoader::load_external_items(location, nav);
     if (externalItems.empty()) {
-        grid.insert_item({"Notice!",
+        grid.insert_item({"ExtAppErr",
                           Theme::getInstance()->error_dark->foreground,
                           nullptr,
                           [&nav]() {
@@ -774,7 +775,7 @@ void add_external_items(NavigationView& nav, app_location_t location, BtnGridVie
                                   "see Mayhem wiki and copy apps\n"
                                   "to " + apps_dir.string() + " folder of SD card.");
                           }},
-                         notice_pos);
+                         error_tile_pos);
     } else {
         std::sort(externalItems.begin(), externalItems.end(), [](const auto &a, const auto &b)
         { 
@@ -795,6 +796,12 @@ void add_external_items(NavigationView& nav, app_location_t location, BtnGridVie
 }
 // clang-format on
 
+bool verify_sdcard_format() {
+    FATFS* fs = &sd_card::fs;
+    return (fs->fs_type == FS_FAT32) || !(sd_card::status() == sd_card::Status::Mounted);
+    /*                                   ^ to satisfy those users that not use an sd*/
+}
+
 /* ReceiversMenuView *****************************************************/
 
 ReceiversMenuView::ReceiversMenuView(NavigationView& nav)
@@ -866,8 +873,13 @@ SystemMenuView::SystemMenuView(NavigationView& nav)
 }
 
 void SystemMenuView::on_populate() {
+    if (!verify_sdcard_format()) {
+        add_item({"SDCard Error", Theme::getInstance()->error_dark->foreground, nullptr, [this]() {
+                      nav_.display_modal("Error", "SD Card is not FAT32,\nformat to FAT32 on PC");
+                  }});
+    }
     add_apps(nav_, *this, HOME);
-    add_external_items(nav_, app_location_t::HOME, *this, 2);
+    add_external_items(nav_, app_location_t::HOME, *this, 0);
     add_item({"HackRF", Theme::getInstance()->fg_cyan->foreground, &bitmap_icon_hackrf, [this]() { hackrf_mode(nav_); }});
 }
 

firmware/application/ui_navigation.hpp

@@ -197,6 +197,7 @@ class SystemStatusView : public View {
     static constexpr auto default_title = "";
     bool batt_was_inited = false;  // if the battery was off on tart, but later turned on.
     bool batt_info_up = false;     // to prevent show multiple batt info dialog
+
     NavigationView& nav_;
 
     Rectangle backdrop{
@@ -322,7 +323,7 @@ class InformationView : public View {
 
     Rectangle backdrop{
         {0, 0 * 16, 240, 16},
-        {33, 33, 33}};
+        Theme::getInstance()->bg_darker->background};
 
     Text version{
         {2, 0, 11 * 8, 16},

firmware/application/ui_sd_card_debug.cpp

@@ -240,21 +240,16 @@ namespace ui {
 
 SDCardDebugView::SDCardDebugView(NavigationView& nav) {
     add_children({
-        &text_title,
-        &text_csd_title,
+        &labels,
+        &text_format,
         &text_csd_value_3,
         &text_csd_value_2,
         &text_csd_value_1,
         &text_csd_value_0,
-        &text_bus_width_title,
         &text_bus_width_value,
-        &text_card_type_title,
         &text_card_type_value,
-        &text_block_size_title,
         &text_block_size_value,
-        &text_block_count_title,
         &text_block_count_value,
-        &text_capacity_title,
         &text_capacity_value,
         &text_test_write_time_title,
         &text_test_write_time_value,
@@ -374,6 +369,14 @@ void SDCardDebugView::on_status(const sd_card::Status) {
         text_csd_value_1.set(to_string_hex(csd[1], 8));
         text_csd_value_0.set(to_string_hex(csd[0], 8));
 
+        text_format.set(fetch_sdcard_format());
+        if (fetch_sdcard_format().find("FAT32") != std::string::npos) {
+            // to satisfy the intendent style in this app, the text contains padding space, thus can't use ==
+            text_format.set_style(Theme::getInstance()->fg_green);
+        } else {
+            text_format.set_style(Theme::getInstance()->error_dark);
+        }
+
         BlockDeviceInfo block_device_info;
         if (sdcGetInfo(&SDCD1, &block_device_info) == CH_SUCCESS) {
             text_block_size_value.set(to_string_dec_uint(block_device_info.blk_size, 5));
@@ -447,4 +450,38 @@ void SDCardDebugView::on_test() {
     }
 }
 
+std::string SDCardDebugView::fetch_sdcard_format() {
+    const size_t max_len = sizeof("Undefined: 255") + 1;
+
+    auto padding = [max_len](std::string s) {
+        if (s.length() < max_len) {
+            return std::string(max_len - s.length(), ' ') + s;
+        }
+        return s;
+    };
+
+    FATFS* fs = &sd_card::fs;
+    std::string resault;
+
+    switch (fs->fs_type) {
+        case FS_FAT12:
+            resault = "FAT12";
+            break;
+        case FS_FAT16:
+            resault = "FAT16";
+            break;
+        case FS_FAT32:
+            resault = "FAT32";
+            break;
+        case FS_EXFAT:  // TODO: a bug from filesystem can't detect exfat, issue not from here
+            resault = "ExFAT";
+            break;
+        default:
+            resault = "Undefined: " + to_string_dec_uint(fs->fs_type, 1);
+            break;
+    }
+
+    return padding(resault);
+}
+
 } /* namespace ui */

firmware/application/ui_sd_card_debug.hpp

@@ -45,15 +45,23 @@ class SDCardDebugView : public View {
 
     void on_status(const sd_card::Status status);
     void on_test();
+    std::string fetch_sdcard_format();
+
+    Labels labels{
+        {{0 * 8, 1 * 16}, "Format", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 3 * 16}, "CSD", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 5 * 16}, "Bus width", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 6 * 16}, "Card type", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 8 * 16}, "Block size", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 9 * 16}, "Block count", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 10 * 16}, "Capacity", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 5 * 16}, "Bus width", Theme::getInstance()->fg_light->foreground},
 
-    Text text_title{
-        {(240 - (7 * 8)) / 2, 1 * 16, (7 * 8), 16},
-        "SD Card",
     };
 
-    Text text_csd_title{
-        {0, 3 * 16, (8 * 8), 16},
-        "CSD",
+    Text text_format{
+        {240 - ((sizeof("Undefined: 255") + 1) * 8), 1 * 16, (sizeof("Undefined: 255") + 1) * 8, 16},
+        "Unknown",
     };
 
     Text text_csd_value_3{
@@ -78,11 +86,6 @@ class SDCardDebugView : public View {
 
     static constexpr size_t bus_width_characters = 1;
 
-    Text text_bus_width_title{
-        {0, 5 * 16, (9 * 8), 16},
-        "Bus width",
-    };
-
     Text text_bus_width_value{
         {240 - (bus_width_characters * 8), 5 * 16, (bus_width_characters * 8), 16},
         "",
@@ -90,11 +93,6 @@ class SDCardDebugView : public View {
 
     static constexpr size_t card_type_characters = 13;
 
-    Text text_card_type_title{
-        {0, 6 * 16, (9 * 8), 16},
-        "Card type",
-    };
-
     Text text_card_type_value{
         {240 - (card_type_characters * 8), 6 * 16, (card_type_characters * 8), 16},
         "",
@@ -102,11 +100,6 @@ class SDCardDebugView : public View {
 
     static constexpr size_t block_size_characters = 5;
 
-    Text text_block_size_title{
-        {0, 8 * 16, (10 * 8), 16},
-        "Block size",
-    };
-
     Text text_block_size_value{
         {240 - (block_size_characters * 8), 8 * 16, (block_size_characters * 8), 16},
         "",
@@ -114,11 +107,6 @@ class SDCardDebugView : public View {
 
     static constexpr size_t block_count_characters = 9;
 
-    Text text_block_count_title{
-        {0, 9 * 16, (11 * 8), 16},
-        "Block count",
-    };
-
     Text text_block_count_value{
         {240 - (block_count_characters * 8), 9 * 16, (block_count_characters * 8), 16},
         "",
@@ -126,11 +114,6 @@ class SDCardDebugView : public View {
 
     static constexpr size_t capacity_characters = 10;
 
-    Text text_capacity_title{
-        {0, 10 * 16, (8 * 8), 16},
-        "Capacity",
-    };
-
     Text text_capacity_value{
         {240 - (capacity_characters * 8), 10 * 16, (capacity_characters * 8), 16},
         "",

firmware/application/usb_serial_shell.cpp

@@ -907,6 +907,191 @@ static void cmd_cpld_read(BaseSequentialStream* chp, int argc, char* argv[]) {
     }
 }
 
+static uint32_t reverse(uint32_t x) {
+    x = ((x >> 1) & 0x55555555u) | ((x & 0x55555555u) << 1);
+    x = ((x >> 2) & 0x33333333u) | ((x & 0x33333333u) << 2);
+    x = ((x >> 4) & 0x0f0f0f0fu) | ((x & 0x0f0f0f0fu) << 4);
+    x = ((x >> 8) & 0x00ff00ffu) | ((x & 0x00ff00ffu) << 8);
+    x = ((x >> 16) & 0xffffu) | ((x & 0xffffu) << 16);
+    return x;
+}
+
+static void cmd_cpld_write(BaseSequentialStream* chp, int argc, char* argv[]) {
+    const char* usage =
+        "usage: cpld_write <device> <target> <file>\r\n"
+        "  device can be: hackrf, portapack\r\n"
+        "  target can be: sram (hackrf only), eeprom\r\n"
+        "  currently only \"cpld_write portapack eeprom <file>\" is supported\r\n";
+
+    if (argc != 3) {
+        chprintf(chp, usage);
+        return;
+    }
+
+    if (strncmp(argv[0], "hackrf", 5) == 0) {
+        chprintf(chp, usage);
+    } else if (strncmp(argv[0], "portapack", 5) == 0) {
+        if (strncmp(argv[1], "eeprom", 5) == 0) {
+            jtag::GPIOTarget target{
+                portapack::gpio_cpld_tck,
+                portapack::gpio_cpld_tms,
+                portapack::gpio_cpld_tdi,
+                portapack::gpio_cpld_tdo};
+            jtag::JTAG jtag{target};
+            portapack::cpld::CPLD cpld{jtag};
+
+            cpld.reset();
+            cpld.run_test_idle();
+            uint32_t idcode = cpld.get_idcode();
+
+            chprintf(chp, "CPLD IDCODE: 0x%08X\r\n", idcode);
+
+            if (idcode == 0x00025610) {
+                chprintf(chp, "CPLD Model: AGM AG256SL100\r\n");
+
+                if (cpld.AGM_enter_maintenance_mode() == false) {
+                    return;
+                }
+
+                File* file = new File();
+                auto path = path_from_string8(argv[2]);
+                auto error = file->open(path);
+
+                if (error.is_valid()) {
+                    chprintf(chp, "Error opening file: %s %d %s\r\n", argv[2], error.value().code(), error.value().what().c_str());
+                    delete file;
+                    cpld.AGM_exit_maintenance_mode();
+                    return;
+                }
+
+                auto data = std::make_unique<std::array<uint32_t, 1801>>();
+                uint32_t magic = 0;
+                bool magic_found = false;
+                uint32_t expected_address = 0;
+
+                auto readData = std::vector<uint8_t>();
+
+                chprintf(chp, "Reading file...\r\n");
+                file->seek(0);
+
+                while (!file->eof().value()) {
+                    uint32_t remainingData = readData.size();
+                    uint32_t bytesToRead = 512 - remainingData;
+
+                    readData.resize(512);
+
+                    auto result = file->read(readData.data() + remainingData, bytesToRead);
+
+                    if (result.is_error()) {
+                        chprintf(chp, "Error reading file: %d %s\r\n", result.error().code(), result.error().what().c_str());
+                        cpld.AGM_exit_maintenance_mode();
+                        file->close();
+                        delete file;
+                        return;
+                    }
+
+                    if (result.value() != 512)
+                        readData.resize(remainingData + result.value());
+
+                    do {
+                        auto it = std::find(readData.begin(), readData.end(), '\n');
+                        if (it != readData.end()) {
+                            std::string line(readData.begin(), it);
+                            readData.erase(readData.begin(), it + 1);
+
+                            line.erase(std::remove(line.begin(), line.end(), '\r'), line.end());
+                            line.erase(std::remove(line.begin(), line.end(), '\n'), line.end());
+
+                            auto prefix = line.find("sdr 64 -tdi ", 0);
+                            auto suffix = line.find("0040", line.size() - 4);
+
+                            if (prefix == 0 && suffix == line.size() - 4) {
+                                std::string dataString = line.substr(line.size() - 16, 16);
+
+                                uint32_t address = reverse(std::stoul(dataString.substr(8, 8), nullptr, 16) - 64) / 4;
+                                uint32_t value = std::stoul(dataString.substr(0, 8), nullptr, 16);
+
+                                if (expected_address == 299 && address == 0) {
+                                    magic = value;
+                                    magic_found = true;
+                                    chprintf(chp, "Magic found: %08X\r\n", magic);
+                                    continue;
+                                }
+
+                                if (expected_address != address) {
+                                    chprintf(chp, "Error: expected address %d, got %d\r\n", expected_address, address);
+                                    cpld.AGM_exit_maintenance_mode();
+                                    file->close();
+                                    delete file;
+                                    return;
+                                }
+
+                                (*data)[expected_address] = value;
+                                expected_address++;
+
+                                if (expected_address == 1801) {
+                                    if (!magic_found) {
+                                        chprintf(chp, "Error: magic not found\r\n");
+                                        cpld.AGM_exit_maintenance_mode();
+                                        file->close();
+                                        delete file;
+                                        return;
+                                    }
+
+                                    chprintf(chp, "Writing data to CPLD...\r\n");
+                                    file->close();
+                                    delete file;
+
+                                    cpld.AGM_write(*data, magic);
+
+                                    cpld.AGM_enter_read_mode();
+
+                                    CRC<32> crc{0x04c11db7, 0xffffffff, 0xffffffff};
+                                    for (size_t i = 0; i < 2048; i++) {
+                                        uint32_t data = cpld.AGM_read(i);
+                                        crc.process_byte((data >> 0) & 0xff);
+                                        crc.process_byte((data >> 8) & 0xff);
+                                        crc.process_byte((data >> 16) & 0xff);
+                                        crc.process_byte((data >> 24) & 0xff);
+                                    }
+
+                                    cpld.AGM_exit_maintenance_mode();
+
+                                    chprintf(chp, "New CPLD firmware checksum: 0x%08X\r\n", crc.checksum());
+
+                                    m4_request_shutdown();
+                                    chThdSleepMilliseconds(1000);
+
+                                    WWDT_MOD = WWDT_MOD_WDEN | WWDT_MOD_WDRESET;
+                                    WWDT_TC = 100000 & 0xFFFFFF;
+                                    WWDT_FEED_SEQUENCE;
+
+                                    return;
+                                    break;
+                                }
+                            }
+                        } else {
+                            break;
+                        }
+                    } while (true);
+                }
+
+                file->close();
+                delete file;
+
+                cpld.AGM_exit_maintenance_mode();
+
+            } else {
+                chprintf(chp, "CPLD Model: unknown\r\n");
+            }
+        } else {
+            chprintf(chp, usage);
+        }
+    } else {
+        chprintf(chp, usage);
+    }
+}
+
 static void cmd_gotgps(BaseSequentialStream* chp, int argc, char* argv[]) {
     const char* usage = "usage: gotgps <lat> <lon> [altitude] [speed] [satinuse]\r\n";
     if (argc < 2 || argc > 5) {
@@ -1203,6 +1388,7 @@ static const ShellCommand commands[] = {
     {"rtcset", cmd_rtcset},
     {"cpld_info", cpld_info},
     {"cpld_read", cmd_cpld_read},
+    {"cpld_write", cmd_cpld_write},
     {"accessibility_readall", cmd_accessibility_readall},
     {"accessibility_readcurr", cmd_accessibility_readcurr},
     {"applist", cmd_applist},

firmware/common/cpld_max5.cpp

@@ -332,5 +332,40 @@ uint32_t CPLD::AGM_read(uint32_t address) {
     return jtag.shift_dr(32, encoded_address, 0x0);
 }
 
+void CPLD::AGM_write(const std::array<uint32_t, 1801>& block, uint32_t magic_value) {
+    shift_ir(instruction_t::AGM_SET_REGISTER);
+    jtag.runtest_tck(100);
+    jtag.shift_dr(8, 0xf0);
+    jtag.runtest_tck(100);
+
+    shift_ir(instruction_t::AGM_ERASE);
+    jtag.runtest_tck(100);
+    jtag.runtest_ms(500);
+
+    shift_ir(instruction_t::AGM_SET_REGISTER);
+    jtag.runtest_tck(100);
+    jtag.shift_dr(8, 0xf0);
+    jtag.runtest_tck(100);
+
+    shift_ir(instruction_t::AGM_PROGRAM);
+    jtag.runtest_tck(100);
+
+    auto data = block.data();
+    for (size_t i = 0; i < 0x12B; i++) {
+        auto address = AGM_encode_address(i * 4, 0x40);
+        jtag.shift_dr(32, address, data[i]);
+        jtag.runtest_ms(2);
+    }
+
+    jtag.shift_dr(32, 0x00000040, magic_value);
+    jtag.runtest_ms(2);
+
+    for (size_t i = 0x12B; i < block.size(); i++) {
+        auto address = AGM_encode_address(i * 4, 0x40);
+        jtag.shift_dr(32, address, data[i]);
+        jtag.runtest_ms(2);
+    }
+}
+
 } /* namespace max5 */
 } /* namespace cpld */

firmware/common/cpld_max5.hpp

@@ -99,6 +99,7 @@ class CPLD {
     void AGM_enter_read_mode();
     uint32_t AGM_encode_address(uint32_t address, uint32_t trailer);
     uint32_t AGM_read(uint32_t address);
+    void AGM_write(const std::array<uint32_t, 1801>& block, uint32_t magic_value);
 
    private:
     using idcode_t = uint32_t;

firmware/common/i2cdev_max17055.cpp

@@ -202,16 +202,14 @@ bool I2cDev_MAX17055::init(uint8_t addr_) {
     model = I2CDEVMDL_MAX17055;
     query_interval = BATTERY_WIDGET_REFRESH_INTERVAL;
     if (detect()) {
+        bool return_status = true;
         if (needsInitialization()) {
             // First-time or POR initialization
-            full_reset_and_init();
-        } else {
-            // Subsequent boot
-            partialInit();
+            return_status = full_reset_and_init();
         }
-        partialInit();
-        // statusClear(); I am not sure if this should be here or not
-        return true;
+        partialInit();  // If you always want hibernation disabled
+        // statusClear();  // I am not sure if this should be here or not (Clear all bits in the Status register (0x00))
+        return return_status;
     }
     return false;
 }
@@ -220,19 +218,15 @@ bool I2cDev_MAX17055::full_reset_and_init() {
     if (!soft_reset()) {
         return false;
     }
-
     if (!initialize_custom_parameters()) {
         return false;
     }
-
     if (!load_custom_parameters()) {
         return false;
     }
-
     if (!clear_por()) {
         return false;
     }
-
     return true;
 }
 
@@ -298,8 +292,7 @@ void I2cDev_MAX17055::partialInit() {
 bool I2cDev_MAX17055::reset_learned() {
     // this if for reset all the learned parameters by ic
     // the full inis should do this
-    full_reset_and_init();
-    return true;
+    return full_reset_and_init();
 }
 
 bool I2cDev_MAX17055::detect() {

firmware/common/jtag.hpp

@@ -23,6 +23,7 @@
 #define __JTAG_H__
 
 #include "jtag_target.hpp"
+#include "ch.h"
 
 #include <cstdint>
 #include <cstddef>
@@ -51,7 +52,16 @@ class JTAG {
     }
 
     void runtest_tck(const size_t count) {
-        target.delay(count);
+        for (size_t i = 0; i < count; i++) {
+            target.clock(0, 0);
+        }
+    }
+
+    void runtest_ms(const size_t count) {
+        auto starttime = chTimeNow();
+
+        while ((chTimeNow() - starttime) < (count + 1))
+            target.clock(0, 0);
     }
 
     uint32_t shift_ir(const size_t count, const uint32_t value) {

firmware/common/message_queue.hpp

@@ -101,7 +101,11 @@ class MessageQueue {
     }
 
     bool push(const void* const buf, const size_t len) {
-        chMtxLock(&mutex_write);
+        bool lock_success = chMtxTryLock(&mutex_write);
+        if (!lock_success) {
+            return false;
+        }
+
         const auto result = fifo.in_r(buf, len);
         chMtxUnlock();
 

hackrf-portapack/CMakeLists.txt

@@ -1,93 +0,0 @@
-# Copyright 2012 Jared Boone <jared@sharebrained.com>
-#
-# This file is part of HackRF.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-#
-
-cmake_minimum_required(VERSION 3.5)
-set(CMAKE_TOOLCHAIN_FILE ../toolchain-arm-cortex-m.cmake)
-
-project(hackrf_usb C)
-
-include(../hackrf/firmware/hackrf-common.cmake)
-
-set(PATH_HACKRF_USB ../hackrf/firmware/hackrf_usb)
-
-add_custom_command(
-	OUTPUT ${PATH_HACKRF_CPLD_DATA_C}
-	COMMAND ${PATH_CPLD_BITSTREAM_TOOL} --xsvf ${PATH_HACKRF_CPLD_XSVF} --hackrf-data ${PATH_HACKRF_CPLD_DATA_C}
-	DEPENDS ${PATH_CPLD_BITSTREAM_TOOL} ${PATH_HACKRF_CPLD_XSVF}
-)
-
-set(SRC_M4
-	${PATH_HACKRF_USB}/hackrf_usb.c
-	"${PATH_HACKRF_FIRMWARE_COMMON}/tuning.c"
-	"${PATH_HACKRF_FIRMWARE_COMMON}/streaming.c"
-	"${PATH_HACKRF_FIRMWARE_COMMON}/usb.c"
-	"${PATH_HACKRF_FIRMWARE_COMMON}/usb_request.c"
-	"${PATH_HACKRF_FIRMWARE_COMMON}/usb_standard_request.c"
-	${PATH_HACKRF_USB}/usb_descriptor.c
-	${PATH_HACKRF_USB}/usb_device.c
-	${PATH_HACKRF_USB}/usb_endpoint.c
-	${PATH_HACKRF_USB}/usb_api_cpld.c
-	${PATH_HACKRF_USB}/usb_api_m0_state.c
-	${PATH_HACKRF_USB}/usb_api_register.c
-	${PATH_HACKRF_USB}/usb_api_spiflash.c
-	${PATH_HACKRF_USB}/usb_api_transceiver.c
-	${PATH_HACKRF_USB}/usb_api_operacake.c
-	${PATH_HACKRF_USB}/usb_api_sweep.c
-	${PATH_HACKRF_USB}/usb_api_ui.c
-	"${PATH_HACKRF_FIRMWARE_COMMON}/usb_queue.c"
-	"${PATH_HACKRF_FIRMWARE_COMMON}/fault_handler.c"
-	"${PATH_HACKRF_FIRMWARE_COMMON}/cpld_jtag.c"
-	"${PATH_HACKRF_FIRMWARE_COMMON}/cpld_xc2c.c"
-	"${PATH_HACKRF_CPLD_DATA_C}"
-	"${PATH_HACKRF_FIRMWARE_COMMON}/xapp058/lenval.c"
-	"${PATH_HACKRF_FIRMWARE_COMMON}/xapp058/micro.c"
-	"${PATH_HACKRF_FIRMWARE_COMMON}/xapp058/ports.c"
-	"${PATH_HACKRF_FIRMWARE_COMMON}/crc.c"
-	"${PATH_HACKRF_FIRMWARE_COMMON}/rom_iap.c"
-	"${PATH_HACKRF_FIRMWARE_COMMON}/operacake.c"
-	"${PATH_HACKRF_FIRMWARE_COMMON}/operacake_sctimer.c"
-)
-
-set(SRC_M0 ${PATH_HACKRF_USB}/sgpio_m0.s)
-
-if(BOARD STREQUAL "HACKRF_ONE")
-	SET(SRC_M4
-		${SRC_M4}
-		usb_api_board_info.c
-		portapack.c
-		"${PATH_HACKRF_FIRMWARE_COMMON}/ui_portapack.c"
-	)
-endif()
-
-if(BOARD STREQUAL "RAD1O")
-	SET(SRC_M4
-		${SRC_M4}
-		"${PATH_HACKRF_FIRMWARE_COMMON}/rad1o/display.c"
-		"${PATH_HACKRF_FIRMWARE_COMMON}/rad1o/print.c"
-		"${PATH_HACKRF_FIRMWARE_COMMON}/rad1o/render.c"
-		"${PATH_HACKRF_FIRMWARE_COMMON}/rad1o/decoder.c"
-		"${PATH_HACKRF_FIRMWARE_COMMON}/rad1o/smallfonts.c"
-		"${PATH_HACKRF_FIRMWARE_COMMON}/rad1o/draw.c"
-		"${PATH_HACKRF_FIRMWARE_COMMON}/rad1o/ubuntu18.c"
-		"${PATH_HACKRF_FIRMWARE_COMMON}/ui_rad1o.c"
-	)
-endif()
-
-DeclareTargets()

hackrf-portapack/portapack.c

@@ -1,640 +0,0 @@
-/*
- * Copyright 2018-2022 Great Scott Gadgets <info@greatscottgadgets.com>
- * Copyright 2018 Jared Boone
- *
- * This file is part of HackRF.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "portapack.h"
-
-#include "hackrf_core.h"
-#include "gpio_lpc.h"
-
-#include <libopencm3/lpc43xx/scu.h>
-
-static void portapack_sleep_milliseconds(const uint32_t milliseconds)
-{
-	/* NOTE: Naively assumes 204 MHz instruction cycle clock and five instructions per count */
-	delay(milliseconds * 40800);
-}
-
-// clang-format off
-static struct gpio_t gpio_io_stbx = GPIO(5,  0); /* P2_0 */
-static struct gpio_t gpio_addr    = GPIO(5,  1); /* P2_1 */
-__attribute__((unused))
-static struct gpio_t gpio_lcd_te  = GPIO(5,  3); /* P2_3 */
-__attribute__((unused))
-static struct gpio_t gpio_unused  = GPIO(5,  7); /* P2_8 */
-static struct gpio_t gpio_lcd_rdx = GPIO(5,  4); /* P2_4 */
-static struct gpio_t gpio_lcd_wrx = GPIO(1, 10); /* P2_9 */
-static struct gpio_t gpio_dir     = GPIO(1, 13); /* P2_13 */
-
-// clang-format on
-
-typedef struct portapack_if_t {
-	gpio_t gpio_dir;
-	gpio_t gpio_lcd_rdx;
-	gpio_t gpio_lcd_wrx;
-	gpio_t gpio_io_stbx;
-	gpio_t gpio_addr;
-	gpio_port_t* const gpio_port_data;
-	uint8_t io_reg;
-} portapack_if_t;
-
-static portapack_if_t portapack_if = {
-	.gpio_dir = &gpio_dir,
-	.gpio_lcd_rdx = &gpio_lcd_rdx,
-	.gpio_lcd_wrx = &gpio_lcd_wrx,
-	.gpio_io_stbx = &gpio_io_stbx,
-	.gpio_addr = &gpio_addr,
-	.gpio_port_data = GPIO_LPC_PORT(3),
-	.io_reg = 0x03,
-};
-
-/* NOTE: Code below assumes the shift value is "8". */
-#define GPIO_DATA_SHIFT (8)
-static const uint32_t gpio_data_mask = 0xFFU << GPIO_DATA_SHIFT;
-
-static void portapack_data_mask_set()
-{
-	portapack_if.gpio_port_data->mask = ~gpio_data_mask;
-}
-
-static void portapack_data_write_low(const uint32_t value)
-{
-	portapack_if.gpio_port_data->mpin = (value << GPIO_DATA_SHIFT);
-}
-
-static void portapack_data_write_high(const uint32_t value)
-{
-	/* NOTE: Assumes no other bits in the port are masked. */
-	/* NOTE: Assumes that bits 15 through 8 are masked. */
-	portapack_if.gpio_port_data->mpin = value;
-}
-
-static void portapack_dir_read()
-{
-	portapack_if.gpio_port_data->dir &= ~gpio_data_mask;
-	gpio_set(portapack_if.gpio_dir);
-}
-
-static void portapack_dir_write()
-{
-	gpio_clear(portapack_if.gpio_dir);
-	portapack_if.gpio_port_data->dir |= gpio_data_mask;
-	/* TODO: Manipulating DIR[3] makes me queasy. The RFFC5072 DATA pin
-	 * is also on port 3, and switches direction periodically...
-	 * Time to resort to bit-banding to enforce atomicity? But then, how
-	 * to change direction on eight bits efficiently? Or do I care, since
-	 * the PortaPack data bus shouldn't change direction too frequently?
-	 */
-}
-
-__attribute__((unused)) static void portapack_lcd_rd_assert()
-{
-	gpio_clear(portapack_if.gpio_lcd_rdx);
-}
-
-static void portapack_lcd_rd_deassert()
-{
-	gpio_set(portapack_if.gpio_lcd_rdx);
-}
-
-static void portapack_lcd_wr_assert()
-{
-	gpio_clear(portapack_if.gpio_lcd_wrx);
-}
-
-static void portapack_lcd_wr_deassert()
-{
-	gpio_set(portapack_if.gpio_lcd_wrx);
-}
-
-static void portapack_io_stb_assert()
-{
-	gpio_clear(portapack_if.gpio_io_stbx);
-}
-
-static void portapack_io_stb_deassert()
-{
-	gpio_set(portapack_if.gpio_io_stbx);
-}
-
-static void portapack_addr(const bool value)
-{
-	gpio_write(portapack_if.gpio_addr, value);
-}
-
-static void portapack_lcd_command(const uint32_t value)
-{
-	portapack_data_write_high(0); /* Drive high byte (with zero -- don't care) */
-	portapack_dir_write();        /* Turn around data bus, MCU->CPLD */
-	portapack_addr(0);            /* Indicate command */
-	__asm__("nop");
-	__asm__("nop");
-	__asm__("nop");
-	portapack_lcd_wr_assert(); /* Latch high byte */
-
-	portapack_data_write_low(value); /* Drive low byte (pass-through) */
-	__asm__("nop");
-	__asm__("nop");
-	__asm__("nop");
-	portapack_lcd_wr_deassert(); /* Complete write operation */
-
-	portapack_addr(1); /* Set up for data phase (most likely after a command) */
-}
-
-static void portapack_lcd_write_data(const uint32_t value)
-{
-	// NOTE: Assumes and DIR=0 and ADDR=1 from command phase.
-	portapack_data_write_high(value); /* Drive high byte */
-	__asm__("nop");
-	portapack_lcd_wr_assert(); /* Latch high byte */
-
-	portapack_data_write_low(value); /* Drive low byte (pass-through) */
-	__asm__("nop");
-	__asm__("nop");
-	__asm__("nop");
-	portapack_lcd_wr_deassert(); /* Complete write operation */
-}
-
-static void portapack_io_write(const bool address, const uint_fast16_t value)
-{
-	portapack_data_write_low(value);
-	portapack_dir_write();
-	portapack_addr(address);
-	__asm__("nop");
-	__asm__("nop");
-	__asm__("nop");
-	portapack_io_stb_assert();
-	__asm__("nop");
-	__asm__("nop");
-	__asm__("nop");
-	portapack_io_stb_deassert();
-}
-
-static void portapack_if_init()
-{
-	portapack_data_mask_set();
-	portapack_data_write_high(0);
-
-	portapack_dir_read();
-	portapack_lcd_rd_deassert();
-	portapack_lcd_wr_deassert();
-	portapack_io_stb_deassert();
-	portapack_addr(0);
-
-	gpio_output(portapack_if.gpio_dir);
-	gpio_output(portapack_if.gpio_lcd_rdx);
-	gpio_output(portapack_if.gpio_lcd_wrx);
-	gpio_output(portapack_if.gpio_io_stbx);
-	gpio_output(portapack_if.gpio_addr);
-	/* gpio_input(portapack_if.gpio_rot_a); */
-	/* gpio_input(portapack_if.gpio_rot_b); */
-
-	scu_pinmux(SCU_PINMUX_PP_D0, SCU_CONF_FUNCTION0 | SCU_GPIO_PDN);
-	scu_pinmux(SCU_PINMUX_PP_D1, SCU_CONF_FUNCTION0 | SCU_GPIO_PDN);
-	scu_pinmux(SCU_PINMUX_PP_D2, SCU_CONF_FUNCTION0 | SCU_GPIO_PDN);
-	scu_pinmux(SCU_PINMUX_PP_D3, SCU_CONF_FUNCTION0 | SCU_GPIO_PDN);
-	scu_pinmux(SCU_PINMUX_PP_D4, SCU_CONF_FUNCTION0 | SCU_GPIO_PDN);
-	scu_pinmux(SCU_PINMUX_PP_D5, SCU_CONF_FUNCTION0 | SCU_GPIO_PDN);
-	scu_pinmux(SCU_PINMUX_PP_D6, SCU_CONF_FUNCTION0 | SCU_GPIO_PDN);
-	scu_pinmux(SCU_PINMUX_PP_D7, SCU_CONF_FUNCTION0 | SCU_GPIO_PDN);
-
-	scu_pinmux(SCU_PINMUX_PP_DIR, SCU_CONF_FUNCTION0 | SCU_GPIO_NOPULL);
-	scu_pinmux(SCU_PINMUX_PP_LCD_RDX, SCU_CONF_FUNCTION4 | SCU_GPIO_NOPULL);
-	scu_pinmux(SCU_PINMUX_PP_LCD_WRX, SCU_CONF_FUNCTION0 | SCU_GPIO_NOPULL);
-	scu_pinmux(SCU_PINMUX_PP_IO_STBX, SCU_CONF_FUNCTION4 | SCU_GPIO_NOPULL);
-	scu_pinmux(SCU_PINMUX_PP_ADDR, SCU_CONF_FUNCTION4 | SCU_GPIO_NOPULL);
-	/* scu_pinmux(SCU_PINMUX_PP_LCD_TE,   SCU_CONF_FUNCTION4 | SCU_GPIO_NOPULL); */
-	/* scu_pinmux(SCU_PINMUX_PP_UNUSED,   SCU_CONF_FUNCTION4 | SCU_GPIO_NOPULL); */
-}
-
-static void portapack_lcd_reset_state(const bool active)
-{
-	portapack_if.io_reg = (portapack_if.io_reg & 0xfe) | (active ? (1 << 0) : 0);
-	portapack_io_write(1, portapack_if.io_reg);
-}
-
-static void portapack_lcd_data_write_command_and_data(
-	const uint_fast8_t command,
-	const uint8_t* data,
-	const size_t data_count)
-{
-	portapack_lcd_command(command);
-	for (size_t i = 0; i < data_count; i++) {
-		portapack_lcd_write_data(data[i]);
-	}
-}
-
-static void portapack_lcd_sleep_out()
-{
-	const uint8_t cmd_11[] = {};
-	portapack_lcd_data_write_command_and_data(0x11, cmd_11, ARRAY_SIZEOF(cmd_11));
-	// "It will be necessary to wait 120msec after sending Sleep Out
-	// command (when in Sleep In Mode) before Sleep In command can be
-	// sent."
-	portapack_sleep_milliseconds(120);
-}
-
-static void portapack_lcd_display_on()
-{
-	const uint8_t cmd_29[] = {};
-	portapack_lcd_data_write_command_and_data(0x29, cmd_29, ARRAY_SIZEOF(cmd_29));
-}
-
-static void portapack_lcd_ramwr_start()
-{
-	const uint8_t cmd_2c[] = {};
-	portapack_lcd_data_write_command_and_data(0x2c, cmd_2c, ARRAY_SIZEOF(cmd_2c));
-}
-
-static void portapack_lcd_set(
-	const uint_fast8_t command,
-	const uint_fast16_t start,
-	const uint_fast16_t end)
-{
-	const uint8_t data[] = {(start >> 8), (start & 0xff), (end >> 8), (end & 0xff)};
-	portapack_lcd_data_write_command_and_data(command, data, ARRAY_SIZEOF(data));
-}
-
-static void portapack_lcd_caset(
-	const uint_fast16_t start_column,
-	const uint_fast16_t end_column)
-{
-	portapack_lcd_set(0x2a, start_column, end_column);
-}
-
-static void portapack_lcd_paset(
-	const uint_fast16_t start_page,
-	const uint_fast16_t end_page)
-{
-	portapack_lcd_set(0x2b, start_page, end_page);
-}
-
-static void portapack_lcd_start_ram_write(const ui_rect_t rect)
-{
-	portapack_lcd_caset(rect.point.x, rect.point.x + rect.size.width - 1);
-	portapack_lcd_paset(rect.point.y, rect.point.y + rect.size.height - 1);
-	portapack_lcd_ramwr_start();
-}
-
-static void portapack_lcd_write_pixel(const ui_color_t pixel)
-{
-	portapack_lcd_write_data(pixel.v);
-}
-
-static void portapack_lcd_write_pixels_color(const ui_color_t c, size_t n)
-{
-	while (n--) {
-		portapack_lcd_write_data(c.v);
-	}
-}
-
-static void portapack_lcd_wake()
-{
-	portapack_lcd_sleep_out();
-	portapack_lcd_display_on();
-}
-
-static void portapack_lcd_reset()
-{
-	portapack_lcd_reset_state(false);
-	portapack_sleep_milliseconds(1);
-	portapack_lcd_reset_state(true);
-	portapack_sleep_milliseconds(10);
-	portapack_lcd_reset_state(false);
-	portapack_sleep_milliseconds(120);
-}
-
-static void portapack_lcd_init()
-{
-	// LCDs are configured for IM[2:0] = 001
-	// 8080-I system, 16-bit parallel bus
-
-	//
-	// 0x3a: DBI[2:0] = 101
-	// MDT[1:0] = XX (if not in 18-bit mode, right?)
-
-	// Power control B
-	// 0
-	// PCEQ=1, DRV_ena=0, Power control=3
-	const uint8_t cmd_cf[] = {0x00, 0xD9, 0x30};
-	portapack_lcd_data_write_command_and_data(0xCF, cmd_cf, ARRAY_SIZEOF(cmd_cf));
-
-	// Power on sequence control
-	const uint8_t cmd_ed[] = {0x64, 0x03, 0x12, 0x81};
-	portapack_lcd_data_write_command_and_data(0xED, cmd_ed, ARRAY_SIZEOF(cmd_ed));
-
-	// Driver timing control A
-	const uint8_t cmd_e8[] = {0x85, 0x10, 0x78};
-	portapack_lcd_data_write_command_and_data(0xE8, cmd_e8, ARRAY_SIZEOF(cmd_e8));
-
-	// Power control A
-	const uint8_t cmd_cb[] = {0x39, 0x2C, 0x00, 0x34, 0x02};
-	portapack_lcd_data_write_command_and_data(0xCB, cmd_cb, ARRAY_SIZEOF(cmd_cb));
-
-	// Pump ratio control
-	const uint8_t cmd_f7[] = {0x20};
-	portapack_lcd_data_write_command_and_data(0xF7, cmd_f7, ARRAY_SIZEOF(cmd_f7));
-
-	// Driver timing control B
-	const uint8_t cmd_ea[] = {0x00, 0x00};
-	portapack_lcd_data_write_command_and_data(0xEA, cmd_ea, ARRAY_SIZEOF(cmd_ea));
-
-	const uint8_t cmd_b1[] = {0x00, 0x1B};
-	portapack_lcd_data_write_command_and_data(0xB1, cmd_b1, ARRAY_SIZEOF(cmd_b1));
-
-	// Blanking Porch Control
-	// VFP = 0b0000010 = 2 (number of HSYNC of vertical front porch)
-	// VBP = 0b0000010 = 2 (number of HSYNC of vertical back porch)
-	// HFP = 0b0001010 = 10 (number of DOTCLOCK of horizontal front porch)
-	// HBP = 0b0010100 = 20 (number of DOTCLOCK of horizontal back porch)
-	const uint8_t cmd_b5[] = {0x02, 0x02, 0x0a, 0x14};
-	portapack_lcd_data_write_command_and_data(0xB5, cmd_b5, ARRAY_SIZEOF(cmd_b5));
-
-	// Display Function Control
-	// PT[1:0] = 0b10
-	// PTG[1:0] = 0b10
-	// ISC[3:0] = 0b0010 (scan cycle interval of gate driver: 5 frames)
-	// SM = 0 (gate driver pin arrangement in combination with GS)
-	// SS = 1 (source output scan direction S720 -> S1)
-	// GS = 0 (gate output scan direction G1 -> G320)
-	// REV = 1 (normally white)
-	// NL = 0b100111 (default)
-	// PCDIV = 0b000000 (default?)
-	const uint8_t cmd_b6[] = {0x0A, 0xA2, 0x27, 0x00};
-	portapack_lcd_data_write_command_and_data(0xB6, cmd_b6, ARRAY_SIZEOF(cmd_b6));
-
-	// Power Control 1
-	//VRH[5:0]
-	const uint8_t cmd_c0[] = {0x1B};
-	portapack_lcd_data_write_command_and_data(0xC0, cmd_c0, ARRAY_SIZEOF(cmd_c0));
-
-	// Power Control 2
-	//SAP[2:0];BT[3:0]
-	const uint8_t cmd_c1[] = {0x12};
-	portapack_lcd_data_write_command_and_data(0xC1, cmd_c1, ARRAY_SIZEOF(cmd_c1));
-
-	// VCOM Control 1
-	const uint8_t cmd_c5[] = {0x32, 0x3C};
-	portapack_lcd_data_write_command_and_data(0xC5, cmd_c5, ARRAY_SIZEOF(cmd_c5));
-
-	// VCOM Control 2
-	const uint8_t cmd_c7[] = {0x9B};
-	portapack_lcd_data_write_command_and_data(0xC7, cmd_c7, ARRAY_SIZEOF(cmd_c7));
-
-	// Memory Access Control
-	// Invert X and Y memory access order, so upper-left of
-	// screen is (0,0) when writing to display.
-	const uint8_t cmd_36[] = {
-		(1 << 7) | // MY=1
-		(1 << 6) | // MX=1
-		(0 << 5) | // MV=0
-		(1 << 4) | // ML=1: reverse vertical refresh to simplify scrolling logic
-		(1 << 3)   // BGR=1: For Kingtech LCD, BGR filter.
-	};
-	portapack_lcd_data_write_command_and_data(0x36, cmd_36, ARRAY_SIZEOF(cmd_36));
-
-	// COLMOD: Pixel Format Set
-	// DPI=101 (16 bits/pixel), DBI=101 (16 bits/pixel)
-	const uint8_t cmd_3a[] = {0x55};
-	portapack_lcd_data_write_command_and_data(0x3A, cmd_3a, ARRAY_SIZEOF(cmd_3a));
-
-	//portapack_lcd_data_write_command_and_data(0xF6, { 0x01, 0x30 });
-	// WEMODE=1 (reset column and page number on overflow)
-	// MDT[1:0]
-	// EPF[1:0]=00 (use channel MSB for LSB)
-	// RIM=0 (If COLMOD[6:4]=101 (65k color), 16-bit RGB interface (1 transfer/pixel))
-	// RM=0 (system interface/VSYNC interface)
-	// DM[1:0]=00 (internal clock operation)
-	// ENDIAN=0 (doesn't matter with 16-bit interface)
-	const uint8_t cmd_f6[] = {0x01, 0x30, 0x00};
-	portapack_lcd_data_write_command_and_data(0xF6, cmd_f6, ARRAY_SIZEOF(cmd_f6));
-
-	// 3Gamma Function Disable
-	const uint8_t cmd_f2[] = {0x00};
-	portapack_lcd_data_write_command_and_data(0xF2, cmd_f2, ARRAY_SIZEOF(cmd_f2));
-
-	// Gamma curve selected
-	const uint8_t cmd_26[] = {0x01};
-	portapack_lcd_data_write_command_and_data(0x26, cmd_26, ARRAY_SIZEOF(cmd_26));
-
-	// Set Gamma
-	const uint8_t cmd_e0[] = {
-		0x0F,
-		0x1D,
-		0x19,
-		0x0E,
-		0x10,
-		0x07,
-		0x4C,
-		0x63,
-		0x3F,
-		0x03,
-		0x0D,
-		0x00,
-		0x26,
-		0x24,
-		0x04};
-	portapack_lcd_data_write_command_and_data(0xE0, cmd_e0, ARRAY_SIZEOF(cmd_e0));
-
-	// Set Gamma
-	const uint8_t cmd_e1[] = {
-		0x00,
-		0x1C,
-		0x1F,
-		0x02,
-		0x0F,
-		0x03,
-		0x35,
-		0x25,
-		0x47,
-		0x04,
-		0x0C,
-		0x0B,
-		0x29,
-		0x2F,
-		0x05};
-	portapack_lcd_data_write_command_and_data(0xE1, cmd_e1, ARRAY_SIZEOF(cmd_e1));
-
-	portapack_lcd_wake();
-
-	// Turn on Tearing Effect Line (TE) output signal.
-	const uint8_t cmd_35[] = {0b00000000};
-	portapack_lcd_data_write_command_and_data(0x35, cmd_35, ARRAY_SIZEOF(cmd_35));
-}
-
-void portapack_backlight(const bool on)
-{
-	portapack_if.io_reg = (portapack_if.io_reg & 0x7f) | (on ? (1 << 7) : 0);
-	portapack_io_write(1, portapack_if.io_reg);
-}
-
-void portapack_reference_oscillator(const bool on)
-{
-	const uint8_t mask = 1 << 6;
-	portapack_if.io_reg = (portapack_if.io_reg & ~mask) | (on ? mask : 0);
-	portapack_io_write(1, portapack_if.io_reg);
-}
-
-void portapack_fill_rectangle(const ui_rect_t rect, const ui_color_t color)
-{
-	portapack_lcd_start_ram_write(rect);
-	portapack_lcd_write_pixels_color(color, rect.size.width * rect.size.height);
-}
-
-void portapack_clear_display(const ui_color_t color)
-{
-	const ui_rect_t rect_screen = {{0, 0}, {240, 320}};
-	portapack_fill_rectangle(rect_screen, color);
-}
-
-void portapack_draw_bitmap(
-	const ui_point_t point,
-	const ui_bitmap_t bitmap,
-	const ui_color_t foreground,
-	const ui_color_t background)
-{
-	const ui_rect_t rect = {.point = point, .size = bitmap.size};
-
-	portapack_lcd_start_ram_write(rect);
-
-	const size_t count = bitmap.size.width * bitmap.size.height;
-	for (size_t i = 0; i < count; i++) {
-		const uint8_t pixel = bitmap.data[i >> 3] & (1U << (i & 0x7));
-		portapack_lcd_write_pixel(pixel ? foreground : background);
-	}
-}
-
-ui_bitmap_t portapack_font_glyph(const ui_font_t* const font, const char c)
-{
-	if (c >= font->c_start) {
-		const uint_fast8_t index = c - font->c_start;
-		if (index < font->c_count) {
-			const ui_bitmap_t bitmap = {
-				.size = font->glyph_size,
-				.data = &font->data[index * font->data_stride]};
-			return bitmap;
-		}
-	}
-
-	const ui_bitmap_t bitmap = {
-		.size = font->glyph_size,
-		.data = font->data,
-	};
-	return bitmap;
-}
-
-static bool jtag_pp_tck(const bool tms_value)
-{
-	gpio_write(jtag_cpld.gpio->gpio_pp_tms, tms_value);
-
-	// 8 ns TMS/TDI to TCK setup
-	__asm__("nop");
-	__asm__("nop");
-	__asm__("nop");
-
-	gpio_set(jtag_cpld.gpio->gpio_tck);
-
-	// 15 ns TCK to TMS/TDI hold time
-	// 20 ns TCK high time
-	__asm__("nop");
-	__asm__("nop");
-	__asm__("nop");
-	__asm__("nop");
-	__asm__("nop");
-
-	gpio_clear(jtag_cpld.gpio->gpio_tck);
-
-	// 20 ns TCK low time
-	// 25 ns TCK falling edge to TDO valid
-	__asm__("nop");
-	__asm__("nop");
-	__asm__("nop");
-	__asm__("nop");
-	__asm__("nop");
-	__asm__("nop");
-	__asm__("nop");
-
-	return gpio_read(jtag_cpld.gpio->gpio_pp_tdo);
-}
-
-static uint32_t jtag_pp_shift(const uint32_t tms_bits, const size_t count)
-{
-	uint32_t result = 0;
-	size_t bit_in_index = count - 1;
-	size_t bit_out_index = 0;
-	while (bit_out_index < count) {
-		const uint32_t tdo = jtag_pp_tck((tms_bits >> bit_in_index) & 1) & 1;
-		result |= (tdo << bit_out_index);
-
-		bit_in_index--;
-		bit_out_index++;
-	}
-
-	return result;
-}
-
-static uint32_t jtag_pp_idcode(void)
-{
-	cpld_jtag_take(&jtag_cpld);
-
-	/* TODO: Check if PortaPack TMS is floating or driven by an external device. */
-	gpio_output(jtag_cpld.gpio->gpio_pp_tms);
-
-	/* Test-Logic/Reset -> Run-Test/Idle -> Select-DR/Scan -> Capture-DR */
-	jtag_pp_shift(0b11111010, 8);
-
-	/* Shift-DR */
-	const uint32_t idcode = jtag_pp_shift(0, 32);
-
-	/* Exit1-DR -> Update-DR -> Run-Test/Idle -> ... -> Test-Logic/Reset */
-	jtag_pp_shift(0b11011111, 8);
-
-	cpld_jtag_release(&jtag_cpld);
-
-	return idcode;
-}
-
-static bool portapack_detect(void)
-{
-	const uint32_t idcode = jtag_pp_idcode();
-	return idcode == 0x00025610 || idcode == 0x020A50DD;
-}
-
-static const portapack_t portapack_instance = {};
-
-static const portapack_t* portapack_pointer = NULL;
-
-const portapack_t* portapack(void)
-{
-	return portapack_pointer;
-}
-
-void portapack_init(void)
-{
-	if (portapack_detect()) {
-		portapack_if_init();
-		portapack_lcd_reset();
-		portapack_lcd_init();
-		portapack_pointer = &portapack_instance;
-	} else {
-		portapack_pointer = NULL;
-	}
-}

hackrf-portapack/usb_api_board_info.c

@@ -1,189 +0,0 @@
-/*
- * Copyright 2012-2022 Great Scott Gadgets <info@greatscottgadgets.com>
- * Copyright 2012 Jared Boone
- * Copyright 2013 Benjamin Vernoux
- *
- * This file is part of HackRF.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "usb_api_board_info.h"
-#include "platform_detect.h"
-#include "firmware_info.h"
-
-#include <hackrf_core.h>
-#include <rom_iap.h>
-#include <usb_queue.h>
-#include <libopencm3/lpc43xx/scu.h>
-#include <libopencm3/lpc43xx/rgu.h>
-#include <libopencm3/lpc43xx/wwdt.h>
-
-#include <stddef.h>
-#include <string.h>
-
-#ifdef HACKRF_ONE
-#include "gpio_lpc.h"
-static struct gpio_t gpio_h1r9_clkout_en = GPIO(0, 9);
-static struct gpio_t gpio_h1r9_mcu_clk_en = GPIO(0, 8);
-static struct gpio_t gpio_h1r9_rx = GPIO(0, 7);
-#endif
-
-usb_request_status_t usb_vendor_request_read_board_id(
-    usb_endpoint_t* const endpoint,
-    const usb_transfer_stage_t stage) {
-    if (stage == USB_TRANSFER_STAGE_SETUP) {
-        endpoint->buffer[0] = detected_platform();
-        usb_transfer_schedule_block(
-            endpoint->in,
-            &endpoint->buffer,
-            1,
-            NULL,
-            NULL);
-        usb_transfer_schedule_ack(endpoint->out);
-    }
-    return USB_REQUEST_STATUS_OK;
-}
-
-usb_request_status_t usb_vendor_request_read_version_string(
-    usb_endpoint_t* const endpoint,
-    const usb_transfer_stage_t stage) {
-    uint8_t length;
-
-    if (stage == USB_TRANSFER_STAGE_SETUP) {
-        length = (uint8_t)strlen(firmware_info.version_string);
-        // The USB peripheral doesn't seem to be able to read directly from flash,
-        // so copy the version string into ram first.
-        memcpy(&endpoint->buffer,
-               firmware_info.version_string,
-               sizeof(firmware_info.version_string));
-        usb_transfer_schedule_block(
-            endpoint->in,
-            &endpoint->buffer,
-            length,
-            NULL,
-            NULL);
-        usb_transfer_schedule_ack(endpoint->out);
-    }
-    return USB_REQUEST_STATUS_OK;
-}
-
-static read_partid_serialno_t read_partid_serialno;
-
-usb_request_status_t usb_vendor_request_read_partid_serialno(
-    usb_endpoint_t* const endpoint,
-    const usb_transfer_stage_t stage) {
-    uint8_t length;
-    iap_cmd_res_t iap_cmd_res;
-
-    if (stage == USB_TRANSFER_STAGE_SETUP) {
-        /* Read IAP Part Number Identification */
-        iap_cmd_res.cmd_param.command_code = IAP_CMD_READ_PART_ID_NO;
-        iap_cmd_call(&iap_cmd_res);
-        if (iap_cmd_res.status_res.status_ret != CMD_SUCCESS) {
-            return USB_REQUEST_STATUS_STALL;
-        }
-
-        read_partid_serialno.part_id[0] = iap_cmd_res.status_res.iap_result[0];
-        read_partid_serialno.part_id[1] = iap_cmd_res.status_res.iap_result[1];
-
-        /* Read IAP Serial Number Identification */
-        iap_cmd_res.cmd_param.command_code = IAP_CMD_READ_SERIAL_NO;
-        iap_cmd_call(&iap_cmd_res);
-        if (iap_cmd_res.status_res.status_ret != CMD_SUCCESS) {
-            return USB_REQUEST_STATUS_STALL;
-        }
-
-        read_partid_serialno.serial_no[0] = iap_cmd_res.status_res.iap_result[0];
-        read_partid_serialno.serial_no[1] = iap_cmd_res.status_res.iap_result[1];
-        read_partid_serialno.serial_no[2] = iap_cmd_res.status_res.iap_result[2];
-        read_partid_serialno.serial_no[3] = iap_cmd_res.status_res.iap_result[3];
-
-        length = (uint8_t)sizeof(read_partid_serialno_t);
-        usb_transfer_schedule_block(
-            endpoint->in,
-            &read_partid_serialno,
-            length,
-            NULL,
-            NULL);
-        usb_transfer_schedule_ack(endpoint->out);
-    }
-    return USB_REQUEST_STATUS_OK;
-}
-
-usb_request_status_t usb_vendor_request_reset(
-    usb_endpoint_t* const endpoint,
-    const usb_transfer_stage_t stage) {
-    if (stage == USB_TRANSFER_STAGE_SETUP) {
-#ifdef HACKRF_ONE
-        /*
-         * Set boot pins as inputs so that the bootloader reads them
-         * correctly after the reset.
-         */
-        if (detected_platform() == BOARD_ID_HACKRF1_R9) {
-            gpio_input(&gpio_h1r9_mcu_clk_en);
-            gpio_input(&gpio_h1r9_clkout_en);
-            gpio_input(&gpio_h1r9_rx);
-        }
-#endif
-        usb_transfer_schedule_ack(endpoint->in);
-        delay(50 * 40800);
-
-        SCU_SFSP2_8 = (SCU_SFSP2_8 & ~(7)) | 4;
-        struct gpio_t dfu = GPIO(5, 7);
-        gpio_output(&dfu);
-        gpio_clear(&dfu);
-
-        wwdt_reset(100000);
-    }
-    return USB_REQUEST_STATUS_OK;
-}
-
-usb_request_status_t usb_vendor_request_read_board_rev(
-    usb_endpoint_t* const endpoint,
-    const usb_transfer_stage_t stage) {
-    if (stage == USB_TRANSFER_STAGE_SETUP) {
-        endpoint->buffer[0] = detected_revision();
-        usb_transfer_schedule_block(
-            endpoint->in,
-            &endpoint->buffer,
-            1,
-            NULL,
-            NULL);
-        usb_transfer_schedule_ack(endpoint->out);
-    }
-    return USB_REQUEST_STATUS_OK;
-}
-
-usb_request_status_t usb_vendor_request_read_supported_platform(
-    usb_endpoint_t* const endpoint,
-    const usb_transfer_stage_t stage) {
-    if (stage == USB_TRANSFER_STAGE_SETUP) {
-        uint32_t platform = supported_platform();
-        endpoint->buffer[0] = (platform >> 24) & 0xff;
-        endpoint->buffer[1] = (platform >> 16) & 0xff;
-        endpoint->buffer[2] = (platform >> 8) & 0xff;
-        endpoint->buffer[3] = platform & 0xff;
-        usb_transfer_schedule_block(
-            endpoint->in,
-            &endpoint->buffer,
-            4,
-            NULL,
-            NULL);
-        usb_transfer_schedule_ack(endpoint->out);
-    }
-    return USB_REQUEST_STATUS_OK;
-}

hackrf-portapack/usb_api_board_info.h

@@ -1,56 +0,0 @@
-/*
- * Copyright 2012-2022 Great Scott Gadgets <info@greatscottgadgets.com>
- * Copyright 2012 Jared Boone
- * Copyright 2013 Benjamin Vernoux
- *
- * This file is part of HackRF.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __USB_API_BOARD_INFO_H__
-#define __USB_API_BOARD_INFO_H__
-
-#include <stdint.h>
-
-#include <usb_type.h>
-#include <usb_request.h>
-
-typedef struct {
-	uint32_t part_id[2];
-	uint32_t serial_no[4];
-} read_partid_serialno_t;
-
-usb_request_status_t usb_vendor_request_read_board_id(
-	usb_endpoint_t* const endpoint,
-	const usb_transfer_stage_t stage);
-usb_request_status_t usb_vendor_request_read_version_string(
-	usb_endpoint_t* const endpoint,
-	const usb_transfer_stage_t stage);
-usb_request_status_t usb_vendor_request_read_partid_serialno(
-	usb_endpoint_t* const endpoint,
-	const usb_transfer_stage_t stage);
-usb_request_status_t usb_vendor_request_reset(
-	usb_endpoint_t* const endpoint,
-	const usb_transfer_stage_t stage);
-usb_request_status_t usb_vendor_request_read_board_rev(
-	usb_endpoint_t* const endpoint,
-	const usb_transfer_stage_t stage);
-usb_request_status_t usb_vendor_request_read_supported_platform(
-	usb_endpoint_t* const endpoint,
-	const usb_transfer_stage_t stage);
-
-#endif /* end of include guard: __USB_API_BOARD_INFO_H__ */

sdcard/FREQMAN/BE_AIRBAND.TXT

@@ -1,13 +1,13 @@
 f=132475000,m=AM,bw=DSB 6k,d=ATIS - Civil
 f=130550000,m=AM,bw=DSB 6k,d=AbelagUnicom - Civil
-f=118250000,m=AM,bw=DSB 6k,d=Approach- Civil
+f=118250000,m=AM,bw=DSB 6k,d=Approach - Civil
 f=120100000,m=AM,bw=DSB 6k,d=Approach - Civil
 f=122500000,m=AM,bw=DSB 6k,d=Approach Military Crossing
 f=121950000,m=AM,bw=DSB 6k,d=Clearance Delivery - Civil
 f=126625000,m=AM,bw=DSB 6k,d=Departure - Civil
 f=127575000,m=AM,bw=DSB 6k,d=Final 25L - Civil
 f=129725000,m=AM,bw=DSB 6k,d=Final 25R - Civil
-f=118050000,m=AM,bw=DSB 6k,d=Ground - Civik
+f=118050000,m=AM,bw=DSB 6k,d=Ground - Civil
 f=121700000,m=AM,bw=DSB 6k,d=Ground - Civil
 f=121875000,m=AM,bw=DSB 6k,d=Ground - Civil
 f=118600000,m=AM,bw=DSB 6k,d=Tower VHF - Civil