Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-19 04:44:47 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DarkFlippers:dev' into dev

Browse Source
This commit is contained in:
Dmitry422
2025-04-09 21:17:12 +07:00
committed by GitHub
parent 7507058870 7286560c23
commit d467798b43
11 changed files with 66 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
applications/services/cli/cli_vcp.c
View File

@@ -50,7 +50,7 @@ struct CliVcp {
PipeSide* own_pipe;
PipeSide* shell_pipe;
bool is_currently_transmitting;
volatile bool is_currently_transmitting;
size_t previous_tx_length;
CliRegistry* main_registry;
@@ -106,6 +106,7 @@ static void cli_vcp_signal_internal_event(CliVcp* cli_vcp, CliVcpInternalEvent e
static void cli_vcp_cdc_tx_done(void* context) {
CliVcp* cli_vcp = context;
cli_vcp->is_currently_transmitting = false;
cli_vcp_signal_internal_event(cli_vcp, CliVcpInternalEventTxDone);
}
@@ -195,6 +196,16 @@ static void cli_vcp_internal_event_happened(void* context) {
CliVcpInternalEvent event = furi_thread_flags_wait(CliVcpInternalEventAll, FuriFlagWaitAny, 0);
furi_check(!(event & FuriFlagError));
if(event & CliVcpInternalEventRx) {
VCP_TRACE(TAG, "Rx");
cli_vcp_maybe_receive_data(cli_vcp);
}
if(event & CliVcpInternalEventTxDone) {
VCP_TRACE(TAG, "TxDone");
cli_vcp_maybe_send_data(cli_vcp);
}
if(event & CliVcpInternalEventDisconnected) {
if(!cli_vcp->is_connected) return;
FURI_LOG_D(TAG, "Disconnected");
@@ -234,17 +245,6 @@ static void cli_vcp_internal_event_happened(void* context) {
cli_main_motd, NULL, cli_vcp->shell_pipe, cli_vcp->main_registry, &cli_main_ext_config);
cli_shell_start(cli_vcp->shell);
}
if(event & CliVcpInternalEventRx) {
VCP_TRACE(TAG, "Rx");
cli_vcp_maybe_receive_data(cli_vcp);
}
if(event & CliVcpInternalEventTxDone) {
VCP_TRACE(TAG, "TxDone");
cli_vcp->is_currently_transmitting = false;
cli_vcp_maybe_send_data(cli_vcp);
}
}
// ============

4
applications/services/namechanger/application.fam
View File

@@ -4,5 +4,5 @@ App(
entry_point="namechanger_on_system_start",
requires=["storage", "cli", "bt"],
conflicts=["updater"],
order=600,
)
order=1300,
)

2
applications/services/rgb_backlight/application.fam
View File

@@ -5,6 +5,6 @@ App(
entry_point="rgb_backlight_srv",
cdefines=["SRV_RGB_BACKLIGHT"],
stack_size=1 * 1024,
order=95,
order=1290,
sdk_headers=["rgb_backlight.h"],
)