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

applications/services/rpc/rpc.c

@@ -9,7 +9,8 @@
 
 #include <furi.h>
 
-#include <cli/cli.h>
+#include <toolbox/cli/cli_command.h>
+#include <cli/cli_main_commands.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <m-dict.h>
@@ -435,9 +436,14 @@ void rpc_on_system_start(void* p) {
 
     rpc->busy_mutex = furi_mutex_alloc(FuriMutexTypeNormal);
 
-    Cli* cli = furi_record_open(RECORD_CLI);
-    cli_add_command(
-        cli, "start_rpc_session", CliCommandFlagParallelSafe, rpc_cli_command_start_session, rpc);
+    CliRegistry* registry = furi_record_open(RECORD_CLI);
+    cli_registry_add_command(
+        registry,
+        "start_rpc_session",
+        CliCommandFlagParallelSafe,
+        rpc_cli_command_start_session,
+        rpc);
+    furi_record_close(RECORD_CLI);
 
     furi_record_create(RECORD_RPC, rpc);
 }

applications/services/rpc/rpc_cli.c

@@ -1,25 +1,26 @@
-#include <cli/cli.h>
+#include <toolbox/cli/cli_command.h>
+#include <cli/cli_main_commands.h>
 #include <furi.h>
 #include <rpc/rpc.h>
 #include <furi_hal.h>
+#include <toolbox/pipe.h>
 
 #define TAG "RpcCli"
 
 typedef struct {
-    Cli* cli;
+    PipeSide* pipe;
     bool session_close_request;
     FuriSemaphore* terminate_semaphore;
 } CliRpc;
 
-#define CLI_READ_BUFFER_SIZE 64
+#define CLI_READ_BUFFER_SIZE 64UL
 
 static void rpc_cli_send_bytes_callback(void* context, uint8_t* bytes, size_t bytes_len) {
     furi_assert(context);
     furi_assert(bytes);
     furi_assert(bytes_len > 0);
     CliRpc* cli_rpc = context;
-
-    cli_write(cli_rpc->cli, bytes, bytes_len);
+    pipe_send(cli_rpc->pipe, bytes, bytes_len);
 }
 
 static void rpc_cli_session_close_callback(void* context) {
@@ -36,9 +37,9 @@ static void rpc_cli_session_terminated_callback(void* context) {
     furi_semaphore_release(cli_rpc->terminate_semaphore);
 }
 
-void rpc_cli_command_start_session(Cli* cli, FuriString* args, void* context) {
+void rpc_cli_command_start_session(PipeSide* pipe, FuriString* args, void* context) {
     UNUSED(args);
-    furi_assert(cli);
+    furi_assert(pipe);
     furi_assert(context);
     Rpc* rpc = context;
 
@@ -53,7 +54,7 @@ void rpc_cli_command_start_session(Cli* cli, FuriString* args, void* context) {
         return;
     }
 
-    CliRpc cli_rpc = {.cli = cli, .session_close_request = false};
+    CliRpc cli_rpc = {.pipe = pipe, .session_close_request = false};
     cli_rpc.terminate_semaphore = furi_semaphore_alloc(1, 0);
     rpc_session_set_context(rpc_session, &cli_rpc);
     rpc_session_set_send_bytes_callback(rpc_session, rpc_cli_send_bytes_callback);
@@ -64,8 +65,9 @@ void rpc_cli_command_start_session(Cli* cli, FuriString* args, void* context) {
     size_t size_received = 0;
 
     while(1) {
-        size_received = cli_read_timeout(cli_rpc.cli, buffer, CLI_READ_BUFFER_SIZE, 50);
-        if(!cli_is_connected(cli_rpc.cli) || cli_rpc.session_close_request) {
+        size_t to_receive = CLAMP(pipe_bytes_available(cli_rpc.pipe), CLI_READ_BUFFER_SIZE, 1UL);
+        size_received = pipe_receive(cli_rpc.pipe, buffer, to_receive);
+        if(size_received < to_receive || cli_rpc.session_close_request) {
             break;
         }
 

applications/services/rpc/rpc_i.h

@@ -5,7 +5,7 @@
 #include <pb_decode.h>
 #include <pb_encode.h>
 #include <flipper.pb.h>
-#include <cli/cli.h>
+#include <toolbox/pipe.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,7 +46,7 @@ void rpc_desktop_free(void* ctx);
 void rpc_debug_print_message(const PB_Main* message);
 void rpc_debug_print_data(const char* prefix, uint8_t* buffer, size_t size);
 
-void rpc_cli_command_start_session(Cli* cli, FuriString* args, void* context);
+void rpc_cli_command_start_session(PipeSide* pipe, FuriString* args, void* context);
 
 PB_CommandStatus rpc_system_storage_get_error(FS_Error fs_error);