Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Better integrate external main apps

Browse Source
This commit is contained in:
Willy-JL
2023-03-28 21:23:42 +01:00
parent fc726ffc84
commit 265473dff6
5 changed files with 49 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/main/application.fam
View File

@@ -13,6 +13,7 @@ App(
"ibutton",
"bad_kb",
"u2f",
"xtreme_app",
"archive",
],
)

5
applications/main/xtreme_app/application.fam
View File

@@ -1,7 +1,7 @@
App(
appid="xtreme_app",
name="Xtreme",
apptype=FlipperAppType.EXTERNAL,
apptype=FlipperAppType.EXTMAINAPP,
entry_point="xtreme_app",
cdefines=["APP_XTREME"],
requires=[
@@ -10,9 +10,8 @@ App(
"xtreme",
],
stack_size=2 * 1024,
# icon="A_Xtreme_14",
icon="A_Xtreme_14",
order=90,
fap_libs=["assets"],
fap_category=".Main",
fap_icon="xtreme_app_10px.png",
)

86
applications/services/loader/loader.c
View File

@@ -19,8 +19,25 @@
static Loader* loader_instance = NULL;
static FlipperApplication const* loader_find_application_by_name_in_list(
const char* name,
const FlipperApplication* list,
const uint32_t n_apps) {
for(size_t i = 0; i < n_apps; i++) {
if(strcmp(name, list[i].name) == 0) {
return &list[i];
}
}
return NULL;
}
static bool
loader_start_application(const FlipperApplication* application, const char* arguments) {
if(application->app == NULL) {
arguments = application->appid;
application = loader_find_application_by_name_in_list(
FAP_LOADER_APP_NAME, FLIPPER_APPS, FLIPPER_APPS_COUNT);
}
loader_instance->application = application;
furi_assert(loader_instance->application_arguments == NULL);
@@ -52,18 +69,6 @@ static bool
return true;
}
static FlipperApplication const* loader_find_application_by_name_in_list(
const char* name,
const FlipperApplication* list,
const uint32_t n_apps) {
for(size_t i = 0; i < n_apps; i++) {
if(strcmp(name, list[i].name) == 0) {
return &list[i];
}
}
return NULL;
}
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);
@@ -94,7 +99,7 @@ static void loader_menu_callback(void* _ctx, uint32_t index) {
loader_start_application(application, NULL);
}
static void loader_main_callback(void* _ctx, uint32_t index) {
static void loader_external_callback(void* _ctx, uint32_t index) {
UNUSED(index);
const char* path = _ctx;
const FlipperApplication* app = loader_find_application_by_name_in_list(
@@ -386,31 +391,19 @@ static void loader_free(Loader* instance) {
bool loader_load_fap_meta(Storage* storage, FuriString* path, FuriString* name, const Icon** icon) {
*icon = NULL;
uint8_t* icon_buf = NULL;
// Match main apps as FAPs for buil-in icons
if(furi_string_equal_str(path, EXT_PATH("apps/.Main/xtreme_app.fap"))) {
*icon = &A_Xtreme_14;
}
// Load FAP bundled icon otherwise
if(!*icon) {
icon_buf = malloc(CUSTOM_ICON_MAX_SIZE);
}
uint8_t* icon_buf = malloc(CUSTOM_ICON_MAX_SIZE);
if(!fap_loader_load_name_and_icon(path, storage, &icon_buf, name)) {
if(icon_buf) {
free(icon_buf);
icon_buf = NULL;
}
free(icon_buf);
icon_buf = NULL;
return false;
}
if(icon_buf) {
*icon = malloc(sizeof(Icon));
FURI_CONST_ASSIGN((*icon)->frame_count, 1);
FURI_CONST_ASSIGN((*icon)->frame_rate, 0);
FURI_CONST_ASSIGN((*icon)->width, 10);
FURI_CONST_ASSIGN((*icon)->height, 10);
FURI_CONST_ASSIGN_PTR((*icon)->frames, malloc(sizeof(const uint8_t*)));
FURI_CONST_ASSIGN_PTR((*icon)->frames[0], icon_buf);
}
*icon = malloc(sizeof(Icon));
FURI_CONST_ASSIGN((*icon)->frame_count, 1);
FURI_CONST_ASSIGN((*icon)->frame_rate, 0);
FURI_CONST_ASSIGN((*icon)->width, 10);
FURI_CONST_ASSIGN((*icon)->height, 10);
FURI_CONST_ASSIGN_PTR((*icon)->frames, malloc(sizeof(const uint8_t*)));
FURI_CONST_ASSIGN_PTR((*icon)->frames[0], icon_buf);
return true;
}
@@ -437,27 +430,6 @@ static void loader_build_menu() {
Storage* storage = furi_record_open(RECORD_STORAGE);
FuriString* path = furi_string_alloc();
FuriString* name = furi_string_alloc();
File* folder = storage_file_alloc(storage);
FileInfo info;
if(storage_dir_open(folder, EXT_PATH("apps/.Main"))) {
char* temp = malloc(100);
while(storage_dir_read(folder, &info, temp, 100)) {
if(file_info_is_dir(&info)) continue;
furi_string_printf(path, EXT_PATH("apps/.Main/%s"), temp);
const Icon* icon;
if(!loader_load_fap_meta(storage, path, name, &icon)) continue;
menu_add_item(
loader_instance->primary_menu,
strdup(furi_string_get_cstr(name)),
icon,
i++,
loader_main_callback,
(void*)strdup(furi_string_get_cstr(path)));
}
free(temp);
}
storage_file_free(folder);
Stream* stream = file_stream_alloc(storage);
if(file_stream_open(stream, XTREME_APPS_PATH, FSAM_READ, FSOM_OPEN_EXISTING)) {
while(stream_read_line(stream, path)) {
@@ -470,7 +442,7 @@ static void loader_build_menu() {
strdup(furi_string_get_cstr(name)),
icon,
i++,
loader_main_callback,
loader_external_callback,
(void*)strdup(furi_string_get_cstr(path)));
}
}

23
scripts/fbt/appmanifest.py
View File

@@ -19,6 +19,7 @@ class FlipperAppType(Enum):
EXTERNAL = "External"
METAPACKAGE = "Package"
PLUGIN = "Plugin"
EXTMAINAPP = "ExtMainApp"
@dataclass
@@ -360,13 +361,21 @@ class ApplicationsCGenerator:
def get_app_descr(self, app: FlipperApplication):
if app.apptype == FlipperAppType.STARTUP:
return app.entry_point
if app.apptype == FlipperAppType.EXTMAINAPP:
return f"""
{{.app = NULL,
.name = "{app.name}",
.appid = "/ext/apps/.Main/{app.appid}.fap",
.stack_size = 0,
.icon = {f"&{app.icon}" if app.icon else "NULL"},
.flags = {'|'.join(f"FlipperApplicationFlag{flag}" for flag in app.flags)}}}"""
return f"""
{{.app = {app.entry_point},
.name = "{app.name}",
.appid = "{app.appid}",
.appid = "{app.appid}",
.stack_size = {app.stack_size},
.icon = {f"&{app.icon}" if app.icon else "NULL"},
.flags = {'|'.join(f"FlipperApplicationFlag{flag}" for flag in app.flags)} }}"""
.flags = {'|'.join(f"FlipperApplicationFlag{flag}" for flag in app.flags)}}}"""
def generate(self):
contents = [
@@ -380,11 +389,11 @@ class ApplicationsCGenerator:
)
entry_type, entry_block = self.APP_TYPE_MAP[apptype]
contents.append(f"const {entry_type} {entry_block}[] = {{")
contents.append(
",\n".join(
map(self.get_app_descr, self.buildset.get_apps_of_type(apptype))
)
)
apps = self.buildset.get_apps_of_type(apptype)
if apptype is FlipperAppType.APP:
apps += self.buildset.get_apps_of_type(FlipperAppType.EXTMAINAPP)
apps.sort(key=lambda app: app.order)
contents.append(",\n".join(map(self.get_app_descr, apps)))
contents.append("};")
contents.append(
f"const size_t {entry_block}_COUNT = COUNT_OF({entry_block});"

1
site_scons/extapps.scons
View File

@@ -68,6 +68,7 @@ class FlipperExtAppBuildArtifacts:
apps_to_build_as_faps = [
FlipperAppType.PLUGIN,
FlipperAppType.EXTERNAL,
FlipperAppType.EXTMAINAPP,
FlipperAppType.DEBUG,
]