move commands out of flash, code cleanup

portasynthinca3 · portasynthinca3 · commit c88891e3c6fc · 2025-01-09T14:17:31.000+04:00
diff --git a/applications/debug/application.fam b/applications/debug/application.fam
@@ -12,6 +12,6 @@ App(
         "display_test",
         "text_box_test",
         "file_browser_test",
-        # "speaker_debug", # TODO: external fap support
+        "speaker_debug",
     ],
 )
diff --git a/applications/debug/bt_debug_app/application.fam b/applications/debug/bt_debug_app/application.fam
@@ -1,18 +1,18 @@
-# App(
-#     appid="bt_debug",
-#     name="Bluetooth Debug",
-#     apptype=FlipperAppType.DEBUG,
-#     entry_point="bt_debug_app",
-#     cdefines=["SRV_BT"],
-#     requires=[
-#         "bt",
-#         "gui",
-#         "dialogs",
-#     ],
-#     provides=[
-#         "bt_debug",
-#     ],
-#     stack_size=1 * 1024,
-#     order=110,
-#     fap_category="Debug",
-# )
+App(
+    appid="bt_debug",
+    name="Bluetooth Debug",
+    apptype=FlipperAppType.DEBUG,
+    entry_point="bt_debug_app",
+    cdefines=["SRV_BT"],
+    requires=[
+        "bt",
+        "gui",
+        "dialogs",
+    ],
+    provides=[
+        "bt_debug",
+    ],
+    stack_size=1 * 1024,
+    order=110,
+    fap_category="Debug",
+)
diff --git a/applications/debug/speaker_debug/application.fam b/applications/debug/speaker_debug/application.fam
@@ -1,11 +1,11 @@
-# App(
-#     appid="speaker_debug",
-#     name="Speaker Debug",
-#     apptype=FlipperAppType.DEBUG,
-#     entry_point="speaker_debug_app",
-#     requires=["gui", "notification"],
-#     stack_size=2 * 1024,
-#     order=10,
-#     fap_category="Debug",
-#     fap_libs=["music_worker"],
-# )
+App(
+    appid="speaker_debug",
+    name="Speaker Debug",
+    apptype=FlipperAppType.DEBUG,
+    entry_point="speaker_debug_app",
+    requires=["gui", "notification"],
+    stack_size=2 * 1024,
+    order=10,
+    fap_category="Debug",
+    fap_libs=["music_worker"],
+)
diff --git a/applications/main/application.fam b/applications/main/application.fam
@@ -22,11 +22,5 @@ App(
     apptype=FlipperAppType.METAPACKAGE,
     provides=[
         "cli",
-        "ibutton_start",
-        "onewire_start",
-        "subghz_start",
-        "infrared_start",
-        "lfrfid_start",
-        "nfc_start",
     ],
 )
diff --git a/applications/main/ibutton/application.fam b/applications/main/ibutton/application.fam
@@ -13,10 +13,11 @@ App(
 )
 
 App(
-    appid="ibutton_start",
-    apptype=FlipperAppType.STARTUP,
+    appid="cli_ikey",
     targets=["f7"],
-    entry_point="ibutton_on_system_start",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="cli_ikey_ep",
+    requires=["cli"],
     sources=["ibutton_cli.c"],
-    order=60,
 )
+
diff --git a/applications/main/ibutton/ibutton_cli.c b/applications/main/ibutton/ibutton_cli.c
@@ -1,27 +1,14 @@
 #include <furi.h>
 #include <furi_hal.h>
 
-#include <cli/cli.h>
+#include <cli/cli_commands.h>
 #include <toolbox/args.h>
 #include <toolbox/pipe.h>
 
 #include <ibutton/ibutton_key.h>
 #include <ibutton/ibutton_worker.h>
 #include <ibutton/ibutton_protocols.h>
 
