Added new game: Morse trainer (#2820 )

* Added new game: Morse trainer * code format error fix, and ui alignment
Oregon fixes (#2822 )
2026-09-14 18:43:01 +00:00 · 2025-10-16 13:01:28 +02:00 · 2025-10-16 13:00:40 +02:00 · 2025-10-14 09:45:52 +02:00 · 2025-10-14 09:03:28 +08:00 · 2025-10-10 22:48:26 +02:00
332 changed files with 26188 additions and 3892 deletions
@@ -1 +1 @@
-v2.0.2
+v2.1.0
@@ -1 +1 @@
-v2.1.0
+v2.2.0
@@ -62,6 +62,7 @@ cmake-build-debug/
 .vscode
 .idea
 *.swp
+.claude

 # VSCodium extensions
 .history
@@ -270,19 +270,15 @@ set(CPPSRC
 	ui/ui_bmpview.cpp
 	apps/ais_app.cpp
 	apps/analog_audio_app.cpp
-	apps/ble_comm_app.cpp
 	apps/ble_rx_app.cpp
 	apps/ble_tx_app.cpp
 	apps/capture_app.cpp
-	apps/ert_app.cpp
 	apps/pocsag_app.cpp
-	apps/soundboard_app.cpp
 	apps/ui_about_simple.cpp
 	apps/ui_adsb_rx.cpp
 	apps/ui_aprs_rx.cpp
 	apps/ui_aprs_tx.cpp
 	apps/ui_battinfo.cpp
-	apps/ui_bht_tx.cpp
 	apps/ui_bmp_file_viewer.cpp
 	apps/ui_btle_rx.cpp
 	apps/ui_debug.cpp
@@ -317,7 +313,6 @@ set(CPPSRC
 	apps/ui_weatherstation.cpp
 	protocols/aprs.cpp
 	protocols/ax25.cpp
-	protocols/bht.cpp
 	protocols/dcs.cpp
 	protocols/encoders.cpp
 	protocols/modems.cpp
@@ -223,9 +223,9 @@ void AISRecentEntry::update(const ais::Packet& packet) {
            break;

        case 5:
-            call_sign = packet.text(70, 7);
-            name = packet.text(112, 20);
-            destination = packet.text(302, 20);
+            call_sign = trim(packet.text(70, 7));
+            name = trim(packet.text(112, 20));
+            destination = trim(packet.text(302, 20));
            break;

        case 18:
@@ -238,7 +238,7 @@ void AISRecentEntry::update(const ais::Packet& packet) {
            break;

        case 21:
-            name = packet.text(43, 20);
+            name = trim(packet.text(43, 20));
            last_position.timestamp = packet.received_at();
            last_position.latitude = packet.latitude(192);
            last_position.longitude = packet.longitude(164);
@@ -247,11 +247,11 @@ void AISRecentEntry::update(const ais::Packet& packet) {
        case 24:
            switch (packet.read(38, 2)) {
                case 0:
-                    name = packet.text(40, 20);
+                    name = trim(packet.text(40, 20));
                    break;

                case 1:
-                    call_sign = packet.text(90, 7);
+                    call_sign = trim(packet.text(90, 7));
                    break;

                default:
@@ -272,14 +272,14 @@ void RecentEntriesTable<AISRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
-    const Style& style) {
+    const Style& style,
+    RecentEntriesColumns&) {
    std::string line = ais::format::mmsi(entry.mmsi) + " ";
    if (!entry.name.empty()) {
        line += ais::format::text(entry.name);
    } else {
        line += ais::format::text(entry.call_sign);
    }
-
    line.resize(target_rect.width() / 8, ' ');
    painter.draw_string(target_rect.location(), style, line);
 }
@@ -301,7 +301,7 @@ AISRecentEntryDetailView::AISRecentEntryDetailView(NavigationView& nav) {
            ais::format::text(entry_.name),
            0,
            GeoPos::alt_unit::METERS,
-            GeoPos::spd_unit::NONE,
+            GeoPos::spd_unit::KNOTS,
            ais::format::latlon_float(entry_.last_position.latitude.normalized()),
            ais::format::latlon_float(entry_.last_position.longitude.normalized()),
            entry_.last_position.true_heading,
@@ -324,7 +324,31 @@ AISRecentEntryDetailView& AISRecentEntryDetailView::operator=(const AISRecentEnt

 void AISRecentEntryDetailView::update_position() {
    if (send_updates)
-        geomap_view->update_position(ais::format::latlon_float(entry_.last_position.latitude.normalized()), ais::format::latlon_float(entry_.last_position.longitude.normalized()), (float)entry_.last_position.true_heading, 0, entry_.last_position.speed_over_ground);
+        geomap_view->update_position(ais::format::latlon_float(entry_.last_position.latitude.normalized()), ais::format::latlon_float(entry_.last_position.longitude.normalized()), (float)entry_.last_position.true_heading, 0, entry_.last_position.speed_over_ground > 1022 ? 0 : entry_.last_position.speed_over_ground / 10);
+}
+
+bool AISRecentEntryDetailView::add_map_marker(const AISRecentEntry& entry) {
+    if (geomap_view && send_updates) {
+        GeoMarker marker{};
+        marker.lon = ais::format::latlon_float(entry.last_position.longitude.normalized());
+        marker.lat = ais::format::latlon_float(entry.last_position.latitude.normalized());
+        marker.angle = entry.last_position.true_heading;
+        marker.tag = entry.call_sign.empty() ? to_string_dec_uint(entry.mmsi) : entry.call_sign;
+        auto markerStored = geomap_view->store_marker(marker);
+        return markerStored == MARKER_STORED;
+    }
+    return false;
+}
+void AISRecentEntryDetailView::update_map_markers(AISRecentEntries& entries) {
+    if (geomap_view && send_updates) {
+        geomap_view->clear_markers();
+        for (const auto& entry : entries) {
+            // if (entry.last_position.latitude.is_valid() && entry.last_position.longitude.is_valid()) {
+            add_map_marker(entry);
+            // }
+        }
+        update_position();  // to update view
+    }
 }

 void AISRecentEntryDetailView::focus() {
@@ -415,14 +439,30 @@ AISAppView::AISAppView(NavigationView& nav)
        audio::set_rate(audio::Rate::Hz_24000);
        audio::output::start();
    }
+
+    signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
+        on_tick_second();
+    };
 }

 AISAppView::~AISAppView() {
+    rtc_time::signal_tick_second -= signal_token_tick_second;
    audio::output::stop();
    receiver_model.disable();
    baseband::shutdown();
 }

+void AISAppView::on_tick_second() {
+    ++timer_seconds;
+    if (timer_seconds % 10 == 0) {
+        if (recent_entry_detail_view.hidden()) return;
+        if (got_new_packet) {
+            got_new_packet = false;
+            recent_entry_detail_view.update_map_markers(recent);
+        }
+    }
+}
+
 void AISAppView::focus() {
    options_channel.focus();
 }
@@ -438,7 +478,7 @@ void AISAppView::on_packet(const ais::Packet& packet) {
    if (logger) {
        logger->on_packet(packet);
    }
-
+    got_new_packet = true;
    auto& entry = ::on_packet(recent, packet.source_id());
    entry.update(packet);
    recent_entries_view.set_dirty();
@@ -461,6 +501,7 @@ void AISAppView::on_show_detail(const AISRecentEntry& entry) {
    recent_entry_detail_view.hidden(false);
    recent_entry_detail_view.set_entry(entry);
    recent_entry_detail_view.focus();
+    recent_entry_detail_view.update_map_markers(recent);
 }

 } /* namespace ui */
@@ -125,18 +125,22 @@ class AISRecentEntryDetailView : public View {
    void update_position();
    void focus() override;
    void paint(Painter&) override;
+    bool add_map_marker(const AISRecentEntry& entry);
+    void update_map_markers(AISRecentEntries& entries);

    AISRecentEntryDetailView(const AISRecentEntryDetailView& Entry);
    AISRecentEntryDetailView& operator=(const AISRecentEntryDetailView& Entry);

+    GeoMapView* get_geomap_view() { return geomap_view; }
+
   private:
    AISRecentEntry entry_{};

    Button button_done{
-        {125, 224, 96, 24},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(6), UI_POS_Y(14), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Done"};
    Button button_see_map{
-        {19, 224, 96, 24},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y(14), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "See on map"};
    GeoMapView* geomap_view{nullptr};
    bool send_updates{false};
@@ -175,9 +179,9 @@ class AISAppView : public View {
    AISRecentEntries recent{};
    std::unique_ptr<AISLogger> logger{};

-    const RecentEntriesColumns columns{{
+    RecentEntriesColumns columns{{
        {"MMSI", 9},
-        {"Name/Call", 20},
+        {"Name/Call", 0},
    }};
    AISRecentEntriesView recent_entries_view{columns, recent};
    AISRecentEntryDetailView recent_entry_detail_view{nav_};
@@ -185,11 +189,11 @@ class AISAppView : public View {
    static constexpr auto header_height = 1 * 16;

    Text label_channel{
-        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(0), 2 * 8, 1 * 16},
        "Ch"};

    OptionsField options_channel{
-        {3 * 8, 0 * 16},
+        {3 * 8, UI_POS_Y(0)},
        3,
        {
            {"87B", 161975000},
@@ -197,24 +201,27 @@ class AISAppView : public View {
        }};

    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {13 * 8, UI_POS_Y(0)}};

    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {15 * 8, UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};

    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4},
+        {UI_POS_X(21), UI_POS_Y(0), UI_POS_WIDTH_REMAINING(23), 4},
    };

    AudioVolumeField field_volume{
-        {screen_width - 2 * 8, 0 * 16}};
+        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

    Channel channel{
-        {21 * 8, 5, 6 * 8, 4},
+        {UI_POS_X(21), 5, UI_POS_WIDTH_REMAINING(23), 4},
    };
+    SignalToken signal_token_tick_second{};
+    uint8_t timer_seconds = 0;
+    bool got_new_packet{false};  // got any new packet since latest screen update?

    MessageHandlerRegistration message_handler_packet{
        Message::ID::AISPacket,
@@ -229,6 +236,7 @@ class AISAppView : public View {
    void on_packet(const ais::Packet& packet);
    void on_show_list();
    void on_show_detail(const AISRecentEntry& entry);
+    void on_tick_second();
 };

 } /* namespace ui */
@@ -43,19 +43,19 @@ class AMOptionsView : public View {

   private:
    Text label_config{
-        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)},
        "BW",
    };

    OptionsField options_config{
-        {3 * 8, 0 * 16},
+        {UI_POS_X(3), UI_POS_Y(0)},
        6,  // Max option length
        {
            // Using common messages from freqman_ui.cpp
        }};

    OptionsField zoom_config{
-        {23 * 8, 0 * 16},
+        {UI_POS_X_RIGHT(7), UI_POS_Y(0)},
        7,
        {{"ZOOM x1", 0},
         {"ZOOM x2", 6}}  // offset index AM modes array FIR filters.
@@ -68,19 +68,19 @@ class AMFMAptOptionsView : public View {

   private:
    Text label_config{
-        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)},
        "BW",
    };

    OptionsField options_config{
-        {3 * 8, 0 * 16},
+        {UI_POS_X(3), UI_POS_Y(0)},
        17,  // Max option length chars   "USB+FM(Wefax Apt)"
        {
            // Using common messages from freqman_ui.cpp In HF USB , Here  we only need USB Audio demod, + post-FM demod fsubcarrier FM tone to get APT signal.
        }};

    OptionsField zoom_config{
-        {23 * 8, 0 * 16},
+        {UI_POS_X_RIGHT(7), UI_POS_Y(0)},
        7,
        {{"ZOOM x1", 0},
         {"ZOOM x2", 6}}  // offset index array filters.
@@ -93,21 +93,21 @@ class NBFMOptionsView : public View {

   private:
    Text label_config{
-        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)},
        "BW",
    };
    OptionsField options_config{
-        {3 * 8, 0 * 16},
+        {UI_POS_X(3), UI_POS_Y(0)},
        3,  // Max option length
        {
            // Using common messages from freqman_ui.cpp
        }};

    Text text_squelch{
-        {7 * 8, 0 * 16, 8 * 8, 1 * 16},
+        {UI_POS_X(7), UI_POS_Y(0), UI_POS_WIDTH(8), UI_POS_HEIGHT(1)},
        "SQ   /99"};
    NumberField field_squelch{
-        {10 * 8, 0 * 16},
+        {UI_POS_X(10), UI_POS_Y(0)},
        2,
        {0, 99},
        1,
@@ -121,11 +121,11 @@ class WFMOptionsView : public View {

   private:
    Text label_config{
-        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)},
        "BW",
    };
    OptionsField options_config{
-        {3 * 8, 0 * 16},
+        {UI_POS_X(3), UI_POS_Y(0)},
        4,  // Max option length
        {
            // Using common messages from freqman_ui.cpp
@@ -138,11 +138,11 @@ class WFMAMAptOptionsView : public View {

   private:
    Text label_config{
-        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)},
        "BW",
    };
    OptionsField options_config{
-        {3 * 8, 0 * 16},
+        {UI_POS_X(3), UI_POS_Y(0)},
        16,  // Max option char length "80k-NOAA Apt LPF" , example.
        {
            // Using common messages from freqman_ui.cpp
@@ -155,11 +155,11 @@ class SPECOptionsView : public View {

   private:
    Text label_config{
-        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)},
        "BW",
    };
    OptionsField options_config{
-        {3 * 8, 0 * 16},
+        {UI_POS_X(3), UI_POS_Y(0)},
        4,
        {
            {"20m ", 20000000},
@@ -172,20 +172,20 @@ class SPECOptionsView : public View {
        }};

    Text text_speed{
-        {9 * 8, 0 * 16, 8 * 8, 1 * 16},
+        {UI_POS_X(9), UI_POS_Y(0), UI_POS_WIDTH(8), UI_POS_HEIGHT(1)},
        "SP   /63"};
    NumberField field_speed{
-        {12 * 8, 0 * 16},
+        {UI_POS_X(12), UI_POS_Y(0)},
        2,
        {0, 63},
        1,
        ' ',
    };
    Text text_rx_cal{
-        {19 * 8, 0 * 16, 11 * 8, 1 * 16},  // 18 (x col.) x char_size,  12 (length) x 8 blanking space to delete previous chars.
+        {UI_POS_X(19), UI_POS_Y(0), UI_POS_WIDTH(11), UI_POS_HEIGHT(1)},  // 18 (x col.) x char_size,  12 (length) x 8 blanking space to delete previous chars.
        "Rx_IQ_CAL  "};
    NumberField field_rx_iq_phase_cal{
-        {screen_width - 2 * 8, 0 * 16},
+        {screen_width - 2 * 8, UI_POS_Y(0)},
        2,
        {0, 63},  // 5 or 6 bits IQ CAL phase adjustment (range updated later)
        1,
@@ -244,34 +244,34 @@ class AnalogAudioView : public View {
            {"previous_zoom"sv, &previous_zoom},                      // we are saving and restoring AMFM ZOOM factor from Settings.
        }};

-    const Rect options_view_rect{0 * 8, 1 * 16, screen_width, 1 * 16};
-    const Rect nbfm_view_rect{0 * 8, 1 * 16, 18 * 8, 1 * 16};
+    const Rect options_view_rect{UI_POS_X(0), UI_POS_Y(1), UI_POS_MAXWIDTH, UI_POS_HEIGHT(1)};
+    const Rect nbfm_view_rect{UI_POS_X(0), UI_POS_Y(1), UI_POS_WIDTH(18), UI_POS_HEIGHT(1)};

    size_t spec_bw_index = 0;
    uint32_t spec_bw = 20000000;
    uint16_t spec_trigger = 63;

    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4}};
+        {UI_POS_X(21), 0, UI_POS_WIDTH_REMAINING(21) - UI_POS_WIDTH(2), 4}};

    Channel channel{
-        {21 * 8, 5, 6 * 8, 4}};
+        {UI_POS_X(21), 5, UI_POS_WIDTH_REMAINING(21) - UI_POS_WIDTH(2), 4}};

    Audio audio{
-        {21 * 8, 10, 6 * 8, 4}};
+        {UI_POS_X(21), 10, UI_POS_WIDTH_REMAINING(21) - UI_POS_WIDTH(2), 4}};

    RxFrequencyField field_frequency{
-        {5 * 8, 0 * 16},
+        {UI_POS_X(5), UI_POS_Y(0)},
        nav_};

    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {UI_POS_X(15), UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {UI_POS_X(18), UI_POS_Y(0)}};

    OptionsField options_modulation{
-        {0 * 8, 0 * 16},
+        {UI_POS_X(0), UI_POS_Y(0)},
        4,
        {
            {" AM ", toUType(ReceiverModel::Mode::AMAudio)},
@@ -283,16 +283,16 @@ class AnalogAudioView : public View {
        }};

    AudioVolumeField field_volume{
-        {screen_width - 2 * 8, 0 * 16}};
+        {screen_width - 2 * 8, UI_POS_Y(0)}};

    Text text_ctcss{
-        {16 * 8, 1 * 16, 14 * 8, 1 * 16},
+        {UI_POS_X(16), UI_POS_Y(1), UI_POS_WIDTH(14), UI_POS_HEIGHT(1)},
        ""};

    std::unique_ptr<Widget> options_widget{};

    RecordView record_view{
-        {0 * 8, 2 * 16, screen_width, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(2), UI_POS_MAXWIDTH, UI_POS_HEIGHT(1)},
        u"AUD",
        u"AUDIO",
        RecordView::FileType::WAV,
@@ -69,7 +69,7 @@ static std::uint64_t get_freq_by_channel_number(uint8_t channel_number) {
 }

 void BLECommView::focus() {
-    options_channel.focus();
+    field_frequency.focus();
 }

 BLECommView::BLECommView(NavigationView& nav)
@@ -79,10 +79,7 @@ BLECommView::BLECommView(NavigationView& nav)
                  &field_rf_amp,
                  &field_lna,
                  &field_vga,
-                  &options_channel,
                  &field_frequency,
-                  &label_send_adv,
-                  &button_send_adv,
                  &check_log,
                  &label_packets_sent,
                  &text_packets_sent,
@@ -90,10 +87,6 @@ BLECommView::BLECommView(NavigationView& nav)

    field_frequency.set_step(0);

-    button_send_adv.on_select = [this](ImageButton&) {
-        this->toggle();
-    };
-
    check_log.set_value(logging);

    check_log.on_select = [this](Checkbox&, bool v) {
@@ -104,27 +97,8 @@ BLECommView::BLECommView(NavigationView& nav)
            logger->append(logs_dir.string() + "/BLELOG_" + to_string_timestamp(rtc_time::now()) + ".TXT");
    };

-    options_channel.on_change = [this](size_t, int32_t i) {
-        // If we selected Auto don't do anything and Auto will handle changing.
-        if (i == 40) {
-            auto_channel = true;
-            return;
-        } else {
-            auto_channel = false;
-        }
-
-        field_frequency.set_value(get_freq_by_channel_number(i));
-        channel_number_rx = i;
-        channel_number_tx = i;
-    };
-
-    options_channel.set_selected_index(3, true);
-
    logger = std::make_unique<BLECommLogger>();

-    // Generate new random Mac Address upon each new startup.
-    generateRandomMacAddress(randomMac);
-
    // Setup Initial Advertise Packet.
    advertisePacket = build_adv_packet();
 }
@@ -145,86 +119,66 @@ bool BLECommView::in_tx_mode() const {
    return (bool)is_running_tx;
 }

-void BLECommView::toggle() {
-    if (in_tx_mode()) {
-        sendAdvertisement(false);
-    } else {
-        sendAdvertisement(true);
-    }
-}
-
 BLETxPacket BLECommView::build_adv_packet() {
    BLETxPacket bleTxPacket;
    memset(&bleTxPacket, 0, sizeof(BLETxPacket));

-    std::string dataString = "11094861636b524620506f7274617061636b";
-
-    strncpy(bleTxPacket.macAddress, randomMac, 12);
+    std::string dataString = "02010603030F1807084861636B5246";
    strncpy(bleTxPacket.advertisementData, dataString.c_str(), dataString.length());

-    // Duty cycle of 40% per 100ms advertisment periods.
-    strncpy(bleTxPacket.packetCount, "80", 3);
-    bleTxPacket.packet_count = 80;
+    strncpy(bleTxPacket.packetCount, "1", 2);
+    bleTxPacket.packet_count = 1;

-    bleTxPacket.packetType = PKT_TYPE_DISCOVERY;
+    bleTxPacket.pduType = PKT_TYPE_ADV_IND;

    return bleTxPacket;
 }

-void BLECommView::sendAdvertisement(bool enable) {
-    if (enable) {
-        startTx(advertisePacket);
-        is_adv = true;
-    } else {
-        is_adv = false;
-        stopTx();
-    }
+void BLECommView::sendAdvertisement(void) {
+    startTx(advertisePacket);
+    ble_state = Ble_State_Advertising;
 }

 void BLECommView::startTx(BLETxPacket packetToSend) {
-    int randomChannel = channel_number_tx;
+    switch_rx_tx(false);

-    if (auto_channel) {
-        int min = 37;
-        int max = 39;
+    currentPacket = packetToSend;
+    packet_counter = currentPacket.packet_count;

-        randomChannel = min + std::rand() % (max - min + 1);
-
-        field_frequency.set_value(get_freq_by_channel_number(randomChannel));
+    switch (advCount) {
+        case 0:
+            channel_number_tx = 37;
+            break;
+        case 1:
+            channel_number_tx = 38;
+            break;
+        case 2:
+            channel_number_tx = 39;
+            break;
    }

-    if (!in_tx_mode()) {
-        switch_rx_tx(false);
+    field_frequency.set_value(get_freq_by_channel_number(37));

-        currentPacket = packetToSend;
-        packet_counter = currentPacket.packet_count;
+    advCount++;

-        button_send_adv.set_bitmap(&bitmap_stop);
-        baseband::set_btletx(randomChannel, currentPacket.macAddress, currentPacket.advertisementData, currentPacket.packetType);
-        transmitter_model.set_tx_gain(47);
-        transmitter_model.enable();
-
-        is_running_tx = true;
-    } else {
-        baseband::set_btletx(randomChannel, currentPacket.macAddress, currentPacket.advertisementData, currentPacket.packetType);
+    if (advCount == 3) {
+        advCount = 0;
    }

-    if ((packet_counter % 10) == 0) {
-        text_packets_sent.set(to_string_dec_uint(packet_counter));
-    }
+    baseband::set_btletx(37, deviceMAC, currentPacket.advertisementData, currentPacket.pduType);
+    transmitter_model.set_tx_gain(47);
+    transmitter_model.enable();

-    is_sending = true;
-
-    packet_counter--;
+    is_running_tx = true;
 }

 void BLECommView::stopTx() {
-    button_send_adv.set_bitmap(&bitmap_play);
    text_packets_sent.set(to_string_dec_uint(packet_counter));

    switch_rx_tx(true);

    baseband::set_btlerx(channel_number_rx);
+    field_frequency.set_value(get_freq_by_channel_number(channel_number_rx));
    receiver_model.enable();

    is_running_tx = false;
@@ -248,14 +202,12 @@ void BLECommView::on_data(BlePacketData* packet) {
    parse_received_packet(packet, (ADV_PDU_TYPE)packet->type);
 }

-// called each 1/60th of second, so 6 = 100ms
 void BLECommView::on_timer() {
-    // Send advertise burst only once every 100ms
    if (++timer_counter == timer_period) {
        timer_counter = 0;

-        if (!is_adv) {
-            sendAdvertisement(true);
+        if (ble_state == Ble_State_Receiving || ble_state == Ble_State_Idle) {
+            sendAdvertisement();
        }
    }
 }
@@ -263,17 +215,18 @@ void BLECommView::on_timer() {
 void BLECommView::on_tx_progress(const bool done) {
    if (done) {
        if (in_tx_mode()) {
-            is_sending = false;
+            ble_state = Ble_State_Receiving;

-            if (packet_counter == 0) {
-                if (is_adv) {
-                    sendAdvertisement(false);
-                } else {
-                    stopTx();
-                }
-            } else {
-                startTx(currentPacket);
-            }
+            timer_counter = 0;
+            timer_period = 12;
+
+            stopTx();
+
+            // else
+            // {
+            //     startTx(advertisePacket);
+            //     advCount++;
+            // }
        }
    }
 }
@@ -309,23 +262,28 @@ void BLECommView::parse_received_packet(const BlePacketData* packet, ADV_PDU_TYP
    }

    if (pdu_type == SCAN_REQ || pdu_type == CONNECT_REQ) {
-        ADV_PDU_PAYLOAD_TYPE_1_3* directed_mac_data = (ADV_PDU_PAYLOAD_TYPE_1_3*)packet->data;
-
-        std::reverse(directed_mac_data->A1, directed_mac_data->A1 + 6);
-        console.clear(true);
-        std::string str_console = "";
-        std::string pduTypeStr = "";
-
        if (pdu_type == SCAN_REQ) {
-            pduTypeStr += "SCAN_REQ";
-        } else if (pdu_type == CONNECT_REQ) {
-            pduTypeStr += "CONNECT_REQ";
-        }
+            ADV_PDU_PAYLOAD_TYPE_1_3* directed_mac_data = (ADV_PDU_PAYLOAD_TYPE_1_3*)packet->data;

-        str_console += "PACKET TYPE:" + pduTypeStr + "\n";
-        str_console += "MY MAC:" + to_string_formatted_mac_address(randomMac) + "\n";
-        str_console += "SCAN MAC:" + to_string_mac_address(directed_mac_data->A1, 6, false) + "\n";
-        console.write(str_console);
+            std::reverse(directed_mac_data->A1, directed_mac_data->A1 + 6);
+            std::string directedMAC = to_string_mac_address(directed_mac_data->A1, 6, false);
+
+            // Compare directed MAC Hex with the device MAC.
+            if (1) {
+                // std::string str_console = "Received SCAN_REQ from directed MAC: " + directedMAC + "\n";
+                // console.clear(true);
+                // console.writeln(str_console);
+            }
+        } else if (pdu_type == CONNECT_REQ) {
+            ADV_PDU_PAYLOAD_TYPE_5* connectReq = (ADV_PDU_PAYLOAD_TYPE_5*)packet->data;
+
+            std::reverse(connectReq->AdvA, connectReq->AdvA + 6);
+            std::string directedMAC = to_string_mac_address(connectReq->AdvA, 6, false);
+
+            std::string str_console = "Received CONNECT_REQ from directed MAC: " + directedMAC + "\n";
+            console.clear(true);
+            console.writeln(str_console);
+        }
    }
 }

@@ -76,7 +76,16 @@ class BLECommView : public View {
    void on_data(BlePacketData* packetData);
    void on_tx_progress(const bool done);
    void parse_received_packet(const BlePacketData* packet, ADV_PDU_TYPE pdu_type);
-    void sendAdvertisement(bool enable);
+    void sendAdvertisement(void);
+
+    typedef enum {
+        Ble_State_Idle = 0,
+        Ble_State_Advertising = 1,
+        Ble_State_Receiving = 2,
+        Ble_State_Sending = 3
+    } BleState;
+
+    BleState ble_state{Ble_State_Idle};

    NavigationView& nav_;

@@ -101,8 +110,9 @@ class BLECommView : public View {
    uint8_t channel_number_tx = 37;
    uint8_t channel_number_rx = 37;
    bool auto_channel = false;
+    uint8_t advCount = 0;

-    char randomMac[13] = "010203040506";
+    char deviceMAC[13] = "C23456789ABC";

    bool is_running_tx = false;
    bool is_sending = false;
@@ -111,7 +121,7 @@ class BLECommView : public View {
    int16_t timer_period{6};  // Delay each packet by 16ms.
    int16_t timer_counter = 0;
    int16_t timer_rx_counter = 0;
-    int16_t timer_rx_period{12};  // Poll Rx for at least 200ms. (TBD)
+    int16_t timer_rx_period{12};  // Poll Rx for at least 150ms. (TBD)

    uint32_t packet_counter{0};
    BLETxPacket advertisePacket{};
@@ -121,7 +131,7 @@ class BLECommView : public View {
    static constexpr auto header_height = 5 * 16;

    OptionsField options_channel{
-        {0 * 8, 0 * 8},
+        {UI_POS_X(0), 0 * 8},
        5,
        {{"Ch.37 ", 37},
         {"Ch.38", 38},
@@ -129,17 +139,17 @@ class BLECommView : public View {
         {"Auto", 40}}};

    RxFrequencyField field_frequency{
-        {6 * 8, 0 * 16},
+        {6 * 8, UI_POS_Y(0)},
        nav_};

    RFAmpField field_rf_amp{
-        {16 * 8, 0 * 16}};
+        {16 * 8, UI_POS_Y(0)}};

    LNAGainField field_lna{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {21 * 8, 0 * 16}};
+        {21 * 8, UI_POS_Y(0)}};

    RSSI rssi{
        {24 * 8, 0, 6 * 8, 4}};
@@ -147,15 +157,6 @@ class BLECommView : public View {
    Channel channel{
        {24 * 8, 5, 6 * 8, 4}};

-    Labels label_send_adv{
-        {{0 * 8, 2 * 8}, "Send Advertisement:", Theme::getInstance()->fg_light->foreground}};
-
-    ImageButton button_send_adv{
-        {21 * 8, 1 * 16, 10 * 8, 2 * 16},
-        &bitmap_play,
-        Theme::getInstance()->fg_green->foreground,
-        Theme::getInstance()->fg_green->background};
-
    Checkbox check_log{
        {24 * 8, 2 * 8},
        3,
@@ -163,7 +164,7 @@ class BLECommView : public View {
        true};

    Labels label_packets_sent{
-        {{0 * 8, 4 * 8}, "Packets Left:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 4 * 8}, "Packets Left:", Theme::getInstance()->fg_light->foreground}};

    Text text_packets_sent{
        {13 * 8, 2 * 16, 12 * 8, 16},
@@ -2,6 +2,7 @@
 * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2017 Furrtek
 * Copyright (C) 2023 TJ Baginski
+ * Copyright (C) 2025 Tommaso Ventafridda
 *
 * This file is part of PortaPack.
 *
@@ -35,6 +36,8 @@
 #include "ui_textentry.hpp"
 #include "usb_serial_asyncmsg.hpp"

+#include <string_view>
+
 using namespace portapack;
 using namespace modems;
 namespace fs = std::filesystem;
@@ -67,6 +70,50 @@ uint64_t copy_mac_address_to_uint64(const uint8_t* macAddress) {
    return result;
 }

+MAC_VENDOR_STATUS lookup_mac_vendor_status(const uint8_t* mac_address, std::string& vendor_name) {
+    static bool db_checked = false;
+    static bool db_exists = false;
+
+    if (!db_checked) {
+        database db;
+        database::MacAddressDBRecord dummy_record;
+        int test_result = db.retrieve_macaddress_record(&dummy_record, "000000");
+        db_exists = (test_result != DATABASE_NOT_FOUND);
+        db_checked = true;
+    }
+
+    if (!db_exists) {
+        vendor_name = "macaddress.db not found";
+        return MAC_DB_NOT_FOUND;
+    }
+
+    database db;
+    database::MacAddressDBRecord record;
+
+    // Convert MAC address to hex string
+    std::string mac_hex = "";
+    for (int i = 0; i < 3; i++) {
+        // Only need first 3 bytes for OUI
+        mac_hex += to_string_hex(mac_address[i], 2);
+    }
+
+    int result = db.retrieve_macaddress_record(&record, mac_hex);
+
+    if (result == DATABASE_RECORD_FOUND) {
+        vendor_name = std::string(record.vendor_name);
+        return MAC_VENDOR_FOUND;
+    } else {
+        vendor_name = "Unknown";
+        return MAC_VENDOR_NOT_FOUND;
+    }
+}
+
+std::string lookup_mac_vendor(const uint8_t* mac_address) {
+    std::string vendor_name;
+    lookup_mac_vendor_status(mac_address, vendor_name);
+    return vendor_name;
+}
+
 void reverse_byte_array(uint8_t* arr, int length) {
    int start = 0;
    int end = length - 1;
@@ -134,24 +181,26 @@ void RecentEntriesTable<BleRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
-    const Style& style) {
+    const Style& style,
+    RecentEntriesColumns& columns) {
    std::string line{};
-    line.reserve(30);
-
+    line.reserve(40);
    if (!entry.nameString.empty() && entry.include_name) {
        line = entry.nameString;
-
-        if (line.length() < 17) {
-            line += pad_string_with_spaces(17 - line.length());
-        } else {
-            line = truncate(line, 17);
-        }
    } else {
        line = to_string_mac_address(entry.packetData.macAddress, 6, false);
    }
+    line.resize(columns.at(0).second, ' ');
+
+    std::string hitsStr;
+
+    if (!entry.informationString.empty()) {
+        hitsStr = entry.informationString;
+    } else {
+        hitsStr = to_string_dec_int(entry.numHits);
+    }

    // Pushing single digit values down right justified.
-    std::string hitsStr = to_string_dec_int(entry.numHits);
    int hitsDigits = hitsStr.length();
    uint8_t hits_spacing = 8 - hitsDigits;

@@ -165,7 +214,10 @@ void RecentEntriesTable<BleRecentEntries>::draw(
    line += pad_string_with_spaces(db_spacing) + dbStr;

    line.resize(target_rect.width() / 8, ' ');
-    painter.draw_string(target_rect.location(), style, line);
+
+    Style row_style = (entry.vendor_status == MAC_VENDOR_FOUND) ? style : Style{style.font, style.background, Color::grey()};
+
+    painter.draw_string(target_rect.location(), row_style, line);
 }

 BleRecentEntryDetailView::BleRecentEntryDetailView(NavigationView& nav, const BleRecentEntry& entry)
@@ -178,17 +230,20 @@ BleRecentEntryDetailView::BleRecentEntryDetailView(NavigationView& nav, const Bl
                  &text_mac_address,
                  &label_pdu_type,
                  &text_pdu_type,
+                  &label_vendor,
+                  &text_vendor,
                  &labels});

    text_mac_address.set(to_string_mac_address(entry.packetData.macAddress, 6, false));
    text_pdu_type.set(pdu_type_to_string(entry.pduType));
+    text_vendor.set(entry.vendor_name.empty() ? lookup_mac_vendor(entry.packetData.macAddress) : entry.vendor_name);

    button_done.on_select = [&nav](const ui::Button&) {
        nav.pop();
    };

    button_send.on_select = [this, &nav](const ui::Button&) {
-        auto packetToSend = build_packet();
+        auto packetToSend = build_packet(entry_);
        nav.set_on_pop([packetToSend, &nav]() {
            nav.replace<BLETxView>(packetToSend);
        });
@@ -196,7 +251,7 @@ BleRecentEntryDetailView::BleRecentEntryDetailView(NavigationView& nav, const Bl
    };

    button_save.on_select = [this, &nav](const ui::Button&) {
-        auto packetToSave = build_packet();
+        auto packetToSave = build_packet(entry_);

        packetFileBuffer = "";
        text_prompt(
@@ -370,10 +425,13 @@ void BleRecentEntryDetailView::paint(Painter& painter) {

 void BleRecentEntryDetailView::set_entry(const BleRecentEntry& entry) {
    entry_ = entry;
+    text_mac_address.set(to_string_mac_address(entry.packetData.macAddress, 6, false));
+    text_pdu_type.set(pdu_type_to_string(entry.pduType));
+    text_vendor.set(entry.vendor_name.empty() ? lookup_mac_vendor(entry.packetData.macAddress) : entry.vendor_name);
    set_dirty();
 }

-BLETxPacket BleRecentEntryDetailView::build_packet() {
+BLETxPacket BleRecentEntryDetailView::build_packet(BleRecentEntry entry_) {
    BLETxPacket bleTxPacket;
    memset(&bleTxPacket, 0, sizeof(BLETxPacket));

@@ -381,8 +439,8 @@ BLETxPacket BleRecentEntryDetailView::build_packet() {

    strncpy(bleTxPacket.macAddress, macAddressStr.c_str(), 12);
    strncpy(bleTxPacket.advertisementData, entry_.dataString.c_str(), entry_.packetData.dataLen * 2);
-    strncpy(bleTxPacket.packetCount, "50", 3);
-    bleTxPacket.packet_count = 50;
+    strncpy(bleTxPacket.packetCount, "10", 3);
+    bleTxPacket.packet_count = 10;

    return bleTxPacket;
 }
@@ -432,16 +490,18 @@ BLERxView::BLERxView(NavigationView& nav)
                  &field_vga,
                  &options_channel,
                  &field_frequency,
-                  &check_log,
-                  &button_find,
-                  &check_name,
                  &label_sort,
                  &options_sort,
-                  &label_found,
-                  &text_found_count,
-                  &check_serial_log,
                  &button_filter,
                  &options_filter,
+                  &check_name,
+                  &check_log,
+                  &check_serial_log,
+                  &check_unique,
+                  &check_duplicate_packets,
+                  &button_find,
+                  &label_found,
+                  &text_found_count,
                  &button_save_list,
                  &button_clear_list,
                  &button_switch,
@@ -453,6 +513,29 @@ BLERxView::BLERxView(NavigationView& nav)
        nav_.push<BleRecentEntryDetailView>(entry);
    };

+    ensure_directory(find_packet_path);
+    ensure_directory(log_packets_path);
+    ensure_directory(packet_save_path);
+
+    // ------------------------------------------------------------------------------
+    // Handle Check Boxes
+    // ------------------------------------------------------------------------------
+    logger = std::make_unique<BLELogger>();
+
+    check_name.on_select = [this](Checkbox&, bool v) {
+        name_enable = v;
+        // update the include_name instance variable value of each entry in recent entries
+        setAllMembersToValue(recent, &BleRecentEntry::include_name, v);
+        recent_entries_view.set_dirty();
+    };
+
+    check_log.on_select = [this](Checkbox&, bool v) {
+        logging = v;
+
+        if (logger && logging)
+            logger->append(bletx_dir.string() + "/Packets/BLETx_" + to_string_timestamp(rtc_time::now()) + ".TXT");
+    };
+
    check_serial_log.on_select = [this](Checkbox&, bool v) {
        serial_logging = v;
        if (v) {
@@ -461,12 +544,28 @@ BLERxView::BLERxView(NavigationView& nav)
            portapack::async_tx_enabled = false;
        }
    };
+
+    check_unique.on_select = [this](Checkbox&, bool v) {
+        uniqueParsing = v;
+        recent.clear();
+        recent_entries_view.set_dirty();
+    };
+
+    check_duplicate_packets.on_select = [this](Checkbox&, bool v) {
+        duplicatePackets = v;
+        recent.clear();
+        recent_entries_view.set_dirty();
+    };
+
+    check_name.set_value(name_enable);
+    check_log.set_value(logging);
    check_serial_log.set_value(serial_logging);
+    check_unique.set_value(uniqueParsing);
+    check_duplicate_packets.set_value(duplicatePackets);

-    ensure_directory(find_packet_path);
-    ensure_directory(log_packets_path);
-    ensure_directory(packet_save_path);
-
+    // ------------------------------------------------------------------------------
+    // Handle Buttons
+    // ------------------------------------------------------------------------------
    filterBuffer = filter;

    button_filter.on_select = [this](Button&) {
@@ -480,17 +579,6 @@ BLERxView::BLERxView(NavigationView& nav)
            });
    };

-    logger = std::make_unique<BLELogger>();
-
-    check_log.on_select = [this](Checkbox&, bool v) {
-        str_log = "";
-        logging = v;
-
-        if (logger && logging)
-            logger->append(blerx_dir.string() + "/Logs/BLELOG_" + to_string_timestamp(rtc_time::now()) + ".TXT");
-    };
-    check_log.set_value(logging);
-
    button_save_list.on_select = [this, &nav](const ui::Button&) {
        listFileBuffer = "";
        text_prompt(
@@ -505,23 +593,25 @@ BLERxView::BLERxView(NavigationView& nav)

    button_clear_list.on_select = [this](Button&) {
        recent.clear();
+        recent_entries_view.set_dirty();
    };

    button_switch.on_select = [&nav](Button&) {
        nav.replace<BLETxView>();
    };

-    field_frequency.set_step(0);
-
-    check_name.set_value(name_enable);
-
-    check_name.on_select = [this](Checkbox&, bool v) {
-        name_enable = v;
-        // update the include_name instance variable value of each entry in recent entries
-        setAllMembersToValue(recent, &BleRecentEntry::include_name, v);
-        recent_entries_view.set_dirty();
+    button_find.on_select = [this](Button&) {
+        auto open_view = nav_.push<FileLoadView>(".TXT");
+        open_view->on_changed = [this](std::filesystem::path new_file_path) {
+            on_file_changed(new_file_path);
+        };
    };

+    // ------------------------------------------------------------------------------
+    // Handle Options
+    // ------------------------------------------------------------------------------
+    field_frequency.set_step(0);
+
    options_channel.on_change = [this](size_t index, int32_t v) {
        channel_index = (uint8_t)index;

@@ -545,23 +635,16 @@ BLERxView::BLERxView(NavigationView& nav)
    };

    options_filter.on_change = [this](size_t index, int32_t v) {
+        (void)v;
        filter_index = (uint8_t)index;
-        handle_filter_options(v);
+        recent.clear();
+        recent_entries_view.set_dirty();
    };

    options_channel.set_selected_index(channel_index, true);
    options_sort.set_selected_index(sort_index, true);
    options_filter.set_selected_index(filter_index, true);

-    button_find.on_select = [this](Button&) {
-        auto open_view = nav_.push<FileLoadView>(".TXT");
-        open_view->on_changed = [this](std::filesystem::path new_file_path) {
-            on_file_changed(new_file_path);
-
-            // nav_.set_on_pop([this]() { button_play.focus(); });
-        };
-    };
-
    // Auto-configure modem for LCR RX (will be removed later)
    baseband::set_btlerx(channel_number);

@@ -719,77 +802,87 @@ bool BLERxView::saveFile(const std::filesystem::path& path) {
 }

 void BLERxView::on_data(BlePacketData* packet) {
-    if (!logging) {
-        str_log = "";
-    }
-
-    str_console += pdu_type_to_string((ADV_PDU_TYPE)packet->type);
-    str_console += " Len:";
-    str_console += to_string_dec_uint(packet->size);
-    str_console += " Mac:";
-    str_console += to_string_mac_address(packet->macAddress, 6, false);
-    str_console += " Data:";
-
-    int i;
-
-    for (i = 0; i < packet->dataLen; i++) {
-        str_console += to_string_hex(packet->data[i], 2);
-    }
-
-    uint64_t macAddressEncoded = copy_mac_address_to_uint64(packet->macAddress);
+    uint64_t uniqueKeyEncoded = copy_mac_address_to_uint64(packet->macAddress);

    // Start of Packet stuffing.
    // Masking off the top 2 bytes to avoid invalid keys.
-    auto& entry = ::on_packet(recent, macAddressEncoded & 0xFFFFFFFFFFFF);
-    updateEntry(packet, entry, (ADV_PDU_TYPE)packet->type);

-    // Add entries if they meet the criteria.
-    // auto value = filter;
-    // resetFilteredEntries(recent, [&value](const BleRecentEntry& entry) {
-    //     return (entry.dataString.find(value) == std::string::npos) && (entry.nameString.find(value) == std::string::npos);
-    // });
-    handle_filter_options(options_filter.selected_index());
+    uint64_t key = (uniqueKeyEncoded & 0xFFFFFFFFFFFF);

-    handle_entries_sort(options_sort.selected_index());
+    if (duplicatePackets) {
+        key |= ((uint64_t)packet->type) << 48;
+    }
+
+    // If found store into tempEntry to modify.
+    auto it = find(recent, key);
+    if (it != recent.end()) {
+        recent.push_front(*it);
+        recent.erase(it);
+    } else {
+        recent.emplace_front(key);
+        truncate_entries(recent);
+    }
+
+    if (updateEntry(packet, recent.front(), (ADV_PDU_TYPE)packet->type)) {
+        if (!searchList.empty()) {
+            auto it = searchList.begin();
+
+            while (it != searchList.end()) {
+                std::string searchStr = (std::string)*it;
+
+                if (recent.front().dataString.find(searchStr) != std::string::npos) {
+                    searchList.erase(it);
+                    found_count++;
+                    break;
+                }
+
+                it++;
+            }
+
+            text_found_count.set(to_string_dec_uint(found_count) + "/" + to_string_dec_uint(total_count));
+        }
+
+        // Packets were updated, resort the list.
+        handle_entries_sort(options_sort.selected_index());
+    } else {
+        recent.pop_front();
+    }
+
+    log_ble_packet(packet);
+}
+
+void BLERxView::log_ble_packet(BlePacketData* packet) {
+    if ((logger && logging) || serial_logging) {
+        str_console = "";
+        str_console += pdu_type_to_string((ADV_PDU_TYPE)packet->type);
+        str_console += " Len:";
+        str_console += to_string_dec_uint(packet->size);
+        str_console += " Mac:";
+        str_console += to_string_mac_address(packet->macAddress, 6, false);
+        str_console += " Data:";
+
+        int i;
+
+        for (i = 0; i < packet->dataLen; i++) {
+            str_console += to_string_hex(packet->data[i], 2);
+        }
+    }

    // Log at End of Packet.
    if (logger && logging) {
-        logger->log_raw_data(str_console + "\r\n");
+        logger->log_raw_data(str_console);
    }

    if (serial_logging) {
        UsbSerialAsyncmsg::asyncmsg(str_console);  // new line handled there, no need here.
    }
-    str_console = "";
-
-    if (!searchList.empty()) {
-        auto it = searchList.begin();
-
-        while (it != searchList.end()) {
-            std::string searchStr = (std::string)*it;
-
-            if (entry.dataString.find(searchStr) != std::string::npos) {
-                searchList.erase(it);
-                found_count++;
-                break;
-            }
-
-            it++;
-        }
-
-        text_found_count.set(to_string_dec_uint(found_count) + "/" + to_string_dec_uint(total_count));
-    }
 }

 void BLERxView::on_filter_change(std::string value) {
    // New filter? Reset list from recent entries.
    if (filter != value) {
-        // resetFilteredEntries(recent, [&value](const BleRecentEntry& entry) {
-        //     // return (entry.dataString.find(value) == std::string::npos) && (entry.nameString.find(value) == std::string::npos);
-        //     return (entry.dataString.find(value) == std::string::npos) && (entry.nameString.find(value) == std::string::npos) && (to_string_mac_address(entry.packetData.macAddress, 6, false).find(value) == std::string::npos);
-        // });
        filter = value;
-        handle_filter_options(options_filter.selected_index());
+        recent.clear();
    }
 }

@@ -841,13 +934,10 @@ void BLERxView::on_timer() {
        timer_count = 0;

        if (auto_channel) {
-            int min = 37;
-            int max = 39;
+            field_frequency.set_value(get_freq_by_channel_number(channel_number));
+            baseband::set_btlerx(channel_number);

-            int randomChannel = min + std::rand() % (max - min + 1);
-
-            field_frequency.set_value(get_freq_by_channel_number(randomChannel));
-            baseband::set_btlerx(randomChannel);
+            channel_number = (channel_number < 39) ? channel_number + 1 : 37;
        }
    }
    if (ble_rx_error != BLE_RX_NO_ERROR) {
@@ -868,7 +958,7 @@ void BLERxView::handle_entries_sort(uint8_t index) {
    switch (index) {
        case 0:
            sortEntriesBy(
-                recent, [](const BleRecentEntry& entry) { return entry.macAddress; }, true);
+                recent, [](const BleRecentEntry& entry) { return entry.uniqueKey & 0xFFFFFFFFFFFF; }, true);
            break;
        case 1:
            sortEntriesBy(
@@ -886,6 +976,10 @@ void BLERxView::handle_entries_sort(uint8_t index) {
            sortEntriesBy(
                recent, [](const BleRecentEntry& entry) { return entry.nameString; }, true);
            break;
+        case 5:
+            sortEntriesBy(
+                recent, [](const BleRecentEntry& entry) { return entry.informationString; }, true);
+            break;
        default:
            break;
    }
@@ -893,21 +987,31 @@ void BLERxView::handle_entries_sort(uint8_t index) {
    recent_entries_view.set_dirty();
 }

-void BLERxView::handle_filter_options(uint8_t index) {
-    auto value = filter;
+bool BLERxView::handle_filter_options(uint8_t index, const BleRecentEntry& entry) {
+    const std::string& value = filter;  // no copy
+    if (value.empty()) return true;
+
    switch (index) {
-        case 0:  // filter by Data
-            resetFilteredEntries(recent, [&value](const BleRecentEntry& entry) {
-                return (entry.dataString.find(value) == std::string::npos) && (entry.nameString.find(value) == std::string::npos);
-            });
-            break;
-        case 1:  // filter by MAC address (All caps: e.g. AA:BB:CC:DD:EE:FF)
-            resetFilteredEntries(recent, [&value](const BleRecentEntry& entry) {
-                return (to_string_mac_address(entry.packetData.macAddress, 6, false).find(value) == std::string::npos);
-            });
-            break;
+        case 0:  // Data OR Name
+            return std::string_view(entry.dataString).find(value) != std::string_view::npos || std::string_view(entry.nameString).find(value) != std::string_view::npos;
+
+        case 1:  // MAC
+            return std::string_view(to_string_mac_address(entry.packetData.macAddress, 6, false)).find(value) != std::string_view::npos;
+
+        case 2:  // Name
+            return std::string_view(entry.nameString).find(value) != std::string_view::npos;
+
+        case 3:  // Info
+            return std::string_view(entry.informationString).find(value) != std::string_view::npos;
+
+        case 4:  // Vendor
+            return std::string_view(entry.vendor_name).find(value) != std::string_view::npos;
+
+        case 5:  // Channel (string once, not per call)
+            return std::string_view(to_string_dec_int(entry.channelNumber)).find(value) != std::string_view::npos;
+
        default:
-            break;
+            return true;
    }
 }

@@ -923,72 +1027,214 @@ BLERxView::~BLERxView() {
    baseband::shutdown();
 }

-void BLERxView::updateEntry(const BlePacketData* packet, BleRecentEntry& entry, ADV_PDU_TYPE pdu_type) {
+bool BLERxView::updateEntry(const BlePacketData* packet, BleRecentEntry& entry, ADV_PDU_TYPE pdu_type) {
    std::string data_string;

-    int i;
-
-    for (i = 0; i < packet->dataLen; i++) {
-        data_string += to_string_hex(packet->data[i], 2);
-    }
-
-    entry.dbValue = packet->max_dB;
-    entry.timestamp = to_string_timestamp(rtc_time::now());
-    entry.dataString = data_string;
-
-    entry.packetData.type = packet->type;
-    entry.packetData.size = packet->size;
-    entry.packetData.dataLen = packet->dataLen;
-
-    // Mac Address of sender.
-    entry.packetData.macAddress[0] = packet->macAddress[0];
-    entry.packetData.macAddress[1] = packet->macAddress[1];
-    entry.packetData.macAddress[2] = packet->macAddress[2];
-    entry.packetData.macAddress[3] = packet->macAddress[3];
-    entry.packetData.macAddress[4] = packet->macAddress[4];
-    entry.packetData.macAddress[5] = packet->macAddress[5];
-
-    entry.numHits++;
-    entry.pduType = pdu_type;
-    entry.channelNumber = channel_number;
-
-    // Parse Data Section into buffer to be interpretted later.
-    for (int i = 0; i < packet->dataLen; i++) {
-        entry.packetData.data[i] = packet->data[i];
-    }
-
-    entry.include_name = check_name.value();
+    bool success = false;

    // Only parse name for advertisment packets and empty name entries
-    if ((pdu_type == ADV_IND || pdu_type == ADV_NONCONN_IND || pdu_type == SCAN_RSP || pdu_type == ADV_SCAN_IND) && entry.nameString.empty()) {
-        ADV_PDU_PAYLOAD_TYPE_0_2_4_6* advertiseData = (ADV_PDU_PAYLOAD_TYPE_0_2_4_6*)entry.packetData.data;
+    if (pdu_type == ADV_IND || pdu_type == ADV_NONCONN_IND || pdu_type == SCAN_RSP || pdu_type == ADV_SCAN_IND) {
+        if (uniqueParsing) {
+            success = parse_tracking_beacon_data(packet->data, packet->dataLen, entry.nameString, entry.informationString);
+        }

-        uint8_t currentByte = 0;
-        uint8_t length = 0;
-        uint8_t type = 0;
-
-        std::string decoded_data;
-        for (currentByte = 0; (currentByte < entry.packetData.dataLen);) {
-            length = advertiseData->Data[currentByte++];
-            type = advertiseData->Data[currentByte++];
-
-            // Subtract 1 because type is part of the length.
-            for (int i = 0; i < length - 1; i++) {
-                // parse the name of bluetooth device: 0x08->Shortened Local Name; 0x09->Complete Local Name
-                if (type == 0x08 || type == 0x09) {
-                    decoded_data += (char)advertiseData->Data[currentByte];
-                }
-                currentByte++;
-            }
-            if (!decoded_data.empty()) {
-                entry.nameString = std::move(decoded_data);
-                break;
-            }
+        if (!success && !uniqueParsing) {
+            success = parse_beacon_data(packet->data, packet->dataLen, entry.nameString, entry.informationString);
        }
    } else if (pdu_type == ADV_DIRECT_IND || pdu_type == SCAN_REQ) {
-        ADV_PDU_PAYLOAD_TYPE_1_3* directed_mac_data = (ADV_PDU_PAYLOAD_TYPE_1_3*)entry.packetData.data;
-        reverse_byte_array(directed_mac_data->A1, 6);
+        if (!uniqueParsing) {
+            ADV_PDU_PAYLOAD_TYPE_1_3* directed_mac_data = (ADV_PDU_PAYLOAD_TYPE_1_3*)packet->data;
+            reverse_byte_array(directed_mac_data->A1, 6);
+            success = true;
+        }
    }
+
+    if (success) {
+        int i;
+
+        for (i = 0; i < packet->dataLen; i++) {
+            data_string += to_string_hex(packet->data[i], 2);
+        }
+
+        entry.dbValue = packet->max_dB - (receiver_model.lna() + receiver_model.vga() + (receiver_model.rf_amp() ? 14 : 0));
+        entry.timestamp = to_string_timestamp(rtc_time::now());
+        entry.dataString = data_string;
+
+        entry.packetData.type = packet->type;
+        entry.packetData.size = packet->size;
+        entry.packetData.dataLen = packet->dataLen;
+
+        // Mac Address of sender.
+        entry.packetData.macAddress[0] = packet->macAddress[0];
+        entry.packetData.macAddress[1] = packet->macAddress[1];
+        entry.packetData.macAddress[2] = packet->macAddress[2];
+        entry.packetData.macAddress[3] = packet->macAddress[3];
+        entry.packetData.macAddress[4] = packet->macAddress[4];
+        entry.packetData.macAddress[5] = packet->macAddress[5];
+
+        entry.pduType = pdu_type;
+        entry.channelNumber = channel_number;
+        entry.numHits++;
+
+        if (entry.vendor_status == MAC_VENDOR_UNKNOWN) {
+            entry.vendor_status = lookup_mac_vendor_status(entry.packetData.macAddress, entry.vendor_name);
+        }
+
+        // Parse Data Section into buffer to be interpretted later.
+        for (int i = 0; i < packet->dataLen; i++) {
+            entry.packetData.data[i] = packet->data[i];
+        }
+
+        entry.include_name = check_name.value();
+    }
+
+    return handle_filter_options(options_filter.selected_index(), entry) && success;
+}
+
+bool BLERxView::parse_tracking_beacon_data(const uint8_t* data, uint8_t length, std::string& nameString, std::string& informationString) {
+    uint8_t currentByte, currentLength, currentType = 0;
+
+    for (currentByte = 0; currentByte < length;) {
+        currentLength = data[currentByte++];
+        currentType = data[currentByte++];
+
+        // Manufacturer Specific Data (0xFF)
+        if (currentType == 0xFF && currentLength >= 4) {
+            uint16_t companyID = data[currentByte] | (data[currentByte + 1] << 8);
+
+            // Apple AirTag / Find My
+            if (companyID == 0x004C && currentLength >= 6) {
+                uint8_t appleType = data[currentByte + 2];
+                uint8_t appleLen = data[currentByte + 3];
+                if (appleType == 0x12 && appleLen == 0x19 && currentLength >= 4 + appleLen) {
+                    nameString.assign("Apple AirTag");
+                    informationString.assign("Find My");
+                    return true;
+                } else if (appleType == 0x02 && appleLen == 0x15) {
+                    uint16_t major = (data[currentByte + 20] << 8) | data[currentByte + 21];
+                    uint16_t minor = (data[currentByte + 22] << 8) | data[currentByte + 23];
+
+                    nameString.assign("iBeacon");
+                    informationString.assign(to_string_hex(major) + to_string_hex(minor));
+                    return true;
+                }
+            }
+        }
+        // Services
+        else if ((currentType == 0x02 || currentType == 0x03) && currentLength >= 3) {
+            for (int u = 0; u < currentLength - 1; u += 2) {
+                uint16_t uuid16 = data[currentByte + u] | (data[currentByte + u + 1] << 8);
+                if (uuid16 == 0x1802) {  // Immediate Alert Service = Find Me Profile
+                    nameString.assign("FindMe");
+                    informationString.assign("IAS");
+                    return true;
+                }
+            }
+        }
+        // Service Data
+        else if (currentType == 0x16 && currentLength >= 3) {
+            uint16_t uuid16 = data[currentByte] | (data[currentByte + 1] << 8);
+
+            switch (uuid16) {
+                case 0xFD59: {  // Samsung SmartTag - Unregistered
+                    nameString.assign("Samsung SmartTag");
+                    informationString.assign("Unreg");
+                    return true;
+                }
+                case 0xFD5A: {  // Samsung SmartTag - Registered
+                    nameString.assign("Samsung SmartTag");
+                    informationString.assign("Reg");
+                    return true;
+                }
+                case 0xFD84: {
+                    if (currentByte + 2 < length) {
+                        uint8_t model = data[currentByte + 2];
+                        switch (model) {
+                            case 0x01:
+                                informationString.assign("Mate");
+                                break;
+                            case 0x02:
+                                informationString.assign("Pro");
+                                break;
+                            case 0x03:
+                                informationString.assign("Slim");
+                                break;
+                            case 0x04:
+                                informationString.assign("Sticker");
+                                break;
+                            default:
+                                informationString.assign("Unknown");
+                                break;
+                        }
+                    }
+                    nameString.assign("Tile");
+                    return true;
+                }
+                case 0xFEAA: {
+                    if (currentByte + 2 < length) {
+                        uint8_t frameType = data[currentByte + 2];
+                        switch (frameType) {
+                            case 0x00:
+                                informationString.assign("UID");
+                                break;
+                            case 0x10:
+                                informationString.assign("URL");
+                                break;
+                            case 0x20:
+                                informationString.assign("TLM");
+                                break;
+                            case 0x30:
+                                informationString.assign("EID");
+                                break;
+                            default:
+                                informationString.assign("Unknown");
+                                break;
+                        }
+                    }
+                    nameString.assign("Eddystone");
+                    return true;
+                }
+            }
+        }
+
+        currentByte += (currentLength - 1);
+    }
+
+    return false;
+}
+
+bool BLERxView::parse_beacon_data(const uint8_t* data, uint8_t length, std::string& nameString, std::string& informationString) {
+    uint8_t currentByte, currentLength, currentType = 0;
+    std::string tempName = "";
+
+    for (currentByte = 0; currentByte < length;) {
+        currentLength = data[currentByte++];
+        currentType = data[currentByte++];
+
+        // Subtract 1 because type is part of the length.
+        for (int i = 0; ((i < currentLength - 1) && (currentByte < length)); i++) {
+            // parse the name of bluetooth device: 0x08->Shortened Local Name; 0x09->Complete Local Name
+            if (currentType == 0x08 || currentType == 0x09) {
+                tempName += (char)data[currentByte];
+            }
+            currentByte++;
+        }
+
+        if (!tempName.empty()) {
+            nameString = tempName;
+            break;
+        }
+    }
+
+    informationString = "";
+
+    if (!informationString.empty()) {
+        // Option to change title of Hits Column.
+        // Setting to default for now.
+        columns.set(1, "Hits", 7);
+    }
+
+    return true;
 }

 } /* namespace ui */
@@ -2,6 +2,7 @@
 * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2017 Furrtek
 * Copyright (C) 2023 TJ Baginski
+ * Copyright (C) 2025 Tommaso Ventafridda
 *
 * This file is part of PortaPack.
 *
@@ -33,6 +34,7 @@
 #include "ui_record_view.hpp"
 #include "app_settings.hpp"
 #include "radio_state.hpp"
+#include "database.hpp"
 #include "log_file.hpp"
 #include "utility.hpp"
 #include "usb_serial_thread.hpp"
@@ -69,24 +71,35 @@ typedef enum {
    RESERVED5 = 12,
    RESERVED6 = 13,
    RESERVED7 = 14,
-    RESERVED8 = 15
+    RESERVED8 = 15,
+    UNKNOWN = 16
 } ADV_PDU_TYPE;

+typedef enum {
+    MAC_VENDOR_UNKNOWN = 0,
+    MAC_VENDOR_FOUND = 1,
+    MAC_VENDOR_NOT_FOUND = 2,
+    MAC_DB_NOT_FOUND = 3
+} MAC_VENDOR_STATUS;
+
 struct BleRecentEntry {
    using Key = uint64_t;

-    static constexpr Key invalid_key = 0xffffffff;
+    static constexpr Key invalid_key = 0xFFFFFFFFFFFFF;

-    uint64_t macAddress;
+    uint64_t uniqueKey;
    int dbValue;
    BlePacketData packetData;
    std::string timestamp;
    std::string dataString;
    std::string nameString;
+    std::string informationString;
    bool include_name;
    uint16_t numHits;
    ADV_PDU_TYPE pduType;
    uint8_t channelNumber;
+    MAC_VENDOR_STATUS vendor_status;
+    std::string vendor_name;
    bool entryFound;

    BleRecentEntry()
@@ -94,22 +107,25 @@ struct BleRecentEntry {
    }

    BleRecentEntry(
-        const uint64_t macAddress)
-        : macAddress{macAddress},
+        const uint64_t uniqueKey)
+        : uniqueKey{uniqueKey},
          dbValue{},
          packetData{},
          timestamp{},
          dataString{},
          nameString{},
+          informationString{},
          include_name{},
          numHits{},
          pduType{},
          channelNumber{},
+          vendor_status{MAC_VENDOR_UNKNOWN},
+          vendor_name{},
          entryFound{} {
    }

    Key key() const {
-        return macAddress;
+        return uniqueKey;
    }
 };

@@ -126,11 +142,11 @@ class BleRecentEntryDetailView : public View {
    void update_data();
    void focus() override;
    void paint(Painter&) override;
+    static BLETxPacket build_packet(BleRecentEntry entry_);

   private:
    NavigationView& nav_;
    BleRecentEntry entry_{};
-    BLETxPacket build_packet();
    void on_save_file(const std::string value, BLETxPacket packetToSave);
    bool saveFile(const std::filesystem::path& path, BLETxPacket packetToSave);
    std::string packetFileBuffer{};
@@ -139,35 +155,42 @@ class BleRecentEntryDetailView : public View {
    static constexpr uint8_t total_data_lines{5};

    Labels label_mac_address{
-        {{0 * 8, 0 * 16}, "Mac Address:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), UI_POS_Y(0)}, "Mac Address:", Theme::getInstance()->fg_light->foreground}};

    Text text_mac_address{
-        {12 * 8, 0 * 16, 17 * 8, 16},
+        {UI_POS_X(12), UI_POS_Y(0), UI_POS_WIDTH(17), UI_POS_HEIGHT(1)},
        "-"};

    Labels label_pdu_type{
-        {{0 * 8, 1 * 16}, "PDU Type:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), UI_POS_Y(1)}, "PDU Type:", Theme::getInstance()->fg_light->foreground}};

    Text text_pdu_type{
-        {9 * 8, 1 * 16, 17 * 8, 16},
+        {9 * 8, UI_POS_Y(1), 17 * 8, UI_POS_HEIGHT(1)},
+        "-"};
+
+    Labels label_vendor{
+        {{UI_POS_X(0), UI_POS_Y(2)}, "Vendor:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_vendor{
+        {7 * 8, UI_POS_Y(2), 23 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Labels labels{
-        {{0 * 8, 3 * 16}, "Len", Theme::getInstance()->fg_light->foreground},
-        {{5 * 8, 3 * 16}, "Type", Theme::getInstance()->fg_light->foreground},
-        {{10 * 8, 3 * 16}, "Value", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(3)}, "Len", Theme::getInstance()->fg_light->foreground},
+        {{5 * 8, UI_POS_Y(3)}, "Type", Theme::getInstance()->fg_light->foreground},
+        {{10 * 8, UI_POS_Y(3)}, "Value", Theme::getInstance()->fg_light->foreground},
    };

    Button button_send{
-        {19, 224, 96, 24},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), 224, 96, 24},
        "Send"};

    Button button_done{
-        {125, 224, 96, 24},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), 224, 96, 24},
        "Done"};

    Button button_save{
-        {72, 264, 96, 24},
+        {UI_POS_X_CENTER(12), 264, 96, 24},
        "Save"};

    bool send_updates{false};
@@ -198,15 +221,19 @@ class BLERxView : public View {
    bool saveFile(const std::filesystem::path& path);
    std::unique_ptr<UsbSerialThread> usb_serial_thread{};
    void on_data(BlePacketData* packetData);
+    void log_ble_packet(BlePacketData* packet);
    void on_filter_change(std::string value);
    void on_file_changed(const std::filesystem::path& new_file_path);
    void file_error();
    void on_timer();
    void handle_entries_sort(uint8_t index);
-    void handle_filter_options(uint8_t index);
-    void updateEntry(const BlePacketData* packet, BleRecentEntry& entry, ADV_PDU_TYPE pdu_type);
+    bool handle_filter_options(uint8_t index, const BleRecentEntry& entry);
+    bool updateEntry(const BlePacketData* packet, BleRecentEntry& entry, ADV_PDU_TYPE pdu_type);
+    bool parse_beacon_data(const uint8_t* data, uint8_t length, std::string& nameString, std::string& informationString);
+    bool parse_tracking_beacon_data(const uint8_t* data, uint8_t length, std::string& nameString, std::string& informationString);

    NavigationView& nav_;
+
    RxRadioState radio_state_{
        2402000000 /* frequency */,
        4000000 /* bandwidth */,
@@ -216,6 +243,8 @@ class BLERxView : public View {
    uint8_t channel_index{0};
    uint8_t sort_index{0};
    uint8_t filter_index{0};
+    bool uniqueParsing = false;
+    bool duplicatePackets = false;
    std::string filter{};
    bool logging{false};
    bool serial_logging{false};
@@ -234,6 +263,8 @@ class BLERxView : public View {
            // disabled to always start without USB serial activated until we can make it non blocking if not connected
            // {"serial_log"sv, &serial_logging},
            {"name"sv, &name_enable},
+            {"unique_parsing"sv, &uniqueParsing},
+            {"duplicate_packets"sv, &duplicatePackets},
        }};

    std::string str_console = "";
@@ -243,7 +274,7 @@ class BLERxView : public View {
    bool auto_channel = false;

    int16_t timer_count{0};
-    int16_t timer_period{6};  // 100ms
+    int16_t timer_period{1};  // 25ms

    std::string filterBuffer{};
    std::string listFileBuffer{};
@@ -259,11 +290,11 @@ class BLERxView : public View {
    std::filesystem::path log_packets_path{blerx_dir / u"Logs/????.TXT"};
    std::filesystem::path packet_save_path{blerx_dir / u"Lists/????.csv"};

-    static constexpr auto header_height = 9 * 8;
+    static constexpr auto header_height = 12 * 8;
    static constexpr auto switch_button_height = 3 * 16;

    OptionsField options_channel{
-        {0 * 8, 0 * 8},
+        {UI_POS_X(0), UI_POS_Y(0)},
        5,
        {{"Ch.37", 37},
         {"Ch.38", 38},
@@ -271,45 +302,50 @@ class BLERxView : public View {
         {"Auto", 40}}};

    RxFrequencyField field_frequency{
-        {6 * 8, 0 * 16},
+        {UI_POS_X(6), UI_POS_Y(0)},
        nav_};

    RFAmpField field_rf_amp{
-        {16 * 8, 0 * 16}};
+        {UI_POS_X(16), UI_POS_Y(0)}};

    LNAGainField field_lna{
-        {18 * 8, 0 * 16}};
+        {UI_POS_X(18), UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {21 * 8, 0 * 16}};
+        {UI_POS_X(21), UI_POS_Y(0)}};

    RSSI rssi{
-        {24 * 8, 0, 6 * 8, 4}};
+        {UI_POS_X(24), 0, UI_POS_WIDTH_REMAINING(6), 4}};

    Channel channel{
-        {24 * 8, 5, 6 * 8, 4}};
+        {UI_POS_X(24), 5, UI_POS_WIDTH_REMAINING(6), 4}};

    Labels label_sort{
-        {{0 * 8, 2 * 8}, "Sort:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), UI_POS_Y(1)}, "Sort:", Theme::getInstance()->fg_light->foreground}};

    OptionsField options_sort{
-        {5 * 8, 2 * 8},
+        {5 * 8, UI_POS_Y(1)},
        4,
        {{"MAC", 0},
         {"Hits", 1},
         {"dB", 2},
         {"Time", 3},
-         {"Name", 4}}};
+         {"Name", 4},
+         {"Info", 5}}};

    Button button_filter{
-        {11 * 8, 2 * 8, 7 * 8, 16},
+        {11 * 8, UI_POS_Y(1), 7 * 8, 16},
        "Filter:"};

    OptionsField options_filter{
-        {18 * 8 + 2, 2 * 8},
-        4,
+        {18 * 8 + 2, UI_POS_Y(1)},
+        7,
        {{"Data", 0},
-         {"MAC", 1}}};
+         {"MAC", 1},
+         {"Name", 2},
+         {"Info", 3},
+         {"Vendor", 4},
+         {"Channel", 5}}};

    Checkbox check_log{
        {10 * 8, 4 * 8 + 2},
@@ -318,41 +354,50 @@ class BLERxView : public View {
        true};

    Checkbox check_name{
-        {0 * 8, 4 * 8 + 2},
+        {UI_POS_X(0), 4 * 8 + 2},
        3,
        "Name",
        true};

-    Button button_find{
-        {0 * 8, 7 * 8 - 2, 4 * 8, 16},
-        "Find"};
-
-    Labels label_found{
-        {{5 * 8, 7 * 8 - 2}, "Found:", Theme::getInstance()->fg_light->foreground}};
-
-    Text text_found_count{
-        {11 * 8, 7 * 8 - 2, 20 * 8, 16},
-        "0/0"};
-
    Checkbox check_serial_log{
        {18 * 8 + 2, 4 * 8 + 2},
        7,
        "USB Log",
        true};

-    // Console console{
-    //     {0, 10 * 8, screen_height, screen_height-80}};
+    Checkbox check_unique{
+        {0 * 8 + 2, 7 * 8 + 2},
+        7,
+        "Unique",
+        true};
+
+    Checkbox check_duplicate_packets{
+        {10 * 8 + 2, 7 * 8 + 2},
+        7,
+        "Duplicate",
+        true};
+
+    Button button_find{
+        {UI_POS_X(0), 10 * 8 - 2, 4 * 8, 16},
+        "Find"};
+
+    Labels label_found{
+        {{5 * 8, 10 * 8 - 2}, "Found:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_found_count{
+        {11 * 8, 10 * 8 - 2, 20 * 8, 16},
+        "0/0"};

    Button button_clear_list{
        {2 * 8, screen_height - (16 + 32), 7 * 8, 32},
        "Clear"};

    Button button_save_list{
-        {11 * 8, screen_height - (16 + 32), 11 * 8, 32},
+        {UI_POS_X_CENTER(11), screen_height - (16 + 32), 11 * 8, 32},
        "Export CSV"};

    Button button_switch{
-        {screen_width - 6 * 8, screen_height - (16 + 32), 4 * 8, 32},
+        {UI_POS_X_RIGHT(6), screen_height - (16 + 32), 4 * 8, 32},
        "Tx"};

    std::string str_log{""};
@@ -361,10 +406,10 @@ class BLERxView : public View {
    BleRecentEntries recent{};
    BleRecentEntries tempList{};

-    const RecentEntriesColumns columns{{
-        {"Mac Address", 17},
+    RecentEntriesColumns columns{{
+        {"Name", 0},
        {"Hits", 7},
-        {"dB", 4},
+        {"dBm", 4},
    }};

    BleRecentEntriesView recent_entries_view{columns, recent};
@@ -35,6 +35,7 @@
 #include "rtc_time.hpp"
 #include "string_format.hpp"
 #include "file_path.hpp"
+#include "usb_serial_asyncmsg.hpp"

 using namespace portapack;
 using namespace modems;
@@ -123,6 +124,31 @@ static std::uint64_t get_freq_by_channel_number(uint8_t channel_number) {

 namespace ui {

+PKT_TYPE get_pkt_type_from_string(const std::string& type_str) {
+    if (type_str == "RAW") {
+        return PKT_TYPE_RAW;
+    } else if (type_str == "DISCOVERY") {
+        return PKT_TYPE_DISCOVERY;
+    } else if (type_str == "IBEACON") {
+        return PKT_TYPE_IBEACON;
+    } else if (type_str == "ADV_IND") {
+        return PKT_TYPE_ADV_IND;
+    } else if (type_str == "ADV_DIRECT_IND") {
+        return PKT_TYPE_ADV_DIRECT_IND;
+    } else if (type_str == "ADV_NONCONN_IND") {
+        return PKT_TYPE_ADV_NONCONN_IND;
+    } else if (type_str == "ADV_SCAN_IND") {
+        return PKT_TYPE_ADV_SCAN_IND;
+    } else if (type_str == "SCAN_REQ") {
+        return PKT_TYPE_SCAN_REQ;
+    } else if (type_str == "SCAN_RSP") {
+        return PKT_TYPE_SCAN_RSP;
+    } else if (type_str == "CONNECT_REQ") {
+        return PKT_TYPE_CONNECT_REQ;
+    }
+    return PKT_TYPE_INVALID_TYPE;
+}
+
 void BLETxView::focus() {
    button_open.focus();
 }
@@ -167,28 +193,11 @@ void BLETxView::toggle() {
    }
 }

-void BLETxView::start() {
-    baseband::run_image(portapack::spi_flash::image_tag_btle_tx);
-    transmitter_model.enable();
-
+void BLETxView::send_packet() {
    // Generate new random Mac Address.
+    transmitter_model.enable();
    generateRandomMacAddress(randomMac);

-    // If this is our first run, check file.
-    if (!is_active()) {
-        File data_file;
-
-        auto error = data_file.open(file_path);
-        if (error && !file_override) {
-            file_error();
-            check_loop.set_value(false);
-            return;
-        }
-
-        button_play.set_bitmap(&bitmap_stop);
-        is_running = true;
-    }
-
    char advertisementData[63] = {0};
    strcpy(advertisementData, packets[current_packet].advertisementData);

@@ -235,9 +244,28 @@ void BLETxView::start() {
        }
    }

-    // Setup next packet configuration.
-    progressbar.set_max(packets[current_packet].packet_count);
-    baseband::set_btletx(channel_number, random_mac ? randomMac : packets[current_packet].macAddress, advertisementData, pduType);
+    progressbar.set_value(packets[current_packet].packet_count - packet_counter);
+    text_packets_sent.set(to_string_dec_uint(packet_counter));
+
+    baseband::set_btletx(channel_number, random_mac ? randomMac : packets[current_packet].macAddress, advertisementData, packets[current_packet].pduType);
+
+    packetDone = false;
+}
+
+void BLETxView::start() {
+    if (file_path.empty()) {
+        file_error();
+        check_loop.set_value(false);
+        return;
+    }
+
+    baseband::run_image(portapack::spi_flash::image_tag_btle_tx);
+    transmitter_model.enable();
+
+    button_play.set_bitmap(&bitmap_stop);
+    is_running = true;
+
+    send_packet();
 }

 void BLETxView::stop() {
@@ -253,73 +281,77 @@ void BLETxView::stop() {
    is_running = false;
 }

-void BLETxView::reset() {
-    transmitter_model.disable();
-    baseband::shutdown();
-
-    start();
-}
-
 // called each 1/60th of second, so 6 = 100ms
 void BLETxView::on_timer() {
    if (++timer_count == timer_period) {
        timer_count = 0;

-        if (is_active()) {
-            // Reached end of current packet repeats.
-            if (packet_counter == 0) {
-                // Done sending all packets.
-                if (current_packet == (num_packets - 1)) {
-                    current_packet = 0;
-
-                    // If looping, restart from beginning.
-                    if (check_loop.value()) {
-                        update_current_packet(packets[current_packet], current_packet);
-                        reset();
-                    } else {
-                        stop();
-                    }
-                } else {
-                    current_packet++;
-                    update_current_packet(packets[current_packet], current_packet);
-                    reset();
-                }
-            } else {
-                reset();
-            }
-        }
-    }
-
-    if (++auto_channel_counter == auto_channel_period) {
-        auto_channel_counter = 0;
-
-        if (auto_channel) {
-            int min = 37;
-            int max = 39;
-
-            channel_number = min + std::rand() % (max - min + 1);
-
-            field_frequency.set_value(get_freq_by_channel_number(channel_number));
+        if (is_active() && packetDone) {
+            send_packet();
        }
    }
 }

-void BLETxView::on_tx_progress(const bool done) {
+void BLETxView::on_tx_progress(const bool done, uint32_t progress) {
+    // TODO: make use of progress variable
+    (void)progress;
    if (done) {
        if (is_active()) {
-            if ((packet_counter % 10) == 0) {
-                text_packets_sent.set(to_string_dec_uint(packet_counter));
-            }
+            transmitter_model.disable();
+            if (auto_channel) {
+                switch (advCount) {
+                    case 0:
+                        channel_number = 37;
+                        break;
+                    case 1:
+                        channel_number = 38;
+                        break;
+                    case 2:
+                        channel_number = 39;
+                        break;
+                }

-            packet_counter--;
-            progressbar.set_value(packets[current_packet].packet_count - packet_counter);
+                field_frequency.set_value(get_freq_by_channel_number(channel_number));
+
+                if (advCount == 3) {
+                    channel_number = 37;
+                    packet_counter--;
+                    packetDone = true;
+                    advCount = 0;
+                } else {
+                    send_packet();
+                    advCount++;
+                }
+            } else {
+                packet_counter--;
+                packetDone = true;
+            }
+        }
+
+        // Reached end of current packet repeats.
+        if (packet_counter == 0) {
+            // Done sending all packets.
+            if (current_packet == (num_packets - 1)) {
+                current_packet = 0;
+
+                // If looping, restart from beginning.
+                if (check_loop.value()) {
+                    update_current_packet(packets[current_packet], current_packet);
+                } else {
+                    stop();
+                }
+            } else {
+                current_packet++;
+                update_current_packet(packets[current_packet], current_packet);
+            }
        }
    }
 }

 BLETxView::BLETxView(NavigationView& nav)
    : nav_{nav} {
-    add_children({&button_open,
+    add_children({&dataEditView,
+                  &button_open,
                  &text_filename,
                  &progressbar,
                  &check_rand_mac,
@@ -330,7 +362,6 @@ BLETxView::BLETxView(NavigationView& nav)
                  &label_speed,
                  &options_speed,
                  &options_channel,
-                  &options_adv_type,
                  &label_marked_data,
                  &marked_data_sequence,
                  &label_packet_index,
@@ -340,7 +371,6 @@ BLETxView::BLETxView(NavigationView& nav)
                  &label_mac_address,
                  &text_mac_address,
                  &label_data_packet,
-                  &dataEditView,
                  &button_clear_marked,
                  &button_save_packet,
                  &button_switch});
@@ -371,13 +401,8 @@ BLETxView::BLETxView(NavigationView& nav)
        timer_count = 0;
    };

-    options_adv_type.on_change = [this](size_t, int32_t i) {
-        pduType = (PKT_TYPE)i;
-    };
-
    options_speed.set_selected_index(0);
-    options_channel.set_selected_index(0);
-    options_adv_type.set_selected_index(0);
+    options_channel.set_selected_index(3);

    check_rand_mac.set_value(false);
    check_rand_mac.on_select = [this](Checkbox&, bool v) {
@@ -430,6 +455,23 @@ BLETxView::BLETxView(NavigationView& nav)
        }
    };

+    dataEditView.on_change = [this](uint8_t value) {
+        // Reject setting newline at index 29.
+        if (cursor_pos.col != 29) {
+            uint16_t dataBytePos = (cursor_pos.line * 29) + cursor_pos.col;
+
+            packets[current_packet].advertisementData[dataBytePos] = uint_to_char(value, 16);
+
+            update_current_packet(packets[current_packet], current_packet);
+        }
+    };
+
+    dataEditView.on_cursor_moved = [this]() {
+        // Save last selected cursor.
+        cursor_pos.line = dataEditView.line();
+        cursor_pos.col = dataEditView.col();
+    };
+
    button_clear_marked.on_select = [this](Button&) {
        marked_counter = 0;
        markedBytes.clear();
@@ -465,17 +507,25 @@ void BLETxView::on_file_changed(const fs::path& new_file_path) {
        do {
            readUntil(data_file, packets[num_packets].macAddress, mac_address_size_str, ' ');
            readUntil(data_file, packets[num_packets].advertisementData, max_packet_size_str, ' ');
+            readUntil(data_file, packets[num_packets].packetType, max_packet_type_str, ' ');
            readUntil(data_file, packets[num_packets].packetCount, max_packet_repeat_str, '\n');

            uint64_t macAddressSize = strlen(packets[num_packets].macAddress);
            uint64_t advertisementDataSize = strlen(packets[num_packets].advertisementData);
            uint64_t packetCountSize = strlen(packets[num_packets].packetCount);
+            uint64_t packetTypeSize = strlen(packets[num_packets].packetType);

            packets[num_packets].packet_count = stringToUint32(packets[num_packets].packetCount);
+            packets[num_packets].pduType = (PKT_TYPE)get_pkt_type_from_string(packets[num_packets].packetType);

            // Verify Data.
-            if ((macAddressSize == mac_address_size_str) && (advertisementDataSize < max_packet_size_str) && (packetCountSize < max_packet_repeat_str) &&
-                hasValidHexPairs(packets[num_packets].macAddress, macAddressSize / 2) && hasValidHexPairs(packets[num_packets].advertisementData, advertisementDataSize / 2) && (packets[num_packets].packet_count >= 1) && (packets[num_packets].packet_count < max_packet_repeat_count)) {
+            if ((macAddressSize == mac_address_size_str) &&
+                (advertisementDataSize < max_packet_size_str) &&
+                (packetCountSize < max_packet_repeat_str) &&
+                hasValidHexPairs(packets[num_packets].macAddress, macAddressSize / 2) &&
+                hasValidHexPairs(packets[num_packets].advertisementData, advertisementDataSize / 2) &&
+                (packets[num_packets].packet_count >= 1) && (packets[num_packets].packet_count < max_packet_repeat_count) &&
+                (packetTypeSize <= max_packet_type_str)) {
                text_filename.set(truncate(file_path.filename().string(), 12));

            } else {
@@ -493,6 +543,8 @@ void BLETxView::on_file_changed(const fs::path& new_file_path) {
        } while (num_packets < max_num_packets);

        update_current_packet(packets[0], 0);
+
+        data_file.close();
    }
 }

@@ -523,6 +575,8 @@ void BLETxView::update_current_packet(BLETxPacket packet, uint32_t currentIndex)

    text_mac_address.set(formattedMacAddress);

+    progressbar.set_max(packet.packet_count);
+
    packet_counter = packet.packet_count;
    current_packet = currentIndex;

@@ -531,10 +585,9 @@ void BLETxView::update_current_packet(BLETxPacket packet, uint32_t currentIndex)
    for (const std::string& str : strings) {
        dataFile.write(str.c_str(), str.size());
        dataFile.write("\n", 1);
-        ;
    }

-    dataFile.~File();
+    dataFile.close();

    auto result = FileWrapper::open(dataTempFilePath);

@@ -546,6 +599,7 @@ void BLETxView::update_current_packet(BLETxPacket packet, uint32_t currentIndex)
    dataEditView.set_font_zoom(true);
    dataEditView.set_file(*dataFileWrapper);
    dataEditView.redraw(true, true);
+    dataEditView.cursor_set(cursor_pos.line, cursor_pos.col);
 }

 void BLETxView::set_parent_rect(const Rect new_parent_rect) {
@@ -38,6 +38,8 @@
 #include "utility.hpp"
 #include "file_path.hpp"

+#include "ble_tx_app.hpp"
+
 #include "recent_entries.hpp"

 #include <string>
@@ -91,8 +93,9 @@ struct BLETxPacket {
    char macAddress[13];
    char advertisementData[63];
    char packetCount[11];
+    char packetType[17];
    uint32_t packet_count;
-    PKT_TYPE packetType;
+    PKT_TYPE pduType;
 };

 class BLETxView : public View {
@@ -109,8 +112,8 @@ class BLETxView : public View {
    bool is_active() const;
    void toggle();
    void start();
+    void send_packet();
    void stop();
-    void reset();
    void handle_replay_thread_done(const uint32_t return_code);
    void file_error();
    bool saveFile(const std::filesystem::path& path);
@@ -122,7 +125,7 @@ class BLETxView : public View {
    void on_data(uint32_t value, bool is_data);
    void on_file_changed(const std::filesystem::path& new_file_path);
    void on_save_file(const std::string value);
-    void on_tx_progress(const bool done);
+    void on_tx_progress(const bool done, uint32_t progress);
    void on_random_data_change(std::string value);
    void update_current_packet(BLETxPacket packet, uint32_t currentIndex);

@@ -156,6 +159,8 @@ class BLETxView : public View {
    uint32_t packet_counter{0};
    uint32_t num_packets{0};
    uint32_t current_packet{0};
+    uint8_t packetTxCount{0};
+    bool packetDone = false;
    bool random_mac = false;
    bool file_override = false;

@@ -170,39 +175,39 @@ class BLETxView : public View {
    std::vector<uint16_t> markedBytes{};
    CursorPos cursor_pos{};
    uint8_t marked_counter = 0;
+    uint8_t advCount = 0;

    static constexpr uint8_t mac_address_size_str{12};
    static constexpr uint8_t max_packet_size_str{62};
    static constexpr uint8_t max_packet_repeat_str{10};
+    static constexpr uint8_t max_packet_type_str{16};
    static constexpr uint32_t max_packet_repeat_count{UINT32_MAX};
    static constexpr uint32_t max_num_packets{32};

    BLETxPacket packets[max_num_packets];

-    PKT_TYPE pduType = {PKT_TYPE_DISCOVERY};
-
    static constexpr auto header_height = 10 * 16;
    static constexpr auto switch_button_height = 6 * 16;

    Button button_open{
-        {0 * 8, 0 * 16, 10 * 8, 2 * 16},
+        {UI_POS_X(0), UI_POS_Y(0), 10 * 8, 2 * 16},
        "Open file"};

    Text text_filename{
-        {11 * 8, 0 * 16, 12 * 8, 16},
+        {11 * 8, UI_POS_Y(0), UI_POS_WIDTH_REMAINING(11), 16},
        "-"};

    ProgressBar progressbar{
-        {11 * 8, 1 * 16, 9 * 8, 16}};
+        {11 * 8, 1 * 16, UI_POS_WIDTH_REMAINING(11 + 10), 16}};

    Checkbox check_rand_mac{
-        {21 * 8, 1 * 16},
+        {UI_POS_X_RIGHT(9), 1 * 16},
        6,
        "?? Mac",
        true};

    TxFrequencyField field_frequency{
-        {0 * 8, 2 * 16},
+        {UI_POS_X(0), 2 * 16},
        nav_};

    TransmitterView2 tx_view{
@@ -210,28 +215,28 @@ class BLETxView : public View {
        /*short_ui*/ true};

    Checkbox check_loop{
-        {21 * 8, 2 * 16},
+        {UI_POS_X_RIGHT(9), 2 * 16},
        4,
        "Loop",
        true};

    ImageButton button_play{
-        {screen_width - 2 * 8, 2 * 16, 2 * 8, 1 * 16},
+        {UI_POS_X_RIGHT(2), 2 * 16, 2 * 8, 1 * 16},
        &bitmap_play,
        Theme::getInstance()->fg_green->foreground,
        Theme::getInstance()->fg_green->background};

    Labels label_speed{
-        {{0 * 8, 6 * 8}, "Speed:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 6 * 8}, "Speed:", Theme::getInstance()->fg_light->foreground}};

    OptionsField options_speed{
        {7 * 8, 6 * 8},
        3,
-        {{"1 ", 1},     // 16ms
-         {"2 ", 2},     // 32ms
-         {"3 ", 3},     // 48ms
-         {"4 ", 6},     // 100ms
-         {"5 ", 12}}};  // 200ms
+        {{"1 ", 2},     // 25ms
+         {"2 ", 4},     // 50ms
+         {"3 ", 6},     // 75ms
+         {"4 ", 8},     // 100ms
+         {"5 ", 12}}};  // 150ms

    OptionsField options_channel{
        {11 * 8, 6 * 8},
@@ -254,7 +259,7 @@ class BLETxView : public View {
         {"CONNECT_REQ", PKT_TYPE_CONNECT_REQ}}};

    Labels label_marked_data{
-        {{0 * 8, 4 * 16}, "Marked Data:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 4 * 16}, "Marked Data:", Theme::getInstance()->fg_light->foreground}};

    OptionsField marked_data_sequence{
        {12 * 8, 8 * 8},
@@ -264,45 +269,42 @@ class BLETxView : public View {
         {"Random", 2}}};

    Labels label_packet_index{
-        {{0 * 8, 12 * 8}, "Packet Index:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 12 * 8}, "Packet Index:", Theme::getInstance()->fg_light->foreground}};

    Text text_packet_index{
        {13 * 8, 6 * 16, 12 * 8, 16},
        "-"};

    Labels label_packets_sent{
-        {{0 * 8, 14 * 8}, "Repeat Count:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 14 * 8}, "Repeat Count:", Theme::getInstance()->fg_light->foreground}};

    Text text_packets_sent{
        {13 * 8, 7 * 16, 12 * 8, 16},
        "-"};

    Labels label_mac_address{
-        {{0 * 8, 16 * 8}, "Mac Address:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 16 * 8}, "Mac Address:", Theme::getInstance()->fg_light->foreground}};

    Text text_mac_address{
        {12 * 8, 8 * 16, 20 * 8, 16},
        "-"};

    Labels label_data_packet{
-        {{0 * 8, 9 * 16}, "Packet Data:", Theme::getInstance()->fg_light->foreground}};
-
-    Console console{
-        {0, 9 * 18, screen_width, screen_height - 80}};
+        {{UI_POS_X(0), 9 * 16}, "Packet Data:", Theme::getInstance()->fg_light->foreground}};

    TextViewer dataEditView{
-        {0, 9 * 18, screen_width, screen_height - 80}};
+        {0, 9 * 18, 240, 240}};

    Button button_clear_marked{
-        {1 * 8, 14 * 16, 13 * 8, 3 * 8},
+        {UI_POS_X(1), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(13), UI_POS_HEIGHT(1.5)},
        "Clear Marked"};

    Button button_save_packet{
-        {1 * 8, 16 * 16, 13 * 8, 2 * 16},
+        {UI_POS_X(1), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(13), UI_POS_HEIGHT(2)},
        "Save Packet"};

    Button button_switch{
-        {16 * 8, 16 * 16, 13 * 8, 2 * 16},
+        {UI_POS_X_RIGHT(14), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(13), UI_POS_HEIGHT(2)},
        "Switch to Rx"};

    std::string str_log{""};
@@ -323,7 +325,7 @@ class BLETxView : public View {
        Message::ID::TXProgress,
        [this](const Message* const p) {
            const auto message = *reinterpret_cast<const TXProgressMessage*>(p);
-            this->on_tx_progress(message.done);
+            this->on_tx_progress(message.done, message.progress);
        }};

    MessageHandlerRegistration message_handler_frame_sync{
@@ -65,31 +65,31 @@ class CaptureAppView : public View {
        }};

    Labels labels{
-        {{0 * 8, 1 * 16}, "Rate:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 1 * 16}, "Rate:", Theme::getInstance()->fg_light->foreground},
        {{11 * 8, 1 * 16}, "Format:", Theme::getInstance()->fg_light->foreground},
    };

    RSSI rssi{
-        {24 * 8, 0, 6 * 8, 4}};
+        {UI_POS_X(24), 0, UI_POS_WIDTH_REMAINING(24), 4}};

    Channel channel{
-        {24 * 8, 5, 6 * 8, 4}};
+        {UI_POS_X(24), 5, UI_POS_WIDTH_REMAINING(24), 4}};

    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 16},
+        {UI_POS_X(0), UI_POS_Y(0)},
        nav_};

    FrequencyStepView field_frequency_step{
-        {10 * 8, 0 * 16}};
+        {10 * 8, UI_POS_Y(0)}};

    RFAmpField field_rf_amp{
-        {16 * 8, 0 * 16}};
+        {16 * 8, UI_POS_Y(0)}};

    LNAGainField field_lna{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {21 * 8, 0 * 16}};
+        {21 * 8, UI_POS_Y(0)}};

    OptionsField option_bandwidth{
        {5 * 8, 1 * 16},
@@ -109,7 +109,7 @@ class CaptureAppView : public View {
        /*small*/ true};

    RecordView record_view{
-        {0 * 8, 2 * 16, screen_width, 1 * 16},
+        {UI_POS_X(0), 2 * 16, screen_width, 1 * 16},
        u"BBD_????.*",
        captures_dir,
        RecordView::FileType::RawS16,
@@ -183,7 +183,7 @@ class POCSAGSettingsView : public View {
        true /*explicit_edit*/};

    Button button_save{
-        {11 * 8, 16 * 16, 10 * 8, 2 * 16},
+        {UI_POS_X_CENTER(10), UI_POS_Y(16), 10 * 8, 2 * 16},
        "Save"};
 };

@@ -236,30 +236,30 @@ class POCSAGAppView : public View {
    uint16_t packet_count = 0;

    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 8},
+        {UI_POS_X(0), 0 * 8},
        nav_};

    RFAmpField field_rf_amp{
-        {11 * 8, 0 * 16}};
+        {11 * 8, UI_POS_Y(0)}};
    LNAGainField field_lna{
-        {13 * 8, 0 * 16}};
+        {13 * 8, UI_POS_Y(0)}};
    VGAGainField field_vga{
-        {16 * 8, 0 * 16}};
+        {16 * 8, UI_POS_Y(0)}};

    RSSI rssi{
-        {19 * 8 - 4, 3, 6 * 8, 4}};
+        {19 * 8 - 4, 3, UI_POS_WIDTH_REMAINING(26), 4}};
    Audio audio{
-        {19 * 8 - 4, 8, 6 * 8, 4}};
+        {19 * 8 - 4, 8, UI_POS_WIDTH_REMAINING(26), 4}};

    NumberField field_squelch{
-        {25 * 8, 0 * 16},
+        {UI_POS_X_RIGHT(6), UI_POS_Y(0)},
        2,
        {0, 99},
        1,
        ' ',
        true /*wrap*/};
    AudioVolumeField field_volume{
-        {screen_width - 2 * 8, 0 * 16}};
+        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

    Image image_status{
        {0 * 8 + 4, 1 * 16 + 2, 16, 16},
@@ -51,7 +51,8 @@ void RecentEntriesTable<AircraftRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
-    const Style& style) {
+    const Style& style,
+    RecentEntriesColumns& columns) {
    Color target_color;
    std::string entry_string;

@@ -70,9 +71,11 @@ void RecentEntriesTable<AircraftRecentEntries>::draw(
            target_color = Theme::getInstance()->fg_medium->foreground;
    };

-    entry_string +=
-        (entry.callsign.empty() ? entry.icao_str + "   " : entry.callsign + " ") +
-        to_string_dec_uint((unsigned int)(entry.pos.altitude / 100), 4);
+    std::string ipc = (entry.callsign.empty() ? entry.icao_str + "   " : entry.callsign + " ");
+    uint8_t firstcolwidth = columns.at(0).second;
+    ipc.resize(firstcolwidth, ' ');  // Make sure this is always match the first column's width that is dynamic.
+
+    entry_string += ipc + to_string_dec_uint((unsigned int)(entry.pos.altitude / 100), 4);

    if (entry.velo.type == SPD_IAS && entry.pos.alt_valid) {  // IAS can be converted to TAS
        // It is generally accepted that for every thousand feet of altitude,
@@ -100,7 +103,7 @@ void RecentEntriesTable<AircraftRecentEntries>::draw(
        entry_string);

    if (entry.pos.pos_valid)
-        painter.draw_bitmap(target_rect.location() + Point(8 * 8, 0),
+        painter.draw_bitmap(target_rect.location() + Point(firstcolwidth * 8 - 8, 0),
                            bitmap_target, target_color, style.background);
 }

@@ -409,7 +412,7 @@ ADSBRxView::ADSBRxView(NavigationView& nav) {
         &status_good_frame,
         &field_volume});

-    recent_entries_view.set_parent_rect({0, 16, screen_width, 272});
+    recent_entries_view.set_parent_rect({0, 16, screen_width, UI_POS_HEIGHT_REMAINING(2)});
    recent_entries_view.on_select = [this, &nav](const AircraftRecentEntry& entry) {
        detail_key = entry.key();
        details_view = nav.push<ADSBRxDetailsView>(entry);
@@ -635,14 +638,14 @@ void ADSBRxView::refresh_ui() {

        if (details_view->map_active()) {
            // Is it time to clear and refresh the map's markers?
-            if (ticks_since_marker_refresh >= MARKER_UPDATE_SECONDS) {
+            if (ticks_since_marker_refresh >= (details_view->get_map_type() == MAP_TYPE_OSM ? MARKER_UPDATE_SECONDS_OSM : MARKER_UPDATE_SECONDS_BIN)) {
                map_needs_update = true;
                ticks_since_marker_refresh = 0;
                details_view->clear_map_markers();
            }
        } else {
            // Refresh map immediately once active.
-            ticks_since_marker_refresh = MARKER_UPDATE_SECONDS;
+            ticks_since_marker_refresh = MARKER_UPDATE_SECONDS_OSM;  // this is the bigger, so set it to force
        }

        // Process the entries list.
@@ -64,8 +64,9 @@ namespace ui {
 #define VEL_AIR_SUBSONIC 3
 #define VEL_AIR_SUPERSONIC 4

-#define O_E_FRAME_TIMEOUT 20     // timeout between odd and even frames
-#define MARKER_UPDATE_SECONDS 5  // "other" map marker redraw interval
+#define O_E_FRAME_TIMEOUT 20          // timeout between odd and even frames
+#define MARKER_UPDATE_SECONDS_OSM 10  // "other" map marker redraw interval for osm
+#define MARKER_UPDATE_SECONDS_BIN 5   // "other" map marker redraw interval for bin map

 /* Thresholds (in seconds) that define the transition between ages. */
 struct ADSBAgeLimit {
@@ -207,54 +208,54 @@ class ADSBRxAircraftDetailsView : public View {

   private:
    Labels labels{
-        {{0 * 8, 1 * 16}, "ICAO:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 2 * 16}, "Registration:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 3 * 16}, "Manufacturer:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 5 * 16}, "Model:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 7 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 8 * 16}, "Number of engines:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 9 * 16}, "Engine type:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 11 * 16}, "Owner:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 13 * 16}, "Operator:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 1 * 16}, "ICAO:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 2 * 16}, "Registration:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 3 * 16}, "Manufacturer:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 5 * 16}, "Model:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 7 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 8 * 16}, "Number of engines:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 9 * 16}, "Engine type:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 11 * 16}, "Owner:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 13 * 16}, "Operator:", Theme::getInstance()->fg_light->foreground}};

    Text text_icao_address{
-        {5 * 8, 1 * 16, 6 * 8, 16},
+        {5 * 8, 1 * 16, 6 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_registration{
-        {13 * 8, 2 * 16, 8 * 8, 16},
+        {13 * 8, 2 * 16, 8 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_manufacturer{
-        {0 * 8, 4 * 16, 19 * 8, 16},
+        {UI_POS_X(0), 4 * 16, 19 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_model{
-        {0 * 8, 6 * 16, screen_width, 16},
+        {UI_POS_X(0), 6 * 16, screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Text text_type{
-        {5 * 8, 7 * 16, 22 * 8, 16},
+        {5 * 8, 7 * 16, 22 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_number_of_engines{
-        {18 * 8, 8 * 16, screen_width, 16},
+        {18 * 8, 8 * 16, screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Text text_engine_type{
-        {0 * 8, 10 * 16, screen_width, 16},
+        {UI_POS_X(0), 10 * 16, screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Text text_owner{
-        {0 * 8, 12 * 16, screen_width, 16},
+        {UI_POS_X(0), 12 * 16, screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Text text_operator{
-        {0 * 8, 14 * 16, screen_width, 16},
+        {UI_POS_X(0), 14 * 16, screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Button button_close{
-        {9 * 8, 16 * 16, 12 * 8, 3 * 16},
+        {UI_POS_X_CENTER(12), UI_POS_Y(16), UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
        "Back"};
 };

@@ -277,6 +278,13 @@ class ADSBRxDetailsView : public View {

    std::string title() const override { return "Details"; }

+    MapType get_map_type() {
+        if (geomap_view_)
+            return geomap_view_->get_map_type();
+        else
+            return MapType::MAP_TYPE_BIN;  // default
+    }
+
   private:
    void refresh_ui();
    void on_gps(const GPSPosDataMessage* msg);
@@ -291,55 +299,55 @@ class ADSBRxDetailsView : public View {
    bool airline_checked{false};

    Labels labels{
-        {{0 * 8, 1 * 16}, "ICAO:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 1 * 16}, "ICAO:", Theme::getInstance()->fg_light->foreground},
        {{13 * 8, 1 * 16}, "Callsign:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 2 * 16}, "Last seen:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 3 * 16}, "Airline:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 5 * 16}, "Country:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 13 * 16}, "Even position frame:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 15 * 16}, "Odd position frame:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 2 * 16}, "Last seen:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 3 * 16}, "Airline:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 5 * 16}, "Country:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 13 * 16}, "Even position frame:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 15 * 16}, "Odd position frame:", Theme::getInstance()->fg_light->foreground}};

    Text text_icao_address{
-        {5 * 8, 1 * 16, 6 * 8, 16},
+        {5 * 8, 1 * 16, 6 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_callsign{
-        {22 * 8, 1 * 16, 8 * 8, 16},
+        {22 * 8, 1 * 16, 8 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_last_seen{
-        {11 * 8, 2 * 16, 19 * 8, 16},
+        {11 * 8, 2 * 16, 19 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_airline{
-        {0 * 8, 4 * 16, screen_width, 16},
+        {UI_POS_X(0), 4 * 16, screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Text text_country{
-        {8 * 8, 5 * 16, 22 * 8, 16},
+        {8 * 8, 5 * 16, 22 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_infos{
-        {0 * 8, 6 * 16, screen_width, 16},
+        {UI_POS_X(0), 6 * 16, screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Text text_info2{
-        {0 * 8, 7 * 16, screen_width, 16},
+        {UI_POS_X(0), 7 * 16, screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Text text_frame_pos_even{
-        {0 * 8, 14 * 16, screen_width, 16},
+        {UI_POS_X(0), 14 * 16, screen_width, UI_POS_HEIGHT(1)},
        "-"};
    Text text_frame_pos_odd{
-        {0 * 8, 16 * 16, screen_width, 16},
+        {UI_POS_X(0), 16 * 16, screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Button button_aircraft_details{
-        {2 * 8, 9 * 16, 12 * 8, 3 * 16},
+        {UI_POS_X_CENTER(12) - UI_POS_X(8), UI_POS_Y(9), UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
        "A/C details"};

    Button button_see_map{
-        {16 * 8, 9 * 16, 12 * 8, 3 * 16},
+        {UI_POS_X_CENTER(12) + UI_POS_X(8), UI_POS_Y(9), UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
        "See on map"};

    MessageHandlerRegistration message_handler_gps{
@@ -388,15 +396,15 @@ class ADSBRxView : public View {

    SignalToken signal_token_tick_second{};
    uint8_t tick_count = 0;
-    uint16_t ticks_since_marker_refresh{MARKER_UPDATE_SECONDS};
+    uint16_t ticks_since_marker_refresh{MARKER_UPDATE_SECONDS_OSM};

    /* Max number of entries that can be updated in a single pass.
     * 16 is one screen of recent entries. */
    static constexpr uint8_t max_update_entries = 16;

    /* Recent Entries */
-    const RecentEntriesColumns columns{
-        {{"ICAO/Call", 9},
+    RecentEntriesColumns columns{
+        {{"ICAO/Call", 0},
         {"Lvl", 3},
         {"Spd", 3},
         {"Amp", 3},
@@ -416,33 +424,33 @@ class ADSBRxView : public View {
    ADSBRxDetailsView* details_view{nullptr};

    Labels labels{
-        {{0 * 8, 0 * 8}, "LNA:   VGA:   AMP:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), UI_POS_Y(0)}, "LNA:   VGA:   AMP:", Theme::getInstance()->fg_light->foreground}};

    LNAGainField field_lna{
-        {4 * 8, 0 * 16}};
+        {UI_POS_X(4), UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {11 * 8, 0 * 16}};
+        {UI_POS_X(11), UI_POS_Y(0)}};

    RFAmpField field_rf_amp{
-        {18 * 8, 0 * 16}};
+        {UI_POS_X(18), UI_POS_Y(0)}};

    RSSI rssi{
-        {20 * 8, 4, 7 * 8, 8},
+        {UI_POS_X(20), 4, UI_POS_WIDTH_REMAINING(23), 8},
    };

    ActivityDot status_frame{
-        {27 * 8 + 2, 5, 2, 2},
+        {UI_POS_X_RIGHT(3) + 2, 5, 2, 2},
        Theme::getInstance()->bg_darkest->foreground,
    };

    ActivityDot status_good_frame{
-        {27 * 8 + 2, 9, 2, 2},
+        {UI_POS_X_RIGHT(3) + 2, 9, 2, 2},
        Theme::getInstance()->fg_green->foreground,
    };

    AudioVolumeField field_volume{
-        {screen_width - 2 * 8, 0 * 16}};
+        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

    MessageHandlerRegistration message_handler_frame{
        Message::ID::ADSBFrame,
@@ -42,7 +42,8 @@ void RecentEntriesTable<APRSRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
-    const Style& style) {
+    const Style& style,
+    RecentEntriesColumns& columns) {
    Color target_color;
    // auto entry_age = entry.age;

@@ -51,8 +52,8 @@ void RecentEntriesTable<APRSRecentEntries>::draw(
    std::string entry_string = "";

    entry_string += entry.source_formatted;
-    entry_string.append(10 - entry.source_formatted.size(), ' ');
-    entry_string += "       ";
+    entry_string.resize(columns.at(0).second, ' ');
+    entry_string += "        ";
    entry_string += (entry.hits <= 999 ? to_string_dec_uint(entry.hits, 4) : "999+");
    entry_string += " ";
    entry_string += entry.time_string;
@@ -247,8 +248,8 @@ APRSTableView::APRSTableView(NavigationView& nav, Rect parent_rec)

    details_view.hidden(true);

-    recent_entries_view.set_parent_rect({0, 0, screen_width, screen_width - 40});
-    details_view.set_parent_rect({0, 0, screen_width, screen_width - 40});
+    recent_entries_view.set_parent_rect({0, 0, screen_width, screen_height - 40});
+    details_view.set_parent_rect({0, 0, screen_width, screen_height - 40});

    recent_entries_view.on_select = [this](const APRSRecentEntry& entry) {
        this->on_show_detail(entry);
@@ -134,14 +134,14 @@ class APRSDetailsView : public View {
    bool send_updates{false};

    Console console{
-        {0, 0 * 16, screen_width, 224}};
+        {UI_POS_X(0), UI_POS_Y(0), screen_width, screen_height - 80}};

    Button button_done{
-        {160, 14 * 16, 8 * 8, 3 * 16},
+        {UI_POS_X_CENTER(4) - UI_POS_WIDTH(8), UI_POS_Y(14), UI_POS_WIDTH(8), UI_POS_HEIGHT(3)},
        "Close"};

    Button button_see_map{
-        {80, 14 * 16, 8 * 8, 3 * 16},
+        {UI_POS_X_CENTER(4) + UI_POS_WIDTH(8), UI_POS_Y(14), UI_POS_WIDTH(8), UI_POS_HEIGHT(3)},
        "Map"};
 };

@@ -161,10 +161,10 @@ class APRSTableView : public View {

   private:
    NavigationView& nav_;
-    const RecentEntriesColumns columns{{{"Source", 9},
-                                        {"Loc", 6},
-                                        {"Hits", 4},
-                                        {"Time", 8}}};
+    RecentEntriesColumns columns{{{"Source", 0},
+                                  {"Loc", 6},
+                                  {"Hits", 4},
+                                  {"Time", 8}}};
    APRSRecentEntries recent{};
    RecentEntriesView<RecentEntries<APRSRecentEntry>> recent_entries_view{columns, recent};
    APRSDetailsView details_view{nav_};
@@ -209,21 +209,21 @@ class APRSRxView : public View {
    std::string str_log{""};

    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {UI_POS_X(13), UI_POS_Y(0)}};
    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {UI_POS_X(15), UI_POS_Y(0)}};
    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {UI_POS_X(18), UI_POS_Y(0)}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4}};
+        {UI_POS_X(21), 0, UI_POS_WIDTH_REMAINING(21) - UI_POS_WIDTH(2), 4}};
    Channel channel{
-        {21 * 8, 5, 6 * 8, 4}};
+        {UI_POS_X(21), 5, UI_POS_WIDTH_REMAINING(21) - UI_POS_WIDTH(2), 4}};

    AudioVolumeField field_volume{
-        {screen_width - 2 * 8, 0 * 16}};
+        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

    OptionsField options_region{
-        {0 * 8, 0 * 8},
+        {UI_POS_X(0), UI_POS_Y(0)},
        3,
        {{"MAN", 0},
         {"NA ", 1},
@@ -237,11 +237,11 @@ class APRSRxView : public View {
         {"ISS", 9}}};

    FrequencyField field_frequency{
-        {3 * 8, 0 * 16}};
+        {UI_POS_X(3), UI_POS_Y(0)}};

    // DEBUG
    RecordView record_view{
-        {0 * 8, 1 * 16, screen_width, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(1), UI_POS_MAXWIDTH, UI_POS_HEIGHT(1)},
        u"AFS_????.WAV",
        aprs_dir,
        RecordView::FileType::WAV,
@@ -249,7 +249,7 @@ class APRSRxView : public View {
        4};

    Console console{
-        {0, 2 * 16, screen_width, screen_height - 80}};
+        {UI_POS_X(0), UI_POS_Y(2), UI_POS_MAXWIDTH, screen_height - 80}};

    std::unique_ptr<APRSLogger> logger{};
 };
@@ -265,7 +265,7 @@ class APRSRXView : public View {

   private:
    NavigationView& nav_;
-    Rect view_rect = {0, 3 * 8, screen_width, screen_height - 40};
+    Rect view_rect = {UI_POS_X(0), 3 * 8, UI_POS_MAXWIDTH, screen_height - 40};

    APRSRxView view_stream{nav_, view_rect};
    APRSTableView view_table{nav_, view_rect};
@@ -61,9 +61,9 @@ class APRSTXView : public View {
    void on_tx_progress(const uint32_t progress, const bool done);

    Labels labels{
-        {{0 * 8, 1 * 16}, "Source:       SSID:", Theme::getInstance()->fg_light->foreground},  // 6 alphanum + SSID
-        {{0 * 8, 2 * 16}, " Dest.:       SSID:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 4 * 16}, "Info field:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 1 * 16}, "Source:       SSID:", Theme::getInstance()->fg_light->foreground},  // 6 alphanum + SSID
+        {{UI_POS_X(0), 2 * 16}, " Dest.:       SSID:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 4 * 16}, "Info field:", Theme::getInstance()->fg_light->foreground},
    };

    SymField sym_source{
@@ -91,14 +91,14 @@ class APRSTXView : public View {
        ' '};

    Text text_payload{
-        {0 * 8, 5 * 16, screen_width, 16},
+        {UI_POS_X(0), 5 * 16, screen_width, 16},
        "-"};
    Button button_set{
-        {0 * 8, 6 * 16, 80, 32},
+        {UI_POS_X(0), 6 * 16, 80, 32},
        "Set"};

    TransmitterView tx_view{
-        16 * 16,
+        (int16_t)UI_POS_Y_BOTTOM(4),
        5000,
        0  // disable setting bandwith, since APRS used fixed 10k bandwidth
    };
@@ -98,7 +98,7 @@ class BattinfoView : public View {
        "Volt"};

    Button button_exit{
-        {72, 17 * 16, 96, 32},
+        {UI_POS_X_CENTER(12), 17 * 16, UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
        "Back"};
    static msg_t static_fn(void* arg);
    Thread* thread{nullptr};
@@ -63,22 +63,22 @@ class BTLERxView : public View {
    static constexpr uint8_t channel_number = 37;

    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {UI_POS_X(13), UI_POS_Y(0)}};
    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {UI_POS_X(15), UI_POS_Y(0)}};
    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {UI_POS_X(18), UI_POS_Y(0)}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4}};
+        {UI_POS_X(21), UI_POS_Y(0), UI_POS_WIDTH_REMAINING(21), 4}};
    Channel channel{
-        {21 * 8, 5, 6 * 8, 4}};
+        {UI_POS_X(21), 5, UI_POS_WIDTH_REMAINING(21), 4}};

    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 16},
+        {UI_POS_X(0), UI_POS_Y(0)},
        nav_};

    Button button_modem_setup{
-        {screen_width - 12 * 8, 1 * 16, 96, 24},
+        {screen_width - 12 * 8, UI_POS_Y(1), 96, 24},
        "Modem setup"};

    Console console{
@@ -242,9 +242,9 @@ class DebugControlsView : public View {

   private:
    Labels labels{
-        {{8 * 8, 1 * 16}, "Controls State", Theme::getInstance()->bg_darkest->foreground},
-        {{0 * 8, 11 * 16}, "Dial:", Theme::getInstance()->fg_medium->foreground},
-        {{0 * 8, 14 * 16}, "Long-Press Mode:", Theme::getInstance()->fg_medium->foreground}};
+        {{UI_POS_X_CENTER(14), 1 * 16}, "Controls State", Theme::getInstance()->bg_darkest->foreground},
+        {{UI_POS_X(0), 11 * 16}, "Dial:", Theme::getInstance()->fg_medium->foreground},
+        {{UI_POS_X(0), 14 * 16}, "Long-Press Mode:", Theme::getInstance()->fg_medium->foreground}};

    ControlsSwitchesWidget switches_widget{
        {80, 80, 80, 112},
@@ -259,7 +259,7 @@ class DebugControlsView : public View {
        }};

    Button button_done{
-        {72, 264, 96, 24},
+        {UI_POS_X_CENTER(12), 264, 96, 24},
        "Done"};
 };

@@ -271,28 +271,28 @@ class DebugMemoryDumpView : public View {

   private:
    Button button_dump{
-        {72, 4 * 16, 96, 24},
+        {UI_POS_X_CENTER(12), 4 * 16, 96, 24},
        "Dump"};

    Button button_read{
-        {16, 11 * 16, 96, 24},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(10), 11 * 16, 96, 24},
        "Read"};

    Button button_write{
-        {128, 11 * 16, 96, 24},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(10), 11 * 16, 96, 24},
        "Write"};

    Button button_done{
-        {128, screen_height - 80, 96, 24},
+        {UI_POS_X_RIGHT(12), UI_POS_Y_BOTTOM(3), 96, 24},
        "Done"};

    Labels labels{
        {{5 * 8, 1 * 16}, "Dump Range to File", Theme::getInstance()->fg_yellow->foreground},
-        {{0 * 8, 2 * 16}, "Starting Address: 0x", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 3 * 16}, "Byte Count:       0x", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 2 * 16}, "Starting Address: 0x", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 3 * 16}, "Byte Count:       0x", Theme::getInstance()->fg_light->foreground},
        {{3 * 8, 8 * 16}, "Read/Write Single Word", Theme::getInstance()->fg_yellow->foreground},
-        {{0 * 8, 9 * 16}, "Memory Address:   0x", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 10 * 16}, "Data Value:       0x", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 9 * 16}, "Memory Address:   0x", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 10 * 16}, "Data Value:       0x", Theme::getInstance()->fg_light->foreground}};

    SymField field_starting_address{
        {20 * 8, 2 * 16},
@@ -12,7 +12,7 @@ BatteryCapacityView::RegisterEntry BatteryCapacityView::get_entry(size_t index)

 BatteryCapacityView::BatteryCapacityView(NavigationView& nav) {
    for (size_t i = 0; i < ENTRIES_PER_PAGE; ++i) {
-        name_texts[i].set_parent_rect({0 * 8, static_cast<int>((i + 1) * 16), 8 * 8, 16});
+        name_texts[i].set_parent_rect({UI_POS_X(0), static_cast<int>((i + 1) * 16), 8 * 8, 16});
        addr_texts[i].set_parent_rect({9 * 8, static_cast<int>((i + 1) * 16), 4 * 8, 16});
        hex_texts[i].set_parent_rect({14 * 8, static_cast<int>((i + 1) * 16), 6 * 8, 16});
        value_texts[i].set_parent_rect({21 * 8, static_cast<int>((i + 1) * 16), 10 * 8, 16});
@@ -24,18 +24,18 @@ class BatteryCapacityView : public View {
    static RegisterEntry get_entry(size_t index);

    Labels labels{
-        {{0 * 8, 0 * 16}, "Reg", Theme::getInstance()->fg_yellow->foreground},
-        {{9 * 8, 0 * 16}, "Addr", Theme::getInstance()->fg_yellow->foreground},
-        {{14 * 8, 0 * 16}, "Hex", Theme::getInstance()->fg_yellow->foreground},
-        {{21 * 8, 0 * 16}, "Value", Theme::getInstance()->fg_yellow->foreground},
+        {{UI_POS_X(0), UI_POS_Y(0)}, "Reg", Theme::getInstance()->fg_yellow->foreground},
+        {{9 * 8, UI_POS_Y(0)}, "Addr", Theme::getInstance()->fg_yellow->foreground},
+        {{14 * 8, UI_POS_Y(0)}, "Hex", Theme::getInstance()->fg_yellow->foreground},
+        {{21 * 8, UI_POS_Y(0)}, "Value", Theme::getInstance()->fg_yellow->foreground},
    };
    std::array<Text, 16> name_texts = {};
    std::array<Text, 16> addr_texts = {};
    std::array<Text, 16> hex_texts = {};
    std::array<Text, 16> value_texts = {};

-    Text page_text{{144, 284, 80, 16}, "Page 1/1"};
-    Button button_done{{16, 280, 96, 24}, "Done"};
+    Text page_text{{144, UI_POS_Y_BOTTOM(3), 80, 16}, "Page 1/1"};
+    Button button_done{{16, UI_POS_Y_BOTTOM(3), 96, 24}, "Done"};

    void update_values();
    void populate_page(int start_index);
@@ -216,10 +216,10 @@ class EncodersView : public View {
        "Ready"};

    ProgressBar progressbar{
-        {2 * 8, 13 * 16 + 20, 208, 16}};
+        {2 * 8, 13 * 16 + 20, UI_POS_WIDTH_REMAINING(4), 16}};

    TransmitterView tx_view{
-        16 * 16,
+        (int16_t)UI_POS_Y_BOTTOM(4),
        50000,
        9};

@@ -228,6 +228,8 @@ void FileManBaseView::load_directory_contents(const fs::path& dir_path) {

    text_current.set(dir_path.empty() ? "(sd root)" : truncate(dir_path, 24));

+    // Collect all entries first
+    std::list<fileman_entry> all_entries;
    for (const auto& entry : fs::directory_iterator(dir_path, u"*")) {
        // Hide files starting with '.' (hidden / tmp).
        if (!show_hidden_files && is_hidden_file(entry.path()))
@@ -235,36 +237,40 @@ void FileManBaseView::load_directory_contents(const fs::path& dir_path) {

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

-    // paginating
-    auto list_size = entry_list.size();
-    nb_pages = 1 + (list_size / items_per_page);
-    size_t start = pagination * items_per_page;
-    size_t stop = start + items_per_page;
-    if (list_size > start) {
-        if (list_size < stop)
-            stop = list_size;
-        entry_list.erase(std::next(entry_list.begin(), stop), entry_list.end());
-        entry_list.erase(entry_list.begin(), std::next(entry_list.begin(), start));
+    // Calculate pagination
+    nb_pages = (all_entries.size() + items_per_page - 1) / items_per_page;
+    if (nb_pages == 0) nb_pages = 1;
+
+    size_t start_idx = pagination * items_per_page;
+    size_t end_idx = std::min(start_idx + items_per_page, all_entries.size());
+
+    // Add "parent" directory if not at the root and on first page
+    if (!dir_path.empty() && pagination == 0) {
+        entry_list.push_back({parent_dir_path.string(), 0, true});
    }

-    // Add "parent" directory if not at the root.
-    if (!dir_path.empty() && pagination == 0)
-        entry_list.insert(entry_list.begin(), {parent_dir_path.string(), 0, true});
-
-    // add next page
-    if (list_size > start + items_per_page) {
-        entry_list.push_back({str_next, (uint32_t)pagination + 1, true});
-    }
-
-    // add prev page
+    // Add prev page navigation if not on first page
    if (pagination > 0) {
-        entry_list.insert(entry_list.begin(), {str_back, (uint32_t)pagination - 1, true});
+        entry_list.push_back({str_back, (uint32_t)pagination - 1, true});
+    }
+
+    // Add entries for current page
+    auto it = all_entries.begin();
+    std::advance(it, start_idx);
+
+    for (size_t i = start_idx; i < end_idx && it != all_entries.end(); i++, ++it) {
+        entry_list.push_back(*it);
+    }
+
+    // Add next page navigation if not on last page
+    if (end_idx < all_entries.size()) {
+        entry_list.push_back({str_next, (uint32_t)pagination + 1, true});
    }
 }

@@ -288,6 +294,7 @@ FileManBaseView::FileManBaseView(
    std::string filter)
    : nav_{nav},
      extension_filter{filter} {
+    max_filename_length = screen_width / 8 - 10;
    add_children({&labels,
                  &text_current,
                  &button_exit});
@@ -320,30 +327,49 @@ void FileManBaseView::focus() {
    } else {
        menu_view.focus();
    }
+
+    // Set menu to the correct page and select the correct item
+    menu_view.set_highlighted(prev_highlight % items_per_page);
 }

+// Push directory - store the global index (page * items_per_page + local_index)
 void FileManBaseView::push_dir(const fs::path& path) {
    if (path == parent_dir_path) {
        pop_dir();
    } else {
+        // Save global index (combines page number and item position)
+        saved_index_stack.push_back(menu_view.highlighted_index() + (pagination * items_per_page));
+
        current_path /= path;
-        saved_index_stack.push_back(menu_view.highlighted_index());
-        menu_view.set_highlighted(0);
-        reload_current(true);
+        reload_current(true);  // Reset pagination when entering new directory
    }
 }

 void FileManBaseView::pop_dir() {
-    if (saved_index_stack.empty())
+    if (current_path.empty()) {
        return;
+    }

+    // Move to parent directory
    current_path = current_path.parent_path();
-    reload_current(true);
-    menu_view.set_highlighted(saved_index_stack.back());
-    saved_index_stack.pop_back();
+
+    // Restore the previous global index if available
+    if (!saved_index_stack.empty()) {
+        uint32_t global_index = saved_index_stack.back();
+        saved_index_stack.pop_back();
+
+        // Calculate pagination from global index
+        pagination = global_index / items_per_page;
+
+        // Calculate local index within the page
+        prev_highlight = global_index % items_per_page;
+        restoring_navigation = true;
+    }
+
+    reload_current(false);  // Important: don't reset pagination
 }

-std::string get_extension(std::string t) {
+std::string FileManBaseView::get_extension(const std::string& t) const {
    const auto index = t.find_last_of(u'.');
    if (index == t.npos) {
        return {};
@@ -372,11 +398,13 @@ void FileManBaseView::refresh_list() {
    if (on_refresh_widgets)
        on_refresh_widgets(false);

-    prev_highlight = menu_view.highlighted_index();
+    if (!restoring_navigation) {
+        prev_highlight = menu_view.highlighted_index();
+    }
    menu_view.clear();

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

        if (entry.is_directory) {
            std::string size_str{};
@@ -387,7 +415,7 @@ void FileManBaseView::refresh_list() {
            }

            menu_view.add_item(
-                {entry_name.substr(0, max_filename_length) + std::string(21 - entry_name.length(), ' ') + size_str,
+                {entry_name.substr(0, max_filename_length) + std::string((max_filename_length + 1) - entry_name.length(), ' ') + size_str,
                 Theme::getInstance()->fg_yellow->foreground,
                 &bitmap_icon_dir,
                 [this](KeyEvent key) {
@@ -400,7 +428,7 @@ void FileManBaseView::refresh_list() {
            auto size_str = to_string_file_size(entry.size);

            menu_view.add_item(
-                {entry_name.substr(0, max_filename_length) + std::string(21 - entry_name.length(), ' ') + size_str,
+                {entry_name.substr(0, max_filename_length) + std::string((max_filename_length + 1) - entry_name.length(), ' ') + size_str,
                 assoc.color,
                 assoc.icon,
                 [this](KeyEvent key) {
@@ -411,10 +439,14 @@ void FileManBaseView::refresh_list() {
    }

    menu_view.set_highlighted(prev_highlight);
+    restoring_navigation = false;
 }

 void FileManBaseView::reload_current(bool reset_pagination) {
-    if (reset_pagination) pagination = 0;
+    // Only reset pagination if explicitly requested
+    if (reset_pagination) {
+        pagination = 0;
+    }
    load_directory_contents(current_path);
    refresh_list();
 }
@@ -455,7 +487,7 @@ FileLoadView::FileLoadView(
    add_children({&menu_view});

    // Resize menu view to fill screen
-    menu_view.set_parent_rect({0, 3 * 8, screen_width, 29 * 8});
+    menu_view.set_parent_rect({0, 3 * 8, screen_width, UI_POS_HEIGHT_REMAINING(4.5)});

    refresh_list();

@@ -489,63 +521,6 @@ void FileLoadView::refresh_widgets(const bool) {
    set_dirty();
 }

-/* FileSaveView **************************************************************/
-/*
-FileSaveView::FileSaveView(
-        NavigationView& nav,
-        const fs::path& path,
-        const fs::path& file
-) : nav_{ nav },
-        path_{ path },
-        file_{ file }
-{
-        add_children({
-                &text_path,
-                &button_edit_path,
-                &text_name,
-                &button_edit_name,
-                &button_save,
-                &button_cancel,
-        });
-
-        button_edit_path.on_select = [this](Button&) {
-                buffer_ = path_.string();
-                text_prompt(nav_, buffer_, max_filename_length,ENTER_KEYBOARD_MODE_ALPHA,
-                        [this](std::string&) {
-                                path_ = buffer_;
-                                refresh_widgets();
-                        });
-        };
-
-        button_edit_name.on_select = [this](Button&) {
-                buffer_ = file_.string();
-                text_prompt(nav_, buffer_, max_filename_length,ENTER_KEYBOARD_MODE_ALPHA,
-                        [this](std::string&) {
-                                file_ = buffer_;
-                                refresh_widgets();
-                        });
-        };
-
-        button_save.on_select = [this](Button&) {
-                if (on_save)
-                        on_save(path_ / file_);
-                else
-                        nav_.pop();
-        };
-
-        button_cancel.on_select = [this](Button&) {
-                nav_.pop();
-        };
-
-        refresh_widgets();
-}
-
-void FileSaveView::refresh_widgets() {
-        text_path.set(truncate(path_, 30));
-        text_name.set(truncate(file_, 30));
-        set_dirty();
-}
-*/
 /* FileManagerView ***********************************************************/

 void FileManagerView::refresh_widgets(const bool v) {
@@ -64,7 +64,8 @@ class FileManBaseView : public View {
    uint32_t prev_highlight = 0;
    uint8_t pagination = 0;
    uint8_t nb_pages = 1;
-    static constexpr size_t max_filename_length = 20;
+    bool restoring_navigation = false;
+    size_t max_filename_length = 20;
    static constexpr size_t max_items_loaded = 75;  // too memory hungry, so won't sort it
    static constexpr size_t items_per_page = 20;

@@ -96,6 +97,7 @@ class FileManBaseView : public View {
    void load_directory_contents(const std::filesystem::path& dir_path);
    void load_directory_contents_unordered(const std::filesystem::path& dir_path, size_t file_cnt);
    const file_assoc_t& get_assoc(const std::filesystem::path& ext) const;
+    std::string get_extension(const std::string& t) const;
    void copy_waterfall(std::filesystem::path path);

    NavigationView& nav_;
@@ -120,16 +122,16 @@ class FileManBaseView : public View {
        {{0, 0}, "Path:", Theme::getInstance()->fg_light->foreground}};

    Text text_current{
-        {6 * 8, 0 * 8, 24 * 8, 16},
+        {UI_POS_X(6), UI_POS_Y(0), UI_POS_WIDTH_REMAINING(6), UI_POS_HEIGHT(1)},
        "",
    };

    MenuView menu_view{
-        {0, 2 * 8, screen_width, 26 * 8},
+        {0, UI_POS_Y(1), UI_POS_MAXWIDTH, UI_POS_HEIGHT_REMAINING(7)},
        true};

    Button button_exit{
-        {22 * 8, 34 * 8, 8 * 8, 32},
+        {UI_POS_X_RIGHT(8), UI_POS_Y_BOTTOM(3), 8 * 8, UI_POS_HEIGHT(2)},
        "Exit"};
 };

@@ -228,66 +230,66 @@ class FileManagerView : public FileManBaseView {
    bool selected_is_valid() const;

    Text text_date{
-        {0 * 8, 26 * 8, 28 * 8, 16},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(6), 28 * 8, UI_POS_HEIGHT(1)},
        ""};

    NewButton button_rename{
-        {0 * 8, 29 * 8, 4 * 8, 32},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_rename,
        Theme::getInstance()->fg_blue->foreground};

    NewButton button_delete{
-        {9 * 8, 34 * 8, 4 * 8, 32},
+        {UI_POS_X(9), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_trash,
        Theme::getInstance()->fg_red->foreground};

    NewButton button_clean{
-        {13 * 8, 34 * 8, 4 * 8, 32},
+        {UI_POS_X(13), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_clean,
        Theme::getInstance()->fg_red->foreground};

    NewButton button_cut{
-        {9 * 8, 29 * 8, 4 * 8, 32},
+        {UI_POS_X(9), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_cut,
        Theme::getInstance()->fg_dark->foreground};

    NewButton button_copy{
-        {13 * 8, 29 * 8, 4 * 8, 32},
+        {UI_POS_X(13), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_copy,
        Theme::getInstance()->fg_dark->foreground};

    NewButton button_paste{
-        {17 * 8, 29 * 8, 4 * 8, 32},
+        {UI_POS_X(17), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_paste,
        Theme::getInstance()->fg_dark->foreground};

    NewButton button_new_dir{
-        {22 * 8, 29 * 8, 4 * 8, 32},
+        {UI_POS_X(22), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_new_dir,
        Theme::getInstance()->fg_green->foreground};

    NewButton button_new_file{
-        {26 * 8, 29 * 8, 4 * 8, 32},
+        {UI_POS_X(26), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_new_file,
        Theme::getInstance()->fg_green->foreground};

    NewButton button_open_notepad{
-        {0 * 8, 34 * 8, 4 * 8, 32},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_notepad,
        Theme::getInstance()->fg_orange->foreground};

    NewButton button_rename_timestamp{

-        {4 * 8, 29 * 8, 4 * 8, 32},
+        {UI_POS_X(4), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_options_datetime,
        Theme::getInstance()->fg_blue->foreground,
@@ -295,13 +297,13 @@ class FileManagerView : public FileManBaseView {

    NewButton button_open_iq_trim{

-        {4 * 8, 34 * 8, 4 * 8, 32},
+        {UI_POS_X(4), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_trim,
        Theme::getInstance()->fg_orange->foreground};

    NewButton button_show_hidden_files{
-        {17 * 8, 34 * 8, 4 * 8, 32},
+        {UI_POS_X(17), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_hide,
        Theme::getInstance()->fg_dark->foreground};
@@ -130,6 +130,12 @@ bool FlashUtilityView::endsWith(const std::u16string& str, const std::u16string&
    }
 }

+void FlashUtilityView::wait_till_loaded() {
+    while (!isLoaded) {
+        chThdSleepMilliseconds(50);
+    }
+}
+
 std::filesystem::path FlashUtilityView::extract_tar(std::filesystem::path::string_type path, ui::Painter& painter) {
    //
    painter.fill_rectangle(
@@ -49,6 +49,7 @@ class FlashUtilityView : public View {

    std::string title() const override { return "Flash Utility"; };
    bool flash_firmware(std::filesystem::path::string_type path);
+    void wait_till_loaded();

   private:
    NavigationView& nav_;
@@ -60,13 +61,21 @@ class FlashUtilityView : public View {
        {{4, 4}, "Select firmware to flash:", Theme::getInstance()->bg_darkest->foreground}};

    MenuView menu_view{
-        {0, 2 * 8, screen_width, 26 * 8},
+        {0, UI_POS_Y(1), screen_width, UI_POS_HEIGHT_REMAINING(2)},
        true};

    std::filesystem::path extract_tar(std::filesystem::path::string_type path, ui::Painter& painter);  // extracts the tar file, and returns the firmware.bin path from it. empty string if no fw
    void firmware_selected(std::filesystem::path::string_type path);

    bool endsWith(const std::u16string& str, const std::u16string& suffix);
+    bool isLoaded = false;
+    uint8_t refreshcnt = 0;
+    MessageHandlerRegistration message_handler_frame_sync{
+        Message::ID::DisplayFrameSync,
+        [this](const Message* const) {
+            refreshcnt++;
+            if (refreshcnt > 5) isLoaded = true;
+        }};
 };

 } /* namespace ui */
@@ -72,7 +72,7 @@ class FreqManBaseView : public View {
        {0, 3 * 8, screen_width, 12 * 16 + 2 /* 2 Keeps text out of border. */}};

    Button button_exit{
-        {15 * 8, 17 * 16, 15 * 8, 2 * 16},
+        {UI_POS_X_RIGHT(14), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(14), UI_POS_HEIGHT(2)},
        "Exit"};

   protected:
@@ -97,14 +97,14 @@ class FrequencySaveView : public FreqManBaseView {
        0};

    Labels labels{
-        {{0 * 8, 6 * 16}, "Description:", Theme::getInstance()->bg_darkest->foreground}};
+        {{UI_POS_X(0), 6 * 16}, "Description:", Theme::getInstance()->bg_darkest->foreground}};

    TextField field_description{
-        {0 * 8, 7 * 16, screen_width, 1 * 16},
+        {UI_POS_X(0), 7 * 16, screen_width, 1 * 16},
        ""};

    Button button_save{
-        {0 * 8, 17 * 16, 15 * 8, 2 * 16},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(14), UI_POS_HEIGHT(2)},
        "Save"};
 };

@@ -134,44 +134,44 @@ class FrequencyManagerView : public FreqManBaseView {
    void on_del_entry();

    NewButton button_add_category{
-        {23 * 8, 0 * 16, 7 * 4, 20},
+        {UI_POS_X_RIGHT(8), UI_POS_Y(0), 7 * 4, 20},
        {},
        &bitmap_icon_new_file,
        Theme::getInstance()->bg_darkest->foreground,
        true};

    NewButton button_del_category{
-        {26 * 8 + 4, 0 * 16, 7 * 4, 20},
+        {UI_POS_X_RIGHT(4), UI_POS_Y(0), 7 * 4, 20},
        {},
        &bitmap_icon_trash,
        Theme::getInstance()->fg_red->foreground,
        true};

    Button button_edit_entry{
-        {0 * 8, 14 * 16 - 4, 15 * 8, 1 * 16 + 4},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(6.5) + 4, 15 * 8, 1 * 16 + 4},
        "Edit"};

    Rectangle rect_padding{
-        {15 * 8, 14 * 16 - 4, 15 * 8, 1 * 16 + 4},
+        {15 * 8, UI_POS_Y_BOTTOM(6.5), 15 * 8, 1 * 16 + 4},
        Theme::getInstance()->fg_medium->background};

    Button button_edit_freq{
-        {0 * 8, 15 * 16, 15 * 8, 2 * 16},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(5), 15 * 8, 2 * 16},
        "Frequency"};

    Button button_edit_desc{
-        {0 * 8, 17 * 16, 15 * 8, 2 * 16},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(3), 15 * 8, 2 * 16},
        "Description"};

    NewButton button_add_entry{
-        {15 * 8, 15 * 16, 7 * 8 + 4, 2 * 16},
+        {15 * 8, UI_POS_Y_BOTTOM(5), 7 * 8 + 4, 2 * 16},
        {},
        &bitmap_icon_add,
        Theme::getInstance()->bg_darkest->foreground,
        true};

    NewButton button_del_entry{
-        {22 * 8 + 4, 15 * 16, 7 * 8 + 4, 2 * 16},
+        {22 * 8 + 4, UI_POS_Y_BOTTOM(5), 7 * 8 + 4, 2 * 16},
        {},
        &bitmap_icon_delete,
        Theme::getInstance()->fg_red->foreground,
@@ -201,14 +201,14 @@ class FrequencyEditView : public View {

    Labels labels{
        {{5 * 8, 1 * 16}, "Edit Frequency Entry", Theme::getInstance()->bg_darkest->foreground},
-        {{0 * 8, 3 * 16}, "Entry Type :", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 4 * 16}, "Frequency A:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 5 * 16}, "Frequency B:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 6 * 16}, "Modulation :", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 7 * 16}, "Bandwidth  :", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 8 * 16}, "Step       :", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 9 * 16}, "Tone Freq  :", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 10 * 16}, "Description:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 3 * 16}, "Entry Type :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 4 * 16}, "Frequency A:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 5 * 16}, "Frequency B:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 6 * 16}, "Modulation :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 7 * 16}, "Bandwidth  :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 8 * 16}, "Step       :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 9 * 16}, "Tone Freq  :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 10 * 16}, "Description:", Theme::getInstance()->fg_light->foreground},
    };

    OptionsField field_type{
@@ -243,11 +243,11 @@ class FrequencyEditView : public View {
        {}};

    Button button_save{
-        {0 * 8, 17 * 16, 15 * 8, 2 * 16},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(3), 15 * 8, 2 * 16},
        "Save"};

    Button button_cancel{
-        {15 * 8, 17 * 16, 15 * 8, 2 * 16},
+        {UI_POS_X_RIGHT(15), UI_POS_Y_BOTTOM(3), 15 * 8, 2 * 16},
        "Cancel"};
 };

@@ -54,7 +54,7 @@ class TrimProgressUI {
    }

    void clear() {
-        p.fill_rectangle({0 * 8, 4 * 16, screen_width, 3 * 16}, Theme::getInstance()->bg_darkest->background);
+        p.fill_rectangle({UI_POS_X(0), 4 * 16, screen_width, 3 * 16}, Theme::getInstance()->bg_darkest->background);
    }

    auto get_callback() {
@@ -100,22 +100,22 @@ class IQTrimView : public View {
    TrimProgressUI progress_ui{};

    Labels labels{
-        {{0 * 8, 0 * 16}, "Capture File:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 6 * 16}, "Start  :", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 7 * 16}, "End    :", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 8 * 16}, "Samples:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 9 * 16}, "Max Pwr:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 10 * 16}, "Cutoff :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(0)}, "Capture File:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 6 * 16}, "Start  :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 7 * 16}, "End    :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 8 * 16}, "Samples:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 9 * 16}, "Max Pwr:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 10 * 16}, "Cutoff :", Theme::getInstance()->fg_light->foreground},
        {{12 * 8, 10 * 16}, "%", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 12 * 16}, "Amplify:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 12 * 16}, "Amplify:", Theme::getInstance()->fg_light->foreground},
        {{10 * 8, 12 * 16}, "x", Theme::getInstance()->fg_light->foreground},
    };

    TextField field_path{
-        {0 * 8, 1 * 16, screen_width, 1 * 16},
+        {UI_POS_X(0), 1 * 16, screen_width, 1 * 16},
        "Open File..."};

-    Point pos_lines{0 * 8, 4 * 16};
+    Point pos_lines{UI_POS_X(0), 4 * 16};
    Dim height_lines{2 * 16};

    NumberField field_start{
@@ -155,7 +155,7 @@ class IQTrimView : public View {
        ' '};

    Button button_trim{
-        {20 * 8, 16 * 16, 8 * 8, 2 * 16},
+        {UI_POS_X_CENTER(8), UI_POS_Y_BOTTOM(3), 8 * 8, 2 * 16},
        "Trim"};
 };

@@ -170,7 +170,7 @@ class GlassView : public View {
    uint8_t ignore_dc = 0;

    Labels labels{
-        {{0, 0 * 16}, "MIN:     MAX:     LNA   VGA  ", Theme::getInstance()->fg_light->foreground},
+        {{0, UI_POS_Y(0)}, "MIN:     MAX:     LNA   VGA  ", Theme::getInstance()->fg_light->foreground},
        {{0, 1 * 16}, "RANGE:       FILTER:     AMP:", Theme::getInstance()->fg_light->foreground},
        {{0, 2 * 16}, "P:", Theme::getInstance()->fg_light->foreground},
        {{0, 3 * 16}, "MARKER:          MHz RXIQCAL", Theme::getInstance()->fg_light->foreground},
@@ -178,24 +178,24 @@ class GlassView : public View {
        {{0, 4 * 16}, "RES:     VOL:", Theme::getInstance()->fg_light->foreground}};

    NumberField field_frequency_min{
-        {4 * 8, 0 * 16},
+        {4 * 8, UI_POS_Y(0)},
        4,
        {0, 7199},
        1,  // number of steps by encoder delta
        ' '};

    NumberField field_frequency_max{
-        {13 * 8, 0 * 16},
+        {13 * 8, UI_POS_Y(0)},
        4,
        {1, 7200},
        1,  // number of steps by encoder delta
        ' '};

    LNAGainField field_lna{
-        {21 * 8, 0 * 16}};
+        {21 * 8, UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {27 * 8, 0 * 16}};
+        {27 * 8, UI_POS_Y(0)}};

    TextField field_range{
        {6 * 8, 1 * 16, 6 * 8, 16},
@@ -298,7 +298,7 @@ class GlassView : public View {
        "RST"};

    Text freq_stats{
-        {0 * 8, 5 * 16, screen_width - 10 * 8, 8},
+        {UI_POS_X(0), 5 * 16, screen_width - 10 * 8, 8},
        ""};

    MessageHandlerRegistration message_handler_spectrum_config{
@@ -446,6 +446,8 @@ MicTXView::MicTXView(
    field_frequency.set_value(tx_frequency);

    // TODO: would be nice if frequency step was configurable in this app
+    // but now, make it a bit lower
+    receiver_model.set_frequency_step(12'500);  // set freq step to 12.5kHz
    field_frequency.set_step(receiver_model.frequency_step());

    // WARNING: transmitter_model.set_target_frequency() and receiver_model.set_target_frequency() both update the same tuning freq, but one has an offset!
@@ -170,7 +170,7 @@ class MicTXView : public View {
        {{17 * 8, 1 * 8}, "ALC", Theme::getInstance()->fg_light->foreground}};

    VuMeter vumeter{
-        {0 * 8, 1 * 8, 2 * 8, 33 * 8},
+        {UI_POS_X(0), 1 * 8, 2 * 8, 33 * 8},
        12,
        true};

@@ -104,7 +104,7 @@ class ModemSetupView : public View {
        "SET"};

    Button button_save{
-        {9 * 8, 250, 96, 40},
+        {UI_POS_X_CENTER(12), 250, UI_POS_WIDTH(12), 40},
        "Save"};
 };

@@ -387,7 +387,6 @@ PlaylistView::PlaylistView(
        &button_next,
        &waterfall,
    });
-
    ensure_directory(playlist_dir);
    waterfall.show_audio_spectrum_view(false);

@@ -107,24 +107,24 @@ class PlaylistView : public View {
    void handle_replay_thread_done(uint32_t return_code);

    Text text_filename{
-        {0 * 8, 0 * 16, screen_width, 16}};
+        {UI_POS_X(0), UI_POS_Y(0), screen_width, 16}};

    FrequencyField field_frequency{
-        {0 * 8, 1 * 16}};
+        {UI_POS_X(0), 1 * 16}};

    Text text_sample_rate{
        {10 * 8, 1 * 16, 7 * 8, 16}};

    ProgressBar progressbar_track{
-        {18 * 8, 1 * 16, 12 * 8, 8 + 1}};
+        {18 * 8, 1 * 16, UI_POS_WIDTH_REMAINING(19), 8 + 1}};

    // (-1) to overlap with progressbar_track so there's
    // only 1 pixel between them instead of 2.
    ProgressBar progressbar_transmit{
-        {18 * 8, 3 * 8 - 1, 12 * 8, 8}};
+        {18 * 8, 3 * 8 - 1, UI_POS_WIDTH_REMAINING(19), 8}};

    Text text_duration{
-        {0 * 8, 2 * 16, 5 * 8, 16}};
+        {UI_POS_X(0), 2 * 16, 5 * 8, 16}};

    // TODO: delay duration field.

@@ -133,7 +133,7 @@ class PlaylistView : public View {
        /*short_ui*/ true};

    Checkbox check_loop{
-        {21 * 8, 2 * 16},
+        {UI_POS_X_RIGHT(9), 2 * 16},
        4,
        "Loop",
        true};
@@ -145,7 +145,7 @@ class PlaylistView : public View {
        Theme::getInstance()->fg_green->background};

    Text text_track{
-        {0 * 8, 3 * 16, screen_width, 16}};
+        {UI_POS_X(0), 3 * 16, screen_width, 16}};

    NewButton button_prev{
        {2 * 8, 4 * 16, 4 * 8, 2 * 16},
@@ -85,7 +85,7 @@ class POCSAGTXView : public View {
        {{6 * 8, 8 * 8}, "Type:", Theme::getInstance()->fg_light->foreground},
        {{2 * 8, 10 * 8}, "Function:", Theme::getInstance()->fg_light->foreground},
        {{5 * 8, 12 * 8}, "Phase:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 14 * 8}, "Message:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 14 * 8}, "Message:", Theme::getInstance()->fg_light->foreground}};

    OptionsField options_bitrate{
        {11 * 8, 4 * 8},
@@ -122,21 +122,21 @@ class POCSAGTXView : public View {
        }};

    Text text_message{
-        {0 * 8, 16 * 8, screen_width, 16},
+        {UI_POS_X(0), 16 * 8, screen_width, 16},
        ""};
    Text text_message_l2{
-        {0 * 8, 18 * 8, screen_width, 16},
+        {UI_POS_X(0), 18 * 8, screen_width, 16},
        ""};

    Button button_message{
-        {0 * 8, 20 * 8, 14 * 8, 32},
+        {UI_POS_X(0), 20 * 8, 14 * 8, 32},
        "Set message"};

    ProgressBar progressbar{
-        {16, 210, 208, 16}};
+        {16, 210, UI_POS_WIDTH_REMAINING(4), 16}};

    TransmitterView tx_view{
-        16 * 16,
+        (int16_t)UI_POS_Y_BOTTOM(4),
        10000,
        9};

@@ -82,7 +82,7 @@ class RDSRadioTextView : public OptionTabView {
        {1 * 8, 4 * 16, 28 * 8, 16},
        "-"};
    Button button_set{
-        {88, 6 * 16, 64, 32},
+        {UI_POS_X_CENTER(8), 6 * 16, UI_POS_WIDTH(8), 32},
        "Set"};
 };

@@ -92,7 +92,7 @@ class RDSDateTimeView : public OptionTabView {

   private:
    Labels labels{
-        {{44, 5 * 16}, "Not yet implemented", Theme::getInstance()->error_dark->foreground}};
+        {{UI_POS_X_CENTER(19), 5 * 16}, "Not yet implemented", Theme::getInstance()->error_dark->foreground}};
 };

 class RDSAudioView : public OptionTabView {
@@ -101,7 +101,7 @@ class RDSAudioView : public OptionTabView {

   private:
    Labels labels{
-        {{44, 5 * 16}, "Not yet implemented", Theme::getInstance()->error_dark->foreground}};
+        {{UI_POS_X_CENTER(19), 5 * 16}, "Not yet implemented", Theme::getInstance()->error_dark->foreground}};
 };

 class RDSThread {
@@ -174,7 +174,7 @@ class RDSView : public View {
        {"Audio", Theme::getInstance()->fg_orange->foreground, &view_audio}};

    Labels labels{
-        {{0 * 8, 28}, "Program type:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 28}, "Program type:", Theme::getInstance()->fg_light->foreground},
        //{ { 14 * 8, 16 + 8 }, "CC:", Theme::getInstance()->fg_light->foreground },
        {{2 * 8, 28 + 16}, "Program ID:", Theme::getInstance()->fg_light->foreground},
        //{ { 13 * 8, 32 + 8 }, "Cov:",Theme::getInstance()->fg_light->foreground },
@@ -319,7 +319,7 @@ class RDSView : public View {
        "TP"};

    TransmitterView tx_view{
-        16 * 16,
+        (int16_t)UI_POS_Y_BOTTOM(4),
        50000,
        9};

@@ -217,23 +217,24 @@ class ReconView : public View {
    std::unique_ptr<RecordView> record_view{};

    Labels labels{
-        {{0 * 8, 0 * 16}, "LNA:   VGA:   AMP:  VOL:     ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(0)}, "LNA:   VGA:   AMP:  ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_RIGHT(6), UI_POS_Y(0)}, "VOL:  ", Theme::getInstance()->fg_light->foreground},
        {{3 * 8, 8 * 16}, "START       END", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, (22 * 8)}, "                S:          ", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, (24 * 8) + 4}, "NBLCKS:x      W,L:      ,     ", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, (26 * 8) + 4}, "MODE:     ,      SQUELCH:    ", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), (22 * 8)}, "                S:          ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), (24 * 8) + 4}, "NBLCKS:x      W,L:      ,     ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), (26 * 8) + 4}, "MODE:     ,      SQUELCH:    ", Theme::getInstance()->fg_light->foreground}};

    LNAGainField field_lna{
-        {4 * 8, 0 * 16}};
+        {4 * 8, UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {11 * 8, 0 * 16}};
+        {11 * 8, UI_POS_Y(0)}};

    RFAmpField field_rf_amp{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};

    AudioVolumeField field_volume{
-        {24 * 8, 0 * 16}};
+        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

    Text file_name{
        // show file used
@@ -297,7 +298,7 @@ class ReconView : public View {
        "CONFIG"};

    ButtonWithEncoder button_manual_start{
-        {0 * 8, 9 * 16, 11 * 8, 28},
+        {UI_POS_X(0), 9 * 16, 11 * 8, 28},
        ""};

    ButtonWithEncoder button_manual_end{
@@ -305,7 +306,7 @@ class ReconView : public View {
        ""};

    OptionsField field_recon_match_mode{
-        {0 * 8, 11 * 16},
+        {UI_POS_X(0), 11 * 16},
        16,  // CONTINUOUS MATCH MODE / SPARSE TIMED MATCH MODE
        {
            {"MATCH:CONTINOUS", 0},
@@ -363,15 +364,15 @@ class ReconView : public View {
    };

    ButtonWithEncoder button_pause{
-        {0, (15 * 16) - 4, 72, 28},
+        {0, (15 * 16) - 4, UI_POS_WIDTH(9), 28},
        "PAUSE"};

    Button button_audio_app{
-        {84, (15 * 16) - 4, 72, 28},
+        {UI_POS_X_CENTER(9), (15 * 16) - 4, UI_POS_WIDTH(9), 28},
        "AUDIO"};

    ButtonWithEncoder button_add{
-        {168, (15 * 16) - 4, 72, 28},
+        {UI_POS_X_RIGHT(9), (15 * 16) - 4, UI_POS_WIDTH(9), 28},
        "<STORE>"};

    Button button_dir{
@@ -383,15 +384,15 @@ class ReconView : public View {
        "RST"};

    Button button_mic_app{
-        {84, (35 * 8) - 4, 72, 28},
+        {UI_POS_X_CENTER(9), (35 * 8) - 4, UI_POS_WIDTH(9), 28},
        "MIC TX"};

    ButtonWithEncoder button_remove{
-        {168, (35 * 8) - 4, 72, 28},
+        {UI_POS_X_RIGHT(9), (35 * 8) - 4, UI_POS_WIDTH(9), 28},
        "<REMOVE>"};

    ProgressBar progressbar{
-        {0 * 8, screen_height / 2 - 16, screen_width, 32}};
+        {UI_POS_X(0), screen_height / 2 - 16, screen_width, 32}};

    TransmitterView2 tx_view{
        {11 * 8, 2 * 16},
@@ -225,7 +225,7 @@ class ReconSetupView : public View {
        {"More", Theme::getInstance()->fg_green->foreground, &viewMore}};

    Button button_save{
-        {9 * 8, 255, 14 * 8, 40},
+        {UI_POS_X_CENTER(18), 255, UI_POS_WIDTH(18), 40},
        "SAVE"};
 };

@@ -46,15 +46,15 @@ class SdOverUsbView : public View {
    NavigationView& nav_;

    Labels labels{
-        {{3 * 8, 2 * 16}, "Click Run to start the", Theme::getInstance()->bg_darkest->foreground},
-        {{3 * 8, 3 * 16}, "USB Mass Storage Mode.", Theme::getInstance()->bg_darkest->foreground},
-        {{3 * 8, 5 * 16}, "It can take up to 20s", Theme::getInstance()->bg_darkest->foreground},
-        {{3 * 8, 6 * 16}, "for the drive to be", Theme::getInstance()->bg_darkest->foreground},
-        {{3 * 8, 7 * 16}, "available.", Theme::getInstance()->bg_darkest->foreground},
+        {{UI_POS_X_CENTER(22), 2 * 16}, "Click Run to start the", Theme::getInstance()->bg_darkest->foreground},
+        {{UI_POS_X_CENTER(22), 3 * 16}, "USB Mass Storage Mode.", Theme::getInstance()->bg_darkest->foreground},
+        {{UI_POS_X_CENTER(21), 5 * 16}, "It can take up to 20s", Theme::getInstance()->bg_darkest->foreground},
+        {{UI_POS_X_CENTER(19), 6 * 16}, "for the drive to be", Theme::getInstance()->bg_darkest->foreground},
+        {{UI_POS_X_CENTER(10), 7 * 16}, "available.", Theme::getInstance()->bg_darkest->foreground},
    };

    Button button_run{
-        {9 * 8, 15 * 16, 12 * 8, 3 * 16},
+        {UI_POS_X_CENTER(12), 15 * 16, 12 * 8, 3 * 16},
        "Run"};
 };

@@ -26,17 +26,24 @@
 #include "binder.hpp"
 #include "string_format.hpp"
 #include "ui_freqman.hpp"
+#include "audio.hpp"

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

 namespace ui {

+void SearchLogger::log_data(SearchRecentEntry& data) {
+    log_file.write_entry(";" + to_string_short_freq(data.frequency) + ";" + std::to_string(data.duration));
+}
+
 template <>
 void RecentEntriesTable<SearchRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
-    const Style& style) {
+    const Style& style,
+    RecentEntriesColumns& columns) {
    std::string str_duration = "";

    if (entry.duration < 600)
@@ -44,9 +51,10 @@ void RecentEntriesTable<SearchRecentEntries>::draw(
    else
        str_duration = to_string_dec_uint(entry.duration / 600) + "m" + to_string_dec_uint((entry.duration / 10) % 60) + "s";

-    str_duration.resize(target_rect.width() / 8, ' ');
-
-    painter.draw_string(target_rect.location(), style, to_string_short_freq(entry.frequency) + " " + entry.time + " " + str_duration);
+    str_duration.resize(11, ' ');
+    std::string freq = to_string_short_freq(entry.frequency);
+    freq.resize(columns.at(0).second, ' ');
+    painter.draw_string(target_rect.location(), style, freq + " " + entry.time + " " + str_duration);
 }

 /* SearchView ********************************************/
@@ -54,6 +62,7 @@ void RecentEntriesTable<SearchRecentEntries>::draw(
 SearchView::SearchView(
    NavigationView& nav)
    : nav_(nav) {
+    spectrum_row.resize(240);
    baseband::run_image(portapack::spi_flash::image_tag_wideband_spectrum);

    if (!gradient.load_file(default_gradient_file)) {
@@ -75,11 +84,12 @@ SearchView::SearchView(
                  &check_snap,
                  &options_snap,
                  &big_display,
+                  &check_log,
                  &recent_entries_view});

    baseband::set_spectrum(SEARCH_SLICE_WIDTH, 31);

-    recent_entries_view.set_parent_rect({0, 28 * 8, screen_width, 12 * 8});
+    recent_entries_view.set_parent_rect({0, 28 * 8, screen_width, screen_height - 28 * 8});
    recent_entries_view.on_select = [this, &nav](const SearchRecentEntry& entry) {
        nav.push<FrequencySaveView>(entry.frequency);
    };
@@ -100,6 +110,14 @@ SearchView::SearchView(
        on_range_changed();
    });

+    check_log.on_select = [this](Checkbox&, bool v) {
+        logging = v;
+        if (logging) {
+            logger.append(logs_dir.string() + "/SEARCH_" + to_string_timestamp(rtc_time::now()) + ".CSV");
+            logger.write_header();
+        }
+    };
+
    bind(field_threshold, settings_.power_threshold);
    bind(check_snap, settings_.snap_search);
    bind(options_snap, settings_.snap_step);
@@ -108,9 +126,15 @@ SearchView::SearchView(

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

 SearchView::~SearchView() {
+    audio::output::stop();
    receiver_model.disable();
    baseband::shutdown();
 }
@@ -139,9 +163,8 @@ void SearchView::do_detection() {
    // Display spectrum
    bin_skip_acc = 0;
    pixel_index = 0;
-    display.draw_pixels(
-        {{0, 88}, {(Dim)spectrum_row.size(), 1}},
-        spectrum_row);
+    uint16_t center_align_start = (screen_width - spectrum_row.size()) / 2;
+    display.draw_pixels({{center_align_start, 88}, {(Dim)spectrum_row.size(), 1}}, spectrum_row);

    mean_power = mean_acc / (SEARCH_BIN_NB_NO_DC * slices_nb);
    mean_acc = 0;
@@ -192,7 +215,9 @@ void SearchView::do_detection() {

                        locked = true;
                        locked_bin = bin_max;
-
+                        if (pmem::beep_on_packets()) {
+                            baseband::request_audio_beep(1000, 24000, 60);
+                        }
                        // TODO: open Audio.
                    } else
                        text_infos.set("Out of range");
@@ -210,6 +235,7 @@ void SearchView::do_detection() {

                auto& entry = ::on_packet(recent, resolved_frequency);
                entry.set_duration(duration);
+                if (logging) logger.log_data(entry);
                recent_entries_view.set_dirty();

                text_infos.set("Listening");
@@ -225,7 +251,7 @@ void SearchView::do_detection() {
    // Refresh red tick
    portapack::display.fill_rectangle({last_tick_pos, 90, 1, 6}, Theme::getInstance()->fg_red->background);
    if (bin_max > -1) {
-        last_tick_pos = (Coord)(bin_max / slices_nb);
+        last_tick_pos = (Coord)(bin_max / slices_nb) + center_align_start;
        portapack::display.fill_rectangle({last_tick_pos, 90, 1, 6}, Theme::getInstance()->fg_red->foreground);
    }
 }
@@ -374,7 +400,7 @@ void SearchView::add_spectrum_pixel(Color color) {

    bin_skip_acc -= 0x10000;

-    if (pixel_index < screen_width)
+    if (pixel_index < spectrum_row.size())
        spectrum_row[pixel_index++] = color;
 }

@@ -26,6 +26,8 @@
 #include "radio_state.hpp"
 #include "gradient.hpp"
 #include "ui_receiver.hpp"
+#include "log_file.hpp"
+#include "file_path.hpp"

 namespace ui {

@@ -70,6 +72,21 @@ struct SearchRecentEntry {

 using SearchRecentEntries = RecentEntries<SearchRecentEntry>;

+class SearchLogger {
+   public:
+    Optional<File::Error> append(const std::filesystem::path& filename) {
+        return log_file.append(filename);
+    }
+
+    void log_data(SearchRecentEntry& data);
+    void write_header() {
+        log_file.write_raw("Time;Freq;Duration;");
+    }
+
+   private:
+    LogFile log_file{};
+};
+
 class SearchView : public View {
   public:
    SearchView(NavigationView& nav);
@@ -126,7 +143,7 @@ class SearchView : public View {
    uint32_t bin_skip_acc = 0;
    uint32_t bin_skip_frac = 0;
    uint32_t pixel_index = 0;
-    std::array<Color, 240> spectrum_row{};
+    std::vector<Color> spectrum_row{};
    ChannelSpectrumFIFO* fifo = nullptr;

    uint8_t detect_timer = 0;
@@ -148,6 +165,8 @@ class SearchView : public View {
    uint16_t locked_bin = 0;
    uint8_t search_counter = 0;
    bool locked = false;
+    bool logging = false;
+    SearchLogger logger{};

    void do_detection();
    void do_timers();
@@ -155,75 +174,82 @@ class SearchView : public View {
    void on_range_changed();
    void add_spectrum_pixel(Color color);

-    const RecentEntriesColumns columns{{{"Frequency", 9},
-                                        {"Time", 8},
-                                        {"Duration", 11}}};
+    RecentEntriesColumns columns{{{"Frequency", 0},
+                                  {"Time", 8},
+                                  {"Duration", 11}}};
    SearchRecentEntries recent{};
    RecentEntriesView<RecentEntries<SearchRecentEntry>> recent_entries_view{columns, recent};

    Labels labels{
-        {{1 * 8, 0}, "Min:      Max:       LNA VGA", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 4 * 8}, "Trig:   /255    Mean:   /255", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 6 * 8}, "Slices:  /32      Rate:   Hz", Theme::getInstance()->fg_light->foreground},
-        {{6 * 8, 10 * 8}, "Timer  Status", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 25 * 8}, "Accuracy +/-4.9kHz", Theme::getInstance()->fg_light->foreground},
-        {{26 * 8, 25 * 8}, "MHz", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(1), UI_POS_Y(0)}, "Min:      Max:       ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_RIGHT(7), UI_POS_Y(0)}, "LNA VGA", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(1), UI_POS_Y(2)}, "Trig:   /255", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_RIGHT(12), UI_POS_Y(2)}, "Mean:   /255", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(1), UI_POS_Y(3)}, "Slices:  /32", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_RIGHT(10), UI_POS_Y(3)}, "Rate:   Hz", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(6), UI_POS_Y(5)}, "Timer  Status", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(1), 25 * 8}, "Accuracy +/-4.9kHz", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_RIGHT(4), 25 * 8}, "MHz", Theme::getInstance()->fg_light->foreground}};
+
+    Checkbox check_log{
+        {UI_POS_X_RIGHT(6), UI_POS_Y(5)},
+        3,
+        "LOG",
+        true};

    FrequencyField field_frequency_min{
-        {1 * 8, 1 * 16}};
+        {UI_POS_X(1), UI_POS_Y(1)}};
    FrequencyField field_frequency_max{
-        {11 * 8, 1 * 16}};
+        {UI_POS_X(11), UI_POS_Y(1)}};

    LNAGainField field_lna{
-        {22 * 8, 1 * 16}};
+        {UI_POS_X_RIGHT(7), UI_POS_Y(1)}};
    VGAGainField field_vga{
-        {26 * 8, 1 * 16}};
+        {UI_POS_X_RIGHT(3), UI_POS_Y(1)}};

    NumberField field_threshold{
-        {6 * 8, 2 * 16},
+        {UI_POS_X(6), UI_POS_Y(2)},
        3,
        {5, 255},
        5,
        ' '};
    Text text_mean{
-        {22 * 8, 2 * 16, 3 * 8, 16},
+        {UI_POS_X_RIGHT(7), UI_POS_Y(2), UI_POS_WIDTH(3), UI_POS_HEIGHT(1)},
        "---"};
    Text text_slices{
-        {8 * 8, 3 * 16, 2 * 8, 16},
+        {UI_POS_X(8), UI_POS_Y(3), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)},
        "--"};
    Text text_rate{
-        {24 * 8, 3 * 16, 3 * 8, 16},
+        {UI_POS_X_RIGHT(5), UI_POS_Y(3), UI_POS_WIDTH(3), UI_POS_HEIGHT(1)},
        "---"};

    VuMeter vu_max{
-        {1 * 8, 11 * 8 - 4, 3 * 8, 48},
+        {UI_POS_X(1), 11 * 8 - 4, 3 * 8, 48},
        18,
        false};

    ProgressBar progress_timers{
-        {6 * 8, 12 * 8, 6 * 8, 16}};
+        {UI_POS_X(6), UI_POS_Y(6), UI_POS_WIDTH(6), UI_POS_HEIGHT(1)}};
    Text text_infos{
-        {13 * 8, 12 * 8, 15 * 8, 16},
+        {UI_POS_X(13), UI_POS_Y(6), UI_POS_WIDTH(15), UI_POS_HEIGHT(1)},
        "Listening"};

    Checkbox check_snap{
-        {6 * 8, 15 * 8},
+        {UI_POS_X(6), 15 * 8},
        7,
        "Snap to:",
        true};
    OptionsField options_snap{
-        {17 * 8, 15 * 8},  // Position
-        7,                 // Length
-        {                  // Options
+        {UI_POS_X(17), 15 * 8},  // Position
+        7,                       // Length
+        {                        // Options
         {"25kHz  ", 25'000},
         {"12.5kHz", 12'500},
         {"8.33kHz", 8'333},
         {"2.5kHz", 2'500},
         {"500Hz", 500}}};

-    BigFrequency big_display{
-        {4, 9 * 16, 28 * 8, 52},
-        0};
+    BigFrequency big_display{{UI_POS_X_CENTER(28), UI_POS_Y(9), UI_POS_WIDTH(28), 52}, 0};

    MessageHandlerRegistration message_handler_spectrum_config{
        Message::ID::ChannelSpectrumConfig,
@@ -6,7 +6,7 @@
 * Copyright (C) 2024 Mark Thompson
 * Copyright (C) 2024 u-foka
 * Copyright (C) 2024 HTotoo
- * Copyleft (ɔ) 2024 zxkmm under GPL license
+ * copyleft 2024 zxkmm AKA zix aka sommermorgentraum
 *
 * This file is part of PortaPack.
 *
@@ -40,6 +40,7 @@ using namespace lpc43xx;

 #include "audio.hpp"
 #include "portapack.hpp"
+#include "portapack_io.hpp"
 using namespace portapack;

 #include "file.hpp"
@@ -759,7 +760,7 @@ AppSettingsView::AppSettingsView(
    add_children({&labels,
                  &menu_view});

-    menu_view.set_parent_rect({0, 3 * 8, screen_width, 33 * 8});
+    menu_view.set_parent_rect({0, 3 * 8, screen_width, UI_POS_HEIGHT_REMAINING(3)});

    ensure_directory(settings_dir);

@@ -810,9 +811,12 @@ SetDisplayView::SetDisplayView(NavigationView& nav) {
                  &field_fake_brightness,
                  &button_save,
                  &button_cancel,
-                  &checkbox_ips_screen_switch,
                  &checkbox_brightness_switch});

+    if (portapack::device_type == portapack::DeviceType::DEV_PORTAPACK) {
+        add_child(&checkbox_ips_screen_switch);
+    }
+
    field_fake_brightness.set_by_value(pmem::fake_brightness_level());
    checkbox_brightness_switch.set_value(pmem::apply_fake_brightness());
    checkbox_ips_screen_switch.set_value(pmem::config_lcd_normally_black());
@@ -5,7 +5,7 @@
 * Copyright (C) 2023 Kyle Reed
 * Copyright (C) 2024 Mark Thompson
 * Copyright (C) 2024 u-foka
- * Copyleft (ɔ) 2024 zxkmm under GPL license
+ * copyleft 2024 zxkmm AKA zix aka sommermorgentraum
 *
 * This file is part of PortaPack.
 *
@@ -72,8 +72,8 @@ class SetDateTimeView : public View {
        {{1 * 8, 5 * 16 - 2}, "YYYY-MM-DD HH:MM:SS  DoW DoY", Theme::getInstance()->fg_medium->foreground},
        {{5 * 8, 6 * 16}, "-  -     :  :", Theme::getInstance()->fg_light->foreground},
        {{1 * 8, 11 * 16}, "DST adds 1 hour to RTC time.", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 12 * 16}, "Start: 0:00 on Nth  DDD in", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 13 * 16}, "End:   1:00 on Nth  DDD in", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 12 * 16}, "Start: 0:00 on Nth  DDD in", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 13 * 16}, "End:   1:00 on Nth  DDD in", Theme::getInstance()->fg_light->foreground}};

    NumberField field_year{
        {1 * 8, 6 * 16},
@@ -170,10 +170,10 @@ class SetDateTimeView : public View {
        {}};

    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Save"};
    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Cancel"};

    void form_init(const SetDateTimeModel& model);
@@ -253,10 +253,10 @@ class SetRadioView : public View {
        "Disable external TCXO"};

    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Save"};
    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Cancel",
    };

@@ -372,11 +372,11 @@ class SetUIView : public View {
        &bitmap_sd_card_ok};

    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Save"};

    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(16) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Cancel"};
 };

@@ -391,28 +391,28 @@ class SetSDCardView : public View {
   private:
    Labels labels{
        // 01234567890123456789012345678
-        {{1 * 8, 120 - 48}, "    HIGH SPEED SDCARD IO     ", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 120 - 32}, "   May or may not work !!    ", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X_CENTER(26), 120 - 48}, "  HIGH SPEED SDCARD IO   ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_CENTER(26), 120 - 32}, " May or may not work !!  ", Theme::getInstance()->fg_light->foreground}};

    Checkbox checkbox_sdcard_speed{
-        {2 * 8, 120},
+        {UI_POS_X_CENTER(26), 120},
        20,
        "enable high speed IO"};

    Button button_test_sdcard_high_speed{
-        {2 * 8, 152, 27 * 8, 32},
+        {UI_POS_X_CENTER(27), 152, UI_POS_WIDTH(27), UI_POS_HEIGHT(2)},
        "TEST BUTTON (NO PMEM SAVE)"};

    Text text_sdcard_test_status{
-        {2 * 8, 198, 28 * 8, 16},
+        {UI_POS_X_CENTER(28), 198, UI_POS_WIDTH(28), UI_POS_HEIGHT(1)},
        ""};

    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Save"};

    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(16) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Cancel"};
 };

@@ -455,7 +455,7 @@ class SetConverterSettingsView : public View {
        {8 * 8, 10 * 16}};

    Button button_return{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Return",
    };
 };
@@ -498,7 +498,7 @@ class SetFrequencyCorrectionView : public View {
        {8 * 8, 10 * 16}};

    Button button_return{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12), UI_POS_Y_BOTTOM(4), 12 * 8, UI_POS_HEIGHT(2)},
        "Return",
    };
 };
@@ -536,11 +536,11 @@ class SetAudioView : public View {
        "Beep on RX packets"};

    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Save"};

    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Cancel",
    };
 };
@@ -559,11 +559,11 @@ class SetEncoderDialView : public View {

   private:
    Labels labels{
-        {{0 * 8, 0 * 16}, "Sensitivity to dial rotation", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 1 * 16}, "position (x steps per 360):", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(0)}, "Sensitivity to dial rotation", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 1 * 16}, "position (x steps per 360):", Theme::getInstance()->fg_light->foreground},
        {{1 * 8, 3 * 16}, "Sensitivity:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 7 * 16}, "Rotation rate (default 1", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 8 * 16}, "means no rate dependency):", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 7 * 16}, "Rotation rate (default 1", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 8 * 16}, "means no rate dependency):", Theme::getInstance()->fg_light->foreground},
        {{2 * 8, 10 * 16}, "Rate multiplier:", Theme::getInstance()->fg_light->foreground},
        {{4 * 8, 14 * 16}, "Direction:", Theme::getInstance()->fg_light->foreground},

@@ -606,11 +606,11 @@ class SetEncoderDialView : public View {
        "-"};

    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Save"};

    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Cancel",
    };
 };
@@ -649,11 +649,11 @@ class SetButtonsView : public View {
         {"FAST", true}}};

    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Save"};

    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Cancel",
    };
 };
@@ -674,7 +674,7 @@ class SetPersistentMemoryView : public View {
    };

    Text text_pmem_status{
-        {1 * 8, 4 * 16 + 8, 28 * 8, 16},
+        {UI_POS_X_CENTER(28), 4 * 16 + 8, 28 * 8, 16},
        ""};

    Checkbox check_use_sdcard_for_pmem{
@@ -683,19 +683,19 @@ class SetPersistentMemoryView : public View {
        "Use SD card for P.Mem"};

    Button button_save_mem_to_file{
-        {1 * 8, 8 * 16, 28 * 8, 2 * 16},
+        {UI_POS_X_CENTER(28), 8 * 16, 28 * 8, 2 * 16},
        "Save P.Mem to SD card"};

    Button button_load_mem_from_file{
-        {1 * 8, 10 * 16 + 2, 28 * 8, 2 * 16},
+        {UI_POS_X_CENTER(28), 10 * 16 + 2, 28 * 8, 2 * 16},
        "Load P.Mem from SD Card"};

    Button button_load_mem_defaults{
-        {1 * 8, 12 * 16 + 4, 28 * 8, 2 * 16},
+        {UI_POS_X_CENTER(28), 12 * 16 + 4, 28 * 8, 2 * 16},
        "Reset P.Mem to defaults"};

    Button button_return{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Return",
    };
 };
@@ -713,7 +713,7 @@ class AppSettingsView : public View {
        {{0, 4}, "Select file to edit:", Theme::getInstance()->bg_darkest->foreground}};

    MenuView menu_view{
-        {0, 2 * 8, screen_width, 26 * 8},
+        {0, 2 * 8, screen_width, UI_POS_HEIGHT_REMAINING(3)},
        true};
 };

@@ -738,11 +738,11 @@ class SetConfigModeView : public View {
        "Config Mode enable"};

    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Save"};

    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Cancel",
    };
 };
@@ -784,11 +784,11 @@ class SetDisplayView : public View {
        "IPS Screen"};

    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Save"};

    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(16) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Cancel",
    };
 };
@@ -841,19 +841,19 @@ class SetTouchscreenThresholdView : public View {
    };

    Button button_autodetect{
-        {2 * 8, 13 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), 13 * 16, 12 * 8, 32},
        "Auto Detect"};
    Button button_reset{
-        {16 * 8, 13 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), 13 * 16, 12 * 8, 32},
        "Reset",
    };

    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), 16 * 16, 12 * 8, 32},
        "Save"};

    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), 16 * 16, 12 * 8, 32},
        "Cancel",
    };

@@ -876,14 +876,14 @@ class SetMenuColorView : public View {
    void paint_sample();

    Labels labels{
-        {{3 * 8, 1 * 16}, "Menu Button Color Scheme", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_CENTER(25), 1 * 16}, "Menu Button Color Scheme", Theme::getInstance()->fg_light->foreground},
        {{2 * 8, 8 * 16}, "Red Level:", Theme::getInstance()->fg_light->foreground},
        {{2 * 8, 9 * 16}, "Green Level:", Theme::getInstance()->fg_light->foreground},
        {{2 * 8, 10 * 16}, "Blue Level:", Theme::getInstance()->fg_light->foreground},
    };

    NewButton button_sample{
-        {8 * 8, 4 * 16, 14 * 8, 3 * 16},
+        {UI_POS_X_CENTER(14), 4 * 16, 14 * 8, 3 * 16},
        "New Color",
        &bitmap_icon_brightness,
    };
@@ -913,16 +913,16 @@ class SetMenuColorView : public View {
    };

    Button button_reset{
-        {2 * 8, 13 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(7), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Reset",
    };

    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Save"};

    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Cancel",
    };
 };
@@ -941,12 +941,8 @@ class SetThemeView : public View {
        {{1 * 8, 1 * 16}, "Select a theme.", Theme::getInstance()->fg_light->foreground},
        {{1 * 8, 2 * 16}, "Restart PP to fully apply!", Theme::getInstance()->fg_light->foreground}};

-    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
-        "Save"};
-
    OptionsField options{
-        {0 * 8, 4 * 16},
+        {UI_POS_X(0), 4 * 16},
        (size_t)(screen_width / 8),
        {
            {"Default - Grey", 0},
@@ -963,8 +959,12 @@ class SetThemeView : public View {
        23,
        "Set Menu color too"};

+    Button button_save{
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
+        "Save"};
+
    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Cancel",
    };
 };
@@ -988,10 +988,6 @@ class SetBatteryView : public View {

    Labels labels2{{{1 * 8, 11 * 16}, "Reset IC's learned params.", Theme::getInstance()->fg_light->foreground}};

-    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
-        "Save"};
-
    Checkbox checkbox_overridebatt{
        {2 * 8, 4 * 16},
        23,
@@ -1003,12 +999,16 @@ class SetBatteryView : public View {
        "Charge hint"};

    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Cancel",
    };

+    Button button_save{
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
+        "Save"};
+
    Button button_reset{
-        {2 * 8, 13 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y(13), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Reset",
    };
 };
@@ -127,7 +127,7 @@ class SigGenView : public View {
         {"Pulse CW 25%", 7}}};

    TransmitterView tx_view{
-        16 * 16,
+        (int16_t)UI_POS_Y_BOTTOM(4),
        10000,
        12};

@@ -54,6 +54,7 @@ SondeView::SondeView(NavigationView& nav)
                  &field_lna,
                  &field_vga,
                  &rssi,
+                  &channel,
                  &field_volume,
                  &check_log,
                  &check_crc,
@@ -96,39 +96,42 @@ class SondeView : public View {
    Labels labels{
        {{4 * 8, 2 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
        {{6 * 8, 3 * 16}, "ID:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 4 * 16}, "DateTime:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 4 * 16}, "DateTime:", Theme::getInstance()->fg_light->foreground},

        {{3 * 8, 5 * 16}, "Vbatt:", Theme::getInstance()->fg_light->foreground},
        {{3 * 8, 6 * 16}, "Frame:", Theme::getInstance()->fg_light->foreground},
        {{4 * 8, 7 * 16}, "Temp:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 8 * 16}, "Humidity:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 8 * 16}, "Humidity:", Theme::getInstance()->fg_light->foreground}};

    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 8},
+        {UI_POS_X(0), 0 * 8},
        nav_};

    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {13 * 8, UI_POS_Y(0)}};

    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {15 * 8, UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};

    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4}};
+        {21 * 8, 0, UI_POS_WIDTH_REMAINING(24), 4}};
+    Channel channel{
+        {21 * 8, 5, UI_POS_WIDTH_REMAINING(24), 4},
+    };

    AudioVolumeField field_volume{
-        {screen_width - 2 * 8, 0 * 16}};
+        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

    Checkbox check_log{
-        {22 * 8, 8 * 16},
+        {UI_POS_X_RIGHT(8), UI_POS_Y(8)},
        3,
        "Log"};

    Checkbox check_crc{
-        {22 * 8, 10 * 16},
+        {UI_POS_X_RIGHT(8), UI_POS_Y(10)},
        3,
        "CRC"};

@@ -166,11 +169,11 @@ class SondeView : public View {
        GeoPos::spd_unit::HIDDEN};

    Button button_see_qr{
-        {2 * 8, 15 * 16, 12 * 8, 3 * 16},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 3 * 16},
        "See QR"};

    Button button_see_map{
-        {16 * 8, 15 * 16, 12 * 8, 3 * 16},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 3 * 16},
        "See on map"};

    GeoMapView* geomap_view_{nullptr};
@@ -27,6 +27,9 @@

 #include "ui_font_fixed_5x8.hpp"
 #include "ui_font_fixed_8x16.hpp"
+#include "portapack.hpp"
+
+#include "file.hpp"

 namespace ui {

@@ -93,8 +96,90 @@ bool i2c_read(uint8_t* cmd, size_t cmd_len, uint8_t* data, size_t data_len) {
    return dev->i2c_read(cmd, cmd_len, data, data_len);
 }

+// v3
+//  Version 3
+FRESULT ext_f_open(FIL* fp, const TCHAR* path, BYTE mode) {
+    return f_open(fp, path, mode);
+}
+FRESULT ext_f_close(FIL* fp) {
+    return f_close(fp);
+}
+FRESULT ext_f_read(FIL* fp, void* buff, UINT btr, UINT* br) {
+    return f_read(fp, buff, btr, br);
+}
+FRESULT ext_f_write(FIL* fp, const void* buff, UINT btw, UINT* bw) {
+    return f_write(fp, buff, btw, bw);
+}
+FRESULT ext_f_lseek(FIL* fp, FSIZE_t ofs) {
+    return f_lseek(fp, ofs);
+}
+FRESULT ext_f_truncate(FIL* fp) {
+    return f_truncate(fp);
+}
+FRESULT ext_f_sync(FIL* fp) {
+    return f_sync(fp);
+}
+FRESULT ext_f_opendir(DIR* dp, const TCHAR* path) {
+    return f_opendir(dp, path);
+}
+FRESULT ext_f_closedir(DIR* dp) {
+    return f_closedir(dp);
+}
+FRESULT ext_f_readdir(DIR* dp, FILINFO* fno) {
+    return f_readdir(dp, fno);
+}
+FRESULT ext_f_findfirst(DIR* dp, FILINFO* fno, const TCHAR* path, const TCHAR* pattern) {
+    return f_findfirst(dp, fno, path, pattern);
+}
+FRESULT ext_f_findnext(DIR* dp, FILINFO* fno) {
+    return f_findnext(dp, fno);
+}
+FRESULT ext_f_mkdir(const TCHAR* path) {
+    return f_mkdir(path);
+}
+FRESULT ext_f_unlink(const TCHAR* path) {
+    return f_unlink(path);
+}
+FRESULT ext_f_rename(const TCHAR* path_old, const TCHAR* path_new) {
+    return f_rename(path_old, path_new);
+}
+FRESULT ext_f_stat(const TCHAR* path, FILINFO* fno) {
+    return f_stat(path, fno);
+}
+FRESULT ext_f_utime(const TCHAR* path, const FILINFO* fno) {
+    return f_utime(path, fno);
+}
+FRESULT ext_f_getfree(const TCHAR* path, DWORD* nclst, FATFS** fatfs) {
+    return f_getfree(path, nclst, fatfs);
+}
+FRESULT ext_f_mount(FATFS* fs, const TCHAR* path, BYTE opt) {
+    return f_mount(fs, path, opt);
+}
+int ext_f_putc(TCHAR c, FIL* fp) {
+    return f_putc(c, fp);
+}
+int ext_f_puts(const TCHAR* str, FIL* cp) {
+    return f_puts(str, cp);
+}
+int ext_f_printf(FIL* fp, const TCHAR* str, ...) {
+    return f_printf(fp, str);
+}
+TCHAR* ext_f_gets(TCHAR* buff, int len, FIL* fp) {
+    return f_gets(buff, len, fp);
+}
+void ext_draw_pixels(const ui::Rect r, const ui::Color* const colors, const size_t count) {
+    portapack::display.draw_pixels(r, colors, count);
+}
+void ext_draw_pixel(const ui::Point p, const ui::Color color) {
+    portapack::display.draw_pixel(p, color);
+}
+
 StandaloneView* standaloneView = nullptr;

+void exit_app() {
+    if (standaloneView) standaloneView->exit();
+}
+
 void set_dirty() {
    if (standaloneView != nullptr)
        standaloneView->set_dirty();
@@ -121,6 +206,36 @@ standalone_application_api_t api = {
    /* .i2c_read = */ &i2c_read,
    /* .panic = */ &chDbgPanic,
    /* .set_dirty = */ &set_dirty,
+    // Version 3
+    .f_open = &ext_f_open,
+    .f_close = &ext_f_close,
+    .f_read = &ext_f_read,
+    .f_write = &ext_f_write,
+    .f_lseek = &ext_f_lseek,
+    .f_truncate = &ext_f_truncate,
+    .f_sync = &ext_f_sync,
+    .f_opendir = &ext_f_opendir,
+    .f_closedir = &ext_f_closedir,
+    .f_readdir = &ext_f_readdir,
+    .f_findfirst = &ext_f_findfirst,
+    .f_findnext = &ext_f_findnext,
+    .f_mkdir = &ext_f_mkdir,
+    .f_unlink = &ext_f_unlink,
+    .f_rename = &ext_f_rename,
+    .f_stat = &ext_f_stat,
+    .f_utime = &ext_f_utime,
+    .f_getfree = &ext_f_getfree,
+    .f_mount = &ext_f_mount,
+    .f_putc = &ext_f_putc,
+    .f_puts = &ext_f_puts,
+    .f_printf = &ext_f_printf,
+    .f_gets = &ext_f_gets,
+    .draw_pixels = &ext_draw_pixels,
+    .draw_pixel = &ext_draw_pixel,
+    .exit_app = &exit_app,
+    // version 4
+    .screen_height = &screen_height,
+    .screen_width = &screen_width,
 };

 StandaloneView::StandaloneView(NavigationView& nav, uint8_t* app_image)
@@ -158,15 +273,14 @@ bool StandaloneView::on_key(const KeyEvent key) {
    if (get_application_information()->header_version > 1) {
        return get_application_information()->OnKeyEvent((uint8_t)key);
    }
-
-    return false;
+    return true;
 }

 bool StandaloneView::on_encoder(const EncoderEvent event) {
    if (get_application_information()->header_version > 1) {
        return get_application_information()->OnEncoder((int32_t)event);
    }
-    return false;
+    return true;
 }

 bool StandaloneView::on_touch(const TouchEvent event) {
@@ -202,4 +316,8 @@ void StandaloneView::on_before_detach() {
    context().focus_manager().clearMirror();
 }

+void StandaloneView::exit() {
+    nav_.pop();
+}
+
 }  // namespace ui
@@ -51,6 +51,8 @@ class StandaloneView : public View {

    void frame_sync();

+    void exit();
+
   private:
    bool initialized = false;
    NavigationView& nav_;
@@ -84,6 +84,7 @@ void SubGhzDView::focus() {
 SubGhzDView::SubGhzDView(NavigationView& nav)
    : nav_{nav} {
    add_children({&rssi,
+                  &channel,
                  &field_rf_amp,
                  &field_lna,
                  &field_vga,
@@ -261,17 +262,14 @@ void RecentEntriesTable<ui::SubGhzDRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
-    const Style& style) {
+    const Style& style,
+    RecentEntriesColumns& columns) {
    std::string line{};
    line.reserve(30);

    line = SubGhzDView::getSensorTypeName((FPROTO_SUBGHZD_SENSOR)entry.sensorType);
    line = line + " " + to_string_hex(entry.data << 32);
-    if (line.length() < 19) {
-        line += SubGhzDView::pad_string_with_spaces(19 - line.length());
-    } else {
-        line = truncate(line, 19);
-    }
+    line.resize(columns.at(0).second, ' ');
    std::string ageStr = to_string_dec_uint(entry.age);
    std::string bitsStr = to_string_dec_uint(entry.bits);
    line += SubGhzDView::pad_string_with_spaces(5 - bitsStr.length()) + bitsStr;
@@ -122,15 +122,18 @@ class SubGhzDView : public View {
    SubGhzDRecentEntries recent{};

    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {13 * 8, UI_POS_Y(0)}};
    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {15 * 8, UI_POS_Y(0)}};
    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4}};
+        {21 * 8, 0, UI_POS_WIDTH_REMAINING(24), 4}};
+    Channel channel{
+        {21 * 8, 5, UI_POS_WIDTH_REMAINING(24), 4},
+    };
    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 16},
+        {UI_POS_X(0), UI_POS_Y(0)},
        nav_};

    SignalToken signal_token_tick_second{};
@@ -149,8 +152,8 @@ class SubGhzDView : public View {

    std::unique_ptr<SubGhzDLogger> logger{};

-    const RecentEntriesColumns columns{{
-        {"Type", 19},
+    RecentEntriesColumns columns{{
+        {"Type", 0},
        {"Bits", 4},
        {"Age", 3},
    }};
@@ -188,16 +191,16 @@ class SubGhzDRecentEntryDetailView : public View {
    uint32_t cnt = SD_NO_CNT;
    uint32_t seed = 0;

-    Text text_type{{0 * 8, 1 * 16, 15 * 8, 16}, "?"};
+    Text text_type{{UI_POS_X(0), 1 * 16, 15 * 8, 16}, "?"};
    Text text_id{{6 * 8, 2 * 16, 10 * 8, 16}, "?"};

    Console console{
        {0, 4 * 16, screen_width, screen_height - (4 * 16) - 36}};

    Labels labels{
-        {{0 * 8, 0 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 2 * 16}, "Serial: ", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 3 * 16}, "Data:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(0)}, "Type:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 2 * 16}, "Serial: ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 3 * 16}, "Data:", Theme::getInstance()->fg_light->foreground},
    };

    Button button_done{
@@ -76,29 +76,29 @@ class TestView : public View {
    bool logging{false};

    Labels labels{
-        {{0 * 8, 1 * 16}, "Data:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 1 * 16}, "Data:", Theme::getInstance()->fg_light->foreground}};

    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 8},
+        {UI_POS_X(0), 0 * 8},
        nav_};
    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {13 * 8, UI_POS_Y(0)}};

    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {15 * 8, UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};

    RSSI rssi{
        {21 * 8, 0, 6 * 8, 4},
    };

    Text text_debug_a{
-        {0 * 8, 4 * 16, screen_width, 16},
+        {UI_POS_X(0), 4 * 16, screen_width, 16},
        "..."};
    Text text_debug_b{
-        {0 * 8, 5 * 16, screen_width, 16},
+        {UI_POS_X(0), 5 * 16, screen_width, 16},
        "..."};

    Button button_cal{
@@ -26,6 +26,7 @@

 #include "log_file.hpp"
 #include "string_format.hpp"
+#include "irq_controls.hpp"

 using namespace portapack;
 namespace fs = std::filesystem;
@@ -81,21 +82,75 @@ void TextViewer::paint(Painter& painter) {
    paint_cursor(painter);
 }

+void TextViewer::enable_long_press() {
+    // Enable long press on "Select".
+    SwitchesState config;
+    config[toUType(Switch::Sel)] = true;
+    set_switches_long_press_config(config);
+}
+
+void TextViewer::on_focus() {
+    enable_long_press();
+}
+
 bool TextViewer::on_key(const KeyEvent key) {
    int16_t delta_col = 0;
    int16_t delta_line = 0;

-    if (key == KeyEvent::Left)
-        delta_col = -1;
-    else if (key == KeyEvent::Right)
-        delta_col = 1;
-    else if (key == KeyEvent::Up)
-        delta_line = -1;
-    else if (key == KeyEvent::Down)
-        delta_line = 1;
-    else if (key == KeyEvent::Select && on_select) {
-        on_select();
-        return true;
+    if (key == KeyEvent::Select) {
+        // Toggle 'digit' mode with long-press.
+        if (digit_mode_ || key_is_long_pressed(key)) {
+            digit_mode_ = !digit_mode_;
+            set_dirty();
+            return true;
+        }
+    }
+
+    if (digit_mode_) {
+        switch (key) {
+            case KeyEvent::Left:
+                delta_col = -1;
+                break;
+            case KeyEvent::Right:
+                delta_col = 1;
+                break;
+            case KeyEvent::Up:
+                set_value(value_ == 0x0F ? 0x00 : value_ + 1);
+                break;
+            case KeyEvent::Down:
+                set_value(value_ == 0x00 ? 0x0F : value_ - 1);
+                break;
+            default:
+                return false;
+        }
+
+        if (delta_col == 0 && delta_line == 0) {
+            return true;
+        }
+    } else {
+        switch (key) {
+            case KeyEvent::Left:
+                delta_col = -1;
+                break;
+            case KeyEvent::Right:
+                delta_col = 1;
+                break;
+            case KeyEvent::Up:
+                delta_line = -1;
+                break;
+            case KeyEvent::Down:
+                delta_line = 1;
+                break;
+            case KeyEvent::Select: {
+                if (on_select) {
+                    on_select();
+                    return true;
+                }
+                break;
+            }
+            default:
+                return false;
+        }
    }

    // Always allow cursor direction to be updated.
@@ -111,19 +166,42 @@ bool TextViewer::on_key(const KeyEvent key) {
 bool TextViewer::on_encoder(EncoderEvent delta) {
    bool updated = false;

-    if (cursor_.dir == ScrollDirection::Horizontal)
-        updated = apply_scrolling_constraints(0, delta);
-    else {
-        delta *= 16;
-        updated = apply_scrolling_constraints(delta, 0);
+    if (digit_mode_) {
+        if (delta > 0) {
+            set_value(value_ == 0x0F ? 0x00 : value_ + 1);
+        } else if (delta < 0) {
+            set_value(value_ == 0x00 ? 0x0F : value_ - 1);
+        }
+
+        updated = true;
+    } else {
+        if (cursor_.dir == ScrollDirection::Horizontal) {
+            updated = apply_scrolling_constraints(0, delta);
+        } else {
+            delta *= 16;
+            updated = apply_scrolling_constraints(delta, 0);
+        }
+
+        if (updated) {
+            redraw();
+        }
    }

-    if (updated)
-        redraw();
-
    return updated;
 }

+void TextViewer::set_value(uint8_t new_value) {
+    if (new_value != value_) {
+        value_ = new_value;
+
+        if (on_change) {
+            on_change(value_);
+        }
+
+        set_dirty();
+    }
+}
+
 void TextViewer::redraw(bool redraw_text, bool redraw_marked) {
    paint_state_.redraw_text = redraw_text;
    paint_state_.redraw_marked = redraw_marked;
@@ -349,7 +427,7 @@ void TextViewer::set_font_zoom(bool zoom) {
 /* TextEditorMenu ***************************************************/

 TextEditorMenu::TextEditorMenu()
-    : View{{7 * 4, 9 * 4, 25 * 8, 25 * 8}} {
+    : View{{UI_POS_X_CENTER(25), 9 * 4, 25 * 8, 25 * 8}} {
    add_children(
        {
            &rect_frame,
@@ -54,10 +54,13 @@ class TextViewer : public Widget {

    std::function<void()> on_select{};
    std::function<void()> on_cursor_moved{};
+    std::function<void(uint8_t)> on_change{};

    void paint(Painter& painter) override;
    bool on_key(KeyEvent key) override;
    bool on_encoder(EncoderEvent delta) override;
+    void set_value(uint8_t new_value);
+    void on_focus() override;

    void redraw(bool redraw_text = false, bool redraw_marked = false);

@@ -74,6 +77,7 @@ class TextViewer : public Widget {
    void cursor_set(uint16_t line, uint16_t col);
    void cursor_mark_selected();
    void cursor_clear_marked();
+    void enable_long_press();

    typedef std::pair<uint16_t, uint16_t> LineColPair;
    std::vector<LineColPair> lineColPair{};
@@ -95,6 +99,9 @@ class TextViewer : public Widget {
    int8_t char_height{};
    uint8_t max_line{};
    uint8_t max_col{};
+    bool digit_mode_{false};
+    uint8_t value_{0};
+    bool allow_digit_mode_{true};

    /* Returns true if the cursor was updated. */
    bool apply_scrolling_constraints(
@@ -157,7 +164,7 @@ class TextEditorMenu : public View {
    void hide_children(bool hidden);

    Rectangle rect_frame{
-        {0 * 8, 0 * 8, 23 * 8, 23 * 8},
+        {UI_POS_X(0), 0 * 8, 23 * 8, 23 * 8},
        Theme::getInstance()->fg_dark->foreground};

    NewButton button_home{
@@ -260,23 +267,23 @@ class TextEditorView : public View {

    TextViewer viewer{
        /* 272 = screen_height - 16 (top bar) - 32 (bottom controls) */
-        {0, 0, screen_width, 272}};
+        {0, 0, screen_width, UI_POS_HEIGHT_REMAINING(4)}};

    TextEditorMenu menu{};

    NewButton button_menu{
-        {26 * 8, 34 * 8, 4 * 8, 4 * 8},
+        {UI_POS_X_RIGHT(4), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_controls,
        Theme::getInstance()->bg_dark->background,
        /*vcenter*/ true};

    Text text_position{
-        {0 * 8, 34 * 8, 26 * 8, 2 * 8},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH_REMAINING(5), UI_POS_HEIGHT(1)},
        ""};

    Text text_size{
-        {0 * 8, 36 * 8, 26 * 8, 2 * 8},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(2), UI_POS_WIDTH_REMAINING(5), UI_POS_HEIGHT(1)},
        ""};
 };

@@ -81,13 +81,13 @@ class TouchCalibrationView : public View {
        Color::black()};

    Image image_calibrate_1{
-        {240 - 32 - 16, (320 - 16) / 2 - 16, 32, 32},
+        {screen_width - 32 - 16, (screen_height - 16) / 2 - 16, 32, 32},
        &bitmap_target_calibrate,
        Color::white(),
        Color::black()};

    Image image_calibrate_2{
-        {240 / 2 - 16, (320 - 16) - 32 - 16, 32, 32},
+        {screen_width / 2 - 16, (screen_height - 16) - 32 - 16, 32, 32},
        &bitmap_target_calibrate,
        Color::white(),
        Color::black()};
@@ -99,13 +99,13 @@ class TouchCalibrationView : public View {
        Color::black()};

    Image image_verify_1{
-        {240 - 32 - 16, (320 - 16) / 2 - 16, 32, 32},
+        {screen_width - 32 - 16, (screen_height - 16) / 2 - 16, 32, 32},
        &bitmap_target_verify,
        Color::white(),
        Color::black()};

    Image image_verify_2{
-        {240 / 2 - 16, (320 - 16) - 32 - 16, 32, 32},
+        {screen_width / 2 - 16, (screen_height - 16) - 32 - 16, 32, 32},
        &bitmap_target_verify,
        Color::white(),
        Color::black()};
@@ -131,11 +131,11 @@ class TouchCalibrationView : public View {
        "Calibration failed. Retry?"};

    Button button_cancel{
-        {40, 200, 64, 24},
+        {40, 200, UI_POS_WIDTH(8), 24},
        "Cancel"};

    Button button_ok{
-        {136, 200, 64, 24},
+        {136, 200, UI_POS_WIDTH(8), 24},
        "OK"};

    void on_frame_sync();
@@ -162,16 +162,16 @@ class TouchTunesView : public View {
                                                         {{18 * 8 + 4, 18 * 8}, "V"},
                                                         {{22 * 8, 18 * 8}, "F4"},

-                                                         {{0 * 8, 5 * 8}, "1"},
+                                                         {{UI_POS_X(0), 5 * 8}, "1"},
                                                         {{4 * 8, 5 * 8}, "2"},
                                                         {{8 * 8, 5 * 8}, "3"},
-                                                         {{0 * 8, 10 * 8}, "4"},
+                                                         {{UI_POS_X(0), 10 * 8}, "4"},
                                                         {{4 * 8, 10 * 8}, "5"},
                                                         {{8 * 8, 10 * 8}, "6"},
-                                                         {{0 * 8, 15 * 8}, "7"},
+                                                         {{UI_POS_X(0), 15 * 8}, "7"},
                                                         {{4 * 8, 15 * 8}, "8"},
                                                         {{8 * 8, 15 * 8}, "9"},
-                                                         {{0 * 8, 20 * 8}, "*"},
+                                                         {{UI_POS_X(0), 20 * 8}, "*"},
                                                         {{4 * 8, 20 * 8}, "0"},
                                                         {{8 * 8, 20 * 8}, "#"},

@@ -107,6 +107,7 @@ void WeatherView::focus() {
 WeatherView::WeatherView(NavigationView& nav)
    : nav_{nav} {
    add_children({&rssi,
+                  &channel,
                  &field_rf_amp,
                  &field_lna,
                  &field_vga,
@@ -196,6 +197,10 @@ WeatherView::~WeatherView() {
    baseband::shutdown();
 }

+uint16_t WeatherView::bcd_decode_short(uint32_t data) {
+    return (data & 0xF) * 10 + ((data >> 4) & 0xF);
+}
+
 const char* WeatherView::getWeatherSensorTypeName(FPROTO_WEATHER_SENSOR type) {
    switch (type) {
        case FPW_NexusTH:
@@ -224,6 +229,8 @@ const char* WeatherView::getWeatherSensorTypeName(FPROTO_WEATHER_SENSOR type) {
            return "LaCrosse TX141THBv2";
        case FPW_OREGON2:
            return "Oregon2";
+        case FPW_OREGON2B:
+            return "Oregon2B";
        case FPW_OREGON3:
            return "Oregon3";
        case FPW_OREGONv1:
@@ -269,16 +276,13 @@ void RecentEntriesTable<ui::WeatherRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
-    const Style& style) {
+    const Style& style,
+    RecentEntriesColumns& columns) {
    std::string line{};
    line.reserve(30);

    line = WeatherView::getWeatherSensorTypeName((FPROTO_WEATHER_SENSOR)entry.sensorType);
-    if (line.length() < 10) {
-        line += WeatherView::pad_string_with_spaces(10 - line.length());
-    } else {
-        line = truncate(line, 10);
-    }
+    line.resize(columns.at(0).second, ' ');

    std::string temp = (weather_units_fahr ? to_string_decimal((entry.temp * 9 / 5) + 32, 1) : to_string_decimal(entry.temp, 1));
    std::string humStr = (entry.humidity != WS_NO_HUMIDITY) ? to_string_dec_uint(entry.humidity) + "%" : "-";
@@ -301,7 +305,9 @@ WeatherRecentEntry WeatherView::process_data(const WeatherDataMessage* data) {
    WeatherRecentEntry ret = {};
    ret.sensorType = data->sensorType;
    int16_t i16 = 0;
+    int32_t i32 = 0;
    uint16_t u16 = 0;
+
    uint64_t u64 = 0;
    uint8_t u8 = 0;
    uint8_t channel_3021[] = {3, 0, 2, 1};
@@ -444,12 +450,34 @@ WeatherRecentEntry WeatherView::process_data(const WeatherDataMessage* data) {
            ret.humidity = (data->decode_data >> 8) & 0xFF;
            break;
        case FPW_OREGON2:
-            i16 = ((data->decode_data >> 4) & 0xF) * 10 + (((data->decode_data >> 4) >> 4) & 0xF);
-            i16 *= 10;
-            i16 += (data->decode_data >> 12) & 0xF;
-            if (data->decode_data & 0xF) i16 = -i16;
-            ret.temp = (float)i16 / 10.0;
-            // todo fix missing parts.
+            i32 = bcd_decode_short(data->decode_data >> 4);
+            i32 *= 10;
+            i32 += (data->decode_data >> 12) & 0xf;
+            if (data->decode_data & 0xF) i32 = -i32;
+            ret.temp = (float)i32 / 10.0;
+            ret.battery_low = ((data->decode_data >> 32) & 0x4) ? 1 : 0;
+            u8 = (data->decode_data >> 44) & 0xF;
+            ret.channel = 1;
+            while (u8 > 1) {
+                ret.channel++;
+                u8 >>= 1;
+            }
+            break;
+        case FPW_OREGON2B:
+            ret.humidity = bcd_decode_short(data->decode_data);
+            u64 = data->decode_data >> 8;
+            i32 = bcd_decode_short(u64 >> 4);
+            i32 *= 10;
+            i32 += (u64 >> 12) & 0xf;
+            if (u64 & 0xF) i32 = -i32;
+            ret.temp = (float)i32 / 10.0;
+            ret.battery_low = ((data->decode_data >> 32) & 0x4) ? 1 : 0;
+            u8 = (data->decode_data >> 44) & 0xF;
+            ret.channel = 1;
+            while (u8 > 1) {
+                ret.channel++;
+                u8 >>= 1;
+            }
            break;
        case FPW_OREGON3:
            // todo check
@@ -114,6 +114,7 @@ class WeatherView : public View {

   private:
    void on_tick_second();
+    uint16_t bcd_decode_short(uint32_t data);
    void on_data(const WeatherDataMessage* data);
    WeatherRecentEntry process_data(const WeatherDataMessage* data);
    NavigationView& nav_;
@@ -134,25 +135,28 @@ class WeatherView : public View {
    WeatherRecentEntries recent{};

    OptionsField options_temperature{
-        {10 * 8, 0 * 16},
+        {10 * 8, UI_POS_Y(0)},
        2,
        {{STR_DEGREES_C, 0},
         {STR_DEGREES_F, 1}}};

    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {13 * 8, UI_POS_Y(0)}};
    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {15 * 8, UI_POS_Y(0)}};
    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4}};
+        {21 * 8, 0, UI_POS_WIDTH_REMAINING(24), 4}};
+    Channel channel{
+        {21 * 8, 5, UI_POS_WIDTH_REMAINING(24), 4},
+    };

    AudioVolumeField field_volume{
-        {screen_width - 2 * 8, 0 * 16}};
+        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 16},
+        {UI_POS_X(0), UI_POS_Y(0)},
        nav_};

    SignalToken signal_token_tick_second{};
@@ -171,8 +175,8 @@ class WeatherView : public View {

    std::unique_ptr<WeatherLogger> logger{};

-    const RecentEntriesColumns columns{{
-        {"Type", 10},
+    RecentEntriesColumns columns{{
+        {"Type", 0},
        {"Temp", 5},
        {"Hum", 4},
        {"Ch", 3},
@@ -215,14 +219,14 @@ class WeatherRecentEntryDetailView : public View {
    Text text_age{{10 * 8, 7 * 16, 10 * 8, 16}, "?"};

    Labels labels{
-        {{0 * 8, 0 * 16}, "Weather Station", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 1 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 2 * 16}, "Id: ", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 3 * 16}, "Temp:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 4 * 16}, "Humidity:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 5 * 16}, "Channel:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 6 * 16}, "Battery:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 7 * 16}, "Age:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(0)}, "Weather Station", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 1 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 2 * 16}, "Id: ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 3 * 16}, "Temp:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 4 * 16}, "Humidity:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 5 * 16}, "Channel:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 6 * 16}, "Battery:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 7 * 16}, "Age:", Theme::getInstance()->fg_light->foreground},
    };

    Button button_done{
@@ -186,13 +186,14 @@ void set_nrf(const uint32_t baudrate, const uint32_t word_length, const uint32_t
    send_message(&message);
 }

-void set_fsk(const size_t deviation) {
+void set_fsk(const uint8_t samplesPerSymbol, const uint32_t syncWord, const uint8_t syncWordLength, const uint32_t preamble, const uint8_t preambleLength, uint16_t numDataBytes) {
    const FSKRxConfigureMessage message{
-        taps_200k_decim_0,
-        taps_16k0_decim_1,
-        taps_11k0_channel,
-        2,
-        deviation};
+        samplesPerSymbol,
+        syncWord,
+        syncWordLength,
+        preamble,
+        preambleLength,
+        numDataBytes};

    send_message(&message);
 }
@@ -80,7 +80,7 @@ void set_pitch_rssi(int32_t avg, bool enabled);
 void set_afsk_data(const uint32_t afsk_samples_per_bit, const uint32_t afsk_phase_inc_mark, const uint32_t afsk_phase_inc_space, const uint8_t afsk_repeat, const uint32_t afsk_bw, const uint8_t symbol_count);
 void kill_afsk();
 void set_afsk(const uint32_t baudrate, const uint32_t word_length, const uint32_t trigger_value, const bool trigger_word);
-void set_fsk(const size_t deviation);
+void set_fsk(const uint32_t samplesPerSymbol, const uint32_t syncWord, const uint8_t syncWordLength, const uint32_t preamble, const uint8_t preambleLength, uint16_t numDataBytes);
 void set_aprs(const uint32_t baudrate);

 void set_btlerx(uint8_t channel_number);
@@ -2,6 +2,7 @@
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
 * Copyright (C) 2022 Arjan Onwezen
+ * Copyright (C) 2025 Tommaso Ventafridda
 *
 * This file is part of PortaPack.
 *
@@ -56,6 +57,16 @@ int database::retrieve_aircraft_record(AircraftDBRecord* record, std::string sea
    return (result);
 }

+int database::retrieve_macaddress_record(MacAddressDBRecord* record, std::string search_term) {
+    file_path = macaddress_dir / u"macaddress.db";
+    index_item_length = 7;
+    record_length = 64;
+
+    result = retrieve_record(file_path, index_item_length, record_length, record, search_term);
+
+    return (result);
+}
+
 int database::retrieve_record(std::filesystem::path file_path, int index_item_length, int record_length, void* record, std::string search_term) {
    if (search_term.empty())
        return DATABASE_RECORD_NOT_FOUND;
@@ -2,6 +2,7 @@
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
 * Copyright (C) 2022 Arjan Onwezen
+ * Copyright (C) 2025 Tommaso Ventafridda
 *
 * This file is part of PortaPack.
 *
@@ -60,6 +61,12 @@ class database {

    int retrieve_aircraft_record(AircraftDBRecord* record, std::string search_term);

+    struct MacAddressDBRecord {
+        char vendor_name[64];  // vendor/manufacturer name
+    };
+
+    int retrieve_macaddress_record(MacAddressDBRecord* record, std::string search_term);
+
   private:
    std::filesystem::path file_path = "";  // path including filename
    int index_item_length = 0;             // length of index item
@@ -77,4 +84,4 @@ class database {
    int retrieve_record(std::filesystem::path file_path, int index_item_length, int record_length, void* record, std::string search_term);
 };

-#endif /*__DATABASE_H__*/
+#endif /*__DATABASE_H__*/
@@ -67,18 +67,18 @@ class ACARSAppView : public View {
    uint32_t packet_counter{0};

    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {13 * 8, UI_POS_Y(0)}};
    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {15 * 8, UI_POS_Y(0)}};
    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4}};
+        {UI_POS_X(21), 0, UI_POS_WIDTH_REMAINING(24), 4}};
    Channel channel{
-        {21 * 8, 5, 6 * 8, 4}};
+        {UI_POS_X(21), 5, UI_POS_WIDTH_REMAINING(24), 4}};

    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 8},
+        {UI_POS_X(0), 0 * 8},
        nav_};
    Checkbox check_log{
        {16 * 8, 1 * 16},
@@ -62,7 +62,7 @@ class ADSBPositionView : public OptionTabView {
        GeoPos::HIDDEN};

    Button button_set_map{
-        {8 * 8, 6 * 16, 14 * 8, 2 * 16},
+        {UI_POS_X_CENTER(14), 6 * 16, 14 * 8, 2 * 16},
        "Set from map"};
 };

@@ -244,7 +244,7 @@ class ADSBTxView : public View {
        "-"};

    TransmitterView tx_view{
-        16 * 16,
+        (int16_t)UI_POS_Y_BOTTOM(4),
        1000000,
        0};

@@ -73,31 +73,31 @@ class AFSKRxView : public View {
    bool logging{false};

    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {13 * 8, UI_POS_Y(0)}};
    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {15 * 8, UI_POS_Y(0)}};
    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4}};
+        {UI_POS_X(21), 0, UI_POS_WIDTH_REMAINING(24), 4}};
    Channel channel{
-        {21 * 8, 5, 6 * 8, 4}};
+        {UI_POS_X(21), 5, UI_POS_WIDTH_REMAINING(24), 4}};

    AudioVolumeField field_volume{
-        {screen_width - 2 * 8, 0 * 16}};
+        {screen_width - 2 * 8, UI_POS_Y(0)}};

    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 16},
+        {UI_POS_X(0), UI_POS_Y(0)},
        nav_};

    Checkbox check_log{
-        {0 * 8, 1 * 16},
+        {UI_POS_X(0), 1 * 16},
        3,
        LanguageHelper::currentMessages[LANG_LOG],
        false};

    Text text_debug{
-        {0 * 8, 12 + 2 * 16, screen_width, 16},
+        {UI_POS_X(0), 12 + 2 * 16, screen_width, 16},
        LanguageHelper::currentMessages[LANG_DEBUG]};

    Button button_modem_setup{
@@ -58,8 +58,8 @@ class AnalogTvView : public View {
    app_settings::SettingsManager settings_{
        "rx_tv", app_settings::Mode::RX};

-    const Rect options_view_rect{0 * 8, 1 * 16, screen_width, 1 * 16};
-    const Rect nbfm_view_rect{0 * 8, 1 * 16, 18 * 8, 1 * 16};
+    const Rect options_view_rect{UI_POS_X(0), 1 * 16, screen_width, 1 * 16};
+    const Rect nbfm_view_rect{UI_POS_X(0), 1 * 16, 18 * 8, 1 * 16};

    RSSI rssi{
        {21 * 8, 0, 6 * 8, 4}};
@@ -71,17 +71,17 @@ class AnalogTvView : public View {
        {21 * 8, 10, 6 * 8, 4}};

    RxFrequencyField field_frequency{
-        {5 * 8, 0 * 16},
+        {5 * 8, UI_POS_Y(0)},
        nav_};

    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {15 * 8, UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};

    OptionsField options_modulation{
-        {0 * 8, 0 * 16},
+        {UI_POS_X(0), UI_POS_Y(0)},
        4,
        {
            {"TV ", toUType(ReceiverModel::Mode::WidebandFMAudio)},
@@ -90,7 +90,7 @@ class AnalogTvView : public View {
        }};

    AudioVolumeField field_volume{
-        {27 * 8, 0 * 16}};
+        {27 * 8, UI_POS_Y(0)}};

    std::unique_ptr<Widget> options_widget{};

@@ -89,7 +89,7 @@ class WhipCalcView : public View {
        {0, 6 * 16, screen_width, 160}};

    Button button_exit{
-        {72, 17 * 16, 96, 32},
+        {UI_POS_X_RIGHT(12), UI_POS_Y_BOTTOM(3), 96, 32},
        "Back"};
 };

@@ -1,5 +1,5 @@
 /*
- * copyleft spammingdramaqueen
+ * copyleft 2024 zxkmm AKA zix aka sommermorgentraum
 *
 * This file is part of PortaPack.
 *
@@ -50,7 +50,7 @@ AppManagerView::AppManagerView(NavigationView& nav)
                  &button_set_cancel_autostart,
                  &button_clean_autostart});

-    menu_view.set_parent_rect({0, 2 * 8, screen_width, 24 * 8});
+    menu_view.set_parent_rect({0, 2 * 8, screen_width, UI_POS_HEIGHT_REMAINING(7)});

    menu_view.on_highlight = [this]() {
        if (menu_view.highlighted_index() >= app_list_index) {
@@ -1,5 +1,5 @@
 /*
- * copyleft spammingdramaqueen
+ * copyleft 2024 zxkmm AKA zix aka sommermorgentraum
 *
 * This file is part of PortaPack.
 *
@@ -43,28 +43,28 @@ class AppManagerView : public View {
    uint16_t app_list_index{0};

    Labels labels{
-        {{0 * 8, 0 * 16}, "App list:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), UI_POS_Y(0)}, "App list:", Theme::getInstance()->fg_light->foreground}};

    MenuView menu_view{};

    Text text_app_info{
-        {0, 27 * 8, screen_width, 16},
+        {0, UI_POS_Y_BOTTOM(6), screen_width, UI_POS_HEIGHT(1)},
        "Highlight an app"};

    Button button_hide_unhide{
-        {0, 29 * 8, screen_width / 2 - 1, 32},
+        {0, UI_POS_Y_BOTTOM(5), screen_width / 2 - 1, UI_POS_HEIGHT(2)},
        "Hide/Show"};

    Button button_clean_hide{
-        {screen_width / 2 + 2, 29 * 8, screen_width / 2 - 2, 32},
+        {screen_width / 2 + 2, UI_POS_Y_BOTTOM(5), screen_width / 2 - 2, UI_POS_HEIGHT(2)},
        "Clean Hidden"};

    Button button_set_cancel_autostart{
-        {0, screen_height - 32 - 16, screen_width / 2 - 1, 32},
+        {0, screen_height - 32 - 16, screen_width / 2 - 1, UI_POS_HEIGHT(2)},
        "Set Autostart"};

    Button button_clean_autostart{
-        {screen_width / 2 + 2, screen_height - 32 - 16, screen_width / 2 - 2, 32},
+        {screen_width / 2 + 2, screen_height - 32 - 16, screen_width / 2 - 2, UI_POS_HEIGHT(2)},
        "Del Autostart"};

    std::string get_app_info(uint16_t index, bool is_display_name);
@@ -44,13 +44,13 @@ class AudioTestView : public View {
    bool beep{false};

    Labels labels{
-        {{7 * 8, 3 * 16}, "Audio Beep Test", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 6 * 16}, "Sample Rate (Hz):", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_CENTER(16), 3 * 16}, "Audio Beep Test", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 6 * 16}, "Sample Rate (Hz):", Theme::getInstance()->fg_light->foreground},
        {{25 * 8, 7 * 16}, "Step:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 8 * 16}, "Frequency (Hz):", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 10 * 16}, "Duration (ms):", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 8 * 16}, "Frequency (Hz):", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 10 * 16}, "Duration (ms):", Theme::getInstance()->fg_light->foreground},
        {{25 * 8, 10 * 16}, "0=con", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 12 * 16}, "Volume:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 12 * 16}, "Volume:", Theme::getInstance()->fg_light->foreground}};

    OptionsField options_sample_rate{
        {18 * 8, 6 * 16},
@@ -0,0 +1,55 @@
+/*
+ * ------------------------------------------------------------
+ * |  Made by RocketGod                                       |
+ * |  Find me at https://betaskynet.com                       |
+ * |  Argh matey!                                             |
+ * ------------------------------------------------------------
+ */
+
+#include "ui.hpp"
+#include "ui_battleship.hpp"
+#include "ui_navigation.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::battleship {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<BattleshipView>();
+}
+}  // namespace ui::external_app::battleship
+
+extern "C" {
+
+__attribute__((section(".external_app.app_battleship.application_information"), used)) application_information_t _application_information_battleship = {
+    /*.memory_location = */ (uint8_t*)0x00000000,
+    /*.externalAppEntry = */ ui::external_app::battleship::initialize_app,
+    /*.header_version = */ CURRENT_HEADER_VERSION,
+    /*.app_version = */ VERSION_MD5,
+
+    /*.app_name = */ "Battleship",
+    /*.bitmap_data = */ {
+        // Pirate galleon - 16x16
+        0x80, 0x00,  // ........#.......
+        0x80, 0x00,  // ........#.......
+        0x80, 0x00,  // ........#.......
+        0xC0, 0x01,  // .......###......
+        0xE0, 0x03,  // ......#####.....
+        0xF0, 0x07,  // .....#######....
+        0xF8, 0x0F,  // ....#########...
+        0xFC, 0x1F,  // ...###########..
+        0xFE, 0x3F,  // ..#############.
+        0x00, 0x01,  // .......#........
+        0x00, 0x01,  // .......#........
+        0x00, 0x01,  // .......#........
+        0xFC, 0x3F,  // ..############..
+        0xFE, 0x7F,  // .##############.
+        0xFF, 0xFF,  // ################
+        0xFC, 0x3F,  // ..############..
+    },
+    /*.icon_color = */ ui::Color::blue().v,
+    /*.menu_location = */ app_location_t::GAMES,
+    /*.desired_menu_position = */ -1,
+
+    /*.m4_app_tag = */ {'P', 'P', 'O', '2'},  // Use POCSAG2 baseband (larger than FSKTX)
+    /*.m4_app_offset = */ 0x00000000,         // will be filled at compile time
+};
+}
@@ -0,0 +1,250 @@
+/*
+ * ------------------------------------------------------------
+ * |  Made by RocketGod                                       |
+ * |  Find me at https://betaskynet.com                       |
+ * |  Argh matey!                                             |
+ * ------------------------------------------------------------
+ */
+
+#ifndef __UI_BATTLESHIP_H__
+#define __UI_BATTLESHIP_H__
+
+#include "ui.hpp"
+#include "ui_navigation.hpp"
+#include "ui_receiver.hpp"
+#include "ui_transmitter.hpp"
+#include "app_settings.hpp"
+#include "radio_state.hpp"
+#include "baseband_api.hpp"
+#include "string_format.hpp"
+#include "audio.hpp"
+#include "message.hpp"
+#include "pocsag.hpp"
+
+#include <array>
+
+namespace ui::external_app::battleship {
+
+constexpr uint8_t GRID_SIZE = 10;
+constexpr uint8_t CELL_SIZE = 24;
+constexpr uint8_t GRID_OFFSET_X = 0;
+constexpr uint8_t GRID_OFFSET_Y = 32;
+
+enum class ShipType : uint8_t {
+    CARRIER = 5,
+    BATTLESHIP = 4,
+    CRUISER = 3,
+    SUBMARINE = 3,
+    DESTROYER = 2
+};
+
+enum class GameState : uint8_t {
+    MENU,
+    PLACING_SHIPS,
+    WAITING_FOR_OPPONENT,
+    MY_TURN,
+    OPPONENT_TURN,
+    GAME_OVER
+};
+
+enum class CellState : uint8_t {
+    EMPTY,
+    SHIP,
+    HIT,
+    MISS,
+    SUNK
+};
+
+enum class MessageType : uint8_t {
+    READY,
+    SHOT,
+    HIT,
+    MISS,
+    SUNK,
+    WIN
+};
+
+struct Ship {
+    ShipType type;
+    uint8_t x;
+    uint8_t y;
+    bool horizontal;
+    uint8_t hits;
+    bool placed;
+
+    uint8_t size() const {
+        return static_cast<uint8_t>(type);
+    }
+
+    bool is_sunk() const {
+        return hits >= size();
+    }
+};
+
+struct GameMessage {
+    MessageType type;
+    uint8_t x;
+    uint8_t y;
+};
+
+class BattleshipView : public View {
+   public:
+    BattleshipView(NavigationView& nav);
+    ~BattleshipView();
+
+    void focus() override;
+    void paint(Painter& painter) override;
+    bool on_touch(const TouchEvent event) override;
+    bool on_encoder(const EncoderEvent delta) override;
+    bool on_key(const KeyEvent key) override;
+
+    std::string title() const override { return "Battleship"; }
+
+   private:
+    NavigationView& nav_;
+
+    RxRadioState rx_radio_state_{
+        433920000 /* frequency */,
+        1750000 /* bandwidth */,
+        2280000 /* sampling rate */
+    };
+
+    TxRadioState tx_radio_state_{
+        433920000 /* frequency */,
+        1750000 /* bandwidth */,
+        2280000 /* sampling rate */
+    };
+
+    // Settings
+    bool sound_enabled{true};
+    bool rf_amp_enabled{false};
+    uint8_t lna_gain{24};
+    uint8_t vga_gain{24};
+    uint8_t tx_gain{35};
+
+    app_settings::SettingsManager settings_{
+        "battleship",
+        app_settings::Mode::RX_TX,
+        {{"rx_freq"sv, &rx_frequency},
+         {"tx_freq"sv, &tx_frequency},
+         {"rf_amp"sv, &rf_amp_enabled}}};
+
+    GameState game_state{GameState::MENU};
+    bool is_red_team{false};
+    bool opponent_ready{false};
+    uint8_t wins{0};
+    uint8_t losses{0};
+
+    std::array<std::array<CellState, GRID_SIZE>, GRID_SIZE> my_grid{};
+    std::array<std::array<CellState, GRID_SIZE>, GRID_SIZE> enemy_grid{};
+
+    std::string current_status{"Choose your team!"};
+    std::string current_score{"W:0 L:0"};
+
+    std::array<Ship, 5> my_ships{};
+    uint8_t current_ship_index{0};
+    bool placing_horizontal{true};
+    uint8_t ships_remaining{5};
+    uint8_t enemy_ships_remaining{5};
+
+    uint8_t cursor_x{0};
+    uint8_t cursor_y{0};
+    uint8_t target_x{0};
+    uint8_t target_y{0};
+    bool touch_enabled{true};
+
+    uint32_t tx_frequency{433920000};
+    uint32_t rx_frequency{433920000};
+    bool is_transmitting{false};
+
+    // POCSAG decoding state
+    pocsag::EccContainer ecc{};
+    pocsag::POCSAGState pocsag_state{&ecc};
+    uint32_t last_address{0};
+
+    // UI Elements - Menu/Settings Screen
+    Text text_title{{60, 2, 120, 24}, "BATTLESHIP"};
+    Text text_subtitle{{40, 20, 160, 16}, "Naval Combat Game"};
+
+    Rectangle rect_radio_settings{{12, 40, 216, 118}, Color::dark_grey()};
+    Text label_radio{{17, 45, 100, 16}, "RADIO SETUP"};
+    ButtonWithEncoder button_frequency{{17, 65, 11 * 8, 20}, ""};
+
+    // Radio controls
+    Text label_rf_amp{{17, 90, 35, 16}, "AMP:"};
+    Checkbox checkbox_rf_amp{{55, 90}, 3, "", false};
+
+    Text label_lna{{17, 118, 30, 16}, "LNA:"};
+    NumberField field_lna{{50, 118}, 2, {0, 40}, 8, ' '};
+
+    Text label_vga{{90, 118, 30, 16}, "VGA:"};
+    NumberField field_vga{{125, 118}, 2, {0, 62}, 8, ' '};
+
+    Text label_tx_gain{{155, 118, 25, 16}, "TX:"};
+    NumberField field_tx_gain{{185, 118}, 2, {0, 47}, 8, ' '};
+
+    Rectangle rect_audio_settings{{12, 164, 216, 45}, Color::dark_grey()};
+    Text label_audio{{17, 169, 80, 16}, "AUDIO"};
+    Checkbox checkbox_sound{{17, 187}, 8, "Sound On", true};
+    Text label_volume{{110, 187, 50, 16}, "Volume:"};
+    AudioVolumeField field_volume{{165, 187}};
+
+    Rectangle rect_team_selection{{12, 217, 216, 75}, Color::dark_grey()};
+    Text label_team{{17, 222, 110, 16}, "SELECT TEAM"};
+    Button button_red_team{{25, 242, 85, 45}, "RED\nTEAM"};
+    Button button_blue_team{{130, 242, 85, 45}, "BLUE\nTEAM"};
+
+    // In-game UI elements
+    RSSI rssi{{21 * 8, 0, 6 * 8, 4}};
+    Text text_status{{10, 16, 220, 16}, ""};
+    Text text_score{{170, 16, 60, 16}, ""};
+    Button button_rotate{{10, 265, 65, 32}, "Rotate"};
+    Button button_place{{82, 265, 65, 32}, "Place"};
+    Button button_fire{{82, 265, 65, 32}, "Fire!"};
+    Button button_menu{{155, 265, 65, 32}, "Menu"};
+
+    // Methods
+    void init_game();
+    void reset_game();
+    void start_team(bool red);
+    void setup_ships();
+    void draw_menu_screen(Painter& painter);
+    void draw_grid(Painter& painter, uint8_t grid_x, uint8_t grid_y, const std::array<std::array<CellState, GRID_SIZE>, GRID_SIZE>& grid, bool show_ships, bool is_offense_grid = false);
+    void draw_cell(Painter& painter, uint8_t cell_x, uint8_t cell_y, CellState state, bool show_ships, bool is_offense_grid, bool is_cursor);
+    void draw_ship_preview(Painter& painter);
+    void place_ship();
+    bool can_place_ship(uint8_t x, uint8_t y, uint8_t size, bool horizontal);
+    void fire_at_position();
+    void process_shot(uint8_t x, uint8_t y);
+    void update_score();
+    bool is_cursor_at(uint8_t x, uint8_t y, bool is_offense_grid);
+
+    void send_message(const GameMessage& msg);
+    void process_message(const std::string& message);
+    bool parse_coords(const std::string& coords, uint8_t& x, uint8_t& y);
+    void mark_ship_sunk(uint8_t x, uint8_t y, std::array<std::array<CellState, GRID_SIZE>, GRID_SIZE>& grid);
+
+    void configure_radio_tx();
+    void configure_radio_rx();
+
+    MessageHandlerRegistration message_handler_packet{
+        Message::ID::POCSAGPacket,
+        [this](Message* const p) {
+            const auto message = static_cast<const POCSAGPacketMessage*>(p);
+            on_pocsag_packet(message);
+        }};
+
+    MessageHandlerRegistration message_handler_tx_progress{
+        Message::ID::TXProgress,
+        [this](const Message* const p) {
+            const auto message = static_cast<const TXProgressMessage*>(p);
+            on_tx_progress(message->progress, message->done);
+        }};
+
+    void on_pocsag_packet(const POCSAGPacketMessage* message);
+    void on_tx_progress(const uint32_t progress, const bool done);
+};
+
+}  // namespace ui::external_app::battleship
+
+#endif
@@ -23,6 +23,8 @@
 #include "bht.hpp"
 #include "portapack_persistent_memory.hpp"

+namespace ui::external_app::bht_tx {
+
 size_t gen_message_ep(uint8_t city_code, size_t family_code_ep, uint32_t relay_number, uint32_t relay_state) {
    size_t c;
    const encoder_def_t* um3750_def;
@@ -152,3 +154,5 @@ std::string ccir_to_ascii(uint8_t* ccir) {

    return ascii;
 }
+
+}  // namespace ui::external_app::bht_tx
@@ -28,6 +28,8 @@

 using namespace encoders;

+namespace ui::external_app::bht_tx {
+
 #define XY_TONE_DURATION ((TONES_SAMPLERATE * 0.1) - 1)  // 100ms
 #define XY_SILENCE (TONES_SAMPLERATE * 0.4)              // 400ms
 #define XY_TONE_COUNT 20
@@ -47,3 +49,5 @@ size_t gen_message_ep(uint8_t city_code, size_t family_code_ep, uint32_t relay_s
 std::string gen_message_xy(const std::string& code);
 std::string gen_message_xy(size_t header_code_a, size_t header_code_b, size_t city_code, size_t family_code, bool subfamily_wc, size_t subfamily_code, bool id_wc, size_t receiver_code, size_t relay_state_A, size_t relay_state_B, size_t relay_state_C, size_t relay_state_D);
 std::string ccir_to_ascii(uint8_t* ccir);
+
+}  // namespace ui::external_app::bht_tx
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2024 EPIRB Decoder Implementation
+ *
+ * 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 "ui_bht_tx.hpp"
+#include "ui_navigation.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::bht_tx {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<BHTView>();
+}
+}  // namespace ui::external_app::bht_tx
+
+extern "C" {
+
+__attribute__((section(".external_app.app_bht_tx.application_information"), used)) application_information_t _application_information_bht_tx = {
+    /*.memory_location = */ (uint8_t*)0x00000000,
+    /*.externalAppEntry = */ ui::external_app::bht_tx::initialize_app,
+    /*.header_version = */ CURRENT_HEADER_VERSION,
+    /*.app_version = */ VERSION_MD5,
+
+    /*.app_name = */ "BHT TX",
+    /*.bitmap_data = */ {
+        0x00,
+        0x00,
+        0xE0,
+        0x07,
+        0xF8,
+        0x08,
+        0x9C,
+        0x07,
+        0x0C,
+        0x00,
+        0x8E,
+        0x0A,
+        0x46,
+        0x12,
+        0x26,
+        0x22,
+        0x06,
+        0x02,
+        0x06,
+        0x00,
+        0x06,
+        0x00,
+        0x06,
+        0x00,
+        0x06,
+        0x00,
+        0x06,
+        0x00,
+        0x06,
+        0x00,
+        0x00,
+        0x00,
+    },
+    /*.icon_color = */ ui::Color::green().v,
+    /*.menu_location = */ app_location_t::TX,
+    /*.desired_menu_position = */ -1,
+
+    /*.m4_app_tag = portapack::spi_flash::image_tag_tones */ {'P', 'T', 'O', 'N'},
+    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
+};
+}
@@ -28,7 +28,7 @@

 using namespace portapack;

-namespace ui {
+namespace ui::external_app::bht_tx {

 void BHTView::focus() {
    tx_view.focus();
@@ -40,8 +40,7 @@ void BHTView::start_tx() {
    transmitter_model.set_baseband_bandwidth(1750000);

    if (target_system == XYLOS) {
-        baseband::run_image(portapack::spi_flash::image_tag_tones);
-
+        baseband::run_prepared_image(portapack::memory::map::m4_code.base());
        view_xylos.generate_message();

        // if (tx_mode == SINGLE) {
@@ -339,4 +338,4 @@ void XylosView::focus() {
    field_city.focus();
 }

-} /* namespace ui */
+}  // namespace ui::external_app::bht_tx
@@ -35,7 +35,7 @@
 #include "radio_state.hpp"
 #include "portapack.hpp"

-namespace ui {
+namespace ui::external_app::bht_tx {

 class XylosView : public View {
   public:
@@ -218,11 +218,11 @@ class BHTView : public View {
        ' '};

    ProgressBar progressbar{
-        {0 * 8, 29 * 8, screen_width, 16},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(5), screen_width, 16},
    };

    TransmitterView tx_view{
-        16 * 16,
+        (int16_t)UI_POS_Y_BOTTOM(4),
        10000,
        12};

@@ -234,4 +234,4 @@ class BHTView : public View {
        }};
 };

-} /* namespace ui */
+}  // namespace ui::external_app::bht_tx
@@ -0,0 +1,53 @@
+/*
+ * Blackjack Game for Portapack Mayhem
+ * Ported / Enhanced / Graphically made awesome by RocketGod (https://betaskynet.com)
+ * Based on BlackJack 83 for TI Calculator by Harper Maddox (was written in Assembly)
+ */
+
+#include "ui.hpp"
+#include "ui_blackjack.hpp"
+#include "ui_navigation.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::blackjack {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<BlackjackView>();
+}
+}  // namespace ui::external_app::blackjack
+
+extern "C" {
+
+__attribute__((section(".external_app.app_blackjack.application_information"), used)) application_information_t _application_information_blackjack = {
+    (uint8_t*)0x00000000,
+    ui::external_app::blackjack::initialize_app,
+    CURRENT_HEADER_VERSION,
+    VERSION_MD5,
+
+    "Blackjack",
+    {
+        // Diamond icon 16x16
+        0x00, 0x00,  // ................
+        0x80, 0x01,  // .......##.......
+        0xC0, 0x03,  // ......####......
+        0xE0, 0x07,  // .....######.....
+        0xF0, 0x0F,  // ....########....
+        0xF8, 0x1F,  // ...##########...
+        0xFC, 0x3F,  // ..############..
+        0xFE, 0x7F,  // .##############.
+        0xFE, 0x7F,  // .##############.
+        0xFC, 0x3F,  // ..############..
+        0xF8, 0x1F,  // ...##########...
+        0xF0, 0x0F,  // ....########....
+        0xE0, 0x07,  // .....######.....
+        0xC0, 0x03,  // ......####......
+        0x80, 0x01,  // .......##.......
+        0x00, 0x00,  // ................
+    },
+    ui::Color::red().v,  // Red color for diamonds
+    app_location_t::GAMES,
+    -1,
+
+    {0, 0, 0, 0},
+    0x00000000,
+};
+}
@@ -0,0 +1,741 @@
+/*
+ * Blackjack Game for Portapack Mayhem
+ * Ported / Enhanced / Graphically made awesome by RocketGod (https://betaskynet.com)
+ * Based on BlackJack 83 for TI Calculator by Harper Maddox (was written in Assembly)
+ */
+
+#include "ui_blackjack.hpp"
+
+namespace ui::external_app::blackjack {
+
+// Global variables
+static BlackjackView* current_instance = nullptr;
+static Callback game_update_callback = nullptr;
+static uint32_t game_update_timeout = 0;
+static uint32_t game_update_counter = 0;
+static Painter painter;
+
+void check_game_timer() {
+    if (game_update_callback) {
+        if (++game_update_counter >= game_update_timeout) {
+            game_update_counter = 0;
+            game_update_callback();
+        }
+    }
+}
+
+void Ticker::attach(Callback func, double delay_sec) {
+    game_update_callback = func;
+    game_update_timeout = delay_sec * 60;
+}
+
+void Ticker::detach() {
+    game_update_callback = nullptr;
+}
+
+void game_timer_check() {
+    if (current_instance) {
+        current_instance->update_game();
+    }
+}
+
+BlackjackView::BlackjackView(NavigationView& nav)
+    : nav_{nav}, game_timer{} {
+    // Initialize screen dimensions dynamically
+    screen_w = ui::screen_width;
+    screen_h = ui::screen_height;
+
+    // Scale card size based on screen
+    if (screen_w <= 240) {
+        card_width = 50;
+        card_height = 65;
+    } else if (screen_w >= 400) {
+        card_width = 70;
+        card_height = 90;
+    }
+
+    add_children({&dummy});
+    current_instance = this;
+    game_timer.attach(&game_timer_check, 1.0 / 60.0);
+}
+
+BlackjackView::~BlackjackView() {
+    current_instance = nullptr;
+}
+
+void BlackjackView::on_show() {
+    draw_menu_static();
+}
+
+void BlackjackView::paint(Painter& painter) {
+    (void)painter;
+
+    if (!initialized) {
+        initialized = true;
+        std::srand(LPC_RTC->CTIME0);
+        init_deck();
+    }
+}
+
+void BlackjackView::frame_sync() {
+    check_game_timer();
+    set_dirty();
+}
+
+void BlackjackView::clear_screen() {
+    painter.fill_rectangle({0, 0, screen_w, screen_h}, Color::black());
+}
+
+void BlackjackView::init_deck() {
+    // Initialize deck with card values 0-51
+    // 0-12 = Spades (A-K), 13-25 = Hearts, 26-38 = Diamonds, 39-51 = Clubs
+    for (int i = 0; i < 52; i++) {
+        deck[i] = i;
+    }
+    shuffle_deck();
+}
+
+void BlackjackView::shuffle_deck() {
+    // Simple shuffle using random swaps
+    for (int i = 51; i > 0; i--) {
+        int j = rand() % (i + 1);
+        uint8_t temp = deck[i];
+        deck[i] = deck[j];
+        deck[j] = temp;
+    }
+    deck_position = 0;
+}
+
+uint8_t BlackjackView::draw_card() {
+    if (deck_position >= 52) {
+        shuffle_deck();
+    }
+    return deck[deck_position++];
+}
+
+int BlackjackView::get_card_value(uint8_t card) {
+    int value = (card % 13) + 1;  // 1-13
+    if (value > 10) value = 10;   // Face cards worth 10
+    return value;
+}
+
+uint8_t BlackjackView::get_card_suit(uint8_t card) {
+    return card / 13;  // 0=Spades, 1=Hearts, 2=Diamonds, 3=Clubs
+}
+
+std::string BlackjackView::get_card_string(uint8_t card) {
+    int value = (card % 13) + 1;
+    std::string result;
+
+    if (value == 1)
+        result = "A";
+    else if (value == 11)
+        result = "J";
+    else if (value == 12)
+        result = "Q";
+    else if (value == 13)
+        result = "K";
+    else if (value == 10)
+        result = "10";  // Special case for 10
+    else
+        result = std::to_string(value);
+
+    return result;
+}
+
+int BlackjackView::calculate_hand_value(uint8_t* cards, uint8_t count) {
+    int value = 0;
+    int aces = 0;
+
+    for (uint8_t i = 0; i < count; i++) {
+        int card_val = get_card_value(cards[i]);
+        if (card_val == 1) {
+            aces++;
+            value += 1;
+        } else {
+            value += card_val;
+        }
+    }
+
+    // Convert aces from 1 to 11 if beneficial
+    while (aces > 0 && value + 10 <= 21) {
+        value += 10;
+        aces--;
+    }
+
+    return value;
+}
+
+void BlackjackView::deal_cards() {
+    // Clear hands
+    player_card_count = 0;
+    dealer_card_count = 0;
+
+    // Deal initial cards
+    player_cards[player_card_count++] = draw_card();
+    dealer_cards[dealer_card_count++] = draw_card();
+    player_cards[player_card_count++] = draw_card();
+    dealer_cards[dealer_card_count++] = draw_card();
+
+    dealer_hidden = true;
+    game_state = GameState::PLAYING;
+}
+
+void BlackjackView::player_hit() {
+    if (player_card_count < MAX_CARDS_IN_HAND) {
+        player_cards[player_card_count++] = draw_card();
+
+        int value = calculate_hand_value(player_cards, player_card_count);
+        if (value > 21) {
+            // Bust!
+            cash = (cash >= bet) ? cash - bet : 0;
+            losses++;
+            game_state = GameState::GAME_OVER;
+        }
+    }
+}
+
+void BlackjackView::player_stay() {
+    dealer_hidden = false;
+    game_state = GameState::DEALER_TURN;
+    dealer_timer = 0;
+}
+
+void BlackjackView::dealer_turn() {
+    int dealer_value = calculate_hand_value(dealer_cards, dealer_card_count);
+
+    if (dealer_value < 17 && dealer_card_count < MAX_CARDS_IN_HAND) {
+        dealer_cards[dealer_card_count++] = draw_card();
+    } else {
+        check_game_over();
+    }
+}
+
+void BlackjackView::check_game_over() {
+    int player_value = calculate_hand_value(player_cards, player_card_count);
+    int dealer_value = calculate_hand_value(dealer_cards, dealer_card_count);
+
+    if (player_value > 21) {
+        // Player bust (already handled)
+    } else if (dealer_value > 21) {
+        // Dealer bust - player wins
+        cash += bet;
+        wins++;
+    } else if (player_value > dealer_value) {
+        // Player wins
+        cash += bet;
+        wins++;
+    } else if (player_value < dealer_value) {
+        // Dealer wins
+        cash = (cash >= bet) ? cash - bet : 0;
+        losses++;
+    }
+    // Else it's a tie - no money changes hands
+
+    if (cash > high_score) {
+        high_score = cash;
+    }
+
+    game_state = GameState::GAME_OVER;
+}
+
+void BlackjackView::update_game() {
+    switch (game_state) {
+        case GameState::MENU:
+            draw_menu();
+            break;
+
+        case GameState::BETTING:
+            draw_betting();
+            break;
+
+        case GameState::PLAYING:
+            draw_game();
+            break;
+
+        case GameState::DEALER_TURN:
+            if (++dealer_timer >= 60) {  // 1 second delay
+                dealer_timer = 0;
+                dealer_turn();
+            }
+            draw_game();
+            break;
+
+        case GameState::GAME_OVER:
+            draw_game();
+            break;
+
+        case GameState::STATS:
+            draw_stats();
+            break;
+    }
+}
+
+void BlackjackView::draw_menu_static() {
+    clear_screen();
+
+    auto style_title = *ui::Theme::getInstance()->fg_green;
+    auto style_text = *ui::Theme::getInstance()->fg_light;
+    auto style_rules = *ui::Theme::getInstance()->fg_cyan;
+
+    painter.draw_string({UI_POS_X_CENTER(10), 20}, style_title, "BLACKJACK");
+
+    // Draw rules - adjust Y positions for smaller screens
+    int rules_y = (screen_h > 300) ? 55 : 45;
+    painter.draw_string({UI_POS_X_CENTER(12), rules_y}, style_rules, "-- RULES --");
+    painter.draw_string({UI_POS_X_CENTER(16), rules_y + 20}, style_text, "Get close to 21");
+    painter.draw_string({UI_POS_X_CENTER(19), rules_y + 35}, style_text, "without going over");
+    painter.draw_string({UI_POS_X_CENTER(18), rules_y + 55}, style_text, "Dealer hits on 16");
+    painter.draw_string({UI_POS_X_CENTER(19), rules_y + 70}, style_text, "Dealer stays on 17");
+    painter.draw_string({UI_POS_X_CENTER(19), rules_y + 90}, style_text, "Blackjack pays 1:1");
+
+    // Controls
+    int controls_y = (screen_h > 300) ? 175 : 155;
+    painter.draw_string({UI_POS_X_CENTER(15), controls_y}, style_rules, "-- CONTROLS --");
+    painter.draw_string({UI_POS_X_CENTER(18), controls_y + 20}, style_text, "SELECT: Start/Hit");
+    painter.draw_string({UI_POS_X_CENTER(12), controls_y + 35}, style_text, "LEFT: Stats");
+    painter.draw_string({UI_POS_X_CENTER(17), controls_y + 50}, style_text, "RIGHT: Exit/Stay");
+
+    // Draw high score at bottom
+    painter.draw_string({UI_POS_X_CENTER(17), screen_h - 70}, style_text, "High Score: $" + std::to_string(high_score));
+}
+
+void BlackjackView::draw_menu() {
+    // Only handle the flashing text animation
+    if (++blink_counter >= 30) {
+        blink_counter = 0;
+        blink_state = !blink_state;
+
+        if (blink_state) {
+            auto style = *ui::Theme::getInstance()->fg_yellow;
+            painter.draw_string({UI_POS_X_CENTER(17), screen_h - 40}, style, "* PRESS SELECT *");
+        } else {
+            // Clear just the text area
+            painter.fill_rectangle({UI_POS_X_CENTER(17), screen_h - 42, 130, 20}, Color::black());
+        }
+    }
+}
+
+void BlackjackView::draw_stats() {
+    clear_screen();
+
+    auto style_title = *ui::Theme::getInstance()->fg_green;
+    auto style_text = *ui::Theme::getInstance()->fg_light;
+    auto style_value = *ui::Theme::getInstance()->fg_yellow;
+
+    painter.draw_string({UI_POS_X_CENTER(11), 30}, style_title, "STATISTICS");
+
+    int stats_x = (screen_w > 300) ? 50 : 30;
+
+    painter.draw_string({stats_x, 80}, style_text, "Wins:");
+    painter.draw_string({UI_POS_X_CENTER(5), 80}, style_value, std::to_string(wins));
+
+    painter.draw_string({stats_x, 100}, style_text, "Losses:");
+    painter.draw_string({UI_POS_X_CENTER(5), 100}, style_value, std::to_string(losses));
+
+    // Win percentage
+    uint32_t total = wins + losses;
+    if (total > 0) {
+        uint32_t win_pct = (wins * 100) / total;
+        painter.draw_string({stats_x, 120}, style_text, "Win %:");
+        painter.draw_string({UI_POS_X_CENTER(5), 120}, style_value, std::to_string(win_pct) + "%");
+    }
+
+    painter.draw_string({stats_x, 160}, style_text, "High Score:");
+    painter.draw_string({UI_POS_X_CENTER(5), 160}, style_value, "$" + std::to_string(high_score));
+
+    painter.draw_string({stats_x, 180}, style_text, "Cash:");
+    painter.draw_string({UI_POS_X_CENTER(5), 180}, style_value, "$" + std::to_string(cash));
+
+    painter.draw_string({UI_POS_X_CENTER(12), screen_h - 70}, style_text, "SELECT: Back");
+}
+
+void BlackjackView::draw_betting() {
+    static uint32_t last_bet = 0;
+    static bool betting_drawn = false;
+
+    if (!betting_drawn) {
+        clear_screen();
+
+        auto style_title = *ui::Theme::getInstance()->fg_green;
+        auto style_text = *ui::Theme::getInstance()->fg_light;
+
+        painter.draw_string({UI_POS_X_CENTER(10), 40}, style_title, "PLACE BET");
+        painter.draw_string({30, 80}, style_text, "Cash: $" + std::to_string(cash));
+
+        painter.draw_string({30, 140}, style_text, "ENCODER: +/- $10");
+        painter.draw_string({30, 160}, style_text, "SELECT: Deal");
+
+        betting_drawn = true;
+        last_bet = 0;
+    }
+
+    // Update bet display
+    if (bet != last_bet) {
+        painter.fill_rectangle({30, 110, 150, 20}, Color::black());
+        painter.draw_string({30, 110}, *ui::Theme::getInstance()->fg_yellow, "Bet: $" + std::to_string(bet));
+        last_bet = bet;
+    }
+}
+
+void BlackjackView::draw_game() {
+    static int last_player_count = -1;
+    static int last_dealer_count = -1;
+    static GameState last_game_state = GameState::MENU;
+    static uint32_t last_bet = 0;
+
+    // Clear and redraw if hands changed or game state changed
+    if (player_card_count != last_player_count || dealer_card_count != last_dealer_count || game_state != last_game_state) {
+        clear_screen();
+
+        auto style = *ui::Theme::getInstance()->fg_green;
+        painter.draw_string({10, 10}, style, "Cash: $" + std::to_string(cash));
+        painter.draw_string({screen_w - 80, 10}, style, "Bet: $" + std::to_string(bet));
+
+        // Draw dealer hand with value next to label
+        auto style_value = *ui::Theme::getInstance()->fg_yellow;
+        painter.draw_string({10, 45}, *ui::Theme::getInstance()->fg_light, "Dealer:");
+        if (!dealer_hidden || game_state == GameState::GAME_OVER) {
+            int dealer_value = calculate_hand_value(dealer_cards, dealer_card_count);
+            painter.draw_string({70, 45}, style_value, "(" + std::to_string(dealer_value) + ")");
+        }
+        draw_hand(10, 65, dealer_cards, dealer_card_count, true);
+
+        // Draw player hand with value next to label
+        int player_y = (screen_h > 300) ? 165 : 145;
+        painter.draw_string({10, player_y}, *ui::Theme::getInstance()->fg_light, "You:");
+        int player_value = calculate_hand_value(player_cards, player_card_count);
+        painter.draw_string({50, player_y}, style_value, "(" + std::to_string(player_value) + ")");
+        draw_hand(10, player_y + 20, player_cards, player_card_count, false);
+
+        // Draw controls or result
+        int controls_y = screen_h - 50;
+        if (game_state == GameState::PLAYING) {
+            auto style_text = *ui::Theme::getInstance()->fg_light;
+            painter.draw_string({30, controls_y}, style_text, "SELECT: Hit");
+            painter.draw_string({screen_w - 100, controls_y}, style_text, "RIGHT: Stay");
+        } else if (game_state == GameState::GAME_OVER) {
+            const Style* style_result = ui::Theme::getInstance()->fg_yellow;
+            std::string result;
+
+            if (player_value > 21) {
+                result = "BUST! You Lose";
+                style_result = ui::Theme::getInstance()->fg_red;
+            } else if (calculate_hand_value(dealer_cards, dealer_card_count) > 21) {
+                result = "Dealer Bust! Win!";
+                style_result = ui::Theme::getInstance()->fg_green;
+            } else if (player_value > calculate_hand_value(dealer_cards, dealer_card_count)) {
+                result = "You Win!";
+                style_result = ui::Theme::getInstance()->fg_green;
+            } else if (player_value < calculate_hand_value(dealer_cards, dealer_card_count)) {
+                result = "You Lose";
+                style_result = ui::Theme::getInstance()->fg_red;
+            } else {
+                result = "Push (Tie)";
+            }
+
+            // Draw result
+            painter.draw_string({UI_POS_X_CENTER(result.length()), controls_y - 20}, *style_result, result);
+
+            // Draw compact bet selector
+            auto style_bet = *ui::Theme::getInstance()->fg_cyan;
+            painter.draw_string({screen_w - 100, 25}, style_bet, "Next: $" + std::to_string(bet));
+
+            // Show controls
+            painter.draw_string({10, controls_y}, *ui::Theme::getInstance()->fg_light, "SELECT: Deal  ENC: +/-");
+        }
+
+        last_player_count = player_card_count;
+        last_dealer_count = dealer_card_count;
+        last_game_state = game_state;
+        last_bet = bet;
+    } else if (game_state == GameState::GAME_OVER && bet != last_bet) {
+        // Only update the bet display when it changes
+        painter.fill_rectangle({screen_w - 100, 25, 90, 16}, Color::black());
+        painter.draw_string({screen_w - 100, 25}, *ui::Theme::getInstance()->fg_cyan, "Next: $" + std::to_string(bet));
+        last_bet = bet;
+    }
+}
+
+void BlackjackView::draw_suit_symbol(int x, int y, uint8_t suit, Color color, bool large) {
+    if (large) {
+        // Scale large symbols based on card size
+        int scale = card_width / 60;
+
+        switch (suit) {
+            case 0:  // Spades
+                // Draw using scaled rectangles
+                painter.fill_rectangle({x + 9 * scale, y + 4 * scale, 2 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 8 * scale, y + 5 * scale, 4 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 7 * scale, y + 6 * scale, 6 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 6 * scale, y + 7 * scale, 8 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 5 * scale, y + 8 * scale, 10 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 4 * scale, y + 9 * scale, 12 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 3 * scale, y + 10 * scale, 14 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 2 * scale, y + 11 * scale, 16 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 1 * scale, y + 12 * scale, 18 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 0 * scale, y + 13 * scale, 20 * scale, 3 * scale}, color);
+                painter.fill_rectangle({x + 1 * scale, y + 16 * scale, 18 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 2 * scale, y + 17 * scale, 16 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 3 * scale, y + 18 * scale, 14 * scale, 1 * scale}, color);
+                // Stem
+                painter.fill_rectangle({x + 9 * scale, y + 19 * scale, 2 * scale, 4 * scale}, color);
+                painter.fill_rectangle({x + 8 * scale, y + 22 * scale, 4 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 7 * scale, y + 23 * scale, 6 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 6 * scale, y + 24 * scale, 8 * scale, 1 * scale}, color);
+                break;
+
+            case 1:  // Hearts
+                // Draw using scaled rectangles
+                painter.fill_rectangle({x + 3 * scale, y + 5 * scale, 4 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 2 * scale, y + 6 * scale, 6 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 1 * scale, y + 7 * scale, 8 * scale, 3 * scale}, color);
+                painter.fill_rectangle({x + 0 * scale, y + 9 * scale, 9 * scale, 3 * scale}, color);
+                painter.fill_rectangle({x + 13 * scale, y + 5 * scale, 4 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 12 * scale, y + 6 * scale, 6 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 11 * scale, y + 7 * scale, 8 * scale, 3 * scale}, color);
+                painter.fill_rectangle({x + 11 * scale, y + 9 * scale, 9 * scale, 3 * scale}, color);
+                painter.fill_rectangle({x + 1 * scale, y + 11 * scale, 18 * scale, 3 * scale}, color);
+                painter.fill_rectangle({x + 2 * scale, y + 14 * scale, 16 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 3 * scale, y + 16 * scale, 14 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 4 * scale, y + 18 * scale, 12 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 5 * scale, y + 19 * scale, 10 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 6 * scale, y + 20 * scale, 8 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 7 * scale, y + 21 * scale, 6 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 8 * scale, y + 22 * scale, 4 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 9 * scale, y + 23 * scale, 2 * scale, 1 * scale}, color);
+                break;
+
+            case 2:  // Diamonds
+                // Draw using scaled rectangles
+                painter.fill_rectangle({x + 10 * scale, y + 3 * scale, 1 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 9 * scale, y + 4 * scale, 3 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 8 * scale, y + 5 * scale, 5 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 7 * scale, y + 6 * scale, 7 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 6 * scale, y + 7 * scale, 9 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 5 * scale, y + 8 * scale, 11 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 4 * scale, y + 9 * scale, 13 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 3 * scale, y + 10 * scale, 15 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 2 * scale, y + 11 * scale, 17 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 1 * scale, y + 12 * scale, 19 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 0 * scale, y + 13 * scale, 21 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 1 * scale, y + 14 * scale, 19 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 2 * scale, y + 15 * scale, 17 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 3 * scale, y + 16 * scale, 15 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 4 * scale, y + 17 * scale, 13 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 5 * scale, y + 18 * scale, 11 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 6 * scale, y + 19 * scale, 9 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 7 * scale, y + 20 * scale, 7 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 8 * scale, y + 21 * scale, 5 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 9 * scale, y + 22 * scale, 3 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 10 * scale, y + 23 * scale, 1 * scale, 1 * scale}, color);
+                break;
+
+            case 3:  // Clubs
+                // Draw using scaled rectangles
+                painter.fill_rectangle({x + 8 * scale, y + 8 * scale, 5 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 7 * scale, y + 9 * scale, 7 * scale, 3 * scale}, color);
+                painter.fill_rectangle({x + 8 * scale, y + 12 * scale, 5 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 3 * scale, y + 11 * scale, 4 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 2 * scale, y + 12 * scale, 6 * scale, 3 * scale}, color);
+                painter.fill_rectangle({x + 3 * scale, y + 15 * scale, 4 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 14 * scale, y + 11 * scale, 4 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 13 * scale, y + 12 * scale, 6 * scale, 3 * scale}, color);
+                painter.fill_rectangle({x + 14 * scale, y + 15 * scale, 4 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 6 * scale, y + 13 * scale, 9 * scale, 2 * scale}, color);
+                painter.fill_rectangle({x + 9 * scale, y + 16 * scale, 3 * scale, 4 * scale}, color);
+                painter.fill_rectangle({x + 8 * scale, y + 19 * scale, 5 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 7 * scale, y + 20 * scale, 7 * scale, 1 * scale}, color);
+                painter.fill_rectangle({x + 6 * scale, y + 21 * scale, 9 * scale, 1 * scale}, color);
+                break;
+        }
+    } else {
+        // Small suit symbols remain the same
+        switch (suit) {
+            case 0:  // Spades - small
+                painter.fill_rectangle({x + 2, y + 1, 3, 3}, color);
+                painter.fill_rectangle({x + 1, y + 3, 5, 2}, color);
+                painter.fill_rectangle({x + 3, y + 5, 1, 2}, color);
+                break;
+
+            case 1:  // Hearts - small
+                painter.fill_rectangle({x + 1, y + 1, 2, 2}, color);
+                painter.fill_rectangle({x + 4, y + 1, 2, 2}, color);
+                painter.fill_rectangle({x + 1, y + 2, 5, 2}, color);
+                painter.fill_rectangle({x + 2, y + 4, 3, 1}, color);
+                painter.fill_rectangle({x + 3, y + 5, 1, 1}, color);
+                break;
+
+            case 2:  // Diamonds - small
+                painter.fill_rectangle({x + 3, y + 1, 1, 1}, color);
+                painter.fill_rectangle({x + 2, y + 2, 3, 1}, color);
+                painter.fill_rectangle({x + 1, y + 3, 5, 1}, color);
+                painter.fill_rectangle({x + 2, y + 4, 3, 1}, color);
+                painter.fill_rectangle({x + 3, y + 5, 1, 1}, color);
+                break;
+
+            case 3:  // Clubs - small
+                painter.fill_rectangle({x + 3, y + 1, 2, 2}, color);
+                painter.fill_rectangle({x + 1, y + 3, 2, 2}, color);
+                painter.fill_rectangle({x + 4, y + 3, 2, 2}, color);
+                painter.fill_rectangle({x + 3, y + 5, 2, 2}, color);
+                break;
+        }
+    }
+}
+
+void BlackjackView::draw_card(int x, int y, uint8_t card, bool hidden) {
+    // Draw card background
+    painter.fill_rectangle({x, y, card_width, card_height}, Color::white());
+    painter.draw_rectangle({x, y, card_width, card_height}, Color::black());
+    painter.draw_rectangle({x + 1, y + 1, card_width - 2, card_height - 2}, Color::grey());
+
+    if (hidden) {
+        // Draw card back pattern - diagonal lines
+        for (int i = 4; i < card_width - 4; i += 6) {
+            for (int j = 4; j < card_height - 4; j += 6) {
+                painter.fill_rectangle({x + i, y + j, 3, 3}, Color::blue());
+                painter.fill_rectangle({x + i + 3, y + j + 3, 3, 3}, Color::red());
+            }
+        }
+    } else {
+        // Draw card value
+        uint8_t suit = get_card_suit(card);
+        Color suit_color = (suit == 1 || suit == 2) ? Color::red() : Color::black();
+
+        const auto* base_style = ui::Theme::getInstance()->fg_light;
+        Style card_style{
+            .font = base_style->font,
+            .background = Color::white(),
+            .foreground = suit_color};
+
+        std::string value_str = get_card_string(card);
+
+        // Draw value in top-left corner
+        painter.draw_string({x + 4, y + 4}, card_style, value_str);
+
+        // Draw small suit symbol next to value
+        int suit_x = (value_str == "10") ? x + 20 : x + 12;
+        draw_suit_symbol(suit_x, y + 4, suit, suit_color, false);
+
+        // Draw value in bottom-right corner
+        int bottom_x = (value_str == "10") ? x + card_width - 24 : x + card_width - 16;
+        painter.draw_string({bottom_x, y + card_height - 18}, card_style, value_str);
+
+        // Draw small suit symbol in bottom-right
+        draw_suit_symbol(x + card_width - 10, y + card_height - 16, suit, suit_color, false);
+
+        // Draw large suit symbol in center
+        int center_x = x + (card_width - 20) / 2;
+        int center_y = y + (card_height - 25) / 2;
+        draw_suit_symbol(center_x, center_y, suit, suit_color, true);
+    }
+}
+
+void BlackjackView::draw_hand(int x, int y, uint8_t* cards, uint8_t count, bool is_dealer) {
+    // Calculate total width needed
+    const int overlap = card_width * 2 / 3;   // Amount of overlap when cards need to fit
+    const int max_width = screen_w - 10 - x;  // Available width on screen
+
+    int spacing;
+    if (count == 1) {
+        spacing = 0;
+    } else if (count == 2) {
+        spacing = card_width + 5;  // Small gap for 2 cards
+    } else {
+        // Calculate spacing to fit all cards
+        int total_overlap_width = card_width + (count - 1) * overlap;
+        if (total_overlap_width <= max_width) {
+            spacing = overlap;
+        } else {
+            // Need more overlap to fit
+            spacing = (max_width - card_width) / (count - 1);
+        }
+    }
+
+    for (uint8_t i = 0; i < count; i++) {
+        bool hide = is_dealer && dealer_hidden && i == 1;
+        int card_x = x + (i * spacing);
+        draw_card(card_x, y, cards[i], hide);
+    }
+}
+
+bool BlackjackView::on_key(const KeyEvent key) {
+    if (key == KeyEvent::Select) {
+        switch (game_state) {
+            case GameState::MENU:
+                if (cash < 10) {
+                    cash = 100;  // Reset if broke
+                    wins = 0;
+                    losses = 0;
+                }
+                game_state = GameState::BETTING;
+                break;
+
+            case GameState::BETTING:
+                deal_cards();
+                break;
+
+            case GameState::PLAYING:
+                player_hit();
+                break;
+
+            case GameState::GAME_OVER:
+                // Deal new hand with current bet
+                if (cash >= bet) {
+                    deal_cards();
+                } else if (cash >= 10) {
+                    // Not enough for current bet, reduce to what they can afford
+                    bet = 10;
+                    deal_cards();
+                } else {
+                    // Broke, reset game
+                    cash = 100;
+                    wins = 0;
+                    losses = 0;
+                    game_state = GameState::MENU;
+                    draw_menu_static();
+                }
+                break;
+
+            case GameState::STATS:
+                game_state = GameState::MENU;
+                draw_menu_static();
+                break;
+
+            default:
+                break;
+        }
+        return true;
+    } else if (key == KeyEvent::Left) {
+        if (game_state == GameState::MENU) {
+            game_state = GameState::STATS;
+        }
+        return true;
+    } else if (key == KeyEvent::Right) {
+        if (game_state == GameState::MENU) {
+            nav_.pop();
+            return true;
+        } else if (game_state == GameState::PLAYING) {
+            player_stay();
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool BlackjackView::on_encoder(const EncoderEvent delta) {
+    if (game_state == GameState::BETTING || game_state == GameState::GAME_OVER) {
+        if (delta > 0 && bet + 10 <= cash) {
+            bet += 10;
+        } else if (delta < 0 && bet >= 20) {
+            bet -= 10;
+        }
+        return true;
+    }
+
+    return false;
+}
+
+}  // namespace ui::external_app::blackjack
@@ -0,0 +1,162 @@
+/*
+ * Blackjack Game for Portapack Mayhem
+ * Ported / Enhanced / Graphically made awesome by RocketGod (https://betaskynet.com)
+ * Based on BlackJack 83 for TI Calculator by Harper Maddox (was written in Assembly)
+ */
+
+#ifndef __UI_BLACKJACK_H__
+#define __UI_BLACKJACK_H__
+
+#include "ui.hpp"
+#include "ui_navigation.hpp"
+#include "event_m0.hpp"
+#include "message.hpp"
+#include "irq_controls.hpp"
+#include "random.hpp"
+#include "lpc43xx_cpp.hpp"
+#include "ui_widget.hpp"
+#include "app_settings.hpp"
+#include <string>
+#include <vector>
+
+namespace ui::external_app::blackjack {
+
+// Game states
+enum class GameState {
+    MENU,
+    BETTING,
+    PLAYING,
+    DEALER_TURN,
+    GAME_OVER,
+    STATS
+};
+
+// Card structure
+struct Card {
+    uint8_t value;  // 1-13 (Ace=1, Jack=11, Queen=12, King=13)
+    uint8_t suit;   // 0=Spades, 1=Hearts, 2=Diamonds, 3=Clubs
+
+    Card()
+        : value(0), suit(0) {}
+    Card(uint8_t v, uint8_t s)
+        : value(v), suit(s) {}
+};
+
+// Timer class
+using Callback = void (*)(void);
+
+class Ticker {
+   public:
+    Ticker() = default;
+    void attach(Callback func, double delay_sec);
+    void detach();
+};
+
+// Function declarations
+void check_game_timer();
+void game_timer_check();
+
+class BlackjackView : public View {
+   public:
+    BlackjackView(NavigationView& nav);
+    ~BlackjackView();
+
+    void on_show() override;
+    std::string title() const override { return "Blackjack"; }
+    void focus() override { dummy.focus(); }
+    void paint(Painter& painter) override;
+    void frame_sync();
+    bool on_encoder(const EncoderEvent event) override;
+    bool on_key(KeyEvent key) override;
+
+    // Public for timer callback
+    GameState game_state = GameState::MENU;
+    void update_game();
+
+   private:
+    NavigationView& nav_;
+    bool initialized = false;
+
+    // Screen dimensions (set dynamically)
+    int screen_w = 0;
+    int screen_h = 0;
+    int card_width = 60;
+    int card_height = 80;
+
+    // Game variables
+    static constexpr uint8_t MAX_CARDS_IN_HAND = 11;  // Maximum possible cards before bust
+    uint8_t deck[52];
+    uint8_t deck_position = 0;
+
+    uint8_t player_cards[MAX_CARDS_IN_HAND];
+    uint8_t player_card_count = 0;
+
+    uint8_t dealer_cards[MAX_CARDS_IN_HAND];
+    uint8_t dealer_card_count = 0;
+
+    // Game state variables
+    uint32_t cash = 100;
+    uint32_t bet = 10;
+    uint32_t wins = 0;
+    uint32_t losses = 0;
+    uint32_t high_score = 100;
+    bool dealer_hidden = true;
+
+    // UI state
+    uint8_t menu_selection = 0;
+    bool blink_state = true;
+    uint32_t blink_counter = 0;
+    uint32_t dealer_timer = 0;
+
+    // Timer
+    Ticker game_timer;
+
+    // Methods
+    void init_deck();
+    void shuffle_deck();
+    uint8_t draw_card();
+    void deal_cards();
+    int calculate_hand_value(uint8_t* cards, uint8_t count);
+    int get_card_value(uint8_t card);
+    uint8_t get_card_suit(uint8_t card);
+    std::string get_card_string(uint8_t card);
+    void player_hit();
+    void player_stay();
+    void dealer_turn();
+    void check_game_over();
+    void reset_game();
+
+    // Drawing methods
+    void draw_menu();
+    void draw_menu_static();
+    void draw_stats();
+    void draw_game();
+    void draw_betting();
+    void draw_card(int x, int y, uint8_t card, bool hidden = false);
+    void draw_hand(int x, int y, uint8_t* cards, uint8_t count, bool is_dealer = false);
+    void draw_suit_symbol(int x, int y, uint8_t suit, Color color, bool large);
+    void clear_screen();
+
+    // Settings
+    app_settings::SettingsManager settings_{
+        "blackjack",
+        app_settings::Mode::NO_RF,
+        {{"cash"sv, &cash},
+         {"wins"sv, &wins},
+         {"losses"sv, &losses},
+         {"highscore"sv, &high_score}}};
+
+    Button dummy{
+        {0, 0, 0, 0},
+        ""};
+
+    MessageHandlerRegistration message_handler_frame_sync{
+        Message::ID::DisplayFrameSync,
+        [this](const Message* const) {
+            this->frame_sync();
+        }};
+};
+
+}  // namespace ui::external_app::blackjack
+
+#endif /* __UI_BLACKJACK_H__ */
@@ -104,10 +104,10 @@ class BLESpamView : public View {
        4'000'000 /* sampling rate */
    };
    TxFrequencyField field_frequency{
-        {0 * 8, 0 * 16},
+        {UI_POS_X(0), UI_POS_Y(0)},
        nav_};
    TransmitterView2 tx_view{
-        {11 * 8, 0 * 16},
+        {11 * 8, UI_POS_Y(0)},
        /*short_ui*/ true};
    app_settings::SettingsManager settings_{
        "tx_blespam", app_settings::Mode::TX};
@@ -122,7 +122,7 @@ class BLESpamView : public View {
        {0, 70, screen_width, 220}};
 #endif
    OptionsField options_atkmode{
-        {0 * 8, 2 * 8},
+        {UI_POS_X(0), 2 * 8},
        10,
        {{"Android", 0},
         {"iOs", 1},
@@ -10,91 +10,41 @@

 namespace ui::external_app::breakout {

-Ticker game_timer;
-
-int paddle_x = 0;
-float ball_x = 0;
-float ball_y = GAME_AREA_BOTTOM - PADDLE_HEIGHT - BALL_SIZE - 1;
-float ball_dx = 1.5f;
-float ball_dy = -2.0f;
-int score = 0;
-int lives = 3;
-int level = 1;
-int game_state = STATE_MENU;
-bool initialized = false;
-bool ball_attached = true;
-unsigned int brick_count = 0;
-
-bool menu_initialized = false;
-bool blink_state = true;
-uint32_t blink_counter = 0;
-int16_t prompt_x = 0;
-
-bool gameover_initialized = false;
-bool gameover_blink_state = true;
-uint32_t gameover_blink_counter = 0;
-int16_t restart_x = 0;
-
-bool bricks[BRICK_ROWS][BRICK_COLS];
-int brick_colors[BRICK_ROWS];
-
-const Color pp_colors[] = {
-    Color::white(),
-    Color::blue(),
-    Color::yellow(),
-    Color::purple(),
-    Color::green(),
-    Color::red(),
-    Color::magenta(),
-    Color::orange(),
-    Color::black(),
-};
-
-Painter painter;
-
-bool but_RIGHT = false;
-bool but_LEFT = false;
-bool but_SELECT = false;
-
-static Callback game_update_callback = nullptr;
-static uint32_t game_update_timeout = 0;
-static uint32_t game_update_counter = 0;
-
-void cls() {
+void BreakoutView::cls() {
    painter.fill_rectangle({0, 0, portapack::display.width(), portapack::display.height()}, Color::black());
 }

-void background(int color) {
+void BreakoutView::background(int color) {
    (void)color;
 }

-void fillrect(int x1, int y1, int x2, int y2, int color) {
+void BreakoutView::fillrect(int x1, int y1, int x2, int y2, int color) {
    painter.fill_rectangle({x1, y1, x2 - x1, y2 - y1}, pp_colors[color]);
 }

-void rect(int x1, int y1, int x2, int y2, int color) {
+void BreakoutView::rect(int x1, int y1, int x2, int y2, int color) {
    painter.draw_rectangle({x1, y1, x2 - x1, y2 - y1}, pp_colors[color]);
 }

-void check_game_timer() {
+void BreakoutView::check_game_timer() {
    if (game_update_callback) {
        if (++game_update_counter >= game_update_timeout) {
            game_update_counter = 0;
-            game_update_callback();
+            game_timer_check();
        }
    }
 }

-void Ticker::attach(Callback func, double delay_sec) {
-    game_update_callback = func;
+void BreakoutView::attach(double delay_sec) {
+    game_update_callback = true;
    game_update_timeout = delay_sec * 60;
 }

-void Ticker::detach() {
-    game_update_callback = nullptr;
+void BreakoutView::detach() {
+    game_update_callback = false;
 }

-void game_timer_check() {
+void BreakoutView::game_timer_check() {
    if (game_state == STATE_PLAYING) {
        update_game();
    } else if (game_state == STATE_MENU) {
@@ -104,36 +54,57 @@ void game_timer_check() {
    }
 }

-void init_game() {
-    paddle_x = (screen_width - PADDLE_WIDTH) / 2;
+void BreakoutView::init_game() {
+    SCREEN_WIDTH = screen_width;
+    SCREEN_HEIGHT = screen_height;
+    GAME_AREA_BOTTOM = SCREEN_HEIGHT - 10;
+    PADDLE_Y = GAME_AREA_BOTTOM - PADDLE_HEIGHT;
+    PADDLE_SPEED = 10;
+
+    // Calculate brick layout
+    int available_width = SCREEN_WIDTH - 4;
+    BRICK_COLS = available_width / 22;
+    if (BRICK_COLS > 12) BRICK_COLS = 12;
+    if (BRICK_COLS < 5) BRICK_COLS = 5;
+    BRICK_WIDTH = (available_width - (BRICK_COLS - 1) * BRICK_GAP) / BRICK_COLS;
+
+    // Initialize paddle position
+    paddle_x = (SCREEN_WIDTH - PADDLE_WIDTH) / 2;
    score = 0;
    lives = 3;
    level = 1;

+    // Set brick colors
    brick_colors[0] = Red;
    brick_colors[1] = Orange;
    brick_colors[2] = Yellow;
    brick_colors[3] = Green;
    brick_colors[4] = Purple;

+    // Initialize bricks array
+    bricks.resize(BRICK_ROWS);
+    for (int i = 0; i < BRICK_ROWS; i++) {
+        bricks[i].resize(BRICK_COLS);
+    }
+
    init_level();

    game_state = STATE_MENU;
-    menu_initialized = false;
-    blink_state = true;
-    blink_counter = 0;
+    menu_blink_state = true;
+    menu_blink_counter = 0;
 }

-void init_level() {
+void BreakoutView::init_level() {
    ball_x = paddle_x + (PADDLE_WIDTH / 2) - (BALL_SIZE / 2);
    ball_y = GAME_AREA_BOTTOM - PADDLE_HEIGHT - BALL_SIZE - 1;

-    float speed_multiplier = (level == 1) ? 1.0f : 1.0f + ((level - 1) * BALL_SPEED_INCREASE);
-    ball_dx = (ball_dx > 0 ? 1.5f : -1.5f) * speed_multiplier;
+    float speed_multiplier = 1.0f + ((level - 1) * BALL_SPEED_INCREASE);
+    ball_dx = 1.5f * speed_multiplier;
    ball_dy = -2.0f * speed_multiplier;

    ball_attached = true;

+    // Fill all bricks
    brick_count = 0;
    for (int row = 0; row < BRICK_ROWS; row++) {
        for (int col = 0; col < BRICK_COLS; col++) {
@@ -143,10 +114,9 @@ void init_level() {
    }
 }

-void draw_screen() {
+void BreakoutView::draw_screen() {
    cls();
    background(COLOR_BACKGROUND);
-
    draw_borders();
    draw_bricks();
    draw_paddle();
@@ -156,11 +126,11 @@ void draw_screen() {
    draw_level();
 }

-void draw_borders() {
-    rect(0, GAME_AREA_TOP - 1, screen_width, GAME_AREA_TOP, COLOR_BORDER);
+void BreakoutView::draw_borders() {
+    rect(0, GAME_AREA_TOP - 1, SCREEN_WIDTH, GAME_AREA_TOP, COLOR_BORDER);
 }

-void draw_bricks() {
+void BreakoutView::draw_bricks() {
    for (int row = 0; row < BRICK_ROWS; row++) {
        for (int col = 0; col < BRICK_COLS; col++) {
            if (bricks[row][col]) {
@@ -173,37 +143,37 @@ void draw_bricks() {
    }
 }

-void draw_paddle() {
+void BreakoutView::draw_paddle() {
    fillrect(paddle_x, PADDLE_Y, paddle_x + PADDLE_WIDTH, PADDLE_Y + PADDLE_HEIGHT, COLOR_PADDLE);
 }

-void draw_ball() {
+void BreakoutView::draw_ball() {
    fillrect(ball_x, ball_y, ball_x + BALL_SIZE, ball_y + BALL_SIZE, COLOR_BALL);
 }

-void draw_score() {
+void BreakoutView::draw_score() {
    auto style = *ui::Theme::getInstance()->fg_green;
    painter.draw_string({5, 10}, style, "Score: " + std::to_string(score));
 }

-void draw_lives() {
+void BreakoutView::draw_lives() {
    auto style = *ui::Theme::getInstance()->fg_red;
    painter.draw_string({5, 30}, style, "Lives: " + std::to_string(lives));
 }

-void draw_level() {
+void BreakoutView::draw_level() {
    auto style = *ui::Theme::getInstance()->fg_yellow;
    painter.draw_string({80, 30}, style, "Level: " + std::to_string(level));
 }

-void move_paddle_left() {
+void BreakoutView::move_paddle_left() {
    if (paddle_x > 0) {
        fillrect(paddle_x, PADDLE_Y, paddle_x + PADDLE_WIDTH, PADDLE_Y + PADDLE_HEIGHT, COLOR_BACKGROUND);
        if (ball_attached) {
            fillrect(ball_x, ball_y, ball_x + BALL_SIZE, ball_y + BALL_SIZE, COLOR_BACKGROUND);
        }

-        paddle_x -= 10;
+        paddle_x -= PADDLE_SPEED;
        if (paddle_x < 0) paddle_x = 0;

        if (ball_attached) {
@@ -217,15 +187,15 @@ void move_paddle_left() {
    }
 }

-void move_paddle_right() {
-    if (paddle_x < screen_width - PADDLE_WIDTH) {
+void BreakoutView::move_paddle_right() {
+    if (paddle_x < SCREEN_WIDTH - PADDLE_WIDTH) {
        fillrect(paddle_x, PADDLE_Y, paddle_x + PADDLE_WIDTH, PADDLE_Y + PADDLE_HEIGHT, COLOR_BACKGROUND);
        if (ball_attached) {
            fillrect(ball_x, ball_y, ball_x + BALL_SIZE, ball_y + BALL_SIZE, COLOR_BACKGROUND);
        }

-        paddle_x += 10;
-        if (paddle_x > screen_width - PADDLE_WIDTH) paddle_x = screen_width - PADDLE_WIDTH;
+        paddle_x += PADDLE_SPEED;
+        if (paddle_x > SCREEN_WIDTH - PADDLE_WIDTH) paddle_x = SCREEN_WIDTH - PADDLE_WIDTH;

        if (ball_attached) {
            ball_x = paddle_x + (PADDLE_WIDTH / 2) - (BALL_SIZE / 2);
@@ -238,26 +208,41 @@ void move_paddle_right() {
    }
 }

-void launch_ball() {
+void BreakoutView::launch_ball() {
    if (ball_attached) {
        ball_attached = false;
-        ball_x = paddle_x + (PADDLE_WIDTH / 2) - (BALL_SIZE / 2);
-        ball_y = GAME_AREA_BOTTOM - PADDLE_HEIGHT - BALL_SIZE - 1;
-        float speed_multiplier = (level == 1) ? 1.0f : 1.0f + ((level - 1) * BALL_SPEED_INCREASE);
+        float speed_multiplier = 1.0f + ((level - 1) * BALL_SPEED_INCREASE);
        ball_dx = 1.5f * speed_multiplier;
        ball_dy = -2.0f * speed_multiplier;
    }
 }

-void update_game() {
+void BreakoutView::update_game() {
    if (ball_attached) {
        return;
    }

    fillrect(ball_x, ball_y, ball_x + BALL_SIZE, ball_y + BALL_SIZE, COLOR_BACKGROUND);

-    float next_ball_y = ball_y + ball_dy;
-    if (next_ball_y > GAME_AREA_BOTTOM) {
+    ball_x += ball_dx;
+    ball_y += ball_dy;
+
+    // Wall collisions
+    if (ball_x < 0) {
+        ball_x = 0;
+        ball_dx = -ball_dx;
+    } else if (ball_x > SCREEN_WIDTH - BALL_SIZE) {
+        ball_x = SCREEN_WIDTH - BALL_SIZE;
+        ball_dx = -ball_dx;
+    }
+
+    if (ball_y < GAME_AREA_TOP) {
+        ball_y = GAME_AREA_TOP;
+        ball_dy = -ball_dy;
+    }
+
+    // Bottom edge - lose life
+    if (ball_y > GAME_AREA_BOTTOM) {
        lives--;
        draw_lives();
        if (lives <= 0) {
@@ -271,37 +256,20 @@ void update_game() {
        return;
    }

-    ball_x += ball_dx;
-    ball_y = next_ball_y;
-
-    if (ball_x < 0) {
-        ball_x = 0;
-        ball_dx = -ball_dx;
-    } else if (ball_x > screen_width - BALL_SIZE) {
-        ball_x = screen_width - BALL_SIZE;
-        ball_dx = -ball_dx;
-    }
-
-    if (ball_y < GAME_AREA_TOP) {
-        ball_y = GAME_AREA_TOP;
-        ball_dy = -ball_dy;
-    }
-
+    // Paddle collision
    if (ball_y + BALL_SIZE >= PADDLE_Y && ball_y <= PADDLE_Y + PADDLE_HEIGHT) {
        if (ball_x + BALL_SIZE >= paddle_x && ball_x <= paddle_x + PADDLE_WIDTH) {
            ball_y = PADDLE_Y - BALL_SIZE;
+            ball_dy = -ball_dy;
+
+            // Add some angle based on hit position
            float hit_position = (ball_x + (BALL_SIZE / 2)) - paddle_x;
            float angle = (hit_position / PADDLE_WIDTH) - 0.5f;
            ball_dx = angle * 4.0f;
-            if (ball_dx > -0.5f && ball_dx < 0.5f) {
-                ball_dx = (ball_dx > 0) ? 0.5f : -0.5f;
-            }
-            ball_dy = -ball_dy;
        }
    }

    check_collisions();
-
    draw_ball();

    if (check_level_complete()) {
@@ -309,151 +277,93 @@ void update_game() {
    }
 }

-void check_collisions() {
+void BreakoutView::check_collisions() {
    int grid_x = ball_x / (BRICK_WIDTH + BRICK_GAP);
    int grid_y = (ball_y - GAME_AREA_TOP - 5) / (BRICK_HEIGHT + BRICK_GAP);

-    for (int row = grid_y - 1; row <= grid_y + 1; row++) {
-        for (int col = grid_x - 1; col <= grid_x + 1; col++) {
-            if (row >= 0 && row < BRICK_ROWS && col >= 0 && col < BRICK_COLS) {
-                if (bricks[row][col] && check_brick_collision(row, col)) {
-                    return;
-                }
-            }
-        }
+    if (grid_x >= 0 && grid_x < BRICK_COLS && grid_y >= 0 && grid_y < BRICK_ROWS) {
+        check_brick_collision(grid_y, grid_x);
    }
 }

-bool check_brick_collision(int row, int col) {
+bool BreakoutView::check_brick_collision(int row, int col) {
+    if (!bricks[row][col]) return false;
+
    int brick_x = col * (BRICK_WIDTH + BRICK_GAP);
    int brick_y = GAME_AREA_TOP + row * (BRICK_HEIGHT + BRICK_GAP) + 5;

    if (ball_x + BALL_SIZE >= brick_x && ball_x <= brick_x + BRICK_WIDTH &&
        ball_y + BALL_SIZE >= brick_y && ball_y <= brick_y + BRICK_HEIGHT) {
        fillrect(brick_x, brick_y, brick_x + BRICK_WIDTH, brick_y + BRICK_HEIGHT, COLOR_BACKGROUND);
-
        bricks[row][col] = false;
        brick_count--;

        score += (5 - row) * 10;
        draw_score();

-        float center_x = brick_x + BRICK_WIDTH / 2;
-        float center_y = brick_y + BRICK_HEIGHT / 2;
-        float ball_center_x = ball_x + BALL_SIZE / 2;
-        float ball_center_y = ball_y + BALL_SIZE / 2;
-        float dx = std::abs(ball_center_x - center_x);
-        float dy = std::abs(ball_center_y - center_y);
-
-        if (dx * BRICK_HEIGHT > dy * BRICK_WIDTH) {
-            ball_dx = -ball_dx;
-        } else {
-            ball_dy = -ball_dy;
-        }
-
+        ball_dy = -ball_dy;
        return true;
    }

    return false;
 }

-bool check_level_complete() {
+bool BreakoutView::check_level_complete() {
    return brick_count == 0;
 }

-void next_level() {
+void BreakoutView::next_level() {
    level++;
    init_level();
    draw_screen();
 }

-void handle_game_over() {
+void BreakoutView::handle_game_over() {
    game_state = STATE_GAME_OVER;
-    gameover_initialized = false;
-    show_game_over();
-}
-
-void init_menu() {
-    cls();
-    background(COLOR_BACKGROUND);
-
-    auto style_yellow = *ui::Theme::getInstance()->fg_yellow;
-    auto style_blue = *ui::Theme::getInstance()->fg_blue;
-    auto style_cyan = *ui::Theme::getInstance()->fg_cyan;
-
-    int16_t screen_width = ui::screen_width;
-    int16_t title_x = (screen_width - 17 * 8) / 2;
-    int16_t divider_width = 24 * 8;
-    int16_t divider_x = (screen_width - divider_width) / 2;
-    int16_t instruction_width = 22 * 8;
-    int16_t instruction_x = (screen_width - instruction_width) / 2;
-    int16_t prompt_width = 16 * 8;
-    prompt_x = (screen_width - prompt_width) / 2;
-
-    painter.fill_rectangle({0, 30, screen_width, 30}, Color::black());
-    painter.draw_string({title_x + 2, 42}, style_yellow, "*** BREAKOUT ***");
-    painter.draw_string({divider_x, 70}, style_blue, "========================");
-    painter.fill_rectangle({instruction_x - 5, 110, instruction_width + 10, 70}, Color::black());
-    painter.draw_rectangle({instruction_x - 5, 110, instruction_width + 10, 70}, Color::white());
-    painter.draw_string({instruction_x, 120}, style_cyan, "  ROTARY: MOVE PADDLE");
-    painter.draw_string({instruction_x, 150}, style_cyan, " SELECT: START/LAUNCH");
-    painter.draw_string({divider_x, 190}, style_blue, "========================");
-
-    menu_initialized = true;
-}
-
-void show_menu() {
-    if (!menu_initialized) {
-        init_menu();
-    }
-
-    auto style_red = *ui::Theme::getInstance()->fg_red;
-
-    if (++blink_counter >= 30) {
-        blink_counter = 0;
-        blink_state = !blink_state;
-
-        painter.fill_rectangle({prompt_x - 2, 228, 16 * 8 + 4, 20}, Color::black());
-
-        if (blink_state) {
-            painter.draw_string({prompt_x, 230}, style_red, "* PRESS SELECT *");
-        }
-    }
-}
-
-void init_game_over() {
-    cls();
-    background(COLOR_BACKGROUND);
-
-    auto style_red = *ui::Theme::getInstance()->fg_red;
-    auto style_yellow = *ui::Theme::getInstance()->fg_yellow;
-
-    // int16_t screen_width = screen_width;
-    int16_t title_width = 9 * 8;
-    int16_t title_x = (screen_width - title_width) / 2;
-    int16_t score_text_width = (16 + std::to_string(score).length()) * 8;
-    int16_t score_x = (screen_width - score_text_width) / 2;
-
-    painter.draw_rectangle({20, 80, screen_width - 40, 160}, Color::red());
-    painter.draw_rectangle({22, 82, screen_width - 44, 156}, Color::white());
-
-    painter.draw_string({title_x, 100}, style_red, "GAME OVER");
-
-    painter.fill_rectangle({40, 140, screen_width - 80, 30}, Color::black());
-    painter.draw_rectangle({40, 140, screen_width - 80, 30}, Color::yellow());
-    painter.draw_string({score_x, 150}, style_yellow, " FINAL SCORE: " + std::to_string(score));
-
-    int16_t restart_width = 12 * 8;
-    restart_x = (screen_width - restart_width) / 2;
-
-    gameover_initialized = true;
    gameover_blink_state = true;
    gameover_blink_counter = 0;
 }

-void show_game_over() {
-    if (!gameover_initialized) {
-        init_game_over();
+void BreakoutView::show_menu() {
+    if (menu_blink_counter == 0) {
+        cls();
+        background(COLOR_BACKGROUND);
+
+        auto style_yellow = *ui::Theme::getInstance()->fg_yellow;
+        auto style_blue = *ui::Theme::getInstance()->fg_blue;
+        auto style_cyan = *ui::Theme::getInstance()->fg_cyan;
+
+        painter.draw_string({UI_POS_X_CENTER(17), 40}, style_yellow, "*** BREAKOUT ***");
+        painter.draw_string({UI_POS_X_CENTER(25), 100}, style_blue, "========================");
+        painter.draw_string({UI_POS_X_CENTER(20), 130}, style_cyan, "ROTARY: MOVE PADDLE");
+        painter.draw_string({UI_POS_X_CENTER(21), 160}, style_cyan, "SELECT: START/LAUNCH");
+        painter.draw_string({UI_POS_X_CENTER(25), 190}, style_blue, "========================");
+    }
+
+    auto style_red = *ui::Theme::getInstance()->fg_red;
+
+    if (++menu_blink_counter >= 30) {
+        menu_blink_counter = 0;
+        menu_blink_state = !menu_blink_state;
+
+        painter.fill_rectangle({UI_POS_X_CENTER(17), 228, 128, 20}, Color::black());
+
+        if (menu_blink_state) {
+            painter.draw_string({UI_POS_X_CENTER(17), 230}, style_red, "* PRESS SELECT *");
+        }
+    }
+}
+
+void BreakoutView::show_game_over() {
+    if (gameover_blink_counter == 0) {
+        cls();
+        background(COLOR_BACKGROUND);
+
+        auto style_red = *ui::Theme::getInstance()->fg_red;
+        auto style_yellow = *ui::Theme::getInstance()->fg_yellow;
+
+        painter.draw_string({UI_POS_X_CENTER(10), 100}, style_red, "GAME OVER");
+        painter.draw_string({UI_POS_X_CENTER(11), 150}, style_yellow, "SCORE: " + std::to_string(score));
    }

    auto style_green = *ui::Theme::getInstance()->fg_green;
@@ -462,32 +372,27 @@ void show_game_over() {
        gameover_blink_counter = 0;
        gameover_blink_state = !gameover_blink_state;

-        painter.fill_rectangle({restart_x - 2, 198, 12 * 8 + 4, 20}, Color::black());
+        painter.fill_rectangle({UI_POS_X_CENTER(13), 198, 96, 20}, Color::black());

        if (gameover_blink_state) {
-            painter.draw_string({restart_x, 200}, style_green, "PRESS SELECT");
+            painter.draw_string({UI_POS_X_CENTER(13), 200}, style_green, "PRESS SELECT");
        }
    }
 }

-void reset_game() {
+void BreakoutView::reset_game() {
    level = 1;
    score = 0;
    lives = 3;
    game_state = STATE_PLAYING;
    init_level();
    draw_screen();
-    gameover_initialized = false;
-    gameover_blink_state = true;
-    gameover_blink_counter = 0;
 }

 BreakoutView::BreakoutView(NavigationView& nav)
-    : nav_{nav} {
-    paddle_x = (screen_width - PADDLE_WIDTH) / 2;
-    ball_x = screen_width / 2;
+    : nav_{nav}, bricks{} {  // Add bricks{} here
    add_children({&dummy});
-    game_timer.attach(&game_timer_check, 1.0 / 60.0);
+    attach(1.0 / 60.0);
 }

 void BreakoutView::on_show() {
@@ -512,20 +417,15 @@ bool BreakoutView::on_encoder(const EncoderEvent delta) {
    if (game_state == STATE_PLAYING) {
        if (delta > 0) {
            move_paddle_right();
-            set_dirty();
        } else if (delta < 0) {
            move_paddle_left();
-            set_dirty();
        }
+        set_dirty();
    }
    return true;
 }

 bool BreakoutView::on_key(const KeyEvent key) {
-    but_SELECT = (key == KeyEvent::Select);
-    but_LEFT = (key == KeyEvent::Left);
-    but_RIGHT = (key == KeyEvent::Right);
-
    if (key == KeyEvent::Select) {
        if (game_state == STATE_MENU) {
            game_state = STATE_PLAYING;
@@ -535,14 +435,10 @@ bool BreakoutView::on_key(const KeyEvent key) {
        } else if (game_state == STATE_GAME_OVER) {
            reset_game();
        }
-    } else if (key == KeyEvent::Left) {
-        if (game_state == STATE_PLAYING) {
-            move_paddle_left();
-        }
-    } else if (key == KeyEvent::Right) {
-        if (game_state == STATE_PLAYING) {
-            move_paddle_right();
-        }
+    } else if (key == KeyEvent::Left && game_state == STATE_PLAYING) {
+        move_paddle_left();
+    } else if (key == KeyEvent::Right && game_state == STATE_PLAYING) {
+        move_paddle_right();
    }

    set_dirty();
@@ -17,6 +17,7 @@
 #include "random.hpp"
 #include "lpc43xx_cpp.hpp"
 #include "ui_widget.hpp"
+#include <vector>

 namespace ui::external_app::breakout {

@@ -32,41 +33,15 @@ enum {
    Black,
 };

-extern const Color pp_colors[];
-extern Painter painter;
-extern bool but_RIGHT;
-extern bool but_LEFT;
-extern bool but_SELECT;
-
-void cls();
-void background(int color);
-void fillrect(int x1, int y1, int x2, int y2, int color);
-void rect(int x1, int y1, int x2, int y2, int color);
-
 #define wait(x) chThdSleepMilliseconds(x * 1000)

-using Callback = void (*)(void);
-
-void check_game_timer();
-
-class Ticker {
-   public:
-    Ticker() = default;
-    void attach(Callback func, double delay_sec);
-    void detach();
-};
-
 #define PADDLE_WIDTH 40
 #define PADDLE_HEIGHT 10
 #define BALL_SIZE 8
-#define BRICK_WIDTH 20
 #define BRICK_HEIGHT 10
 #define BRICK_ROWS 5
-#define BRICK_COLS 10
 #define BRICK_GAP 2
 #define GAME_AREA_TOP 50
-#define GAME_AREA_BOTTOM 310
-#define PADDLE_Y (GAME_AREA_BOTTOM - PADDLE_HEIGHT)
 #define BALL_SPEED_INCREASE 0.1f

 #define STATE_MENU 0
@@ -77,49 +52,6 @@ class Ticker {
 #define COLOR_PADDLE Blue
 #define COLOR_BALL White
 #define COLOR_BORDER White
-#define COLOR_BRICK_COLORS \
-    { Red, Orange, Yellow, Green, Purple }
-
-extern Ticker game_timer;
-
-extern int paddle_x;
-extern float ball_x;
-extern float ball_y;
-extern float ball_dx;
-extern float ball_dy;
-extern int score;
-extern int lives;
-extern int level;
-extern int game_state;
-extern bool initialized;
-extern bool ball_attached;
-extern unsigned int brick_count;
-extern bool bricks[BRICK_ROWS][BRICK_COLS];
-extern int brick_colors[BRICK_ROWS];
-
-void game_timer_check();
-void init_game();
-void init_level();
-void draw_screen();
-void draw_bricks();
-void draw_paddle();
-void draw_ball();
-void draw_score();
-void draw_lives();
-void draw_level();
-void draw_borders();
-void move_paddle_left();
-void move_paddle_right();
-void launch_ball();
-void update_game();
-void check_collisions();
-bool check_brick_collision(int row, int col);
-void handle_game_over();
-void show_menu();
-void show_game_over();
-bool check_level_complete();
-void next_level();
-void reset_game();

 class BreakoutView : public View {
   public:
@@ -134,9 +66,86 @@ class BreakoutView : public View {
    bool on_encoder(const EncoderEvent event) override;
    bool on_key(KeyEvent key) override;

+    void cls();
+    void background(int color);
+    void fillrect(int x1, int y1, int x2, int y2, int color);
+    void rect(int x1, int y1, int x2, int y2, int color);
+    void game_timer_check();
+    void init_game();
+    void init_level();
+    void draw_screen();
+    void draw_bricks();
+    void draw_paddle();
+    void draw_ball();
+    void draw_score();
+    void draw_lives();
+    void draw_level();
+    void draw_borders();
+    void move_paddle_left();
+    void move_paddle_right();
+    void launch_ball();
+    void update_game();
+    void check_collisions();
+    bool check_brick_collision(int row, int col);
+    void handle_game_over();
+    void show_menu();
+    void show_game_over();
+    bool check_level_complete();
+    void next_level();
+    void reset_game();
+    void check_game_timer();
+    void attach(double delay_sec);
+    void detach();
+
   private:
-    bool initialized = false;
+    const Color pp_colors[9] = {
+        Color::white(),
+        Color::blue(),
+        Color::yellow(),
+        Color::purple(),
+        Color::green(),
+        Color::red(),
+        Color::magenta(),
+        Color::orange(),
+        Color::black(),
+    };
    NavigationView& nav_;
+    Painter painter{};
+
+    // Dynamic screen-dependent values
+    int SCREEN_WIDTH = 0;
+    int SCREEN_HEIGHT = 0;
+    int GAME_AREA_BOTTOM = 0;
+    int PADDLE_Y = 0;
+    int BRICK_WIDTH = 0;
+    int BRICK_COLS = 0;
+    int PADDLE_SPEED = 0;
+
+    int paddle_x = 0;
+    float ball_x = 0;
+    float ball_y = 0;
+    float ball_dx = 1.5f;
+    float ball_dy = -2.0f;
+    int score = 0;
+    int lives = 3;
+    int level = 1;
+    int game_state = STATE_MENU;
+    bool initialized = false;
+    bool ball_attached = true;
+    unsigned int brick_count = 0;
+
+    bool menu_blink_state = true;
+    uint32_t menu_blink_counter = 0;
+
+    bool gameover_blink_state = true;
+    uint32_t gameover_blink_counter = 0;
+
+    std::vector<std::vector<bool>> bricks;
+    int brick_colors[BRICK_ROWS];
+
+    bool game_update_callback = false;
+    double game_update_timeout = 0;
+    uint32_t game_update_counter = 0;

    Button dummy{
        {screen_width, 0, 0, 0},
@@ -440,7 +440,7 @@ static void _sumlr(void);
 #undef __O
 #undef __P

-#define PI 3.141592653589793
+#include "mathdef.hpp"

 static void _numinput(byte k);
 static double dpush(double d);
@@ -48,25 +48,25 @@ class CalculatorView : public View {
   private:
    NavigationView& nav_;

-    Button button_F{{0 * 8, 11 * 16, 6 * 8, 16 + 8}, "F"};
-    Button button_7{{8 * 8, 11 * 16, 6 * 8, 16 + 8}, "7"};
-    Button button_8{{16 * 8, 11 * 16, 6 * 8, 16 + 8}, "8"};
-    Button button_9{{24 * 8, 11 * 16, 6 * 8, 16 + 8}, "9"};
-    Button button_E{{0 * 8, 13 * 16, 6 * 8, 16 + 8}, "E"};
-    Button button_4{{8 * 8, 13 * 16, 6 * 8, 16 + 8}, "4"};
-    Button button_5{{16 * 8, 13 * 16, 6 * 8, 16 + 8}, "5"};
-    Button button_6{{24 * 8, 13 * 16, 6 * 8, 16 + 8}, "6"};
-    Button button_N{{0 * 8, 15 * 16, 6 * 8, 16 + 8}, "N"};
-    Button button_1{{8 * 8, 15 * 16, 6 * 8, 16 + 8}, "1"};
-    Button button_2{{16 * 8, 15 * 16, 6 * 8, 16 + 8}, "2"};
-    Button button_3{{24 * 8, 15 * 16, 6 * 8, 16 + 8}, "3"};
-    Button button_C{{0 * 8, 17 * 16, 6 * 8, 16 + 8}, "C"};
-    Button button_0{{8 * 8, 17 * 16, 6 * 8, 16 + 8}, "0"};
-    Button button_P{{16 * 8, 17 * 16, 6 * 8, 16 + 8}, "."};
-    Button button_D{{24 * 8, 17 * 16, 6 * 8, 16 + 8}, "D"};
+    Button button_F{{UI_POS_X_TABLE(4, 0), UI_POS_Y_BOTTOM(9), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "F"};
+    Button button_7{{UI_POS_X_TABLE(4, 1), UI_POS_Y_BOTTOM(9), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "7"};
+    Button button_8{{UI_POS_X_TABLE(4, 2), UI_POS_Y_BOTTOM(9), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "8"};
+    Button button_9{{UI_POS_X_TABLE(4, 3), UI_POS_Y_BOTTOM(9), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "9"};
+    Button button_E{{UI_POS_X_TABLE(4, 0), UI_POS_Y_BOTTOM(7), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "E"};
+    Button button_4{{UI_POS_X_TABLE(4, 1), UI_POS_Y_BOTTOM(7), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "4"};
+    Button button_5{{UI_POS_X_TABLE(4, 2), UI_POS_Y_BOTTOM(7), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "5"};
+    Button button_6{{UI_POS_X_TABLE(4, 3), UI_POS_Y_BOTTOM(7), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "6"};
+    Button button_N{{UI_POS_X_TABLE(4, 0), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "N"};
+    Button button_1{{UI_POS_X_TABLE(4, 1), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "1"};
+    Button button_2{{UI_POS_X_TABLE(4, 2), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "2"};
+    Button button_3{{UI_POS_X_TABLE(4, 3), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "3"};
+    Button button_C{{UI_POS_X_TABLE(4, 0), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "C"};
+    Button button_0{{UI_POS_X_TABLE(4, 1), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "0"};
+    Button button_P{{UI_POS_X_TABLE(4, 2), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "."};
+    Button button_D{{UI_POS_X_TABLE(4, 3), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(6), UI_POS_HEIGHT(1.5)}, "D"};

    Console console{
-        {0 * 8, 0 * 16, screen_width, 10 * 16}};
+        {UI_POS_X(0), UI_POS_Y(0), screen_width, UI_POS_HEIGHT_REMAINING(10)}};

    void on_button_press(uint8_t button);
    void update_button_labels();
@@ -88,7 +88,7 @@ class CoasterPagerView : public View {
        ""};

    TransmitterView tx_view{
-        16 * 16,
+        (int16_t)UI_POS_Y_BOTTOM(4),
        10000,
        12};

@@ -53,38 +53,38 @@ class CVSSpamView : public View {
    std::vector<std::filesystem::path> file_list{};

    MenuView menu_view{
-        {0, 0, screen_width, 180},
+        {0, 0, screen_width, UI_POS_HEIGHT_REMAINING(12)},
        true};

    Text text_empty{
-        {7 * 8, 12 * 8, 16 * 8, 16},
+        {UI_POS_X_CENTER(16), 12 * 8, UI_POS_WIDTH(16), UI_POS_HEIGHT(1)},
        "Empty directory!"};

    Button button_prev_page{
-        {0, 180, 50, 32},
+        {0, UI_POS_Y_BOTTOM(10), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        "<"};

    Button button_next_page{
-        {190, 180, 50, 32},
+        {UI_POS_X_RIGHT(3), UI_POS_Y_BOTTOM(10), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        ">"};

    Text page_info{
-        {95, 188, 50, 16}};
+        {UI_POS_X_CENTER(7), UI_POS_Y_BOTTOM(9.5), UI_POS_WIDTH(7), UI_POS_HEIGHT(1)}};

    Button button_send{
-        {0, 212, 75, 36},
+        {0, UI_POS_Y_BOTTOM(8), UI_POS_WIDTH(9), UI_POS_HEIGHT(2)},
        "CALL"};

    Button button_chaos{
-        {82, 212, 75, 36},
+        {UI_POS_X_CENTER(9), UI_POS_Y_BOTTOM(8), UI_POS_WIDTH(9), UI_POS_HEIGHT(2)},
        "CHAOS"};

    Button button_stop{
-        {165, 212, 75, 36},
+        {UI_POS_X_RIGHT(9), UI_POS_Y_BOTTOM(8), UI_POS_WIDTH(9), UI_POS_HEIGHT(2)},
        LanguageHelper::currentMessages[LANG_STOP]};

    ProgressBar progressbar{
-        {0, 256, screen_width, 44}};
+        {0, UI_POS_Y_BOTTOM(6), screen_width, UI_POS_HEIGHT(5)}};

    MessageHandlerRegistration message_handler_fifo_signal{
        Message::ID::RequestSignal,
@@ -44,11 +44,11 @@ class DebugDumpView : public View {
    NavigationView& nav_;

    Text dump_output{
-        {0 * 8, 19 * 8, screen_width, 16},
+        {UI_POS_X(0), 19 * 8, screen_width, 16},
        ""};

    Button button_exit{
-        {22 * 8, 34 * 8, 8 * 8, 32},
+        {UI_POS_X_CENTER(8), UI_POS_Y_BOTTOM(4), 8 * 8, 32},
        "Exit"};
 };

@@ -77,7 +77,9 @@ class DetectorRxView : public View {
        }};

    Labels labels{
-        {{UI_POS_X(0), UI_POS_Y(0)}, "LNA:   VGA:   AMP:  VOL:     ", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), UI_POS_Y(0)}, "LNA:   VGA:   AMP:  ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_RIGHT(6), UI_POS_Y(0)}, "VOL:  ", Theme::getInstance()->fg_light->foreground},
+    };

    LNAGainField field_lna{
        {UI_POS_X(4), UI_POS_Y(0)}};
@@ -89,7 +91,7 @@ class DetectorRxView : public View {
        {UI_POS_X(18), UI_POS_Y(0)}};

    AudioVolumeField field_volume{
-        {UI_POS_X(24), UI_POS_Y(0)}};
+        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

    OptionsField field_mode{
        {UI_POS_X(0), UI_POS_Y(1)},
@@ -4,9 +4,7 @@
 * |  Find me at https://betaskynet.com                       |
 * |  Argh matey!                                             |
 * ------------------------------------------------------------
- */
-
-/*
+ *
 * Chrome Dino Game for Portapack Mayhem
 * Based on the original DinoGame by various contributors
 */
@@ -32,38 +30,23 @@ __attribute__((section(".external_app.app_dinogame.application_information"), us

    "Dino Game",
    {
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0xF0,
-        0xF8,
-        0xFC,
-        0xFE,
-        0xFF,
-        0xFF,
-        0x7F,
-        0x7F,
-        0x3F,
-        0x3F,
-        0x3E,
-        0x3C,
-        0x38,
-        0x30,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
+        // Cactus icon 16x16
+        0x00, 0x00,  // ................
+        0x80, 0x01,  // .......##.......
+        0x80, 0x01,  // .......##.......
+        0x80, 0x01,  // .......##.......
+        0x98, 0x19,  // ...##..##..##...
+        0x98, 0x19,  // ...##..##..##...
+        0x98, 0x19,  // ...##..##..##...
+        0x98, 0x19,  // ...##..##..##...
+        0xF8, 0x1F,  // ...##########...
+        0xF0, 0x0F,  // ....########....
+        0x80, 0x01,  // .......##.......
+        0x80, 0x01,  // .......##.......
+        0x80, 0x01,  // .......##.......
+        0x80, 0x01,  // .......##.......
+        0x80, 0x01,  // .......##.......
+        0x00, 0x00,  // ................
    },
    ui::Color::green().v,
    app_location_t::GAMES,
@@ -72,4 +55,4 @@ __attribute__((section(".external_app.app_dinogame.application_information"), us
    {0, 0, 0, 0},
    0x00000000,
 };
-}
+}
@@ -43,7 +43,7 @@ const Color pp_colors[] = {

 // Drawing functions
 void cls() {
-    painter.fill_rectangle({0, 0, portapack::display.width(), portapack::display.height()}, Color::black());
+    painter.fill_rectangle({0, 0, ui::screen_width, ui::screen_height}, Color::black());
 }

 void fillrect(int x1, int y1, int x2, int y2, int color) {
@@ -100,6 +100,15 @@ DinoGameView::DinoGameView(NavigationView& nav)
    : nav_{nav}, bird_info{}, game_timer{} {
    add_children({&dummy, &button_difficulty});
    current_instance = this;
+
+    // Initialize dimensions first
+    init_dimensions();
+
+    // Now reposition button with proper centering
+    int button_y = SCREEN_HEIGHT - 100;
+    int button_x = (SCREEN_WIDTH - 100) / 2;
+    button_difficulty.set_parent_rect({button_x, button_y, 100, 20});
+
    game_timer.attach(&game_timer_check, 1.0 / 60.0);

    button_difficulty.on_select = [this](Button&) {
@@ -126,6 +135,33 @@ void DinoGameView::frame_sync() {
    set_dirty();
 }

+void DinoGameView::init_dimensions() {
+    SCREEN_WIDTH = ui::screen_width;
+    SCREEN_HEIGHT = ui::screen_height;
+
+    // Scale game area based on screen size
+    GAME_AREA_HEIGHT = (SCREEN_HEIGHT * 160) / 320;  // Scale proportionally
+    GAME_AREA_TOP = SCREEN_HEIGHT / 4;
+
+    // Calculate positions
+    DINO_Y = GAME_AREA_TOP + GAME_AREA_HEIGHT - GROUND_HEIGHT - DINO_HEIGHT;
+    DINO_DUCK_Y = GAME_AREA_TOP + GAME_AREA_HEIGHT - GROUND_HEIGHT - DINO_DUCK_HEIGHT;
+    BIRD_Y_UP = GAME_AREA_TOP + 20;
+    BIRD_Y_DOWN = GAME_AREA_TOP + (GAME_AREA_HEIGHT * 60) / 160;
+
+    // Scale jump height
+    JUMP_MAX_HEIGHT = (GAME_AREA_HEIGHT * 70) / 160;
+
+    // Scale distances based on screen width
+    MIN_OBSTACLE_DISTANCE = (SCREEN_WIDTH * 300) / 240;
+    MAX_OBSTACLE_DISTANCE = (SCREEN_WIDTH * 600) / 240;
+
+    // Scale horizontal position
+    DINO_X = SCREEN_WIDTH / 8;
+
+    last_dino_y = DINO_Y;
+}
+
 void DinoGameView::init_game() {
    game_state = GameState::MENU;
    menu_initialized = false;
@@ -142,7 +178,7 @@ void DinoGameView::new_game() {
    duck_timer = 0;
    displayedGameOver = false;
    bird_info.inGame = false;
-    bird_info.x_offset = 320;
+    bird_info.x_offset = SCREEN_WIDTH;
    bird_info.y_offset = 0;
    bird_info.y_velocity = 0;
    jumping = false;
@@ -178,12 +214,12 @@ void DinoGameView::show_menu() {
        auto style_title = *ui::Theme::getInstance()->fg_light;

        // Draw title
-        painter.draw_string({80, 60}, style_title, "DINO GAME");
+        painter.draw_string({UI_POS_X_CENTER(10), 60}, style_title, "DINO GAME");

        // Draw instructions
-        painter.draw_string({45, 130}, style, "SELECT: Jump/Start");
-        painter.draw_string({65, 150}, style, "DOWN: Duck");
-        painter.draw_string({50, 170}, style, "Avoid obstacles!");
+        painter.draw_string({UI_POS_X_CENTER(19), 120}, style, "SELECT: Jump/Start");
+        painter.draw_string({UI_POS_X_CENTER(11), 140}, style, "DOWN: Duck");
+        painter.draw_string({UI_POS_X_CENTER(17), 160}, style, "Avoid obstacles!");

        // Draw high score
        draw_high_score();
@@ -194,14 +230,21 @@ void DinoGameView::show_menu() {
    // Show difficulty button
    button_difficulty.hidden(false);

-    // Animate the menu dino
-    bool menu_run_frame = (blink_counter / 15) % 2;
+    // Animate the menu dino - use frame counter for smooth animation
+    bool menu_run_frame = (blink_counter / 10) % 2;

-    // Clear previous dino position
-    fillrect(103, 90, 103 + DINO_WIDTH, 90 + DINO_HEIGHT, Black);
+    int menu_dino_x = UI_POS_X_CENTER(DINO_WIDTH);
+    int menu_dino_y = 90;
+
+    // Clear previous dino position - clear a bit extra to handle any artifacts
+    static bool last_menu_frame = false;
+    if (last_menu_frame != menu_run_frame || blink_counter == 0) {
+        fillrect(menu_dino_x - 5, menu_dino_y - 5, menu_dino_x + DINO_WIDTH + 5, menu_dino_y + DINO_HEIGHT + 5, Black);
+        last_menu_frame = menu_run_frame;
+    }

    // Draw animated dino
-    draw_dino_at(103, 90, false, menu_run_frame);
+    draw_dino_at(menu_dino_x, menu_dino_y, false, menu_run_frame);

    // Blinking start prompt
    auto style_prompt = *ui::Theme::getInstance()->fg_light;
@@ -209,9 +252,10 @@ void DinoGameView::show_menu() {
        blink_counter = 0;
        blink_state = !blink_state;

-        painter.fill_rectangle({55, 258, 130, 20}, Color::black());
+        int prompt_y = SCREEN_HEIGHT - 60;
+        painter.fill_rectangle({UI_POS_X_CENTER(17), prompt_y - 2, 130, 20}, Color::black());
        if (blink_state) {
-            painter.draw_string({55, 260}, style_prompt, "* PRESS SELECT *");
+            painter.draw_string({UI_POS_X_CENTER(17), prompt_y}, style_prompt, "* PRESS SELECT *");
        }
    }
 }
@@ -220,33 +264,30 @@ void DinoGameView::show_game_over() {
    if (!displayedGameOver) {
        displayedGameOver = true;

-        // Clear the last normal dino position
-        if (last_ducking) {
-            fillrect(DINO_X, last_dino_y, DINO_X + DINO_DUCK_WIDTH, last_dino_y + DINO_DUCK_HEIGHT, Black);
-        } else {
-            fillrect(DINO_X, last_dino_y, DINO_X + DINO_WIDTH, last_dino_y + DINO_HEIGHT, Black);
-        }
+        // Clear the entire play area to ensure clean display
+        fillrect(0, GAME_AREA_TOP, SCREEN_WIDTH, GAME_AREA_HEIGHT + 20, Black);

-        // Draw the game over dino sprite
-        draw_dino_sprite(DINO_X, DINO_Y, dino_gameover);
+        // Draw the game over dino sprite in the center
+        int gameover_dino_x = UI_POS_X_CENTER(DINO_WIDTH);
+        int gameover_dino_y = GAME_AREA_TOP + 40;
+        draw_dino_sprite(gameover_dino_x, gameover_dino_y, dino_gameover);

        auto style = *ui::Theme::getInstance()->fg_light;
        auto style_score = *ui::Theme::getInstance()->fg_medium;

        // Game over text
-        painter.draw_string({85, 70}, style, "GAME OVER");
+        painter.draw_string({UI_POS_X_CENTER(10), GAME_AREA_TOP + 90}, style, "GAME OVER");

        // Show final score
        std::string score_text = "SCORE: " + score_to_string(score);
-        int score_x = (240 - score_text.length() * 8) / 2;
-        painter.draw_string({score_x, 90}, style_score, score_text);
+        painter.draw_string({UI_POS_X_CENTER(score_text.length()), GAME_AREA_TOP + 110}, style_score, score_text);

-        painter.draw_string({65, 110}, style, "SELECT TO RETRY");
+        painter.draw_string({UI_POS_X_CENTER(16), GAME_AREA_TOP + 130}, style, "SELECT TO RETRY");

        // Update high score
        if (score > highScore) {
            highScore = score;
-            painter.draw_string({55, 130}, style, "NEW HIGH SCORE!");
+            painter.draw_string({UI_POS_X_CENTER(16), GAME_AREA_TOP + 150}, style, "NEW HIGH SCORE!");
        }
    }
 }
@@ -263,7 +304,7 @@ void DinoGameView::game_loop() {
    // Update ground animation
    ground_offset = (ground_offset + GAME_SPEED_BASE + speed_modifier) % 20;

-    // Clear only the game area (not the whole screen to reduce flicker)
+    // Draw ground
    draw_ground();

    // Update and draw obstacles
@@ -295,38 +336,38 @@ void DinoGameView::game_loop() {
    // Update run animation
    if (get_steps() % (10 - speed_modifier) == 0) runstate = !runstate;

-    // Draw dino with minimal redraw
+    // Draw dino with proper clearing
    int current_dino_y = jumping ? (DINO_Y - jumpHeight) : (ducking ? DINO_DUCK_Y : DINO_Y);

-    // Clear old dino position more precisely
+    // Only clear and redraw if something changed
    if (current_dino_y != last_dino_y || runstate != last_runstate || ducking != last_ducking) {
-        // Clear based on last state
+        // Clear old position with extra margin to prevent artifacts
        if (last_ducking) {
-            fillrect(DINO_X, last_dino_y, DINO_X + DINO_DUCK_WIDTH, last_dino_y + DINO_DUCK_HEIGHT, Black);
+            fillrect(DINO_X - 2, last_dino_y - 2, DINO_X + DINO_DUCK_WIDTH + 2, last_dino_y + DINO_DUCK_HEIGHT + 2, Black);
        } else {
-            fillrect(DINO_X, last_dino_y, DINO_X + DINO_WIDTH, last_dino_y + DINO_HEIGHT, Black);
+            fillrect(DINO_X - 2, last_dino_y - 2, DINO_X + DINO_WIDTH + 2, last_dino_y + DINO_HEIGHT + 2, Black);
        }
-    }

-    // Draw dino at new position
-    if (jumping) {
-        draw_dino_sprite(DINO_X, current_dino_y, dino_default);
-    } else if (ducking) {
-        if (runstate)
-            draw_dino_sprite(DINO_X, current_dino_y, dino_ducking_leftstep);
-        else
-            draw_dino_sprite(DINO_X, current_dino_y, dino_ducking_rightstep);
-    } else {
-        if (runstate)
-            draw_dino_sprite(DINO_X, current_dino_y, dino_leftstep);
-        else
-            draw_dino_sprite(DINO_X, current_dino_y, dino_rightstep);
-    }
+        // Draw dino at new position
+        if (jumping) {
+            draw_dino_sprite(DINO_X, current_dino_y, dino_default);
+        } else if (ducking) {
+            if (runstate)
+                draw_dino_sprite(DINO_X, current_dino_y, dino_ducking_leftstep);
+            else
+                draw_dino_sprite(DINO_X, current_dino_y, dino_ducking_rightstep);
+        } else {
+            if (runstate)
+                draw_dino_sprite(DINO_X, current_dino_y, dino_leftstep);
+            else
+                draw_dino_sprite(DINO_X, current_dino_y, dino_rightstep);
+        }

-    // Update last state
-    last_dino_y = current_dino_y;
-    last_ducking = ducking;
-    last_runstate = runstate;
+        // Update last state
+        last_dino_y = current_dino_y;
+        last_ducking = ducking;
+        last_runstate = runstate;
+    }

    // Check collisions
    check_collision();
@@ -346,14 +387,14 @@ void DinoGameView::draw_ground() {
    int ground_y = GAME_AREA_TOP + GAME_AREA_HEIGHT - GROUND_HEIGHT;

    // Clear ground area
-    fillrect(0, ground_y, 320, ground_y + GROUND_HEIGHT, Black);
+    fillrect(0, ground_y, SCREEN_WIDTH, ground_y + GROUND_HEIGHT, Black);

    // Draw ground line
-    painter.draw_hline({0, ground_y}, 320, Color::white());
-    painter.draw_hline({0, ground_y + 1}, 320, Color::dark_grey());
+    painter.draw_hline({0, ground_y}, SCREEN_WIDTH, Color::white());
+    painter.draw_hline({0, ground_y + 1}, SCREEN_WIDTH, Color::dark_grey());

    // Draw ground texture
-    for (int x = -ground_offset; x < 320; x += 20) {
+    for (int x = -ground_offset; x < SCREEN_WIDTH; x += 20) {
        painter.draw_hline({x, ground_y + 3}, 10, Color::dark_grey());
        painter.draw_hline({x + 5, ground_y + 5}, 5, Color::dark_grey());
    }
@@ -364,7 +405,7 @@ void DinoGameView::update_obstacles() {
    for (int i = 0; i < MAX_OBSTACLES; i++) {
        if (obstacles[i].active) {
            // Clear old position
-            if (obstacles[i].last_x != obstacles[i].x && obstacles[i].last_x < 320) {
+            if (obstacles[i].last_x != obstacles[i].x && obstacles[i].last_x < SCREEN_WIDTH) {
                clear_obstacle_area(obstacles[i].last_x, obstacles[i].width + 10, obstacles[i].height + 10);
            }

@@ -394,8 +435,8 @@ void DinoGameView::update_obstacles() {
        for (int i = 0; i < MAX_OBSTACLES; i++) {
            if (!obstacles[i].active) {
                obstacles[i].active = true;
-                obstacles[i].x = 320;
-                obstacles[i].last_x = 320;
+                obstacles[i].x = SCREEN_WIDTH;
+                obstacles[i].last_x = SCREEN_WIDTH;
                obstacles[i].type = rand() % 4;

                // Set obstacle dimensions based on type
@@ -495,7 +536,7 @@ void DinoGameView::manage_bird() {
        // Only spawn bird if no obstacles are too close
        bool obstacle_nearby = false;
        for (int i = 0; i < MAX_OBSTACLES; i++) {
-            if (obstacles[i].active && obstacles[i].x > 200) {
+            if (obstacles[i].active && obstacles[i].x > SCREEN_WIDTH * 0.8) {
                obstacle_nearby = true;
                break;
            }
@@ -504,7 +545,7 @@ void DinoGameView::manage_bird() {
        // Randomly spawn bird if no nearby obstacles
        if (!obstacle_nearby && rand() % 400 == 0 && get_steps() > 100) {
            bird_info.inGame = true;
-            bird_info.x_offset = 320;
+            bird_info.x_offset = SCREEN_WIDTH;
            bird_info.y_offset = 0;
            bird_info.y_velocity = easy_mode ? 0 : (rand() % 3) - 1;  // No vertical movement in easy mode
            bird_info.y_position = BirdPosition::DOWN;                // Always spawn at standing height in easy mode
@@ -514,16 +555,16 @@ void DinoGameView::manage_bird() {
        int base_y = (bird_info.y_position == BirdPosition::UP) ? BIRD_Y_UP : BIRD_Y_DOWN;
        int current_y = base_y + bird_info.y_offset;

-        // Clear previous bird position
-        if (last_bird_x < 320 && last_bird_x >= -BIRD_WIDTH) {
-            int clear_start_x = last_bird_x;
-            int clear_end_x = last_bird_x + BIRD_WIDTH;
+        // Clear previous bird position with extra margin
+        if (last_bird_x < SCREEN_WIDTH && last_bird_x >= -BIRD_WIDTH) {
+            int clear_start_x = last_bird_x - 2;
+            int clear_end_x = last_bird_x + BIRD_WIDTH + 2;

            if (clear_start_x < 0) clear_start_x = 0;
-            if (clear_end_x > 320) clear_end_x = 320;
+            if (clear_end_x > SCREEN_WIDTH) clear_end_x = SCREEN_WIDTH;

            if (clear_end_x > clear_start_x) {
-                fillrect(clear_start_x, last_bird_y, clear_end_x, last_bird_y + BIRD_HEIGHT, Black);
+                fillrect(clear_start_x, last_bird_y - 2, clear_end_x, last_bird_y + BIRD_HEIGHT + 2, Black);
            }
        }

@@ -549,7 +590,6 @@ void DinoGameView::manage_bird() {
            }
        } else {
            // In easy mode, keep bird at perfect ducking height
-            // Bird should hit standing dino but miss ducking dino
            current_y = DINO_Y - 10;  // Position bird just above ducking height
        }

@@ -557,7 +597,7 @@ void DinoGameView::manage_bird() {
        if (get_steps() % 15 == 0) bird_info.flop = !bird_info.flop;

        // Draw bird only if any part is visible
-        if (bird_info.x_offset > -BIRD_WIDTH && bird_info.x_offset < 320) {
+        if (bird_info.x_offset > -BIRD_WIDTH && bird_info.x_offset < SCREEN_WIDTH) {
            if (bird_info.flop) {
                draw_bird_sprite(bird_info.x_offset, current_y, pterodactyl_upflop);
            } else {
@@ -590,6 +630,7 @@ void DinoGameView::draw_dino_sprite(int x, int y, const uint16_t* sprite) {
        width = DINO_WIDTH;
    }

+    // Draw sprite efficiently with run-length optimization
    for (int dy = 0; dy < height; dy++) {
        int run_start = -1;
        uint16_t run_color = 0;
@@ -623,16 +664,21 @@ void DinoGameView::draw_dino_sprite(int x, int y, const uint16_t* sprite) {
 }

 void DinoGameView::draw_bird_sprite(int x, int y, const uint16_t* sprite) {
+    // Draw sprite efficiently with clipping
    for (int dy = 0; dy < BIRD_HEIGHT; dy++) {
        int run_start = -1;
        uint16_t run_color = 0;

        for (int dx = 0; dx < BIRD_WIDTH; dx++) {
            // Skip pixels that would be off-screen
-            if (x + dx < 0 || x + dx >= 320) {
+            if (x + dx < 0 || x + dx >= SCREEN_WIDTH) {
                // End any current run
-                if (run_start != -1) {
-                    painter.fill_rectangle({x + run_start, y + dy, dx - run_start, 1}, Color(run_color));
+                if (run_start != -1 && x + run_start < SCREEN_WIDTH) {
+                    int run_width = dx - run_start;
+                    if (x + run_start + run_width > SCREEN_WIDTH) {
+                        run_width = SCREEN_WIDTH - (x + run_start);
+                    }
+                    painter.fill_rectangle({x + run_start, y + dy, run_width, 1}, Color(run_color));
                    run_start = -1;
                }
                continue;
@@ -660,10 +706,10 @@ void DinoGameView::draw_bird_sprite(int x, int y, const uint16_t* sprite) {
            }
        }

-        if (run_start != -1 && x + run_start < 320) {
+        if (run_start != -1 && x + run_start < SCREEN_WIDTH) {
            int width = BIRD_WIDTH - run_start;
-            if (x + run_start + width > 320) {
-                width = 320 - (x + run_start);
+            if (x + run_start + width > SCREEN_WIDTH) {
+                width = SCREEN_WIDTH - (x + run_start);
            }
            if (width > 0) {
                painter.fill_rectangle({x + run_start, y + dy, width, 1}, Color(run_color));
@@ -683,7 +729,7 @@ void DinoGameView::draw_dino_at(int x, int y, bool is_ducking, bool run_frame) {
        if (run_frame) {
            draw_dino_sprite(x, y, dino_leftstep);
        } else {
-            draw_dino_sprite(x, y, dino_default);
+            draw_dino_sprite(x, y, dino_rightstep);
        }
    }
 }
@@ -743,8 +789,8 @@ void DinoGameView::draw_current_score() {

 void DinoGameView::draw_high_score() {
    auto style = *ui::Theme::getInstance()->fg_light;
-    painter.fill_rectangle({152, 28, 100, 14}, Color::black());
-    painter.draw_string({152, 30}, style, "HI " + score_to_string(highScore));
+    painter.fill_rectangle({UI_POS_X_RIGHT(90), 28, 90, 18}, Color::black());
+    painter.draw_string({UI_POS_X_RIGHT(90), 30}, style, "HI " + score_to_string(highScore));
 }

 void DinoGameView::jump() {
@@ -805,4 +851,4 @@ bool DinoGameView::on_encoder(const EncoderEvent delta) {
    return true;
 }

-}  // namespace ui::external_app::dinogame
+}  // namespace ui::external_app::dinogame
@@ -41,29 +41,6 @@ enum {
    Black,
 };

-// Game constants
-#define DINO_WIDTH 34
-#define DINO_HEIGHT 36
-#define DINO_DUCK_WIDTH 45
-#define DINO_DUCK_HEIGHT 22
-#define BIRD_WIDTH 34
-#define BIRD_HEIGHT 27
-#define GROUND_HEIGHT 10
-#define GAME_AREA_TOP 78
-#define GAME_AREA_HEIGHT 160
-#define DINO_X 30
-#define DINO_Y (GAME_AREA_TOP + GAME_AREA_HEIGHT - GROUND_HEIGHT - DINO_HEIGHT)
-#define DINO_DUCK_Y (GAME_AREA_TOP + GAME_AREA_HEIGHT - GROUND_HEIGHT - DINO_DUCK_HEIGHT)
-#define BIRD_Y_UP (GAME_AREA_TOP + 20)
-#define BIRD_Y_DOWN (GAME_AREA_TOP + 60)
-#define JUMP_MAX_HEIGHT 70
-#define JUMP_SPEED 3
-#define GAME_SPEED_BASE 3
-#define SPRITE_COLOR 0x528A
-#define TRANSPARENT_COLOR 0xFFFF
-#define MIN_OBSTACLE_DISTANCE 300
-#define MAX_OBSTACLE_DISTANCE 600
-
 // Game states
 enum class GameState {
    MENU,
@@ -159,6 +136,33 @@ class DinoGameView : public View {
    bool initialized = false;
    NavigationView& nav_;

+    // Dynamic screen dimensions
+    int SCREEN_WIDTH = 240;
+    int SCREEN_HEIGHT = 320;
+    int DINO_WIDTH = 34;
+    int DINO_HEIGHT = 36;
+    int DINO_DUCK_WIDTH = 45;
+    int DINO_DUCK_HEIGHT = 22;
+    int BIRD_WIDTH = 34;
+    int BIRD_HEIGHT = 27;
+    int GROUND_HEIGHT = 10;
+    int GAME_AREA_TOP = 78;
+    int GAME_AREA_HEIGHT = 160;
+    int DINO_X = 30;
+    int DINO_Y = 0;       // Will be calculated
+    int DINO_DUCK_Y = 0;  // Will be calculated
+    int BIRD_Y_UP = 0;    // Will be calculated
+    int BIRD_Y_DOWN = 0;  // Will be calculated
+    int JUMP_MAX_HEIGHT = 70;
+    int JUMP_SPEED = 3;
+    int GAME_SPEED_BASE = 3;
+    int MIN_OBSTACLE_DISTANCE = 300;
+    int MAX_OBSTACLE_DISTANCE = 600;
+
+    // Sprite constants
+    static constexpr uint16_t SPRITE_COLOR = 0x528A;
+    static constexpr uint16_t TRANSPARENT_COLOR = 0xFFFF;
+
    // Game variables
    static constexpr uint8_t MAX_OBSTACLES = 1;
    SimpleObstacle obstacles[MAX_OBSTACLES];
@@ -185,7 +189,7 @@ class DinoGameView : public View {
    int32_t obstacle_spawn_timer = 0;

    // Position tracking for minimal redraw
-    int16_t last_dino_y = DINO_Y;
+    int16_t last_dino_y = 0;
    int16_t last_bird_x = -1;
    int16_t last_bird_y = -1;
    uint8_t duck_timer = 0;
@@ -202,6 +206,7 @@ class DinoGameView : public View {
    Ticker game_timer;

    // Private methods
+    void init_dimensions();
    void init_game();
    void new_game();
    void update_obstacles();
@@ -239,7 +244,7 @@ class DinoGameView : public View {
         {"easy_mode"sv, &easy_mode}}};

    Button dummy{
-        {screen_width, 0, 0, 0},
+        {240, 0, 0, 0},
        ""};

    MessageHandlerRegistration message_handler_frame_sync{
@@ -251,4 +256,4 @@ class DinoGameView : public View {

 }  // namespace ui::external_app::dinogame

-#endif /* __UI_DINOGAME_H__ */
+#endif /* __UI_DINOGAME_H__ */
@@ -17,6 +17,7 @@ int SCREEN_HEIGHT = 0;
 int RENDER_HEIGHT = 0;
 int HALF_WIDTH = 0;
 int HALF_HEIGHT = 0;
+int HUD_HEIGHT = 40;
 #define LEVEL_WIDTH_BASE 6
 #define LEVEL_WIDTH (1 << LEVEL_WIDTH_BASE)
 #define LEVEL_HEIGHT 57
@@ -24,18 +25,18 @@ int HALF_HEIGHT = 0;
 #define MAX_RENDER_DEPTH 12
 #define MIN_ENTITIES 15
 #define MAX_ENTITIES 25
-#define RES_DIVIDER 2
+int RES_DIVIDER = 2;
 #define DISTANCE_MULTIPLIER 20
 #define ROT_SPEED 0.25
 #define MOV_SPEED 1.0
 #define JOGGING_SPEED 1.2
 #define MAX_ENTITY_DISTANCE 200
 #define ITEM_COLLIDER_DIST 6
-#define PI 3.14159265358979323846
-#define GUN_WIDTH 30
-#define GUN_HEIGHT 40
-#define GUN_TARGET_POS 24
-#define GUN_SHOT_POS (GUN_TARGET_POS + 6)
+#include "mathdef.hpp"
+int GUN_WIDTH = 30;
+int GUN_HEIGHT = 40;
+int GUN_TARGET_POS = 24;
+int GUN_SHOT_POS = 30;
 #define ENEMY_SIZE 16
 #define ENEMY_SPEED 0.03
 #define ENEMY_MELEE_DIST 20
@@ -145,7 +146,7 @@ static bool up, down, left, right, fired;
 static double jogging, view_height;
 static bool needs_redraw = false;
 static bool needs_gun_redraw = false;
-static uint8_t gun_pos = GUN_TARGET_POS;
+static uint8_t gun_pos = 24;
 static bool gun_fired = false;
 static int prev_gun_x = 0;
 static int prev_gun_y = 0;
@@ -850,13 +851,23 @@ void render_entities(Painter& painter) {
    }
 }

-void render_map(Painter& painter, bool full_clear, int16_t x_start = 0, int16_t x_end = SCREEN_WIDTH) {
+void render_map(Painter& painter, bool full_clear, int16_t x_start = 0, int16_t x_end = -1) {
+    if (x_end == -1) x_end = SCREEN_WIDTH;
+
+    // Add safety bounds
+    x_start = fmax(0, x_start);
+    x_end = fmin(SCREEN_WIDTH, x_end);
+
+    // Dynamically adjust RES_DIVIDER based on screen size
+    int dynamic_res = (SCREEN_WIDTH > 400) ? 4 : (SCREEN_WIDTH > 300) ? 3
+                                                                      : RES_DIVIDER;
+
    if (full_clear) {
        painter.fill_rectangle({0, 0, SCREEN_WIDTH, RENDER_HEIGHT / 2}, Color(64, 64, 128));
        painter.fill_rectangle({0, RENDER_HEIGHT / 2, SCREEN_WIDTH, RENDER_HEIGHT / 2}, Color(32, 32, 32));
    }

-    for (uint8_t x = x_start; x < x_end; x += RES_DIVIDER) {
+    for (uint16_t x = x_start; x < x_end; x += dynamic_res) {
        double camera_x = 2 * (double)x / SCREEN_WIDTH - 1;
        double ray_x = player.dir.x + player.plane.x * camera_x;
        double ray_y = player.dir.y + player.plane.y * camera_x;
@@ -985,15 +996,15 @@ void render_map(Painter& painter, bool full_clear, int16_t x_start = 0, int16_t
                wall_color = Color(brightness / 5, (brightness - noise) * 0.8, brightness / 5);
            }

-            painter.fill_rectangle({x, start_y, RES_DIVIDER, end_y - start_y}, wall_color);
+            painter.fill_rectangle({x, start_y, dynamic_res, end_y - start_y}, wall_color);
        }

        if (!full_clear && hit) {
            if (start_y > 0) {
-                painter.fill_rectangle({x, 0, RES_DIVIDER, start_y}, Color(64, 64, 128));
+                painter.fill_rectangle({x, 0, dynamic_res, start_y}, Color(64, 64, 128));
            }
            if (end_y < RENDER_HEIGHT) {
-                painter.fill_rectangle({x, end_y, RES_DIVIDER, RENDER_HEIGHT - end_y}, Color(32, 32, 32));
+                painter.fill_rectangle({x, end_y, dynamic_res, RENDER_HEIGHT - end_y}, Color(32, 32, 32));
            }
        }
    }
@@ -1001,11 +1012,28 @@ void render_map(Painter& painter, bool full_clear, int16_t x_start = 0, int16_t

 DoomView::DoomView(NavigationView& nav)
    : nav_{nav} {
-    SCREEN_WIDTH = screen_width;
-    SCREEN_HEIGHT = screen_height;
-    RENDER_HEIGHT = screen_height - 40;
-    HALF_WIDTH = screen_width / 2;
+    SCREEN_WIDTH = ui::screen_width;
+    SCREEN_HEIGHT = ui::screen_height;
+    HUD_HEIGHT = 40;
+    RENDER_HEIGHT = SCREEN_HEIGHT - HUD_HEIGHT;
+    HALF_WIDTH = SCREEN_WIDTH / 2;
    HALF_HEIGHT = RENDER_HEIGHT / 2;
+
+    // More aggressive resolution reduction for larger screens
+    if (SCREEN_WIDTH > 400) {
+        RES_DIVIDER = 4;
+    } else if (SCREEN_WIDTH > 300) {
+        RES_DIVIDER = 3;
+    } else {
+        RES_DIVIDER = 2;
+    }
+
+    // Cap gun size to prevent overflow
+    GUN_WIDTH = fmin(60, SCREEN_WIDTH / 8);
+    GUN_HEIGHT = fmin(50, SCREEN_HEIGHT / 8);
+    GUN_TARGET_POS = fmin(40, RENDER_HEIGHT / 13);
+    GUN_SHOT_POS = GUN_TARGET_POS + 6;
+
    add_children({&dummy});
    game_timer.attach(&game_timer_check, 1.0 / 60.0);
 }
@@ -1034,26 +1062,32 @@ void DoomView::paint(Painter& painter) {

    if (scene == 0) {
        auto style_yellow = *ui::Theme::getInstance()->fg_yellow;
-        painter.draw_string({50, 40}, style_yellow, "* * * DOOM * * *");
+        painter.draw_string({UI_POS_X_CENTER(15), 40}, style_yellow, "* * * DOOM * * *");
        auto style_green = *ui::Theme::getInstance()->fg_green;
-        painter.draw_string({15, 240}, style_green, "** PRESS SELECT TO START **");
+        painter.draw_string({UI_POS_X_CENTER(26), SCREEN_HEIGHT - 80}, style_green, "** PRESS SELECT TO START **");
    } else if (scene == 1) {
        if (needs_redraw || (needs_gun_redraw && jogging > 0)) {
            bool full_clear = (player.velocity == 0 || !prev_velocity_moving);
            render_map(painter, full_clear);
            render_entities(painter);
            render_gun(painter, gun_pos, jogging);
+
+            // Draw HUD
            painter.fill_rectangle({0, RENDER_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT - RENDER_HEIGHT}, pp_colors[COLOR_BACKGROUND]);
            auto style_yellow = *ui::Theme::getInstance()->fg_yellow;
            auto style_red = *ui::Theme::getInstance()->fg_red;
            auto style_blue = *ui::Theme::getInstance()->fg_blue;
-            painter.draw_string({5, RENDER_HEIGHT + 5}, style_yellow, "Health: " + std::to_string(player.health));
-            painter.draw_string({100, RENDER_HEIGHT + 5}, style_red, "Kills: " + std::to_string(kills));
-            painter.draw_string({170, RENDER_HEIGHT + 5}, style_blue, "Ammo: " + std::to_string(player.ammo));
+
+            int hud_y = RENDER_HEIGHT + 5;
+            painter.draw_string({5, hud_y}, style_yellow, "Health: " + std::to_string(player.health));
+            painter.draw_string({UI_POS_X_CENTER(15), hud_y}, style_red, "Kills: " + std::to_string(kills));
+            painter.draw_string({UI_POS_X_RIGHT(80), hud_y}, style_blue, "Ammo: " + std::to_string(player.ammo));
+
            prev_velocity_moving = (player.velocity != 0);
            needs_redraw = false;
            needs_gun_redraw = false;
        } else if (needs_gun_redraw) {
+            // Partial redraw for gun only
            int current_x = HALF_WIDTH - GUN_WIDTH / 2 + sin(LPC_RTC->CTIME0 * JOGGING_SPEED) * 10 * jogging;
            int current_y = RENDER_HEIGHT - gun_pos - 29 + fabs(cos(LPC_RTC->CTIME0 * JOGGING_SPEED)) * 8 * jogging;
            int flash_height = (gun_pos > GUN_TARGET_POS) ? (gun_pos - GUN_TARGET_POS) * 2 + 10 : 0;
@@ -1069,13 +1103,18 @@ void DoomView::paint(Painter& painter) {
            render_map(painter, false, min_x, max_x);
            render_entities(painter);
            render_gun(painter, gun_pos, jogging);
+
+            // Redraw HUD
            painter.fill_rectangle({0, RENDER_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT - RENDER_HEIGHT}, pp_colors[COLOR_BACKGROUND]);
            auto style_yellow = *ui::Theme::getInstance()->fg_yellow;
            auto style_red = *ui::Theme::getInstance()->fg_red;
            auto style_blue = *ui::Theme::getInstance()->fg_blue;
-            painter.draw_string({5, RENDER_HEIGHT + 5}, style_yellow, "Health: " + std::to_string(player.health));
-            painter.draw_string({100, RENDER_HEIGHT + 5}, style_red, "Kills: " + std::to_string(kills));
-            painter.draw_string({170, RENDER_HEIGHT + 5}, style_blue, "Ammo: " + std::to_string(player.ammo));
+
+            int hud_y = RENDER_HEIGHT + 5;
+            painter.draw_string({5, hud_y}, style_yellow, "Health: " + std::to_string(player.health));
+            painter.draw_string({UI_POS_X_CENTER(15), hud_y}, style_red, "Kills: " + std::to_string(kills));
+            painter.draw_string({UI_POS_X_RIGHT(80), hud_y}, style_blue, "Ammo: " + std::to_string(player.ammo));
+
            needs_gun_redraw = false;
        }
    }
@@ -70,7 +70,7 @@ class DoomView : public View {

   private:
    NavigationView& nav_;
-    Button dummy{{screen_width, 0, 0, 0}, ""};
+    Button dummy{{0, 0, 0, 0}, ""};
    bool initialized{false};
    bool prev_velocity_moving{false};
    MessageHandlerRegistration message_handler_frame_sync{
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2024 EPIRB Decoder Implementation
+ *
+ * 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 "ui_epirb_rx.hpp"
+#include "ui_navigation.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::epirb_rx {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<EPIRBAppView>();
+}
+}  // namespace ui::external_app::epirb_rx
+
+extern "C" {
+
+__attribute__((section(".external_app.app_epirb_rx.application_information"), used)) application_information_t _application_information_epirb_rx = {
+    /*.memory_location = */ (uint8_t*)0x00000000,
+    /*.externalAppEntry = */ ui::external_app::epirb_rx::initialize_app,
+    /*.header_version = */ CURRENT_HEADER_VERSION,
+    /*.app_version = */ VERSION_MD5,
+
+    /*.app_name = */ "EPIRB RX",
+    /*.bitmap_data = */ {
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x7C,
+        0x3E,
+        0xFE,
+        0x7F,
+        0xFF,
+        0xFF,
+        0xF7,
+        0xEF,
+        0xE3,
+        0xC7,
+        0xE3,
+        0xC7,
+        0xE3,
+        0xC7,
+        0xE3,
+        0xC7,
+        0xF7,
+        0xEF,
+        0xFF,
+        0xFF,
+        0xFE,
+        0x7F,
+        0x7C,
+        0x3E,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+    },
+    /*.icon_color = */ ui::Color::red().v,
+    /*.menu_location = */ app_location_t::RX,
+    /*.desired_menu_position = */ -1,
+
+    /*.m4_app_tag = portapack::spi_flash::image_tag_epirb_rx */ {'P', 'E', 'P', 'I'},
+    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
+};
+}
@@ -0,0 +1,707 @@
+/*
+ * Copyright (C) 2024 EPIRB Decoder Implementation
+ *
+ * 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 "baseband_api.hpp"
+#include "portapack_persistent_memory.hpp"
+#include "file_path.hpp"
+
+#include "ui_epirb_rx.hpp"
+
+using namespace portapack;
+
+#include "rtc_time.hpp"
+#include "string_format.hpp"
+#include "ui.hpp"
+
+#include "message.hpp"
+
+namespace ui::external_app::epirb_rx {
+
+EPIRBBeacon EPIRBDecoder::decode_packet(const baseband::Packet& packet) {
+    EPIRBBeacon beacon;
+
+    if (packet.size() < 112) {
+        return beacon;  // Invalid packet
+    }
+
+    // Convert packet bits to byte array for easier processing
+    std::array<uint8_t, 16> data{};
+    for (size_t i = 0; i < std::min(packet.size() / 8, data.size()); i++) {
+        uint8_t byte_val = 0;
+        for (int bit = 0; bit < 8 && (i * 8 + bit) < packet.size(); bit++) {
+            if (packet[i * 8 + bit]) {
+                byte_val |= (1 << (7 - bit));
+            }
+        }
+        data[i] = byte_val;
+    }
+
+    // Perform BCH error detection and correction
+    uint8_t error_count = 0;
+    beacon.packet_status = perform_bch_check(data, error_count);
+    beacon.error_count = error_count;
+
+    // Extract beacon ID (bits 26-85, 15 hex digits)
+    beacon.beacon_id = 0;
+    for (int i = 3; i < 11; i++) {
+        beacon.beacon_id = (beacon.beacon_id << 8) | data[i];
+    }
+
+    // Extract beacon type (bits 86-88)
+    uint8_t type_bits = (data[10] >> 5) & 0x07;
+    beacon.beacon_type = decode_beacon_type(type_bits);
+
+    // Extract emergency type (bits 91-94 for some beacon types)
+    uint8_t emergency_bits = (data[11] >> 4) & 0x0F;
+    beacon.emergency_type = decode_emergency_type(emergency_bits);
+
+    // Extract location if encoded (depends on beacon type and protocol)
+    beacon.location = decode_location(data);
+
+    // Extract country code (bits 1-10)
+    beacon.country_code = decode_country_code(data);
+
+    // Set timestamp
+    rtc::RTC datetime;
+    rtcGetTime(&RTCD1, &datetime);
+    beacon.timestamp = datetime;
+
+    return beacon;
+}
+
+EPIRBLocation EPIRBDecoder::decode_location(const std::array<uint8_t, 16>& data) {
+    // EPIRB location encoding varies by protocol version
+    // This is a simplified decoder for the most common format
+
+    // Check for location data presence (bit patterns vary)
+    if ((data[12] & 0x80) == 0) {
+        return EPIRBLocation();  // No location data
+    }
+
+    // Extract latitude (simplified - actual encoding is more complex)
+    int32_t lat_raw = ((data[12] & 0x7F) << 10) | (data[13] << 2) | ((data[14] >> 6) & 0x03);
+    if (lat_raw & 0x10000) lat_raw |= 0xFFFE0000;  // Sign extend
+    float latitude = lat_raw * (180.0f / 131072.0f);
+
+    // Extract longitude (simplified - actual encoding is more complex)
+    int32_t lon_raw = ((data[14] & 0x3F) << 12) | (data[15] << 4) | ((data[0] >> 4) & 0x0F);
+    if (lon_raw & 0x20000) lon_raw |= 0xFFFC0000;  // Sign extend
+    float longitude = lon_raw * (360.0f / 262144.0f);
+
+    // Validate coordinates
+    if (latitude < -90.0f || latitude > 90.0f || longitude < -180.0f || longitude > 180.0f) {
+        return EPIRBLocation();  // Invalid coordinates
+    }
+
+    return EPIRBLocation(latitude, longitude);
+}
+
+BeaconType EPIRBDecoder::decode_beacon_type(uint8_t type_bits) {
+    switch (type_bits) {
+        case 0:
+            return BeaconType::OrbitingLocationBeacon;
+        case 1:
+            return BeaconType::PersonalLocatorBeacon;
+        case 2:
+            return BeaconType::EmergencyLocatorTransmitter;
+        case 3:
+            return BeaconType::SerialELT;
+        case 4:
+            return BeaconType::NationalELT;
+        default:
+            return BeaconType::Other;
+    }
+}
+
+EmergencyType EPIRBDecoder::decode_emergency_type(uint8_t emergency_bits) {
+    switch (emergency_bits) {
+        case 0:
+            return EmergencyType::Fire;
+        case 1:
+            return EmergencyType::Flooding;
+        case 2:
+            return EmergencyType::Collision;
+        case 3:
+            return EmergencyType::Grounding;
+        case 4:
+            return EmergencyType::Sinking;
+        case 5:
+            return EmergencyType::Disabled;
+        case 6:
+            return EmergencyType::Abandoning;
+        case 7:
+            return EmergencyType::Piracy;
+        case 8:
+            return EmergencyType::Man_Overboard;
+        default:
+            return EmergencyType::Other;
+    }
+}
+
+uint32_t EPIRBDecoder::decode_country_code(const std::array<uint8_t, 16>& data) {
+    // Country code is in bits 1-10 (ITU country code)
+    return ((data[0] & 0x03) << 8) | data[1];
+}
+
+std::string EPIRBDecoder::decode_vessel_name(const std::array<uint8_t, 16>& /* data */) {
+    // Vessel name extraction depends on beacon type and protocol
+    // This is a placeholder - actual implementation would be more complex
+    return "";
+}
+
+PacketStatus EPIRBDecoder::perform_bch_check(std::array<uint8_t, 16>& data, uint8_t& error_count) {
+    // Make a copy to detect changes
+    std::array<uint8_t, 16> original_data = data;
+
+    // Calculate BCH syndrome
+    uint32_t syndrome = calculate_bch_syndrome(data);
+
+    if (syndrome == 0) {
+        // No errors detected
+        error_count = 0;
+        return PacketStatus::Valid;
+    }
+
+    // Try to correct single-bit error
+    if (correct_single_error(data, syndrome)) {
+        // Successfully corrected
+        error_count = count_bit_errors(original_data, data);
+        return PacketStatus::Corrected;
+    }
+
+    // Multiple errors or uncorrectable
+    error_count = 255;  // Indicate unknown error count
+    return PacketStatus::Error;
+}
+
+uint32_t EPIRBDecoder::calculate_bch_syndrome(const std::array<uint8_t, 16>& data) {
+    // BCH(127,92,5) polynomial for EPIRB: x^35 + x^2 + x + 1
+    // This is a simplified implementation - actual EPIRB uses BCH(63,21,6)
+    uint32_t syndrome = 0;
+    uint32_t polynomial = 0x80000007;  // x^31 + x^2 + x + 1 (simplified)
+
+    // Process each byte of the data
+    for (int i = 0; i < 14; i++) {  // Only data bits, not parity
+        uint32_t byte_val = data[i];
+        for (int bit = 7; bit >= 0; bit--) {
+            syndrome <<= 1;
+            if (byte_val & (1 << bit)) {
+                syndrome |= 1;
+            }
+
+            // XOR with polynomial if MSB is set
+            if (syndrome & 0x80000000) {
+                syndrome ^= polynomial;
+            }
+        }
+    }
+
+    // XOR with parity bits
+    syndrome ^= (data[14] << 8) | data[15];
+
+    return syndrome & 0xFFFF;  // 16-bit syndrome
+}
+
+bool EPIRBDecoder::correct_single_error(std::array<uint8_t, 16>& data, uint32_t syndrome) {
+    // Simplified single-error correction
+    // This is a basic implementation - real BCH correction is more complex
+
+    if (syndrome == 0) return true;  // No error
+
+    // Look up table for single-bit error patterns (simplified)
+    // In a real implementation, this would be a proper BCH syndrome table
+    for (int byte_idx = 0; byte_idx < 14; byte_idx++) {
+        for (int bit_idx = 0; bit_idx < 8; bit_idx++) {
+            // Create test error pattern
+            std::array<uint8_t, 16> test_data = data;
+            test_data[byte_idx] ^= (1 << bit_idx);
+
+            // Check if this correction produces zero syndrome
+            if (calculate_bch_syndrome(test_data) == 0) {
+                // Found the error location, apply correction
+                data[byte_idx] ^= (1 << bit_idx);
+                return true;
+            }
+        }
+    }
+
+    return false;  // Could not correct
+}
+
+uint8_t EPIRBDecoder::count_bit_errors(const std::array<uint8_t, 16>& original, const std::array<uint8_t, 16>& corrected) {
+    uint8_t count = 0;
+    for (size_t i = 0; i < 16; i++) {
+        uint8_t diff = original[i] ^ corrected[i];
+        // Count set bits in diff
+        while (diff) {
+            count += diff & 1;
+            diff >>= 1;
+        }
+    }
+    return count;
+}
+
+void EPIRBLogger::on_packet(const EPIRBBeacon& beacon) {
+    std::string entry = "EPIRB," +
+                        to_string_dec_uint(beacon.beacon_id, 15, '0') + "," +
+                        to_string_dec_uint(static_cast<uint8_t>(beacon.beacon_type)) + "," +
+                        to_string_dec_uint(static_cast<uint8_t>(beacon.emergency_type)) + ",";
+
+    if (beacon.location.valid) {
+        entry += to_string_decimal(beacon.location.latitude, 6) + "," +
+                 to_string_decimal(beacon.location.longitude, 6);
+    } else {
+        entry += ",";
+    }
+
+    entry += "," + to_string_dec_uint(beacon.country_code) + "," +
+             format_packet_status(beacon.packet_status) + "," +
+             to_string_dec_uint(beacon.error_count) + "\n";
+
+    log_file.write_entry(beacon.timestamp, entry);
+}
+
+std::string format_beacon_type(BeaconType type) {
+    switch (type) {
+        case BeaconType::OrbitingLocationBeacon:
+            return "OLB";
+        case BeaconType::PersonalLocatorBeacon:
+            return "PLB";
+        case BeaconType::EmergencyLocatorTransmitter:
+            return "ELT";
+        case BeaconType::SerialELT:
+            return "S-ELT";
+        case BeaconType::NationalELT:
+            return "N-ELT";
+        default:
+            return "Other";
+    }
+}
+
+std::string format_emergency_type(EmergencyType type) {
+    switch (type) {
+        case EmergencyType::Fire:
+            return "Fire";
+        case EmergencyType::Flooding:
+            return "Flooding";
+        case EmergencyType::Collision:
+            return "Collision";
+        case EmergencyType::Grounding:
+            return "Grounding";
+        case EmergencyType::Sinking:
+            return "Sinking";
+        case EmergencyType::Disabled:
+            return "Disabled";
+        case EmergencyType::Abandoning:
+            return "Abandoning";
+        case EmergencyType::Piracy:
+            return "Piracy";
+        case EmergencyType::Man_Overboard:
+            return "MOB";
+        default:
+            return "Other";
+    }
+}
+
+std::string format_packet_status(PacketStatus status) {
+    switch (status) {
+        case PacketStatus::Valid:
+            return "OK";
+        case PacketStatus::Corrected:
+            return "CORR";
+        case PacketStatus::Error:
+            return "ERR";
+        default:
+            return "UNK";
+    }
+}
+
+ui::Color get_packet_status_color(PacketStatus status) {
+    switch (status) {
+        case PacketStatus::Valid:
+            return ui::Color::green();
+        case PacketStatus::Corrected:
+            return ui::Color::yellow();
+        case PacketStatus::Error:
+            return ui::Color::red();
+        default:
+            return ui::Color::white();
+    }
+}
+
+EPIRBBeaconDetailView::EPIRBBeaconDetailView(ui::NavigationView& nav) {
+    add_children({&button_done,
+                  &button_see_map});
+
+    button_done.on_select = [this](Button&) {
+        if (on_close) on_close();
+    };
+
+    button_see_map.on_select = [this, &nav](Button&) {
+        if (beacon_.location.valid) {
+            nav.push<GeoMapView>(
+                to_string_hex(beacon_.beacon_id, 8),  // tag as string
+                0,                                    // altitude
+                GeoPos::alt_unit::METERS,
+                GeoPos::spd_unit::NONE,
+                beacon_.location.latitude,
+                beacon_.location.longitude,
+                0,  // angle
+                [this]() {
+                    if (on_close) on_close();
+                });
+        }
+    };
+}
+
+void EPIRBBeaconDetailView::set_beacon(const EPIRBBeacon& beacon) {
+    beacon_ = beacon;
+    set_dirty();
+}
+
+void EPIRBBeaconDetailView::focus() {
+    button_see_map.focus();
+}
+
+void EPIRBBeaconDetailView::paint(ui::Painter& painter) {
+    View::paint(painter);
+
+    const auto rect = screen_rect();
+    const auto s = style();
+
+    auto draw_cursor = rect.location();
+    draw_cursor += {8, 8};
+
+    draw_cursor = draw_field(painter, {draw_cursor, {200, 16}}, s,
+                             "Beacon ID", to_string_hex(beacon_.beacon_id, 15))
+                      .location();
+
+    draw_cursor = draw_field(painter, {draw_cursor, {200, 16}}, s,
+                             "Type", format_beacon_type(beacon_.beacon_type))
+                      .location();
+
+    draw_cursor = draw_field(painter, {draw_cursor, {200, 16}}, s,
+                             "Emergency", format_emergency_type(beacon_.emergency_type))
+                      .location();
+
+    if (beacon_.location.valid) {
+        draw_cursor = draw_field(painter, {draw_cursor, {200, 16}}, s,
+                                 "Latitude", to_string_decimal(beacon_.location.latitude, 6) + "°")
+                          .location();
+
+        draw_cursor = draw_field(painter, {draw_cursor, {200, 16}}, s,
+                                 "Longitude", to_string_decimal(beacon_.location.longitude, 6) + "°")
+                          .location();
+    } else {
+        draw_cursor = draw_field(painter, {draw_cursor, {200, 16}}, s,
+                                 "Location", "Unknown")
+                          .location();
+    }
+
+    draw_cursor = draw_field(painter, {draw_cursor, {200, 16}}, s,
+                             "Country", to_string_dec_uint(beacon_.country_code))
+                      .location();
+
+    draw_cursor = draw_field(painter, {draw_cursor, {200, 16}}, s,
+                             "Time", to_string_datetime(beacon_.timestamp, HMS))
+                      .location();
+
+    // Show packet status with appropriate color
+    std::string status_text = format_packet_status(beacon_.packet_status);
+    if (beacon_.error_count > 0 && beacon_.packet_status == PacketStatus::Corrected) {
+        status_text += " (" + to_string_dec_uint(beacon_.error_count) + " err)";
+    }
+    draw_cursor = draw_field(painter, {draw_cursor, {200, 16}}, s,
+                             "Status", status_text)
+                      .location();
+}
+
+ui::Rect EPIRBBeaconDetailView::draw_field(
+    ui::Painter& painter,
+    const ui::Rect& draw_rect,
+    const ui::Style& style,
+    const std::string& label,
+    const std::string& value) {
+    const auto label_width = 8 * 8;
+
+    painter.draw_string({draw_rect.location()}, style, label + ":");
+    painter.draw_string({draw_rect.location() + ui::Point{label_width, 0}}, style, value);
+
+    return {draw_rect.location() + ui::Point{0, draw_rect.height()}, draw_rect.size()};
+}
+
+EPIRBAppView::EPIRBAppView(ui::NavigationView& nav)
+    : nav_(nav) {
+    baseband::run_prepared_image(portapack::memory::map::m4_code.base());
+
+    add_children({&label_frequency,
+                  &options_frequency,
+                  &field_rf_amp,
+                  &field_lna,
+                  &field_vga,
+                  &rssi,
+                  &field_volume,
+                  &channel,
+                  &label_status,
+                  &label_beacons_count,
+                  &label_latest,
+                  &text_latest_info,
+                  &label_packet_stats,
+                  &console,
+                  &button_map,
+                  &button_clear,
+                  &button_log});
+
+    button_map.on_select = [this](Button&) {
+        this->on_show_map();
+    };
+
+    button_clear.on_select = [this](Button&) {
+        this->on_clear_beacons();
+    };
+
+    button_log.on_select = [this](Button&) {
+        this->on_toggle_log();
+    };
+
+    options_frequency.on_change = [this](size_t, ui::OptionsField::value_t v) {
+        receiver_model.set_target_frequency(v);
+    };
+    options_frequency.set_by_value(receiver_model.target_frequency());
+
+    signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
+        this->on_tick_second();
+    };
+
+    // Configure receiver for default EPIRB frequency (406.028 MHz)
+    receiver_model.set_target_frequency(406028000);
+    receiver_model.set_rf_amp(true);
+    receiver_model.set_lna(32);
+    receiver_model.set_vga(32);
+    receiver_model.set_sampling_rate(2457600);
+    receiver_model.enable();
+
+    logger = std::make_unique<EPIRBLogger>();
+    if (logger) {
+        logger->append(logs_dir / "epirb_rx.txt");
+    }
+}
+
+EPIRBAppView::~EPIRBAppView() {
+    rtc_time::signal_tick_second -= signal_token_tick_second;
+
+    receiver_model.disable();
+    baseband::shutdown();
+}
+
+void EPIRBAppView::set_parent_rect(const ui::Rect new_parent_rect) {
+    View::set_parent_rect(new_parent_rect);
+
+    const auto console_rect = ui::Rect{
+        new_parent_rect.left(),
+        new_parent_rect.top() + header_height,
+        new_parent_rect.width(),
+        new_parent_rect.height() - header_height - 32};
+    console.set_parent_rect(console_rect);
+}
+
+void EPIRBAppView::paint(ui::Painter& /* painter */) {
+    // Custom painting if needed
+}
+
+void EPIRBAppView::focus() {
+    options_frequency.focus();
+}
+
+void EPIRBAppView::on_packet(const baseband::Packet& packet) {
+    // Decode the EPIRB packet
+    auto beacon = EPIRBDecoder::decode_packet(packet);
+
+    if (beacon.beacon_id != 0) {  // Valid beacon decoded
+        on_beacon_decoded(beacon);
+    }
+}
+
+void EPIRBAppView::on_beacon_decoded(const EPIRBBeacon& beacon) {
+    beacons_received++;
+
+    // Track packet statistics
+    switch (beacon.packet_status) {
+        case PacketStatus::Valid:
+            packets_valid++;
+            break;
+        case PacketStatus::Corrected:
+            packets_corrected++;
+            break;
+        case PacketStatus::Error:
+            packets_error++;
+            break;
+    }
+
+    recent_beacons.push_back(beacon);
+
+    // Keep only last 50 beacons
+    if (recent_beacons.size() > 50) {
+        recent_beacons.erase(recent_beacons.begin());
+    }
+
+    // Update display
+    update_display();
+
+    // Log the beacon
+    if (logger) {
+        logger->on_packet(beacon);
+    }
+
+    // Display in console with full details and colored status
+    std::string beacon_info = format_beacon_summary(beacon);
+    if (beacon.emergency_type != EmergencyType::Other) {
+        beacon_info += " [" + format_emergency_type(beacon.emergency_type) + "]";
+    }
+
+    // Add colored status indicator
+    std::string status_color;
+    switch (beacon.packet_status) {
+        case PacketStatus::Valid:
+            status_color = STR_COLOR_GREEN;
+            break;
+        case PacketStatus::Corrected:
+            status_color = STR_COLOR_YELLOW;
+            break;
+        case PacketStatus::Error:
+            status_color = STR_COLOR_RED;
+            break;
+        default:
+            status_color = STR_COLOR_WHITE;
+            break;
+    }
+
+    beacon_info += " [" + status_color + format_packet_status(beacon.packet_status) + STR_COLOR_WHITE + "]";
+    if (beacon.error_count > 0 && beacon.packet_status == PacketStatus::Corrected) {
+        beacon_info += " (" + to_string_dec_uint(beacon.error_count) + "e)";
+    }
+
+    console.write(beacon_info + "\n");
+}
+
+void EPIRBAppView::on_show_map() {
+    if (!recent_beacons.empty()) {
+        // Find latest beacon with valid location
+        for (auto it = recent_beacons.rbegin(); it != recent_beacons.rend(); ++it) {
+            if (it->location.valid) {
+                // Create a GeoMapView with all beacon locations
+                auto map_view = nav_.push<ui::GeoMapView>(
+                    "EPIRB",  // tag
+                    0,        // altitude
+                    ui::GeoPos::alt_unit::METERS,
+                    ui::GeoPos::spd_unit::NONE,
+                    it->location.latitude,
+                    it->location.longitude,
+                    0  // angle
+                );
+
+                // Add all beacons with valid locations as markers
+                for (const auto& beacon : recent_beacons) {
+                    if (beacon.location.valid) {
+                        ui::GeoMarker marker;
+                        marker.lat = beacon.location.latitude;
+                        marker.lon = beacon.location.longitude;
+                        marker.angle = 0;
+                        marker.tag = to_string_hex(beacon.beacon_id, 8) + " " +
+                                     format_beacon_type(beacon.beacon_type);
+                        map_view->store_marker(marker);
+                    }
+                }
+                return;
+            }
+        }
+    }
+
+    // No valid location found
+    nav_.display_modal("No Location", "No beacons with valid\nlocation data found.");
+}
+
+void EPIRBAppView::on_clear_beacons() {
+    recent_beacons.clear();
+    beacons_received = 0;
+    packets_valid = 0;
+    packets_corrected = 0;
+    packets_error = 0;
+    console.clear(true);
+    update_display();
+}
+
+void EPIRBAppView::on_toggle_log() {
+    // Toggle logging functionality
+    if (logger) {
+        logger.reset();
+        button_log.set_text("Log");
+    } else {
+        logger = std::make_unique<EPIRBLogger>();
+        logger->append("epirb_rx.txt");
+        button_log.set_text("Stop");
+    }
+}
+
+void EPIRBAppView::on_tick_second() {
+    // Update status display every second
+    rtc::RTC datetime;
+    rtcGetTime(&RTCD1, &datetime);
+
+    label_status.set("Listening... " + to_string_datetime(datetime, HM));
+}
+
+void EPIRBAppView::update_display() {
+    label_beacons_count.set("Beacons: " + to_string_dec_uint(beacons_received));
+
+    // Update packet statistics display
+    std::string stats = std::string("Stats: ") +
+                        STR_COLOR_GREEN + to_string_dec_uint(packets_valid) + "OK " +
+                        STR_COLOR_YELLOW + to_string_dec_uint(packets_corrected) + "CORR " +
+                        STR_COLOR_RED + to_string_dec_uint(packets_error) + "ERR" + STR_COLOR_WHITE;
+    label_packet_stats.set(stats);
+
+    if (!recent_beacons.empty()) {
+        const auto& latest = recent_beacons.back();
+        text_latest_info.set(format_beacon_summary(latest));
+    }
+}
+
+std::string EPIRBAppView::format_beacon_summary(const EPIRBBeacon& beacon) {
+    std::string summary = to_string_hex(beacon.beacon_id, 8) + " " +
+                          format_beacon_type(beacon.beacon_type);
+
+    if (beacon.location.valid) {
+        summary += " " + format_location(beacon.location);
+    }
+
+    // Add status indicator for summary display
+    summary += " " + format_packet_status(beacon.packet_status);
+
+    return summary;
+}
+
+std::string EPIRBAppView::format_location(const EPIRBLocation& location) {
+    return to_string_decimal(location.latitude, 4) + "°," +
+           to_string_decimal(location.longitude, 4) + "°";
+}
+
+}  // namespace ui::external_app::epirb_rx
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pezsma	545dead1ca	Added new game: Morse trainer (#2820 ) * Added new game: Morse trainer * code format error fix, and ui alignment	2025-10-16 13:01:28 +02:00
Totoo	e3b2a65b39	Oregon fixes (#2822 )	2025-10-16 13:00:40 +02:00
Totoo	2f4d222403	New memory address for i2c dev loaded apps (#2817 ) * New memory address for i2c dev loaded apps * better download handling on error * new hackrf version (added PortapackRf support) * lock i2cdev while loading apps	2025-10-14 09:45:52 +02:00
Totoo	54d99945f2	fix touch calib on prf (#2816 )	2025-10-14 09:03:28 +08:00
RocketGod	65a3c797c6	Blackjack - Dynamic screen for PortaRF (#2814 ) Blackjack - Dynamic screen for PortaRF	2025-10-10 22:48:26 +02:00
Totoo	6a81a981aa	Fix standalont touch_release event (#2813 )	2025-10-10 22:47:17 +02:00
RocketGod	193ac73b34	Doom UI improvements for dynamic screen (#2812 ) * Doom dynamic screen and other improvements Doom dynamic screen and other improvements * Res divider fix for big screens * Format code	2025-10-09 22:54:54 +02:00
RocketGod	477d035dce	Dino Game Dynamic Screen for PortaRF plus sprite animation improvements (#2811 ) * Dino Game Dynamic Screen for PortaRF plus sprite animation improvements Dino Game Dynamic Screen for PortaRF plus sprite animation improvements * Format code per usual	2025-10-09 22:31:26 +02:00
RocketGod	1d8f53b49e	Space invaders UI improvements for all device screens including new PortaRF (#2810 ) * Dynamic screen for PortaRF Dynamic screen size for new PortaRF device. * Format code * Space Invaders improvements for all devices including new PortaRF Space Invaders improvements for all devices including new PortaRF	2025-10-09 22:30:30 +02:00
Totoo	db324a5225	PortaRF battery fix (#2809 )	2025-10-09 22:29:53 +02:00
Totoo	b2331bf818	clarify battery settings (#2805 )	2025-10-06 10:29:17 +02:00
Totoo	4b18ac42e9	full blue batt when charging (#2804 )	2025-10-05 17:04:30 +02:00
RocketGod	41dd0c4674	Dynamic screen for PortaRF Tetris (#2803 ) * Dynamic screen for PortaRF * Format code	2025-10-04 19:19:54 +02:00
Totoo	371b6b5079	Multi screen support, with dyn alignment (#2801 )	2025-10-03 19:10:10 +02:00
RocketGod	23cabb8b8a	Make dynamic screen for PortaRF (#2800 )	2025-10-02 11:31:33 -07:00
Totoo	b3edaf3cd0	AIS name fix (#2793 ) * AIS name fix	2025-09-17 22:40:46 +02:00
Totoo	9afd3a9dca	Standalone imp (#2791 ) * Moved ui elements to common folder in standalone, and add screen parameters to the api v4 * pass it as a pointer, so if standalone app supports it can change	2025-09-16 20:29:05 +02:00
Totoo	d80f41e9d7	Beep on search find something. Beep on search find something. Solves #2643	2025-09-14 07:22:48 +00:00
Totoo	46d87d95ae	Set MIC app's freq step a bit lower to 12.5k. Solves #2728 (#2788 )	2025-09-13 12:38:29 +02:00
Totoo	7626dff1ef	Add blue bar (Channel) to sonde app.	2025-09-13 12:37:34 +02:00
Totoo	f101680521	fixes osm marker display bug #2783 (#2786 )	2025-09-13 12:37:01 +02:00
Totoo	325f295ee8	Log function for search app (#2782 )	2025-09-07 22:44:04 +08:00
Totoo	b15bb59678	Standalone app api v3 (#2772 ) Added file io, and updated some ui elements. Also added Digital Rain standalone app for an example.	2025-09-01 11:50:46 +02:00
Totoo	776c9bc7c9	Fix jammer ranges, clean code (#2776 )	2025-08-30 22:22:14 +02:00
Totoo	b9ebefc7c7	AIS map speed fix (#2777 )	2025-08-30 15:01:29 +02:00
Netro	70ace4be8f	BLE RX Lag Improvements (#2770 ) * Better handling on filtering to improve lag.	2025-08-27 15:46:53 +02:00
Totoo	fe826d5d98	Fix bmp16bit with nocomp header (#2769 )	2025-08-27 19:07:08 +08:00
Totoo	4dda7cfaa5	Openstreetmap support (#2765 )	2025-08-27 06:37:57 +00:00
zxkmm	e6d4081c06	Add game 2048 (#2767 ) * _ * rename my name * fix warnings * fix warnings	2025-08-26 07:26:53 -07:00
zxkmm	4f738adc70	rename my names in comments (#2768 ) * rename my name * remove wrong line	2025-08-26 19:56:39 +08:00
Totoo	d516191ccb	Update external.cmake (#2764 ) Disable acars ext app, since not working	2025-08-22 10:44:55 +02:00
gullradriel	29bdc539a3	Fix BLE TX warning, regenerate bitmap.hpp (#2762 ) * fix 'progress' variable warning, added a TODO * up to date bitmap.hpp file, soundboard icon	2025-08-19 07:19:46 +02:00
Arne Luehrs	29bba4d0ea	Epirb 406 v2 (#2761 ) * Adding channel selection to EPIRB receiver * UI enhancement, Packet error check and color display of error * code formating	2025-08-18 09:09:37 +02:00
zxkmm	a6f886ad0a	- (#2759 )	2025-08-16 10:50:52 +02:00
Totoo	2d2d9223f2	better rs41 (#2757 )	2025-08-15 16:24:07 +02:00
zxkmm	6e33007cb6	move soundbrd app external (#2756 )	2025-08-15 13:31:18 +02:00
zxkmm	3f7b59f27e	frequency keypad opt (#2755 ) * init * revert changes that caused by batch replace * revert changes that caused by batch replace * revert changes that caused by batch replace * revert submodu;e	2025-08-13 14:25:21 +02:00
Arne Luehrs	375d1ad54e	Implementation of EPIRB receiver (#2754 ) * Implementation of EPIRB receiver * Baseband processing of EPIRB signal * UI to ddecode and display EPIRB message with display on a map * External application * External proc element * Delete CLAUDE.md	2025-08-13 14:24:18 +02:00
Netro	6b05878532	BLE RX/TX Changes (#2752 ) * Work on BLE Rx Tx improvements. * Working on compile size. * cleanup * Formatting * Fixes * More Improvements + Custom Parsing for Tags * Moving ERT to external apps. * Fix Icon.	2025-08-11 07:42:58 +02:00
RocketGod	3983749f11	Update ui_jammer.cpp (#2747 ) Update warning to reflect actual range limit of bandwidth.	2025-07-30 20:08:00 +02:00
Totoo	28e2f770e5	fix miss (#2738 )	2025-07-12 13:33:22 +02:00
gullradriel	4c5275247e	update version (#2735 ) Co-authored-by: gullradriel <gullradriel@no-mail.com>	2025-07-11 15:57:04 +02:00
gullradriel	a0185d28eb	update submodule (#2734 ) Co-authored-by: gullradriel <gullradriel@no-mail.com>	2025-07-09 21:33:38 +02:00
RocketGod	2500df310f	Add radio settings, new app icon, and other UI improvements (#2732 )	2025-07-03 11:03:51 -07:00
Totoo	54f9ff116b	AIS map improv (#2725 ) * AIS map improv * format code mismatch with vc	2025-06-29 22:47:18 +02:00
Totoo	47f231ad63	Add blue bar to subghzd+weather (#2724 )	2025-06-29 19:31:05 +08:00
Netro	f90d3fabce	Adding simple FSK Rx Processor. Can be used with New Apps. (#2716 ) * Work to allow for unique beacon parsing functions. * Fixing pull. * Changes. * Formatting. * Fix Copyright * Update firmware/application/apps/ble_rx_app.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update firmware/baseband/proc_btlerx.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * PR suggestions. * Fix String. * FSK Rx Improvements. Works for my custom protocol. * Fix buffer size. * Refactor * Formatting. * Formatting. * Fixing compiling, and BLE Rx UI/Performance. * More improvements. * Fixing stuck state. * More stuck parsing fix. * Combining PR changes. * Improvements from previous PR. * Fix dbM calculation relative to device RSSI. * Formatting. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: TJ <tj.baginski@cognosos.com>	2025-06-29 01:02:12 +02:00
RocketGod	4e276cdc71	Battleship (#2720 ) * Made the Battleship 2P 2PP game - FSK is wip * Using POCSAG	2025-06-28 20:02:29 +02:00
plomek	0eb03373b1	Added 3d printed cases for the H4M (#2715 )	2025-06-25 19:16:43 +02:00
Netro	d5ea0f0369	BLE Rx Improvements (#2710 ) * Work to allow for unique beacon parsing functions. * Fix Copyright * Update firmware/application/apps/ble_rx_app.cpp * Update firmware/baseband/proc_btlerx.cpp * PR suggestions. * Fix String. * Refactor	2025-06-25 19:14:04 +02:00
RocketGod	22cc311447	Update app icons for Space Invaders and Dino Game (#2713 )	2025-06-25 16:08:48 +02:00
RocketGod	4fbba205ad	Made the Blackjack game (#2712 ) * Made the Blackjack game * Format Blackjack main.cpp * Changed spade to diamond for dark mode visibility * Format code	2025-06-25 16:07:56 +02:00
RocketGod	7b91103118	Made the Space Invaders game. Argh matey! (#2709 ) * Made the Space Invaders game. Argh matey! * Format code, sigh.	2025-06-21 08:35:52 +02:00
Tommaso Ventafridda	c0aa4a1738	ADSB database update (tools, db) (#2701 ) * enhance make_airlines_db tool * enhance make_icao24_db tool * update airlinescode (.txt, .db), aircraftdatabase/icao24 (.csv, .db)	2025-06-19 17:28:49 +02:00
Tommaso Ventafridda	e26f77ee77	Filemanager: go to parent directory keep track of the right selected … (#2702 ) * Filemanager: go to parent directory keep track of the right selected item and page number * review: avoid unnecessary copies in get_extension	2025-06-19 17:24:38 +02:00
plomek	f53262783a	Improved FPV_ANALOG.txt FREQMAN file (#2700 ) * Improved FPV_ANALOG.txt FREQMAN file Removed unused or super rare analog fpv bands: U, O, H, D Added 1.2GHz -1.3GHz channels sometimes used for long range analog fpv * Corrected and updated the labels to be more consistent. Corrected the labels to be more consistent. I also somehow messed up the correct channels because 1.3GHz FPV is not fully standardized, but these channels seem to be the most common. It should be all correct now. Example transmitters using those channels: https://greenchip.com.ua/0-0-1615-2.html https://flymod.net/en/item/walksnail_vtx_9ch https://pl.aliexpress.com/item/1005006505365351.html	2025-06-19 05:26:02 +00:00
Netro	b456c18008	Modified Text Editor to handle long presses. (#2698 )	2025-06-19 07:21:54 +02:00
Tommaso Ventafridda	fa4b74fd6f	Add vendor name in bluetooth rx app (#2696 ) * add macaddress db, add vendor name in bluetooth rx app * show "missing macaddress.db" instead of unknown if db not found * bluetooth rx list with colors based on mac vendor * bug fix	2025-06-16 10:57:58 -07:00