Merge remote-tracking branch 'OFW/dev' into dev

applications/debug/accessor/application.fam

@@ -6,6 +6,5 @@ App(
     entry_point="accessor_app",
     requires=["gui"],
     stack_size=4 * 1024,
-    order=40,
     fap_category="Debug",
 )

applications/debug/battery_test_app/application.fam

@@ -8,7 +8,6 @@ App(
         "power",
     ],
     stack_size=1 * 1024,
-    order=130,
     fap_category="Debug",
     fap_libs=["assets"],
 )

applications/debug/blink_test/application.fam

@@ -5,6 +5,5 @@ App(
     entry_point="blink_test_app",
     requires=["gui"],
     stack_size=1 * 1024,
-    order=10,
     fap_category="Debug",
 )

applications/debug/bt_debug_app/application.fam

@@ -13,6 +13,5 @@ App(
         "bt_debug",
     ],
     stack_size=1 * 1024,
-    order=110,
     fap_category="Debug",
 )

applications/debug/ccid_test/application.fam

@@ -10,6 +10,5 @@ App(
         "ccid_test",
     ],
     stack_size=1 * 1024,
-    order=120,
     fap_category="Debug",
 )

applications/debug/direct_draw/application.fam

@@ -5,6 +5,5 @@ App(
     entry_point="direct_draw_app",
     requires=["gui", "input"],
     stack_size=2 * 1024,
-    order=70,
     fap_category="Debug",
 )

applications/debug/display_test/application.fam

@@ -6,6 +6,5 @@ App(
     requires=["gui"],
     fap_libs=["u8g2"],
     stack_size=1 * 1024,
-    order=120,
     fap_category="Debug",
 )

applications/debug/event_loop_blink_test/application.fam

@@ -5,6 +5,5 @@ App(
     entry_point="event_loop_blink_test_app",
     requires=["input"],
     stack_size=1 * 1024,
-    order=20,
     fap_category="Debug",
 )

applications/debug/expansion_test/application.fam

@@ -6,7 +6,6 @@ App(
     requires=["expansion_start"],
     fap_libs=["assets"],
     stack_size=1 * 1024,
-    order=20,
     fap_category="Debug",
     fap_file_assets="assets",
 )

applications/debug/file_browser_test/application.fam

@@ -5,7 +5,6 @@ App(
     entry_point="file_browser_app",
     requires=["gui"],
     stack_size=2 * 1024,
-    order=150,
     fap_category="Debug",
     fap_icon_assets="icons",
 )

applications/debug/keypad_test/application.fam

@@ -5,6 +5,5 @@ App(
     entry_point="keypad_test_app",
     requires=["gui"],
     stack_size=1 * 1024,
-    order=30,
     fap_category="Debug",
 )

applications/debug/lfrfid_debug/application.fam

@@ -11,6 +11,5 @@ App(
         "lfrfid_debug",
     ],
     stack_size=1 * 1024,
-    order=100,
     fap_category="Debug",
 )

applications/debug/loader_chaining_a/application.fam

@@ -0,0 +1,8 @@
+App(
+    appid="loader_chaining_a",
+    name="Loader Chaining Test: App A",
+    apptype=FlipperAppType.DEBUG,
+    entry_point="chaining_test_app_a",
+    stack_size=1 * 1024,
+    fap_category="Debug",
+)

applications/debug/loader_chaining_a/loader_chaining_a.c

