From 868eb1038162305b5e1e3193f6150173e9e95f2e Mon Sep 17 00:00:00 2001 From: WillyJL <49810075+Willy-JL@users.noreply.github.com> Date: Sat, 12 Apr 2025 04:21:39 +0100 Subject: [PATCH 1/3] SDK: Fix missing RECORD_CLI define (#4185) * SDK: Fix missing RECORD_CLI define * sdk: added compatibility `cli.h` header * cli: updated porting comments --------- Co-authored-by: hedger --- applications/services/cli/application.fam | 2 +- applications/services/cli/cli.h | 13 +++++++++++++ applications/services/cli/cli_main_commands.h | 4 ++-- targets/f18/api_symbols.csv | 1 + targets/f7/api_symbols.csv | 1 + 5 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 applications/services/cli/cli.h diff --git a/applications/services/cli/application.fam b/applications/services/cli/application.fam index 6e0a28164..b305fb6b0 100644 --- a/applications/services/cli/application.fam +++ b/applications/services/cli/application.fam @@ -22,7 +22,7 @@ App( entry_point="cli_vcp_srv", stack_size=1024, order=10, - sdk_headers=["cli_vcp.h"], + sdk_headers=["cli_vcp.h", "cli.h"], sources=["cli_vcp.c"], ) diff --git a/applications/services/cli/cli.h b/applications/services/cli/cli.h new file mode 100644 index 000000000..ca787d3db --- /dev/null +++ b/applications/services/cli/cli.h @@ -0,0 +1,13 @@ +#pragma once + +/* + * Compatibility header for ease of porting existing apps. + * In short: + * Cli* is replaced with with CliRegistry* + * cli_* functions are replaced with cli_registry_* functions + * (i.e., cli_add_command() is now cli_registry_add_command()) +*/ + +#include + +#define RECORD_CLI "cli" diff --git a/applications/services/cli/cli_main_commands.h b/applications/services/cli/cli_main_commands.h index d8058f467..ebee4ba1e 100644 --- a/applications/services/cli/cli_main_commands.h +++ b/applications/services/cli/cli_main_commands.h @@ -1,9 +1,9 @@ #pragma once +#include "cli.h" #include #include -#define RECORD_CLI "cli" -#define CLI_APPID "cli" +#define CLI_APPID "cli" void cli_main_commands_init(CliRegistry* registry); diff --git a/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv index d4cc2bec5..f1ebda528 100644 --- a/targets/f18/api_symbols.csv +++ b/targets/f18/api_symbols.csv @@ -2,6 +2,7 @@ entry,status,name,type,params Version,+,85.0,, Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/bt/bt_service/bt_keys_storage.h,, +Header,+,applications/services/cli/cli.h,, Header,+,applications/services/cli/cli_vcp.h,, Header,+,applications/services/dialogs/dialogs.h,, Header,+,applications/services/dolphin/dolphin.h,, diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv index f5f18bc43..2e23dc56b 100644 --- a/targets/f7/api_symbols.csv +++ b/targets/f7/api_symbols.csv @@ -3,6 +3,7 @@ Version,+,85.0,, Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,, Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/bt/bt_service/bt_keys_storage.h,, +Header,+,applications/services/cli/cli.h,, Header,+,applications/services/cli/cli_vcp.h,, Header,+,applications/services/dialogs/dialogs.h,, Header,+,applications/services/dolphin/dolphin.h,, From ddf77f58e383bc688d8df6aa179c91d18c128ce1 Mon Sep 17 00:00:00 2001 From: hedger Date: Sat, 12 Apr 2025 12:27:58 +0100 Subject: [PATCH 2/3] sdk: bump API to force re-upload for the catalog (#4186) --- targets/f18/api_symbols.csv | 2 +- targets/f7/api_symbols.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv index f1ebda528..23c9edb63 100644 --- a/targets/f18/api_symbols.csv +++ b/targets/f18/api_symbols.csv @@ -1,5 +1,5 @@ entry,status,name,type,params -Version,+,85.0,, +Version,+,86.0,, Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/bt/bt_service/bt_keys_storage.h,, Header,+,applications/services/cli/cli.h,, diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv index 2e23dc56b..d142a6374 100644 --- a/targets/f7/api_symbols.csv +++ b/targets/f7/api_symbols.csv @@ -1,5 +1,5 @@ entry,status,name,type,params -Version,+,85.0,, +Version,+,86.0,, Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,, Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/bt/bt_service/bt_keys_storage.h,, From 1eb57ba4626c11e432ec44b6c9df470bc8b795d7 Mon Sep 17 00:00:00 2001 From: WillyJL <49810075+Willy-JL@users.noreply.github.com> Date: Sat, 12 Apr 2025 12:35:19 +0100 Subject: [PATCH 3/3] FBT: Fix for Python 3.13 (#4187) Co-authored-by: hedger --- scripts/fbt/appmanifest.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/fbt/appmanifest.py b/scripts/fbt/appmanifest.py index b5b5d6e12..4da23b3dd 100644 --- a/scripts/fbt/appmanifest.py +++ b/scripts/fbt/appmanifest.py @@ -158,7 +158,7 @@ class AppManager: f"App {kw.get('appid')} cannot have fal_embedded set" ) - if apptype in AppBuildset.dist_app_types: + if apptype in AppBuildset.DIST_APP_TYPES: # For distributing .fap's resources, there's "fap_file_assets" for app_property in ("resources",): if kw.get(app_property): @@ -258,14 +258,12 @@ class AppBuildset: FlipperAppType.DEBUG: True, FlipperAppType.MENUEXTERNAL: False, } - - @classmethod - @property - def dist_app_types(cls): - """Applications that are installed on SD card""" - return list( - entry[0] for entry in cls.EXTERNAL_APP_TYPES_MAP.items() if entry[1] - ) + DIST_APP_TYPES = list( + # Applications that are installed on SD card + entry[0] + for entry in EXTERNAL_APP_TYPES_MAP.items() + if entry[1] + ) @staticmethod def print_writer(message):