Revert "Keep power settings internal (fix wrong mA) +5kb DFU :("

This reverts commit 5bd168c24b.
2026-04-24 03:29:57 -07:00 · 2024-02-15 01:19:38 +00:00
parent 16d821142d
commit 4ec530c912
17 changed files with 18 additions and 44 deletions
--- a/applications/services/applications.h
+++ b/applications/services/applications.h
@@ -62,7 +62,7 @@ extern const FlipperInternalApplication FLIPPER_ARCHIVE;
 /* Settings list
 * Spawned by loader
 */
-extern const FlipperInternalApplication FLIPPER_SETTINGS_APPS[];
+extern const FlipperExternalApplication FLIPPER_SETTINGS_APPS[];
 extern const size_t FLIPPER_SETTINGS_APPS_COUNT;

 /* External Menu Apps list
@@ -70,9 +70,3 @@ extern const size_t FLIPPER_SETTINGS_APPS_COUNT;
 */
 extern const FlipperExternalApplication FLIPPER_EXTERNAL_APPS[];
 extern const size_t FLIPPER_EXTERNAL_APPS_COUNT;
-
-/* External Settings list
- * Spawned by loader
- */
-extern const FlipperExternalApplication FLIPPER_EXTSETTINGS_APPS[];
-extern const size_t FLIPPER_EXTSETTINGS_APPS_COUNT;
--- a/applications/services/loader/loader.c
+++ b/applications/services/loader/loader.c
@@ -26,9 +26,9 @@ static const char* loader_find_external_application_by_name(const char* app_name
        }
    }

-    for(size_t i = 0; i < FLIPPER_EXTSETTINGS_APPS_COUNT; i++) {
-        if(strcmp(FLIPPER_EXTSETTINGS_APPS[i].name, app_name) == 0) {
-            return FLIPPER_EXTSETTINGS_APPS[i].path;
+    for(size_t i = 0; i < FLIPPER_SETTINGS_APPS_COUNT; i++) {
+        if(strcmp(FLIPPER_SETTINGS_APPS[i].name, app_name) == 0) {
+            return FLIPPER_SETTINGS_APPS[i].path;
        }
    }

@@ -327,7 +327,6 @@ 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},
    };
--- a/applications/services/loader/loader_cli.c
+++ b/applications/services/loader/loader_cli.c
@@ -26,9 +26,6 @@ static void loader_cli_list() {
    for(size_t i = 0; i < FLIPPER_SETTINGS_APPS_COUNT; i++) {
        printf("\t%s\r\n", FLIPPER_SETTINGS_APPS[i].name);
    }
-    for(size_t i = 0; i < FLIPPER_EXTSETTINGS_APPS_COUNT; i++) {
-        printf("\t%s\r\n", FLIPPER_EXTSETTINGS_APPS[i].name);
-    }
 }

 static void loader_cli_info(Loader* loader) {
--- a/applications/services/loader/loader_menu.c
+++ b/applications/services/loader/loader_menu.c
@@ -117,14 +117,6 @@ static void loader_menu_build_submenu(LoaderMenuApp* app, LoaderMenu* loader_men
            loader_menu_callback,
            loader_menu);
    }