-static void ibutton_cli(PipeSide* pipe, FuriString* args, void* context);
-
-// app cli function
-void ibutton_on_system_start(void) {
-#ifdef SRV_CLI
-    Cli* cli = furi_record_open(RECORD_CLI);
-    cli_add_command(cli, "ikey", CliCommandFlagParallelUnsafe, ibutton_cli, cli);
-    furi_record_close(RECORD_CLI);
-#else
-    UNUSED(ibutton_cli);
-#endif
-}
-
 static void ibutton_cli_print_usage(void) {
     printf("Usage:\r\n");
     printf("ikey read\r\n");
@@ -229,7 +216,7 @@ void ibutton_cli_emulate(PipeSide* pipe, FuriString* args) {
     ibutton_protocols_free(protocols);
 }
 
-void ibutton_cli(PipeSide* pipe, FuriString* args, void* context) {
+static void execute(PipeSide* pipe, FuriString* args, void* context) {
     UNUSED(context);
     FuriString* cmd;
     cmd = furi_string_alloc();
@@ -252,3 +239,5 @@ void ibutton_cli(PipeSide* pipe, FuriString* args, void* context) {
 
     furi_string_free(cmd);
 }
+
+CLI_COMMAND_INTERFACE(ikey, execute, CliCommandFlagDefault, 1024);
diff --git a/applications/main/infrared/application.fam b/applications/main/infrared/application.fam
@@ -15,14 +15,14 @@ App(
 )
 
 App(
-    appid="infrared_start",
-    apptype=FlipperAppType.STARTUP,
+    appid="cli_ir",
     targets=["f7"],
-    entry_point="infrared_on_system_start",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="cli_ir_ep",
+    requires=["cli"],
     sources=[
         "infrared_cli.c",
         "infrared_brute_force.c",
         "infrared_signal.c",
     ],
-    order=20,
 )
diff --git a/applications/main/infrared/infrared_cli.c b/applications/main/infrared/infrared_cli.c
@@ -1,5 +1,4 @@
-#include <cli/cli.h>
-#include <cli/cli_i.h>
+#include <cli/cli_commands.h>
 #include <infrared.h>
 #include <infrared_worker.h>
 #include <furi_hal_infrared.h>
@@ -528,7 +527,7 @@ static void infrared_cli_process_universal(PipeSide* pipe, FuriString* args) {
     furi_string_free(arg2);
 }
 
-static void infrared_cli_start_ir(PipeSide* pipe, FuriString* args, void* context) {
+static void execute(PipeSide* pipe, FuriString* args, void* context) {
     UNUSED(context);
     if(furi_hal_infrared_is_busy()) {
         printf("INFRARED is busy. Exiting.");
@@ -555,12 +554,5 @@ static void infrared_cli_start_ir(PipeSide* pipe, FuriString* args, void* contex
 
     furi_string_free(command);
 }
-void infrared_on_system_start(void) {
-#ifdef SRV_CLI
-    Cli* cli = (Cli*)furi_record_open(RECORD_CLI);
-    cli_add_command(cli, "ir", CliCommandFlagDefault, infrared_cli_start_ir, NULL);
-    furi_record_close(RECORD_CLI);
-#else
-    UNUSED(infrared_cli_start_ir);
-#endif
-}
+
+CLI_COMMAND_INTERFACE(ir, execute, CliCommandFlagDefault, 2048);
diff --git a/applications/main/lfrfid/application.fam b/applications/main/lfrfid/application.fam
@@ -13,10 +13,10 @@ App(
 )
 
 App(
-    appid="lfrfid_start",
+    appid="cli_rfid",
     targets=["f7"],
-    apptype=FlipperAppType.STARTUP,
-    entry_point="lfrfid_on_system_start",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="cli_rfid_ep",
+    requires=["cli"],
     sources=["lfrfid_cli.c"],
-    order=50,
 )
diff --git a/applications/main/lfrfid/lfrfid_cli.c b/applications/main/lfrfid/lfrfid_cli.c
@@ -1,7 +1,7 @@
 #include <furi.h>
 #include <furi_hal.h>
 #include <stdarg.h>
-#include <cli/cli.h>
+#include <cli/cli_commands.h>
 #include <lib/toolbox/args.h>
 #include <lib/lfrfid/lfrfid_worker.h>
 #include <storage/storage.h>
@@ -15,15 +15,6 @@
 #include <lfrfid/lfrfid_raw_file.h>
 #include <toolbox/pulse_protocols/pulse_glue.h>
 
-static void lfrfid_cli(PipeSide* pipe, FuriString* args, void* context);
-
-// app cli function
-void lfrfid_on_system_start(void) {
-    Cli* cli = furi_record_open(RECORD_CLI);
-    cli_add_command(cli, "rfid", CliCommandFlagDefault, lfrfid_cli, NULL);
-    furi_record_close(RECORD_CLI);
-}
-
 static void lfrfid_cli_print_usage(void) {
     printf("Usage:\r\n");
     printf("rfid read <optional: normal | indala>         - read in ASK/PSK mode\r\n");
@@ -545,7 +536,7 @@ static void lfrfid_cli_raw_emulate(PipeSide* pipe, FuriString* args) {
     furi_string_free(filepath);
 }
 
-static void lfrfid_cli(PipeSide* pipe, FuriString* args, void* context) {
+static void execute(PipeSide* pipe, FuriString* args, void* context) {
     UNUSED(context);
     FuriString* cmd;
     cmd = furi_string_alloc();
@@ -574,3 +565,5 @@ static void lfrfid_cli(PipeSide* pipe, FuriString* args, void* context) {
 
     furi_string_free(cmd);
 }
+
+CLI_COMMAND_INTERFACE(rfid, execute, CliCommandFlagDefault, 2048);
diff --git a/applications/main/nfc/application.fam b/applications/main/nfc/application.fam
@@ -248,10 +248,10 @@ App(
 )
 
 App(
-    appid="nfc_start",
+    appid="cli_nfc",
     targets=["f7"],
-    apptype=FlipperAppType.STARTUP,
-    entry_point="nfc_on_system_start",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="cli_nfc_ep",
+    requires=["cli"],
     sources=["nfc_cli.c"],
-    order=30,
 )
diff --git a/applications/main/nfc/nfc_cli.c b/applications/main/nfc/nfc_cli.c
@@ -1,6 +1,7 @@
 #include <furi.h>
 #include <furi_hal.h>
 #include <cli/cli.h>
+#include <cli/cli_commands.h>
 #include <lib/toolbox/args.h>
 #include <lib/toolbox/hex.h>
 #include <toolbox/pipe.h>
@@ -41,7 +42,7 @@ static void nfc_cli_field(PipeSide* pipe, FuriString* args) {
     furi_hal_nfc_release();
 }
 
-static void nfc_cli(PipeSide* pipe, FuriString* args, void* context) {
+static void execute(PipeSide* pipe, FuriString* args, void* context) {
     UNUSED(context);
     FuriString* cmd;
     cmd = furi_string_alloc();
@@ -64,12 +65,4 @@ static void nfc_cli(PipeSide* pipe, FuriString* args, void* context) {
     furi_string_free(cmd);
 }
 
-void nfc_on_system_start(void) {
-#ifdef SRV_CLI
-    Cli* cli = furi_record_open(RECORD_CLI);
-    cli_add_command(cli, "nfc", CliCommandFlagDefault, nfc_cli, NULL);
-    furi_record_close(RECORD_CLI);
-#else
-    UNUSED(nfc_cli);
-#endif
-}
+CLI_COMMAND_INTERFACE(nfc, execute, CliCommandFlagDefault, 1024);
diff --git a/applications/main/onewire/application.fam b/applications/main/onewire/application.fam
@@ -1,6 +1,8 @@
 App(
-    appid="onewire_start",
-    apptype=FlipperAppType.STARTUP,
-    entry_point="onewire_on_system_start",
-    order=60,
+    appid="cli_onewire",
+    targets=["f7"],
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="cli_onewire_ep",
+    requires=["cli"],
+    sources=["onewire_cli.c"],
 )
diff --git a/applications/main/onewire/onewire_cli.c b/applications/main/onewire/onewire_cli.c
@@ -1,23 +1,11 @@
 #include <furi.h>
 #include <furi_hal.h>
 
-#include <cli/cli.h>
+#include <cli/cli_commands.h>
 #include <toolbox/args.h>
 
 #include <one_wire/one_wire_host.h>
 
-static void onewire_cli(PipeSide* pipe, FuriString* args, void* context);
-
-void onewire_on_system_start(void) {
-#ifdef SRV_CLI
-    Cli* cli = furi_record_open(RECORD_CLI);
-    cli_add_command(cli, "onewire", CliCommandFlagDefault, onewire_cli, cli);
-    furi_record_close(RECORD_CLI);
-#else
-    UNUSED(onewire_cli);
-#endif
-}
-
 static void onewire_cli_print_usage(void) {
     printf("Usage:\r\n");
     printf("onewire search\r\n");
@@ -53,7 +41,7 @@ static void onewire_cli_search(PipeSide* pipe) {
     onewire_host_free(onewire);
 }
 
-void onewire_cli(PipeSide* pipe, FuriString* args, void* context) {
+static void execute(PipeSide* pipe, FuriString* args, void* context) {
     UNUSED(context);
     FuriString* cmd;
     cmd = furi_string_alloc();
@@ -70,3 +58,5 @@ void onewire_cli(PipeSide* pipe, FuriString* args, void* context) {
 
     furi_string_free(cmd);
 }
+
+CLI_COMMAND_INTERFACE(onewire, execute, CliCommandFlagDefault, 1024);
diff --git a/applications/main/subghz/application.fam b/applications/main/subghz/application.fam
@@ -20,10 +20,10 @@ App(
 )
 
 App(
-    appid="subghz_start",
+    appid="cli_subghz",
     targets=["f7"],
-    apptype=FlipperAppType.STARTUP,
-    entry_point="subghz_on_system_start",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="cli_subghz_ep",
+    requires=["cli"],
     sources=["subghz_cli.c", "helpers/subghz_chat.c"],
-    order=40,
 )
diff --git a/applications/main/subghz/subghz_cli.c b/applications/main/subghz/subghz_cli.c
@@ -4,7 +4,7 @@
 #include <furi_hal.h>
 
 #include <applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h>
-#include <cli/cli_ansi.h>
+#include <cli/cli_commands.h>
 
 #include <lib/subghz/subghz_keystore.h>
 #include <lib/subghz/receiver.h>
@@ -1120,7 +1120,7 @@ static void subghz_cli_command_chat(PipeSide* pipe, FuriString* args) {
     printf("\r\nExit chat\r\n");
 }
 
-static void subghz_cli_command(PipeSide* pipe, FuriString* args, void* context) {
+static void execute(PipeSide* pipe, FuriString* args, void* context) {
     FuriString* cmd;
     cmd = furi_string_alloc();
 
@@ -1188,12 +1188,4 @@ static void subghz_cli_command(PipeSide* pipe, FuriString* args, void* context)
     furi_string_free(cmd);
 }
 
-void subghz_on_system_start(void) {
-#ifdef SRV_CLI
-    Cli* cli = furi_record_open(RECORD_CLI);
-    cli_add_command(cli, "subghz", CliCommandFlagDefault, subghz_cli_command, NULL);
-    furi_record_close(RECORD_CLI);
-#else
-    UNUSED(subghz_cli_command);
-#endif
-}
+CLI_COMMAND_INTERFACE(subghz, execute, CliCommandFlagDefault, 2048);
diff --git a/applications/services/cli/application.fam b/applications/services/cli/application.fam
diff --git a/applications/services/cli/cli_shell.c b/applications/services/cli/cli_shell.c
diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ App(`
`12`	`12`	`"display_test",`
`13`	`13`	`"text_box_test",`
`14`	`14`	`"file_browser_test",`
`15`		`- # "speaker_debug", # TODO: external fap support`
	`15`	`+ "speaker_debug",`
`16`	`16`	`],`
`17`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@ App(`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`App(`
`16`		`- appid="lfrfid_start",`
	`16`	`+ appid="cli_rfid",`
`17`	`17`	`targets=["f7"],`
`18`		`- apptype=FlipperAppType.STARTUP,`
`19`		`- entry_point="lfrfid_on_system_start",`
	`18`	`+ apptype=FlipperAppType.PLUGIN,`
	`19`	`+ entry_point="cli_rfid_ep",`
	`20`	`+ requires=["cli"],`
`20`	`21`	`sources=["lfrfid_cli.c"],`
`21`		`- order=50,`
`22`	`22`	`)`