[FL-3097] fbt, faploader: minimal app module implementation (#2420)
* fbt, faploader: minimal app module implementation * faploader, libs: moved API hashtable core to flipper_application * example: compound api * lib: flipper_application: naming fixes, doxygen comments * fbt: changed `requires` manifest field behavior for app extensions * examples: refactored plugin apps; faploader: changed new API naming; fbt: changed PLUGIN app type meaning * loader: dropped support for debug apps & plugin menus * moved applications/plugins -> applications/external * Restored x bit on chiplist_convert.py * git: fixed free-dap submodule path * pvs: updated submodule paths * examples: example_advanced_plugins.c: removed potential memory leak on errors * examples: example_plugins: refined requires * fbt: not deploying app modules for debug/sample apps; extra validation for .PLUGIN-type apps * apps: removed cdefines for external apps * fbt: moved ext app path definition * fbt: reworked fap_dist handling; f18: synced api_symbols.csv * fbt: removed resources_paths for extapps * scripts: reworked storage * scripts: reworked runfap.py & selfupdate.py to use new api * wip: fal runner * fbt: moved file packaging into separate module * scripts: storage: fixes * scripts: storage: minor fixes for new api * fbt: changed internal artifact storage details for external apps * scripts: storage: additional fixes and better error reporting; examples: using APP_DATA_PATH() * fbt, scripts: reworked launch_app to deploy plugins; moved old runfap.py to distfap.py * fbt: extra check for plugins descriptors * fbt: additional checks in emitter * fbt: better info message on SDK rebuild * scripts: removed requirements.txt * loader: removed remnants of plugins & debug menus * post-review fixes
This commit is contained in:
@@ -7,5 +7,8 @@ App(
|
||||
requires=["gui"],
|
||||
stack_size=2 * 1024,
|
||||
order=90,
|
||||
sdk_headers=["loader.h"],
|
||||
sdk_headers=[
|
||||
"loader.h",
|
||||
"firmware_api/firmware_api.h",
|
||||
],
|
||||
)
|
||||
|
21
applications/services/loader/firmware_api/firmware_api.cpp
Normal file
21
applications/services/loader/firmware_api/firmware_api.cpp
Normal file
@@ -0,0 +1,21 @@
|
||||
#include "firmware_api.h"
|
||||
|
||||
#include <flipper_application/api_hashtable/api_hashtable.h>
|
||||
#include <flipper_application/api_hashtable/compilesort.hpp>
|
||||
|
||||
/* Generated table */
|
||||
#include <symbols.h>
|
||||
|
||||
static_assert(!has_hash_collisions(elf_api_table), "Detected API method hash collision!");
|
||||
|
||||
constexpr HashtableApiInterface elf_api_interface{
|
||||
{
|
||||
.api_version_major = (elf_api_version >> 16),
|
||||
.api_version_minor = (elf_api_version & 0xFFFF),
|
||||
.resolver_callback = &elf_resolve_from_hashtable,
|
||||
},
|
||||
.table_cbegin = elf_api_table.cbegin(),
|
||||
.table_cend = elf_api_table.cend(),
|
||||
};
|
||||
|
||||
const ElfApiInterface* const firmware_api_interface = &elf_api_interface;
|
5
applications/services/loader/firmware_api/firmware_api.h
Normal file
5
applications/services/loader/firmware_api/firmware_api.h
Normal file
@@ -0,0 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#include <flipper_application/elf/elf_api_interface.h>
|
||||
|
||||
extern const ElfApiInterface* const firmware_api_interface;
|
@@ -88,10 +88,6 @@ static FlipperApplication const* loader_find_application_by_name_in_list(
|
||||
const FlipperApplication* loader_find_application_by_name(const char* name) {
|
||||
const FlipperApplication* application = NULL;
|
||||
application = loader_find_application_by_name_in_list(name, FLIPPER_APPS, FLIPPER_APPS_COUNT);
|
||||
if(!application) {
|
||||
application =
|
||||
loader_find_application_by_name_in_list(name, FLIPPER_PLUGINS, FLIPPER_PLUGINS_COUNT);
|
||||
}
|
||||
if(!application) {
|
||||
application = loader_find_application_by_name_in_list(
|
||||
name, FLIPPER_SETTINGS_APPS, FLIPPER_SETTINGS_APPS_COUNT);
|
||||
@@ -100,10 +96,6 @@ const FlipperApplication* loader_find_application_by_name(const char* name) {
|
||||
application = loader_find_application_by_name_in_list(
|
||||
name, FLIPPER_SYSTEM_APPS, FLIPPER_SYSTEM_APPS_COUNT);
|
||||
}
|
||||
if(!application) {
|
||||
application = loader_find_application_by_name_in_list(
|
||||
name, FLIPPER_DEBUG_APPS, FLIPPER_DEBUG_APPS_COUNT);
|
||||
}
|
||||
|
||||
return application;
|
||||
}
|
||||
@@ -160,18 +152,6 @@ static void loader_cli_list(Cli* cli, FuriString* args, Loader* instance) {
|
||||
for(size_t i = 0; i < FLIPPER_APPS_COUNT; i++) {
|
||||
printf("\t%s\r\n", FLIPPER_APPS[i].name);
|
||||
}
|
||||
|
||||
printf("Plugins:\r\n");
|
||||
for(size_t i = 0; i < FLIPPER_PLUGINS_COUNT; i++) {
|
||||
printf("\t%s\r\n", FLIPPER_PLUGINS[i].name);
|
||||
}
|
||||
|
||||
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
|
||||
printf("Debug:\r\n");
|
||||
for(size_t i = 0; i < FLIPPER_DEBUG_APPS_COUNT; i++) {
|
||||
printf("\t%s\r\n", FLIPPER_DEBUG_APPS[i].name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void loader_cli_info(Cli* cli, FuriString* args, Loader* instance) {
|
||||
@@ -341,22 +321,6 @@ static Loader* loader_alloc() {
|
||||
view_set_previous_callback(menu_get_view(instance->primary_menu), loader_hide_menu);
|
||||
view_dispatcher_add_view(
|
||||
instance->view_dispatcher, LoaderMenuViewPrimary, menu_get_view(instance->primary_menu));
|
||||
// Plugins menu
|
||||
instance->plugins_menu = submenu_alloc();
|
||||
view_set_context(submenu_get_view(instance->plugins_menu), instance->plugins_menu);
|
||||
view_set_previous_callback(
|
||||
submenu_get_view(instance->plugins_menu), loader_back_to_primary_menu);
|
||||
view_dispatcher_add_view(
|
||||
instance->view_dispatcher,
|
||||
LoaderMenuViewPlugins,
|
||||
submenu_get_view(instance->plugins_menu));
|
||||
// Debug menu
|
||||
instance->debug_menu = submenu_alloc();
|
||||
view_set_context(submenu_get_view(instance->debug_menu), instance->debug_menu);
|
||||
view_set_previous_callback(
|
||||
submenu_get_view(instance->debug_menu), loader_back_to_primary_menu);
|
||||
view_dispatcher_add_view(
|
||||
instance->view_dispatcher, LoaderMenuViewDebug, submenu_get_view(instance->debug_menu));
|
||||
// Settings menu
|
||||
instance->settings_menu = submenu_alloc();
|
||||
view_set_context(submenu_get_view(instance->settings_menu), instance->settings_menu);
|
||||
@@ -385,10 +349,6 @@ static void loader_free(Loader* instance) {
|
||||
|
||||
menu_free(loader_instance->primary_menu);
|
||||
view_dispatcher_remove_view(loader_instance->view_dispatcher, LoaderMenuViewPrimary);
|
||||
submenu_free(loader_instance->plugins_menu);
|
||||
view_dispatcher_remove_view(loader_instance->view_dispatcher, LoaderMenuViewPlugins);
|
||||
submenu_free(loader_instance->debug_menu);
|
||||
view_dispatcher_remove_view(loader_instance->view_dispatcher, LoaderMenuViewDebug);
|
||||
submenu_free(loader_instance->settings_menu);
|
||||
view_dispatcher_remove_view(loader_instance->view_dispatcher, LoaderMenuViewSettings);
|
||||
view_dispatcher_free(loader_instance->view_dispatcher);
|
||||
@@ -411,24 +371,6 @@ static void loader_build_menu() {
|
||||
loader_menu_callback,
|
||||
(void*)&FLIPPER_APPS[i]);
|
||||
}
|
||||
if(FLIPPER_PLUGINS_COUNT != 0) {
|
||||
menu_add_item(
|
||||
loader_instance->primary_menu,
|
||||
"Plugins",
|
||||
&A_Plugins_14,
|
||||
i++,
|
||||
loader_submenu_callback,
|
||||
(void*)LoaderMenuViewPlugins);
|
||||
}
|
||||
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug) && (FLIPPER_DEBUG_APPS_COUNT > 0)) {
|
||||
menu_add_item(
|
||||
loader_instance->primary_menu,
|
||||
"Debug Tools",
|
||||
&A_Debug_14,
|
||||
i++,
|
||||
loader_submenu_callback,
|
||||
(void*)LoaderMenuViewDebug);
|
||||
}
|
||||
menu_add_item(
|
||||
loader_instance->primary_menu,
|
||||
"Settings",
|
||||
@@ -439,29 +381,8 @@ static void loader_build_menu() {
|
||||
}
|
||||
|
||||
static void loader_build_submenu() {
|
||||
FURI_LOG_I(TAG, "Building plugins menu");
|
||||
size_t i;
|
||||
for(i = 0; i < FLIPPER_PLUGINS_COUNT; i++) {
|
||||
submenu_add_item(
|
||||
loader_instance->plugins_menu,
|
||||
FLIPPER_PLUGINS[i].name,
|
||||
i,
|
||||
loader_menu_callback,
|
||||
(void*)&FLIPPER_PLUGINS[i]);
|
||||
}
|
||||
|
||||
FURI_LOG_I(TAG, "Building debug menu");
|
||||
for(i = 0; i < FLIPPER_DEBUG_APPS_COUNT; i++) {
|
||||
submenu_add_item(
|
||||
loader_instance->debug_menu,
|
||||
FLIPPER_DEBUG_APPS[i].name,
|
||||
i,
|
||||
loader_menu_callback,
|
||||
(void*)&FLIPPER_DEBUG_APPS[i]);
|
||||
}
|
||||
|
||||
FURI_LOG_I(TAG, "Building settings menu");
|
||||
for(i = 0; i < FLIPPER_SETTINGS_APPS_COUNT; i++) {
|
||||
for(size_t i = 0; i < FLIPPER_SETTINGS_APPS_COUNT; i++) {
|
||||
submenu_add_item(
|
||||
loader_instance->settings_menu,
|
||||
FLIPPER_SETTINGS_APPS[i].name,
|
||||
|
@@ -26,8 +26,6 @@ struct Loader {
|
||||
|
||||
ViewDispatcher* view_dispatcher;
|
||||
Menu* primary_menu;
|
||||
Submenu* plugins_menu;
|
||||
Submenu* debug_menu;
|
||||
Submenu* settings_menu;
|
||||
|
||||
volatile uint8_t lock_count;
|
||||
@@ -37,7 +35,5 @@ struct Loader {
|
||||
|
||||
typedef enum {
|
||||
LoaderMenuViewPrimary,
|
||||
LoaderMenuViewPlugins,
|
||||
LoaderMenuViewDebug,
|
||||
LoaderMenuViewSettings,
|
||||
} LoaderMenuView;
|
||||
|
Reference in New Issue
Block a user