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

Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev

Browse Source
This commit is contained in:
Willy-JL
2024-03-20 01:48:10 +00:00
parent f723eb400e bcde0aefbd
commit 06aea09169
588 changed files with 3875 additions and 2957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
applications/services/rpc/rpc.c
View File

@@ -94,7 +94,7 @@ struct Rpc {
};
RpcOwner rpc_session_get_owner(RpcSession* session) {
furi_assert(session);
furi_check(session);
return session->owner;
}
@@ -115,7 +115,7 @@ static void rpc_close_session_process(const PB_Main* request, void* context) {
}
void rpc_session_set_context(RpcSession* session, void* context) {
furi_assert(session);
furi_check(session);
furi_mutex_acquire(session->callbacks_mutex, FuriWaitForever);
session->context = context;
@@ -123,7 +123,7 @@ void rpc_session_set_context(RpcSession* session, void* context) {
}
void rpc_session_set_close_callback(RpcSession* session, RpcSessionClosedCallback callback) {
furi_assert(session);
furi_check(session);
furi_mutex_acquire(session->callbacks_mutex, FuriWaitForever);
session->closed_callback = callback;
@@ -131,7 +131,7 @@ void rpc_session_set_close_callback(RpcSession* session, RpcSessionClosedCallbac
}
void rpc_session_set_send_bytes_callback(RpcSession* session, RpcSendBytesCallback callback) {
furi_assert(session);
furi_check(session);
furi_mutex_acquire(session->callbacks_mutex, FuriWaitForever);
session->send_bytes_callback = callback;
@@ -141,7 +141,7 @@ void rpc_session_set_send_bytes_callback(RpcSession* session, RpcSendBytesCallba
void rpc_session_set_buffer_is_empty_callback(
RpcSession* session,
RpcBufferIsEmptyCallback callback) {
furi_assert(session);
furi_check(session);
furi_mutex_acquire(session->callbacks_mutex, FuriWaitForever);
session->buffer_is_empty_callback = callback;
@@ -151,7 +151,7 @@ void rpc_session_set_buffer_is_empty_callback(
void rpc_session_set_terminated_callback(
RpcSession* session,
RpcSessionTerminatedCallback callback) {
furi_assert(session);
furi_check(session);
furi_mutex_acquire(session->callbacks_mutex, FuriWaitForever);
session->terminated_callback = callback;
@@ -169,8 +169,8 @@ size_t rpc_session_feed(
const uint8_t* encoded_bytes,
size_t size,
uint32_t timeout) {
furi_assert(session);
furi_assert(encoded_bytes);
furi_check(session);
furi_check(encoded_bytes);
if(!size) return 0;
@@ -182,7 +182,7 @@ size_t rpc_session_feed(
}
size_t rpc_session_get_available_size(RpcSession* session) {
furi_assert(session);
furi_check(session);
return furi_stream_buffer_spaces_available(session->stream);
}
@@ -388,7 +388,7 @@ RpcSession* rpc_session_open(Rpc* rpc, RpcOwner owner) {
!momentum_settings.allow_locked_rpc_commands)
return NULL;
furi_assert(rpc);
furi_check(rpc);
RpcSession* session = malloc(sizeof(RpcSession));
session->callbacks_mutex = furi_mutex_alloc(FuriMutexTypeNormal);
@@ -428,8 +428,8 @@ RpcSession* rpc_session_open(Rpc* rpc, RpcOwner owner) {
}
void rpc_session_close(RpcSession* session) {
furi_assert(session);
furi_assert(session->rpc);
furi_check(session);
furi_check(session->rpc);
session->rpc->sessions_count--;

20
applications/services/rpc/rpc_app.c
View File

@@ -314,20 +314,20 @@ static void rpc_system_app_data_exchange_process(const PB_Main* request, void* c
}
void rpc_system_app_send_started(RpcAppSystem* rpc_app) {
furi_assert(rpc_app);
furi_check(rpc_app);
rpc_system_app_send_state_response(rpc_app, PB_App_AppState_APP_STARTED, "SendStarted");
}
void rpc_system_app_send_exited(RpcAppSystem* rpc_app) {
furi_assert(rpc_app);
furi_check(rpc_app);
rpc_system_app_send_state_response(rpc_app, PB_App_AppState_APP_CLOSED, "SendExit");
}
void rpc_system_app_confirm(RpcAppSystem* rpc_app, bool result) {
furi_assert(rpc_app);
furi_assert(rpc_app->last_command_id != 0);
furi_check(rpc_app);
furi_check(rpc_app->last_command_id != 0);
/* Ensure that only commands of these types can be confirmed */
furi_assert(
furi_check(
rpc_app->last_event_type == RpcAppEventTypeAppExit ||
rpc_app->last_event_type == RpcAppEventTypeLoadFile ||
rpc_app->last_event_type == RpcAppEventTypeButtonPress ||
@@ -353,19 +353,19 @@ void rpc_system_app_confirm(RpcAppSystem* rpc_app, bool result) {
}
void rpc_system_app_set_callback(RpcAppSystem* rpc_app, RpcAppSystemCallback callback, void* ctx) {
furi_assert(rpc_app);
furi_check(rpc_app);
rpc_app->callback = callback;
rpc_app->callback_context = ctx;
}
void rpc_system_app_set_error_code(RpcAppSystem* rpc_app, uint32_t error_code) {
furi_assert(rpc_app);
furi_check(rpc_app);
rpc_app->error_code = error_code;
}
void rpc_system_app_set_error_text(RpcAppSystem* rpc_app, const char* error_text) {
furi_assert(rpc_app);
furi_check(rpc_app);
if(rpc_app->error_text) {
free(rpc_app->error_text);
@@ -375,14 +375,14 @@ void rpc_system_app_set_error_text(RpcAppSystem* rpc_app, const char* error_text
}
void rpc_system_app_error_reset(RpcAppSystem* rpc_app) {
furi_assert(rpc_app);
furi_check(rpc_app);
rpc_system_app_set_error_code(rpc_app, 0);
rpc_system_app_set_error_text(rpc_app, NULL);
}
void rpc_system_app_exchange_data(RpcAppSystem* rpc_app, const uint8_t* data, size_t data_size) {
furi_assert(rpc_app);
furi_check(rpc_app);
PB_Main* request = malloc(sizeof(PB_Main));