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

This reverts commit 5bd168c24b.
This commit is contained in:
Willy-JL
2024-02-15 01:19:38 +00:00
parent 16d821142d
commit 4ec530c912
17 changed files with 18 additions and 44 deletions
+1 -3
View File
@@ -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
+2 -6
View File
@@ -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",
),
}
+1 -1
View File
@@ -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:
+1 -1
View File
@@ -232,7 +232,7 @@ apps_to_build_as_faps = [
FlipperAppType.PLUGIN,
FlipperAppType.EXTERNAL,
FlipperAppType.MENUEXTERNAL,
FlipperAppType.EXTSETTINGS,
FlipperAppType.SETTINGS,
]
known_extapps = [