@@ -0,0 +1,164 @@
+#include <furi.h>
+#include <gui/gui.h>
+#include <gui/view_dispatcher.h>
+#include <gui/modules/submenu.h>
+#include <loader/loader.h>
+#include <dialogs/dialogs.h>
+
+#define TAG             "LoaderChainingA"
+#define CHAINING_TEST_B "/ext/apps/Debug/loader_chaining_b.fap"
+#define NONEXISTENT_APP "Some nonexistent app"
+
+typedef struct {
+    Gui* gui;
+    ViewDispatcher* view_dispatcher;
+    Submenu* submenu;
+
+    Loader* loader;
+
+    DialogsApp* dialogs;
+} LoaderChainingA;
+
+typedef enum {
+    LoaderChainingASubmenuLaunchB,
+    LoaderChainingASubmenuLaunchBThenA,
+    LoaderChainingASubmenuLaunchNonexistentSilent,
+    LoaderChainingASubmenuLaunchNonexistentGui,
+    LoaderChainingASubmenuLaunchNonexistentGuiThenA,
+} LoaderChainingASubmenu;
+
+static void loader_chaining_a_submenu_callback(void* context, uint32_t index) {
+    LoaderChainingA* app = context;
+
+    FuriString* self_path = furi_string_alloc();
+    furi_check(loader_get_application_launch_path(app->loader, self_path));
+
+    switch(index) {
+    case LoaderChainingASubmenuLaunchB:
+        loader_enqueue_launch(app->loader, CHAINING_TEST_B, "Hello", LoaderDeferredLaunchFlagGui);
+        view_dispatcher_stop(app->view_dispatcher);
+        break;
+
+    case LoaderChainingASubmenuLaunchBThenA:
+        loader_enqueue_launch(app->loader, CHAINING_TEST_B, "Hello", LoaderDeferredLaunchFlagGui);
+        loader_enqueue_launch(
+            app->loader,
+            furi_string_get_cstr(self_path),
+            "Hello to you from the future",
+            LoaderDeferredLaunchFlagGui);
+
+        break;
+
+    case LoaderChainingASubmenuLaunchNonexistentSilent:
+        loader_enqueue_launch(app->loader, NONEXISTENT_APP, NULL, LoaderDeferredLaunchFlagNone);
+        break;
+
+    case LoaderChainingASubmenuLaunchNonexistentGui:
+        loader_enqueue_launch(app->loader, NONEXISTENT_APP, NULL, LoaderDeferredLaunchFlagGui);
+        break;
+
+    case LoaderChainingASubmenuLaunchNonexistentGuiThenA:
+        loader_enqueue_launch(app->loader, NONEXISTENT_APP, NULL, LoaderDeferredLaunchFlagGui);
+        loader_enqueue_launch(
+            app->loader,
+            furi_string_get_cstr(self_path),
+            "Hello to you from the future",
+            LoaderDeferredLaunchFlagGui);
+        break;
+    }
+
+    furi_string_free(self_path);
+    view_dispatcher_stop(app->view_dispatcher);
+}
+
+static bool loader_chaining_a_nav_callback(void* context) {
+    LoaderChainingA* app = context;
+    view_dispatcher_stop(app->view_dispatcher);
+    return true;
+}
+
+LoaderChainingA* loader_chaining_a_alloc(void) {
+    LoaderChainingA* app = malloc(sizeof(LoaderChainingA));
+    app->gui = furi_record_open(RECORD_GUI);
+    app->loader = furi_record_open(RECORD_LOADER);
+    app->dialogs = furi_record_open(RECORD_DIALOGS);
+    app->view_dispatcher = view_dispatcher_alloc();
+    app->submenu = submenu_alloc();
+
+    submenu_add_item(
+        app->submenu,
+        "Launch B",
+        LoaderChainingASubmenuLaunchB,
+        loader_chaining_a_submenu_callback,
+        app);
+    submenu_add_item(
+        app->submenu,
+        "Launch B, then A",
+        LoaderChainingASubmenuLaunchBThenA,
+        loader_chaining_a_submenu_callback,
+        app);
+    submenu_add_item(
+        app->submenu,
+        "Trigger error: silent",
+        LoaderChainingASubmenuLaunchNonexistentSilent,
+        loader_chaining_a_submenu_callback,
+        app);
+    submenu_add_item(
+        app->submenu,
+        "Trigger error: GUI",
+        LoaderChainingASubmenuLaunchNonexistentGui,
+        loader_chaining_a_submenu_callback,
+        app);
+    submenu_add_item(
+        app->submenu,
+        "Error, then launch A",
+        LoaderChainingASubmenuLaunchNonexistentGuiThenA,
+        loader_chaining_a_submenu_callback,
+        app);
+
+    view_dispatcher_add_view(app->view_dispatcher, 0, submenu_get_view(app->submenu));
+    view_dispatcher_set_navigation_event_callback(
+        app->view_dispatcher, loader_chaining_a_nav_callback);
+    view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
+
+    view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
+    view_dispatcher_switch_to_view(app->view_dispatcher, 0);
+
+    return app;
+}
+
+void loader_chaining_a_free(LoaderChainingA* app) {
+    furi_record_close(RECORD_DIALOGS);
+    furi_record_close(RECORD_LOADER);
+    furi_record_close(RECORD_GUI);
+    view_dispatcher_remove_view(app->view_dispatcher, 0);
+    submenu_free(app->submenu);
+    view_dispatcher_free(app->view_dispatcher);
+    free(app);
+}
+
+int32_t chaining_test_app_a(const char* arg) {
+    LoaderChainingA* app = loader_chaining_a_alloc();
+
+    if(arg) {
+        if(strlen(arg)) {
+            DialogMessage* message = dialog_message_alloc();
+            FuriString* text;
+
+            dialog_message_set_header(message, "Hi, I am A", 64, 0, AlignCenter, AlignTop);
+            text = furi_string_alloc_printf("Me from the past says:\n%s", arg);
+            dialog_message_set_buttons(message, NULL, "ok!", NULL);
+
+            dialog_message_set_text(
+                message, furi_string_get_cstr(text), 64, 32, AlignCenter, AlignCenter);
+            dialog_message_show(app->dialogs, message);
+            dialog_message_free(message);
+            furi_string_free(text);
+        }
+    }
+
+    view_dispatcher_run(app->view_dispatcher);
+
+    loader_chaining_a_free(app);
+    return 0;
+}

