Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-23 01:18:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

CLI: Fix long delay with quick connect/disconnect

Browse Source 
noticeable with qflipper, for some reason it sets DTR on/off/on again
so flipper starts CLI, stops it, then starts again
but cli shell is trying to print motd, and pipe is already broken
so each character of motd times out for 100ms
changing pipe timeout to 10ms works too, but is just a workaround

it didnt always happen, i think that variable time of loading ext cmds
made it so on ofw it usually manages to print motd before pipe is broken
on cfw with more ext commands it always hung, on ofw only sometimes

important part is bailing early in cli shell
in cli vcp i made it cleanup cli shell on disconnect so it doesnt stay
around after disconnecting usb, might free a little ram maybe
This commit is contained in:
WillyJL
2025-07-22 17:10:41 +02:00
parent d1c3b0bc68
commit 291ed9d1ed
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/services/cli/cli_vcp.c
+5 -9
View File
@@ -217,7 +217,11 @@ static void cli_vcp_internal_event_happened(FuriEventLoopObject* object, void* c
// disconnect our side of the pipe
pipe_detach_from_event_loop(cli_vcp->own_pipe);
pipe_free(cli_vcp->own_pipe);
cli_vcp->own_pipe = NULL;
// wait for shell to stop
cli_shell_join(cli_vcp->shell);
cli_shell_free(cli_vcp->shell);
pipe_free(cli_vcp->shell_pipe);
break;
}
@@ -226,14 +230,6 @@ static void cli_vcp_internal_event_happened(FuriEventLoopObject* object, void* c
FURI_LOG_D(TAG, "Connected");
cli_vcp->is_connected = true;
// wait for previous shell to stop
furi_check(!cli_vcp->own_pipe);
if(cli_vcp->shell) {
cli_shell_join(cli_vcp->shell);
cli_shell_free(cli_vcp->shell);
pipe_free(cli_vcp->shell_pipe);
}
// start shell thread
PipeSideBundle bundle = pipe_alloc(VCP_BUF_SIZE, 1);
cli_vcp->own_pipe = bundle.alices_side;
lib/toolbox/cli/shell/cli_shell.c
+5
View File
@@ -423,11 +423,16 @@ static int32_t cli_shell_thread(void* context) {
cli_shell_init(shell);
FURI_LOG_D(TAG, "Started");
if(pipe_state(shell->pipe) == PipeStateBroken) goto bail;
shell->motd(shell->callback_context);
cli_shell_line_prompt(shell->components[CliShellComponentLine]);
if(pipe_state(shell->pipe) == PipeStateBroken) goto bail;
furi_event_loop_run(shell->event_loop);
bail:
FURI_LOG_D(TAG, "Stopped");
cli_shell_deinit(shell);
return 0;