Merge branch 'hedger/faploader-api-1' into 420

applications/plugins/picopass/application.fam

@@ -1,7 +1,7 @@
 App(
     appid="APPS_Picopass",
     name="PicoPass Reader",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="picopass_app",
     requires=[
         "storage",

assets/SConscript

@@ -1,16 +1,5 @@
 Import("env")
 
-from fbt.version import get_fast_git_version_id
-
-# HACHHACK
-# Currently injected to CPPPATH by libs - since they are built earlier and depend on assets
-# env.Append(
-#     CPPPATH=[
-#         Dir("./compiled"),
-#     ]
-# )
-version_value = Value(get_fast_git_version_id())
-
 assetsenv = env.Clone(
     tools=["fbt_assets"],
     FW_LIB_NAME="assets",
@@ -77,7 +66,6 @@ assetsenv.Alias("proto_ver", proto_ver)
 
 # Gather everything into a static lib
 assets_parts = (icons, proto, dolphin_blocking, dolphin_internal, proto_ver)
-assetsenv.Depends(assets_parts, version_value)
 
 assetslib = assetsenv.Library("${FW_LIB_NAME}", assets_parts)
 assetsenv.Install("${LIB_DIST_DIR}", assetslib)
@@ -113,6 +101,7 @@ if assetsenv["IS_BASE_FIRMWARE"]:
     )
 
     # Exporting resources node to external environment
+    env["FW_ASSETS_HEADERS"] = assets_parts
     env["FW_RESOURCES"] = resources
     assetsenv.Alias("resources", resources)
 

documentation/AppManifests.md

@@ -1,5 +1,80 @@
 # Flipper Application Manifests (.fam)
 
+All components of Flipper Zero firmware — services, user applications, system settings — are developed independently. Each component has a build system manifest file, named `application.fam`, defining basic properties of a component and its relations to other parts of the system.
+
+When building firmware, **`fbt`** collects all application manifests, processes their dependencies and builds only those components that are utilized in current build configuration. See [fbt docs](./fbt.md#firmware-application-set) for details on build configurations.
+
+## Application definition
+
+Properties of a firmware component are declared in a form of a Python code snippet, forming a call to App() function with various parameters. 
+
+Only 2 parameters are mandatoty: ***appid*** and ***apptype***, others are optional and may be meaningful only for certain application types.
+
+### Keys
+
+* **appid**: string, application id within the build system. Used for specifying which applications to include in build configuration and to resolve dependencies and conflicts.
+
+* **apptype**: member of FlipperAppType.* enumeration. Valid values are:
+
+| Enum member  | Firmware component type  |
+|--------------|--------------------------|
+| SERVICE      | System service, created at early startup  |
+| SYSTEM       | Application not being shown in any menus. Can be started by other apps or from CLI  |
+| APP          | Regular application for main menu |
+| PLUGIN       | Application to be built as a part of firmware an to be placed in Plugins menu |
+| DEBUG        | Application only visible in Debug menu with debug mode enabled |
+| ARCHIVE      | One and only Archive app |
+| SETTINGS     | Application to be placed in System settings menu |
+| STARTUP      | Callback function to run at system startup. Does not define a standalone app |
+| EXTERNAL     | Application to be built as a .fap executable file |
+| METAPACKAGE  | Does not define any code to be run, used for declaring dependencies and application bundles |
+
+* **name**: Name to show in menus.
+* **entry_point**: C function to be used as applicaiton's entry point.
+* **flags**: Internal flags for system apps. Do not use.
+* **cdefines**: C preprocessor definitions to declare globally for other apps when current application is included in active build configuration.
+* **requires**: List of application IDs to also include in build configuration, when current application is referenced in list of applications to build.
+* **conflicts**: List of application IDs that current application conflicts with. If any of them is found in constructed application list, **`fbt`** will abort firmware build process.
+* **provides**: Functionally identical to ***requires*** field.
+* **stack_size**: Stack size, in bytes, to allocate for application on its startup. Note that allocating a stack too small for app to run will cause system crash due to stack overflow, and allocating too much stack will reduce usable heap memory size for app to process data. *Note: you can use `ps` and `free` CLI commands to profile you app's memory usage.*
+* **icon**: Animated icon name from built-in assets to be used when building app as a part of firmware.
+* **order**: Order of an application within its group when sorting entries in it. The lower the order is, the closer to the start of the list the items is located. Used for ordering startup hooks and menu entries. 
+* **sdk_headers**: List of C header files from this app's code to include in API definitions for external applicaions.
+
+The following parameters are used only for [FAPs](./AppsOnSDCard.md):
+
+* **sources**: list of file name masks, used for gathering sources within app folder. Default value of ["\*.c\*"] includes C and CPP source files.
+* **version**: string, 2 numbers in form of "x.y": application version to be embedded within .fap file.
+* **fap_icon**: name of .png file, 1-bit color depth, 10x10px, to be embedded within .fap file.
+* **fap_libs**: list of extra libraries to link application against. Provides access to extra functions that are not exported as a part of main firmware at expense of increased .fap file size and RAM consumption.
+* **fap_category**: string, may be empty. App subcategory, also works as path of FAP within apps folder in the file system.
+
+
+## .fam file contents
+
+.fam file contains one or more Application definitions. For example, here's a part of `applications/service/bt/application.fam`:
+
+```python
+App(
+    appid="bt_start",
+    apptype=FlipperAppType.STARTUP,
+    entry_point="bt_on_system_start",
+    order=70,
+)
+
+App(
+    appid="bt_settings",
+    name="Bluetooth",
+    apptype=FlipperAppType.SETTINGS,
+    entry_point="bt_settings_app",
+    stack_size=1 * 1024,
+    requires=[
+        "bt",
+        "gui",
+    ],
+    order=10,
+)
+
 ```
 App(
     appid="example_app", => App id, used in fbt app lists only, like applications\meta

fbt_options.py

@@ -73,7 +73,8 @@ FIRMWARE_APPS = {
         "system_apps",
         # Settings
         "settings_apps",
-        # Plugins
+        # Stock plugins - no longer built into fw, now they're .faps
+        # Yet you can still build them as a part of fw
         # "basic_plugins",
         # Debug
         # "debug_apps",

firmware.scons

@@ -302,7 +302,7 @@ if fwenv["IS_BASE_FIRMWARE"]:
             "-D__inline__=inline",
         ],
     )
-    Depends(sdk_source, fwenv["SDK_HEADERS"])
+    Depends(sdk_source, (fwenv["SDK_HEADERS"], fwenv["FW_ASSETS_HEADERS"]))
 
     sdk_tree = fwenv.SDKTree("sdk/sdk.opts", "sdk_origin")
     AlwaysBuild(sdk_tree)

site_scons/extapps.scons

@@ -63,7 +63,10 @@ def build_app_as_external(env, appdef):
     extapps["dist"][appdef.appid] = (appdef.fap_category, compact_elf)
 
 
-apps_to_build_as_faps = [FlipperAppType.PLUGIN, FlipperAppType.EXTERNAL]
+apps_to_build_as_faps = [
+    FlipperAppType.PLUGIN,
+    FlipperAppType.EXTERNAL,
+]
 if appenv["DEBUG_TOOLS"]:
     apps_to_build_as_faps.append(FlipperAppType.DEBUG)
 

site_scons/fbt/sdk.py

@@ -329,7 +329,6 @@ class SdkCache:
         self.sdk = ApiEntries()
         self.disabled_entries = set()
         self.new_entries = set()
-        self.loaded_dirty = False
         self.loaded_dirty_version = False
 
         self.version_action = VersionBump.NONE
@@ -340,8 +339,7 @@ class SdkCache:
         return (
             self.version != SdkVersion(0, 0)
             and self.version_action == VersionBump.NONE
-            and not self.loaded_dirty
-            and not self.new_entries
+            and not self._have_pending_entries()
         )
 
     def _filter_enabled(self, sdk_entries):
@@ -388,21 +386,12 @@ class SdkCache:
         if self._load_version_only:
             raise Exception("Only SDK version was loaded, cannot save")
 
-        version_is_clean = True
-        if self.loaded_dirty:
-            # There are still new entries and version was already updated
-            version_is_clean = False
-
         if self.version_action == VersionBump.MINOR:
             self.version = SdkVersion(self.version.major, self.version.minor + 1)
-            version_is_clean = False
         elif self.version_action == VersionBump.MAJOR:
             self.version = SdkVersion(self.version.major + 1, 0)
-            version_is_clean = False
 
-        if version_is_clean:
-            print(f"API version {self.version} is up to date")
-        else:
+        if self._have_pending_entries():
             self.new_entries.add(self.version)
             print(
                 f"API version is still WIP: {self.version}. Review the changes and re-run command."
@@ -418,16 +407,23 @@ class SdkCache:
                     )
                 )
             )
+        else:
+            print(f"API version {self.version} is up to date")
 
-        if not version_is_clean or self.loaded_dirty_version:
-            # Regenerate cache file
+        regenerate_csv = (
+            self.loaded_dirty_version
+            or self._have_pending_entries()
+            or self.version_action != VersionBump.NONE
+        )
+
+        if regenerate_csv:
             str_cache_entries = [self.version]
             name_getter = operator.attrgetter("name")
             str_cache_entries.extend(sorted(self.sdk.headers, key=name_getter))
             str_cache_entries.extend(sorted(self.sdk.functions, key=name_getter))
             str_cache_entries.extend(sorted(self.sdk.variables, key=name_getter))
 
-            with open(self.cache_file_name, "w", newline="") as f:
+            with open(self.cache_file_name, "wt", newline="") as f:
                 writer = csv.DictWriter(f, fieldnames=SdkCache.CSV_FIELD_NAMES)
                 writer.writeheader()
 
@@ -476,13 +472,20 @@ class SdkCache:
                 f"Cannot load symbol cache '{self.cache_file_name}'! File does not exist"
             )
 
-        with open(self.cache_file_name, "r") as f:
+        with open(self.cache_file_name, "rt") as f:
             reader = csv.DictReader(f)
             for row in reader:
                 self._process_entry(row)
                 if self._load_version_only and row.get("entry") == SdkVersion.csv_type:
                     break
-        self.loaded_dirty = bool(self.new_entries)
+
+    def _have_pending_entries(self) -> bool:
+        return any(
+            filter(
+                lambda e: not isinstance(e, SdkVersion),
+                self.new_entries,
+            )
+        )
 
     def sync_sets(
         self, known_set: Set[Any], new_set: Set[Any], update_version: bool = True

site_scons/site_tools/fbt_sdk.py

@@ -15,6 +15,7 @@ from fbt.sdk import SdkCollector, SdkCache
 
 def prebuild_sdk_emitter(target, source, env):
     target.append(env.ChangeFileExtension(target[0], ".d"))
+    target.append(env.ChangeFileExtension(target[0], ".i.c"))
     return target, source