applications/debug/loader_chaining_b/application.fam

@@ -0,0 +1,8 @@
+App(
+    appid="loader_chaining_b",
+    name="Loader Chaining Test: App B",
+    apptype=FlipperAppType.DEBUG,
+    entry_point="chaining_test_app_b",
+    stack_size=1 * 1024,
+    fap_category="Debug",
+)

applications/debug/loader_chaining_b/loader_chaining_b.c

@@ -0,0 +1,27 @@
+#include <furi.h>
+#include <dialogs/dialogs.h>
+#include <loader/loader.h>
+
+int32_t chaining_test_app_b(const char* arg) {
+    if(!arg) return 0;
+
+    Loader* loader = furi_record_open(RECORD_LOADER);
+    DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS);
+
+    DialogMessage* message = dialog_message_alloc();
+    dialog_message_set_header(message, "Hi, I am B", 64, 0, AlignCenter, AlignTop);
+    FuriString* text = furi_string_alloc_printf("And A told me:\n%s", arg);
+    dialog_message_set_text(message, furi_string_get_cstr(text), 64, 32, AlignCenter, AlignCenter);
+    dialog_message_set_buttons(message, "Just quit", NULL, "Launch A");
+    DialogMessageButton result = dialog_message_show(dialogs, message);
+    dialog_message_free(message);
+    furi_string_free(text);
+
+    if(result == DialogMessageButtonRight)
+        loader_enqueue_launch(
+            loader, "/ext/apps/Debug/loader_chaining_a.fap", NULL, LoaderDeferredLaunchFlagGui);
+
+    furi_record_close(RECORD_LOADER);
+    furi_record_close(RECORD_DIALOGS);
+    return 0;
+}

applications/debug/locale_test/application.fam

@@ -5,6 +5,5 @@ App(
     entry_point="locale_test_app",
     requires=["gui", "locale"],
     stack_size=2 * 1024,
-    order=70,
     fap_category="Debug",
 )

applications/debug/rpc_debug_app/application.fam

@@ -5,6 +5,5 @@ App(
     entry_point="rpc_debug_app",
     requires=["gui", "rpc_start", "notification"],
     stack_size=2 * 1024,
-    order=10,
     fap_category="Debug",
 )

applications/debug/speaker_debug/application.fam

@@ -5,7 +5,6 @@ App(
     entry_point="speaker_debug_app",
     requires=["gui", "notification"],
     stack_size=2 * 1024,
-    order=10,
     fap_category="Debug",
     fap_libs=["music_worker"],
 )

applications/debug/speaker_debug/speaker_debug.c

@@ -1,8 +1,10 @@
 #include <furi.h>
 #include <notification/notification.h>
 #include <music_worker/music_worker.h>
-#include <cli/cli.h>
 #include <toolbox/args.h>
