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

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

Browse Source 
IR univeral not merged as commands are all already present here
This commit is contained in:
Willy-JL
2024-06-25 19:13:54 +02:00
parent 0660cde8de a881816673
commit 56ba3b3fb8
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/nfc/helpers/protocol_support/mf_desfire/mf_desfire_render.c
View File

@@ -91,7 +91,7 @@ void nfc_render_mf_desfire_version(const MfDesfireVersion* data, FuriString* str
furi_string_cat_printf( furi_string_cat_printf(
str, str,
"batch %02x:%02x:%02x:%02x:%02x\n" "batch %02x:%02x:%02x:%02x:%02x\n"
"week %d year %d\n", "week %02x year 20%02x\n",
data->batch[0], data->batch[0],
data->batch[1], data->batch[1],
data->batch[2], data->batch[2],

13
applications/services/rpc/rpc_gui.c
View File

@@ -57,6 +57,7 @@ typedef struct {
RpcSession* session; RpcSession* session;
Gui* gui; Gui* gui;
const Icon* icon; const Icon* icon;
FuriPubSub* input_events;
// Receive part // Receive part
ViewPort* virtual_display_view_port; ViewPort* virtual_display_view_port;
@@ -264,10 +265,7 @@ static void
} }
// Submit event // Submit event
FuriPubSub* input_events = furi_record_open(RECORD_INPUT_EVENTS); furi_pubsub_publish(rpc_gui->input_events, &event);
furi_check(input_events);
furi_pubsub_publish(input_events, &event);
furi_record_close(RECORD_INPUT_EVENTS);
rpc_send_and_release_empty(session, request->command_id, PB_CommandStatus_OK); rpc_send_and_release_empty(session, request->command_id, PB_CommandStatus_OK);
} }
@@ -431,6 +429,7 @@ void* rpc_system_gui_alloc(RpcSession* session) {
RpcGuiSystem* rpc_gui = malloc(sizeof(RpcGuiSystem)); RpcGuiSystem* rpc_gui = malloc(sizeof(RpcGuiSystem));
rpc_gui->gui = furi_record_open(RECORD_GUI); rpc_gui->gui = furi_record_open(RECORD_GUI);
rpc_gui->input_events = furi_record_open(RECORD_INPUT_EVENTS);
rpc_gui->session = session; rpc_gui->session = session;
// Active session icon // Active session icon
@@ -486,10 +485,7 @@ void rpc_system_gui_free(void* context) {
.sequence_source = INPUT_SEQUENCE_SOURCE_SOFTWARE, .sequence_source = INPUT_SEQUENCE_SOURCE_SOFTWARE,
.sequence_counter = rpc_gui->input_key_counter[key], .sequence_counter = rpc_gui->input_key_counter[key],
}; };
FuriPubSub* input_events = furi_record_open(RECORD_INPUT_EVENTS); furi_pubsub_publish(rpc_gui->input_events, &event);
furi_check(input_events);
furi_pubsub_publish(input_events, &event);
furi_record_close(RECORD_INPUT_EVENTS);
} }
} }
@@ -520,6 +516,7 @@ void rpc_system_gui_free(void* context) {
free(rpc_gui->transmit_frame); free(rpc_gui->transmit_frame);
rpc_gui->transmit_frame = NULL; rpc_gui->transmit_frame = NULL;
} }
furi_record_close(RECORD_INPUT_EVENTS);
furi_record_close(RECORD_GUI); furi_record_close(RECORD_GUI);
free(rpc_gui); free(rpc_gui);
} }