-    for(size_t i = 0; i < FLIPPER_EXTSETTINGS_APPS_COUNT; i++) {
-        submenu_add_item(
-            app->settings_menu,
-            FLIPPER_EXTSETTINGS_APPS[i].name,
-            (uint32_t)FLIPPER_EXTSETTINGS_APPS[i].name,
-            loader_menu_callback,
-            loader_menu);
-    }
 }

 static LoaderMenuApp* loader_menu_app_alloc(LoaderMenu* loader_menu) {
--- a/applications/settings/about/application.fam
+++ b/applications/settings/about/application.fam
@@ -1,7 +1,7 @@
 App(
    appid="about",
    name="About",
-    apptype=FlipperAppType.EXTSETTINGS,
+    apptype=FlipperAppType.SETTINGS,
    entry_point="about_settings_app",
    cdefines=["APP_ABOUT"],
    requires=[
--- a/applications/settings/bt_settings_app/application.fam
+++ b/applications/settings/bt_settings_app/application.fam
@@ -1,7 +1,7 @@
 App(
    appid="bt_settings",
    name="Bluetooth",
-    apptype=FlipperAppType.EXTSETTINGS,
+    apptype=FlipperAppType.SETTINGS,
    entry_point="bt_settings_app",
    stack_size=1 * 1024,
    requires=[
--- a/applications/settings/desktop_settings/application.fam
+++ b/applications/settings/desktop_settings/application.fam
@@ -1,7 +1,7 @@
 App(
    appid="desktop_settings",
    name="Desktop",
-    apptype=FlipperAppType.EXTSETTINGS,
+    apptype=FlipperAppType.SETTINGS,
    entry_point="desktop_settings_app",
    requires=[
        "desktop",
--- a/applications/settings/dolphin_passport/application.fam
+++ b/applications/settings/dolphin_passport/application.fam
@@ -1,7 +1,7 @@
 App(
    appid="passport",
    name="Passport",
-    apptype=FlipperAppType.EXTSETTINGS,
+    apptype=FlipperAppType.SETTINGS,
    entry_point="passport_app",
    cdefines=["APP_PASSPORT"],
    requires=[
--- a/applications/settings/expansion_settings_app/application.fam
+++ b/applications/settings/expansion_settings_app/application.fam
@@ -1,7 +1,7 @@
 App(
    appid="expansion_settings",
    name="Expansion Modules",
-    apptype=FlipperAppType.EXTSETTINGS,
+    apptype=FlipperAppType.SETTINGS,
    entry_point="expansion_settings_app",
    requires=["gui"],
    stack_size=1 * 1024,
--- a/applications/settings/notification_settings/application.fam
+++ b/applications/settings/notification_settings/application.fam
@@ -1,7 +1,7 @@
 App(
    appid="notification_settings",
    name="LCD and Notifications",
-    apptype=FlipperAppType.EXTSETTINGS,
+    apptype=FlipperAppType.SETTINGS,
    entry_point="notification_settings_app",
    requires=["notification"],
    stack_size=1 * 1024,
--- a/applications/settings/storage_settings/application.fam
+++ b/applications/settings/storage_settings/application.fam
@@ -1,7 +1,7 @@
 App(
    appid="storage_settings",
    name="Storage",
-    apptype=FlipperAppType.EXTSETTINGS,
+    apptype=FlipperAppType.SETTINGS,
    entry_point="storage_settings_app",
    requires=["storage"],
    stack_size=2 * 1024,
--- a/applications/settings/system/application.fam
+++ b/applications/settings/system/application.fam
@@ -1,7 +1,7 @@
 App(
    appid="system_settings",
    name="System",
-    apptype=FlipperAppType.EXTSETTINGS,
+    apptype=FlipperAppType.SETTINGS,
    entry_point="system_settings_app",
    requires=["gui", "locale"],
    stack_size=1 * 1024,
--- a/scripts/fbt/appmanifest.py
+++ b/scripts/fbt/appmanifest.py
@@ -26,7 +26,6 @@ class FlipperAppType(Enum):
    STARTUP = "StartupHook"
    EXTERNAL = "External"
    MENUEXTERNAL = "MenuExternal"
-    EXTSETTINGS = "ExtSettings"
    METAPACKAGE = "Package"
    PLUGIN = "Plugin"

@@ -249,7 +248,6 @@ class AppBuildset:
        FlipperAppType.APP,
        FlipperAppType.DEBUG,
        FlipperAppType.ARCHIVE,
-        FlipperAppType.SETTINGS,
        FlipperAppType.STARTUP,
    )
    EXTERNAL_APP_TYPES_MAP = {
@@ -258,7 +256,7 @@ class AppBuildset:
        FlipperAppType.PLUGIN: True,
        FlipperAppType.DEBUG: True,
        FlipperAppType.MENUEXTERNAL: False,
-        FlipperAppType.EXTSETTINGS: False,
+        FlipperAppType.SETTINGS: False,
    }

    @classmethod
--- a/scripts/fbt_tools/fbt_apps.py
+++ b/scripts/fbt_tools/fbt_apps.py
@@ -23,10 +23,6 @@ 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",
@@ -38,9 +34,9 @@ class ApplicationsCGenerator:
            "FlipperExternalApplication",
            "FLIPPER_EXTERNAL_APPS",
        ),
-        FlipperAppType.EXTSETTINGS: (
+        FlipperAppType.SETTINGS: (
            "FlipperExternalApplication",
-            "FLIPPER_EXTSETTINGS_APPS",
+            "FLIPPER_SETTINGS_APPS",
        ),
    }

--- a/scripts/fbt_tools/fbt_extapps.py
+++ b/scripts/fbt_tools/fbt_extapps.py
@@ -488,7 +488,7 @@ def _gather_app_components(env, appname) -> AppDeploymentComponents:
            if host_app.apptype in [
                FlipperAppType.EXTERNAL,
                FlipperAppType.MENUEXTERNAL,
-                FlipperAppType.EXTSETTINGS,
+                FlipperAppType.SETTINGS,
            ]:
                components.add_app(host_app)
            else:
--- a/scripts/ufbt/SConstruct
+++ b/scripts/ufbt/SConstruct
@@ -232,7 +232,7 @@ apps_to_build_as_faps = [
    FlipperAppType.PLUGIN,
    FlipperAppType.EXTERNAL,
    FlipperAppType.MENUEXTERNAL,
-    FlipperAppType.EXTSETTINGS,
+    FlipperAppType.SETTINGS,
 ]

 known_extapps = [
--- a/targets/f7/api_symbols.csv
+++ b/targets/f7/api_symbols.csv
@@ -3663,13 +3663,11 @@ Variable,-,FLIPPER_DEBUG_APPS,const FlipperInternalApplication[],
 Variable,-,FLIPPER_DEBUG_APPS_COUNT,const size_t,
 Variable,+,FLIPPER_EXTERNAL_APPS,const FlipperExternalApplication[],
 Variable,+,FLIPPER_EXTERNAL_APPS_COUNT,const size_t,
-Variable,+,FLIPPER_EXTSETTINGS_APPS,const FlipperExternalApplication[],
-Variable,+,FLIPPER_EXTSETTINGS_APPS_COUNT,const size_t,
 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 FlipperInternalApplication[],
+Variable,+,FLIPPER_SETTINGS_APPS,const FlipperExternalApplication[],
 Variable,+,FLIPPER_SETTINGS_APPS_COUNT,const size_t,
 Variable,-,FLIPPER_SYSTEM_APPS,const FlipperInternalApplication[],
 Variable,-,FLIPPER_SYSTEM_APPS_COUNT,const size_t,