+#include <toolbox/pipe.h>
+#include <toolbox/cli/cli_registry.h>
+#include <cli/cli_main_commands.h>
 
 #define TAG "SpeakerDebug"
 
@@ -19,14 +21,14 @@ typedef struct {
 typedef struct {
     MusicWorker* music_worker;
     FuriMessageQueue* message_queue;
-    Cli* cli;
+    CliRegistry* cli_registry;
 } SpeakerDebugApp;
 
 static SpeakerDebugApp* speaker_app_alloc(void) {
     SpeakerDebugApp* app = (SpeakerDebugApp*)malloc(sizeof(SpeakerDebugApp));
     app->music_worker = music_worker_alloc();
     app->message_queue = furi_message_queue_alloc(8, sizeof(SpeakerDebugAppMessage));
-    app->cli = furi_record_open(RECORD_CLI);
+    app->cli_registry = furi_record_open(RECORD_CLI);
     return app;
 }
 
@@ -37,8 +39,8 @@ static void speaker_app_free(SpeakerDebugApp* app) {
     free(app);
 }
 
-static void speaker_app_cli(Cli* cli, FuriString* args, void* context) {
-    UNUSED(cli);
+static void speaker_app_cli(PipeSide* pipe, FuriString* args, void* context) {
+    UNUSED(pipe);
 
     SpeakerDebugApp* app = (SpeakerDebugApp*)context;
     SpeakerDebugAppMessage message;
@@ -95,7 +97,8 @@ static void speaker_app_run(SpeakerDebugApp* app, const char* arg) {
         return;
     }
 
-    cli_add_command(app->cli, CLI_COMMAND, CliCommandFlagParallelSafe, speaker_app_cli, app);
+    cli_registry_add_command(
+        app->cli_registry, CLI_COMMAND, CliCommandFlagParallelSafe, speaker_app_cli, app);
 
     SpeakerDebugAppMessage message;
     FuriStatus status;
@@ -110,7 +113,7 @@ static void speaker_app_run(SpeakerDebugApp* app, const char* arg) {
         }
     }
 
-    cli_delete_command(app->cli, CLI_COMMAND);
+    cli_registry_delete_command(app->cli_registry, CLI_COMMAND);
 }
 
 int32_t speaker_debug_app(void* arg) {

applications/debug/subghz_test/application.fam

@@ -6,7 +6,6 @@ App(
     entry_point="subghz_test_app",
     requires=["gui"],
     stack_size=4 * 1024,
-    order=50,
     fap_icon="subghz_test_10px.png",
     fap_category="Debug",
     fap_icon_assets="images",

applications/debug/text_box_element_test/application.fam

@@ -5,6 +5,5 @@ App(
     entry_point="text_box_element_test_app",
     requires=["gui"],
     stack_size=1 * 1024,
-    order=140,
     fap_category="Debug",
 )

applications/debug/text_box_view_test/application.fam

@@ -5,6 +5,5 @@ App(
     entry_point="text_box_view_test_app",
     requires=["gui"],
     stack_size=1 * 1024,
-    order=140,
     fap_category="Debug",
 )

applications/debug/unit_tests/application.fam

@@ -4,10 +4,9 @@ App(
     entry_point="unit_tests_on_system_start",
     sources=["unit_tests.c", "test_runner.c", "unit_test_api_table.cpp"],
     cdefines=["APP_UNIT_TESTS"],
-    requires=["system_settings", "subghz_start"],
+    requires=["system_settings", "cli_subghz"],
     provides=["delay_test"],
     resources="resources",
-    order=100,
 )
 
 App(

applications/debug/unit_tests/test_runner.c

@@ -2,8 +2,9 @@
 
 #include "tests/test_api.h"
 
-#include <cli/cli.h>
+#include <toolbox/cli/cli_command.h>
 #include <toolbox/path.h>
+#include <toolbox/pipe.h>
 #include <loader/loader.h>
 #include <storage/storage.h>
 #include <notification/notification_messages.h>
@@ -25,7 +26,7 @@ struct TestRunner {
     NotificationApp* notification;
 
     // Temporary used things
-    Cli* cli;
+    PipeSide* pipe;
     FuriString* args;
 
     // ELF related stuff
@@ -38,14 +39,14 @@ struct TestRunner {
     int minunit_status;
 };
 
-TestRunner* test_runner_alloc(Cli* cli, FuriString* args) {
+TestRunner* test_runner_alloc(PipeSide* pipe, FuriString* args) {
     TestRunner* instance = malloc(sizeof(TestRunner));
 
     instance->storage = furi_record_open(RECORD_STORAGE);
     instance->loader = furi_record_open(RECORD_LOADER);
     instance->notification = furi_record_open(RECORD_NOTIFICATION);
 
-    instance->cli = cli;
+    instance->pipe = pipe;
     instance->args = args;
 
     instance->composite_resolver = composite_api_resolver_alloc();
@@ -147,7 +148,7 @@ static void test_runner_run_internal(TestRunner* instance) {
         }
 
         while(true) {
-            if(cli_cmd_interrupt_received(instance->cli)) {
+            if(cli_is_pipe_broken_or_is_etx_next_char(instance->pipe)) {
                 break;
             }
 

applications/debug/unit_tests/test_runner.h

@@ -1,12 +1,12 @@
 #pragma once
 
 #include <furi.h>
+#include <toolbox/pipe.h>
 
 typedef struct TestRunner TestRunner;
-typedef struct Cli Cli;
 
-TestRunner* test_runner_alloc(Cli* cli, FuriString* args);
+TestRunner* test_runner_alloc(PipeSide* pipe, FuriString* args);
 
-void test_runner_free(TestRunner* isntance);
+void test_runner_free(TestRunner* instance);
 
-void test_runner_run(TestRunner* isntance);
+void test_runner_run(TestRunner* instance);

applications/debug/unit_tests/tests/pipe/pipe_test.c

@@ -25,16 +25,13 @@ MU_TEST(pipe_test_trivial) {
         mu_assert_int_eq(PIPE_SIZE - i, pipe_spaces_available(alice));
         mu_assert_int_eq(i, pipe_bytes_available(bob));
 
-        if(pipe_send(alice, &i, sizeof(uint8_t), 0) != sizeof(uint8_t)) {
-            break;
-        }
+        if(pipe_spaces_available(alice) == 0) break;
+        furi_check(pipe_send(alice, &i, sizeof(uint8_t)) == sizeof(uint8_t));
 
         mu_assert_int_eq(PIPE_SIZE - i, pipe_spaces_available(bob));
         mu_assert_int_eq(i, pipe_bytes_available(alice));
 
-        if(pipe_send(bob, &i, sizeof(uint8_t), 0) != sizeof(uint8_t)) {
-            break;
-        }
+        furi_check(pipe_send(bob, &i, sizeof(uint8_t)) == sizeof(uint8_t));
     }
 
     pipe_free(alice);
@@ -43,10 +40,9 @@ MU_TEST(pipe_test_trivial) {
     for(uint8_t i = 0;; ++i) {
         mu_assert_int_eq(PIPE_SIZE - i, pipe_bytes_available(bob));
 
+        if(pipe_bytes_available(bob) == 0) break;
         uint8_t value;
-        if(pipe_receive(bob, &value, sizeof(uint8_t), 0) != sizeof(uint8_t)) {
-            break;
-        }
+        furi_check(pipe_receive(bob, &value, sizeof(uint8_t)) == sizeof(uint8_t));
 
         mu_assert_int_eq(i, value);
     }
@@ -68,16 +64,15 @@ typedef struct {
 static void on_data_arrived(PipeSide* pipe, void* context) {
     AncillaryThreadContext* ctx = context;
     ctx->flag |= TestFlagDataArrived;
-    uint8_t buffer[PIPE_SIZE];
-    size_t size = pipe_receive(pipe, buffer, sizeof(buffer), 0);
-    pipe_send(pipe, buffer, size, 0);
+    uint8_t input;
+    size_t size = pipe_receive(pipe, &input, sizeof(input));
+    pipe_send(pipe, &input, size);
 }
 
 static void on_space_freed(PipeSide* pipe, void* context) {
+    UNUSED(pipe);
     AncillaryThreadContext* ctx = context;
     ctx->flag |= TestFlagSpaceFreed;
-    const char* message = "Hi!";
-    pipe_send(pipe, message, strlen(message), 0);
 }
 
 static void on_became_broken(PipeSide* pipe, void* context) {
@@ -117,22 +112,16 @@ MU_TEST(pipe_test_event_loop) {
     furi_thread_start(thread);
 
     const char* message = "Hello!";
-    pipe_send(alice, message, strlen(message), FuriWaitForever);
+    pipe_send(alice, message, strlen(message));
 
     char buffer_1[16];
-    size_t size = pipe_receive(alice, buffer_1, sizeof(buffer_1), FuriWaitForever);
+    size_t size = pipe_receive(alice, buffer_1, strlen(message));
     buffer_1[size] = 0;
 
-    char buffer_2[16];
-    const char* expected_reply = "Hi!";
-    size = pipe_receive(alice, buffer_2, sizeof(buffer_2), FuriWaitForever);
-    buffer_2[size] = 0;
-
     pipe_free(alice);
     furi_thread_join(thread);
 
     mu_assert_string_eq(message, buffer_1);
-    mu_assert_string_eq(expected_reply, buffer_2);
     mu_assert_int_eq(
         TestFlagDataArrived | TestFlagSpaceFreed | TestFlagBecameBroken,
         furi_thread_get_return_code(thread));

applications/debug/unit_tests/tests/rpc/rpc_test.c

@@ -3,7 +3,6 @@
 
 #include <rpc/rpc.h>
 #include <rpc/rpc_i.h>
-#include <cli/cli.h>
 #include <storage/storage.h>
 #include <loader/loader.h>
 #include <storage/filesystem_api_defines.h>

applications/debug/unit_tests/tests/storage/storage_test.c

@@ -521,11 +521,6 @@ MU_TEST(test_storage_data_path) {
     // check that appsdata folder exists
     mu_check(storage_dir_exists(storage, APPS_DATA_PATH));
 
-    // check that cli folder exists
-    mu_check(storage_dir_exists(storage, APPSDATA_APP_PATH("cli")));
-
-    storage_simply_remove(storage, APPSDATA_APP_PATH("cli"));
-
     furi_record_close(RECORD_STORAGE);
 }
 

applications/debug/unit_tests/unit_tests.c

@@ -1,21 +1,24 @@
 #include <furi.h>
-#include <cli/cli.h>
+#include <toolbox/pipe.h>
+#include <toolbox/cli/cli_command.h>
+#include <toolbox/cli/cli_registry.h>
+#include <cli/cli_main_commands.h>
 
 #include "test_runner.h"
 
-void unit_tests_cli(Cli* cli, FuriString* args, void* context) {
-    UNUSED(cli);
+void unit_tests_cli(PipeSide* pipe, FuriString* args, void* context) {
     UNUSED(context);
 
-    TestRunner* test_runner = test_runner_alloc(cli, args);
+    TestRunner* test_runner = test_runner_alloc(pipe, args);
     test_runner_run(test_runner);
     test_runner_free(test_runner);
 }
 
 void unit_tests_on_system_start(void) {
 #ifdef SRV_CLI
-    Cli* cli = furi_record_open(RECORD_CLI);
-    cli_add_command(cli, "unit_tests", CliCommandFlagParallelSafe, unit_tests_cli, NULL);
+    CliRegistry* registry = furi_record_open(RECORD_CLI);
+    cli_registry_add_command(
+        registry, "unit_tests", CliCommandFlagParallelSafe, unit_tests_cli, NULL);
     furi_record_close(RECORD_CLI);
 #endif
 }

applications/debug/usb_mouse/application.fam

@@ -5,6 +5,5 @@ App(
     entry_point="usb_mouse_app",
     requires=["gui"],
     stack_size=1 * 1024,
-    order=60,
     fap_category="Debug",
 )

applications/debug/usb_test/application.fam

@@ -5,6 +5,5 @@ App(
     entry_point="usb_test_app",
     requires=["gui"],
     stack_size=1 * 1024,
-    order=50,
     fap_category="Debug",
 )

applications/debug/vibro_test/application.fam

@@ -5,6 +5,5 @@ App(
     entry_point="vibro_test_app",
     requires=["gui"],
     stack_size=1 * 1024,
-    order=20,
     fap_category="Debug",
 )