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

Settings: Hybrid internal/external, unused for now

Browse Source 
- Reverts part of acc352e61f
- Reverts part of ca5f3bb09a
- Based partly on 71d1c1d0f1
- Use FlipperInternalApplication for settings for settings
- Set FlipperInternalApplicationFlagExternal accordingly
- Keep storage and power settings internal, all others external
- Unused for now, uses too much flash:
  - Previously: 29kb free flash
  - All internal: 4kb free flash
  - Power internal: 22kb free flash
  - Power and storage internal: 16kb free flash
This commit is contained in:
Willy-JL
2024-09-06 01:26:07 +02:00
parent f65d4bb233
commit 1d4cba8c61
15 changed files with 74 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/services/applications.h
+14 -7
View File
@@ -4,24 +4,31 @@
#include <gui/icon.h>
typedef enum {
FlipperApplicationFlagDefault = 0,
FlipperApplicationFlagInsomniaSafe = (1 << 0),
} FlipperApplicationFlag;
FlipperInternalApplicationFlagDefault = 0,
FlipperInternalApplicationFlagInsomniaSafe = (1 << 0),
// Workaround for int and ext apps in same array:
// - use FlipperInternalApplication struct and array
// - set this flag to indicate it is external
FlipperInternalApplicationFlagExternal = (1 << 7),
} FlipperInternalApplicationFlag;
typedef struct {
const FuriThreadCallback app;
const char* name;
const char* appid;
union {
const char* appid; // When internal
const char* path; // When flag FlipperInternalApplicationFlagExternal is set
};
const size_t stack_size;
const Icon* icon;
const FlipperApplicationFlag flags;
const FlipperInternalApplicationFlag flags;
} FlipperInternalApplication;
typedef struct {
const char* name;
const Icon* icon;
const char* path;
const FlipperApplicationFlag flags;
} FlipperExternalApplication;
typedef void (*FlipperInternalOnStartHook)(void);
@@ -63,7 +70,7 @@ extern const FlipperInternalApplication FLIPPER_ARCHIVE;
/* Settings list
* Spawned by loader
*/
extern const FlipperExternalApplication FLIPPER_SETTINGS_APPS[];
extern const FlipperInternalApplication FLIPPER_SETTINGS_APPS[];
extern const size_t FLIPPER_SETTINGS_APPS_COUNT;
/* External Menu Apps list
applications/services/loader/loader.c
+13 -8
View File
@@ -16,18 +16,21 @@
// helpers
static const char*
loader_find_external_application_by_name(const char* app_name, FlipperApplicationFlag* flags) {
static const char* loader_find_external_application_by_name(
const char* app_name,
FlipperInternalApplicationFlag* flags) {
for(size_t i = 0; i < FLIPPER_EXTERNAL_APPS_COUNT; i++) {
if(strcmp(FLIPPER_EXTERNAL_APPS[i].name, app_name) == 0) {
if(flags) *flags = FLIPPER_EXTERNAL_APPS[i].flags;
if(flags) *flags = FlipperInternalApplicationFlagDefault;
return FLIPPER_EXTERNAL_APPS[i].path;
}
}
for(size_t i = 0; i < FLIPPER_SETTINGS_APPS_COUNT; i++) {
FlipperInternalApplicationFlag app_flags = FLIPPER_SETTINGS_APPS[i].flags;
if(!(app_flags & FlipperInternalApplicationFlagExternal)) continue;
if(strcmp(FLIPPER_SETTINGS_APPS[i].name, app_name) == 0) {
if(flags) *flags = FLIPPER_SETTINGS_APPS[i].flags;
if(flags) *flags = app_flags & ~FlipperInternalApplicationFlagExternal;
return FLIPPER_SETTINGS_APPS[i].path;
}
}
@@ -358,6 +361,7 @@ static FlipperInternalApplication const* loader_find_application_by_name_in_list
const FlipperInternalApplication* list,
const uint32_t n_apps) {
for(size_t i = 0; i < n_apps; i++) {
if(list[i].flags & FlipperInternalApplicationFlagExternal) continue;
if((strcmp(name, list[i].name) == 0) || (strcmp(name, list[i].appid) == 0)) {
return &list[i];
}
@@ -371,6 +375,7 @@ static const FlipperInternalApplication* loader_find_application_by_name(const c
const uint32_t count;
} lists[] = {
{FLIPPER_APPS, FLIPPER_APPS_COUNT},
{FLIPPER_SETTINGS_APPS, FLIPPER_SETTINGS_APPS_COUNT},
{FLIPPER_SYSTEM_APPS, FLIPPER_SYSTEM_APPS_COUNT},
{FLIPPER_DEBUG_APPS, FLIPPER_DEBUG_APPS_COUNT},
};
@@ -386,7 +391,7 @@ static const FlipperInternalApplication* loader_find_application_by_name(const c
return NULL;
}
static void loader_start_app_thread(Loader* loader, FlipperApplicationFlag flags) {
static void loader_start_app_thread(Loader* loader, FlipperInternalApplicationFlag flags) {
// setup heap trace
FuriHalRtcHeapTrackMode mode = furi_hal_rtc_get_heap_track_mode();
if(mode > FuriHalRtcHeapTrackModeNone) {
@@ -396,7 +401,7 @@ static void loader_start_app_thread(Loader* loader, FlipperApplicationFlag flags
}
// setup insomnia
if(!(flags & FlipperApplicationFlagInsomniaSafe)) {
if(!(flags & FlipperInternalApplicationFlagInsomniaSafe)) {
furi_hal_power_insomnia_enter();
loader->app.insomniac = true;
} else {
@@ -502,7 +507,7 @@ static LoaderMessageLoaderStatusResult loader_start_external_app(
const char* path,
const char* args,
FuriString* error_message,
FlipperApplicationFlag flags) {
FlipperInternalApplicationFlag flags) {
LoaderMessageLoaderStatusResult result;
result.value = loader_make_success_status(error_message);
result.error = LoaderStatusErrorUnknown;
@@ -700,7 +705,7 @@ static LoaderMessageLoaderStatusResult loader_do_start_by_name(
}
// check External Applications
FlipperApplicationFlag flags = FlipperApplicationFlagDefault;
FlipperInternalApplicationFlag flags = FlipperInternalApplicationFlagDefault;
{
const char* path = loader_find_external_application_by_name(name, &flags);
if(path) {
applications/settings/about/application.fam
+1 -1
View File
@@ -1,7 +1,7 @@
App(
appid="about",
name="About",
apptype=FlipperAppType.SETTINGS,
apptype=FlipperAppType.SETTINGSEXTERNAL,
entry_point="about_settings_app",
cdefines=["APP_ABOUT"],
requires=[
applications/settings/bt_settings_app/application.fam
+1 -1
View File
@@ -1,7 +1,7 @@
App(
appid="bt_settings",
name="Bluetooth",
apptype=FlipperAppType.SETTINGS,
apptype=FlipperAppType.SETTINGSEXTERNAL,
entry_point="bt_settings_app",
stack_size=1 * 1024,
requires=[
applications/settings/desktop_settings/application.fam
+1 -1
View File
@@ -1,7 +1,7 @@
App(
appid="desktop_settings",
name="Desktop",
apptype=FlipperAppType.SETTINGS,
apptype=FlipperAppType.SETTINGSEXTERNAL,
entry_point="desktop_settings_app",
requires=[
"desktop",
applications/settings/dolphin_passport/application.fam
+1 -1
View File
@@ -1,7 +1,7 @@
App(
appid="passport",
name="Passport",
apptype=FlipperAppType.SETTINGS,
apptype=FlipperAppType.SETTINGSEXTERNAL,
entry_point="passport_app",
cdefines=["APP_PASSPORT"],
requires=[
applications/settings/expansion_settings_app/application.fam
+1 -1
View File
@@ -1,7 +1,7 @@
App(
appid="expansion_settings",
name="Expansion Modules",
apptype=FlipperAppType.SETTINGS,
apptype=FlipperAppType.SETTINGSEXTERNAL,
entry_point="expansion_settings_app",
requires=["gui"],
flags=["InsomniaSafe"],
applications/settings/notification_settings/application.fam
+1 -1
View File
@@ -1,7 +1,7 @@
App(
appid="notification_settings",
name="LCD and Notifications",
apptype=FlipperAppType.SETTINGS,
apptype=FlipperAppType.SETTINGSEXTERNAL,
entry_point="notification_settings_app",
requires=["notification"],
flags=["InsomniaSafe"],
applications/settings/power_settings_app/mock_imports/mock_power_api.c
-7
View File
@@ -1,7 +0,0 @@
// Since settings app is external, it cannot access firmware functions
// For simple utils like this, easier to include C code in app rather than exposing to API
// Instead of copying the file, can (ab)use the preprocessor to insert the source code here
// Then, we still use the Header from original code as if nothing happened
// power_get_settings(), power_set_settings()
#include <applications/services/power/power_service/power_api.c>
applications/settings/system/application.fam
+1 -1
View File
@@ -1,7 +1,7 @@
App(
appid="system_settings",
name="System",
apptype=FlipperAppType.SETTINGS,
apptype=FlipperAppType.SETTINGSEXTERNAL,
entry_point="system_settings_app",
requires=["gui", "locale"],
flags=["InsomniaSafe"],
scripts/fbt/appmanifest.py
+3 -1
View File
@@ -26,6 +26,7 @@ class FlipperAppType(Enum):
STARTUP = "StartupHook"
EXTERNAL = "External"
MENUEXTERNAL = "MenuExternal"
SETTINGSEXTERNAL = "SettingsExternal"
METAPACKAGE = "Package"
PLUGIN = "Plugin"
@@ -250,6 +251,7 @@ class AppBuildset:
FlipperAppType.APP,
FlipperAppType.DEBUG,
FlipperAppType.ARCHIVE,
FlipperAppType.SETTINGS,
FlipperAppType.STARTUP,
)
EXTERNAL_APP_TYPES_MAP = {
@@ -258,7 +260,7 @@ class AppBuildset:
FlipperAppType.PLUGIN: True,
FlipperAppType.DEBUG: True,
FlipperAppType.MENUEXTERNAL: False,
FlipperAppType.SETTINGS: False,
FlipperAppType.SETTINGSEXTERNAL: False,
}
@classmethod
scripts/fbt_tools/fbt_apps.py
+34 -27
View File
@@ -23,22 +23,20 @@ class ApplicationsCGenerator:
FlipperAppType.SYSTEM: ("FlipperInternalApplication", "FLIPPER_SYSTEM_APPS"),
FlipperAppType.APP: ("FlipperInternalApplication", "FLIPPER_APPS"),
FlipperAppType.DEBUG: ("FlipperInternalApplication", "FLIPPER_DEBUG_APPS"),
FlipperAppType.SETTINGS: (
"FlipperInternalApplication",
"FLIPPER_SETTINGS_APPS",
),
FlipperAppType.STARTUP: (
"FlipperInternalOnStartHook",
"FLIPPER_ON_SYSTEM_START",
),
}
EXTERNAL_TYPE_MAP = {
FlipperAppType.MENUEXTERNAL: (
"FlipperExternalApplication",
"FLIPPER_EXTERNAL_APPS",
),
FlipperAppType.SETTINGS: (
"FlipperExternalApplication",
"FLIPPER_SETTINGS_APPS",
),
}
APP_EXTERNAL_TYPE = (
"FlipperExternalApplication",
"FLIPPER_EXTERNAL_APPS",
)
def __init__(self, buildset: AppBuildset, autorun_app: str = ""):
self.buildset = buildset
@@ -52,13 +50,26 @@ class ApplicationsCGenerator:
def get_app_descr(self, app: FlipperApplication):
if app.apptype == FlipperAppType.STARTUP:
return app.entry_point
if app.apptype == FlipperAppType.SETTINGSEXTERNAL:
app_path = "/ext/apps"
if app.fap_category:
app_path += f"/{app.fap_category}"
app_path += f"/{app.appid}.fap"
flags = app.flags + ["External"]
return f"""
{{.app = NULL,
.name = "{app.name}",
.path = "{app_path}",
.stack_size = 0,
.icon = {f"&{app.icon}" if app.icon else "NULL"},
.flags = {'|'.join(f"FlipperInternalApplicationFlag{flag}" for flag in flags)} }}"""
return f"""
{{.app = {app.entry_point},
.name = "{app.name}",
.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"FlipperInternalApplicationFlag{flag}" for flag in app.flags)} }}"""
def get_external_app_descr(self, app: FlipperApplication):
app_path = "/ext/apps"
@@ -69,8 +80,7 @@ class ApplicationsCGenerator:
{{
.name = "{app.name}",
.icon = {f"&{app.icon}" if app.icon else "NULL"},
.path = "{app_path}",
.flags = {'|'.join(f"FlipperApplicationFlag{flag}" for flag in app.flags)} }}"""
.path = "{app_path}" }}"""
def generate(self):
contents = [
@@ -84,11 +94,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.SETTINGS:
apps += self.buildset.get_apps_of_type(FlipperAppType.SETTINGSEXTERNAL)
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});"
@@ -103,15 +113,12 @@ class ApplicationsCGenerator:
]
)
for apptype in self.EXTERNAL_TYPE_MAP:
entry_type, entry_block = self.EXTERNAL_TYPE_MAP[apptype]
external_apps = self.buildset.get_apps_of_type(apptype)
contents.append(f"const {entry_type} {entry_block}[] = {{")
contents.append(",\n".join(map(self.get_external_app_descr, external_apps)))
contents.append("};")
contents.append(
f"const size_t {entry_block}_COUNT = COUNT_OF({entry_block});"
)
entry_type, entry_block = self.APP_EXTERNAL_TYPE
external_apps = self.buildset.get_apps_of_type(FlipperAppType.MENUEXTERNAL)
contents.append(f"const {entry_type} {entry_block}[] = {{")
contents.append(",\n".join(map(self.get_external_app_descr, external_apps)))
contents.append("};")
contents.append(f"const size_t {entry_block}_COUNT = COUNT_OF({entry_block});")
return "\n".join(contents)
scripts/fbt_tools/fbt_extapps.py
+1 -1
View File
@@ -491,7 +491,7 @@ def _gather_app_components(env, appname) -> AppDeploymentComponents:
if host_app.apptype in [
FlipperAppType.EXTERNAL,
FlipperAppType.MENUEXTERNAL,
FlipperAppType.SETTINGS,
FlipperAppType.SETTINGSEXTERNAL,
]:
components.add_app(host_app)
else:
scripts/ufbt/SConstruct
+1 -1
View File
@@ -232,7 +232,7 @@ apps_to_build_as_faps = [
FlipperAppType.PLUGIN,
FlipperAppType.EXTERNAL,
FlipperAppType.MENUEXTERNAL,
FlipperAppType.SETTINGS,
FlipperAppType.SETTINGSEXTERNAL,
]
known_extapps = [
targets/f7/api_symbols.csv
+1 -1
View File
@@ -3852,7 +3852,7 @@ Variable,-,FLIPPER_ON_SYSTEM_START,const FlipperInternalOnStartHook[],
Variable,-,FLIPPER_ON_SYSTEM_START_COUNT,const size_t,
Variable,-,FLIPPER_SERVICES,const FlipperInternalApplication[],
Variable,-,FLIPPER_SERVICES_COUNT,const size_t,
Variable,+,FLIPPER_SETTINGS_APPS,const FlipperExternalApplication[],
Variable,+,FLIPPER_SETTINGS_APPS,const FlipperInternalApplication[],
Variable,+,FLIPPER_SETTINGS_APPS_COUNT,const size_t,
Variable,-,FLIPPER_SYSTEM_APPS,const FlipperInternalApplication[],
Variable,-,FLIPPER_SYSTEM_APPS_COUNT,const size_t,
1 entry status name type params
3852 Variable - FLIPPER_ON_SYSTEM_START_COUNT const size_t
3853 Variable - FLIPPER_SERVICES const FlipperInternalApplication[]
3854 Variable - FLIPPER_SERVICES_COUNT const size_t
3855 Variable + FLIPPER_SETTINGS_APPS const FlipperExternalApplication[] const FlipperInternalApplication[]
3856 Variable + FLIPPER_SETTINGS_APPS_COUNT const size_t
3857 Variable - FLIPPER_SYSTEM_APPS const FlipperInternalApplication[]
3858 Variable - FLIPPER_SYSTEM_APPS_COUNT const size_t