Moved external Font Viewer app to DEBUG menu (#1485)

* Updated icon
* Support external apps on DEBUG menu screen
This commit is contained in:
Mark Thompson 2023-10-11 11:32:01 -05:00 committed by GitHub
parent 5cd7a09797
commit 37c6b35fb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 21 deletions

View File

@ -34,6 +34,7 @@
#include "ui_font_fixed_8x16.hpp" #include "ui_font_fixed_8x16.hpp"
#include "ui_styles.hpp" #include "ui_styles.hpp"
#include "ui_painter.hpp" #include "ui_painter.hpp"
#include "ui_external_items_menu_loader.hpp"
#include "portapack.hpp" #include "portapack.hpp"
#include "portapack_persistent_memory.hpp" #include "portapack_persistent_memory.hpp"
@ -409,6 +410,11 @@ DebugMenuView::DebugMenuView(NavigationView& nav) {
{"Temperature", ui::Color::dark_cyan(), &bitmap_icon_temperature, [&nav]() { nav.push<TemperatureView>(); }}, {"Temperature", ui::Color::dark_cyan(), &bitmap_icon_temperature, [&nav]() { nav.push<TemperatureView>(); }},
{"Touch Test", ui::Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<DebugScreenTest>(); }}, {"Touch Test", ui::Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<DebugScreenTest>(); }},
}); });
for (auto const& gridItem : ExternalItemsMenuLoader::load_external_items(app_location_t::DEBUG, nav)) {
add_item(gridItem);
};
set_max_rows(2); // allow wider buttons set_max_rows(2); // allow wider buttons
} }

View File

@ -40,32 +40,32 @@ __attribute__((section(".external_app.app_font_viewer.application_information"),
/*.app_name = */ "Font Viewer", /*.app_name = */ "Font Viewer",
/*.bitmap_data = */ { /*.bitmap_data = */ {
0x00,
0x00,
0x00, 0x00,
0x00, 0x00,
0x10, 0x10,
0x08, 0x0C,
0x10,
0x08,
0x38, 0x38,
0x08, 0x0C,
0x28, 0x38,
0x08, 0x0C,
0x6C, 0x6C,
0x08, 0x0C,
0x44, 0x6C,
0x08, 0x0C,
0xC6,
0x7C,
0xFE, 0xFE,
0x78, 0xFC,
0x82, 0xFF,
0x88, 0x8D,
0x83, 0x83,
0x89, 0x8D,
0x83,
0xFD,
0x01, 0x01,
0x89, 0x7D,
0x01,
0x79,
0x00,
0x00,
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
@ -73,8 +73,8 @@ __attribute__((section(".external_app.app_font_viewer.application_information"),
0x00, 0x00,
0x00, 0x00,
}, },
/*.icon_color = */ ui::Color::yellow().v, /*.icon_color = */ ui::Color::cyan().v,
/*.menu_location = */ app_location_t::UTILITIES, /*.menu_location = */ app_location_t::DEBUG,
/*.m4_app_tag = portapack::spi_flash::image_tag_noop */ {'\0', '\0', '\0', '\0'}, /*.m4_app_tag = portapack::spi_flash::image_tag_noop */ {'\0', '\0', '\0', '\0'},
/*.m4_app_offset = */ 0x00000000, // will be filled at compile time /*.m4_app_offset = */ 0x00000000, // will be filled at compile time

View File

@ -33,7 +33,8 @@ typedef void (*externalAppEntry_t)(ui::NavigationView& nav);
enum app_location_t : uint32_t { enum app_location_t : uint32_t {
UTILITIES = 0, UTILITIES = 0,
RX, RX,
TX TX,
DEBUG
}; };
struct application_information_t { struct application_information_t {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 B

After

Width:  |  Height:  |  Size: 167 B