Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2024-11-25 22:10:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
MX 2024-06-27 04:36:00 +03:00
commit a91a4af053
No known key found for this signature in database
GPG key ID: 7CCC66B7DBDD1C83
2 changed files with 18 additions and 5 deletions
Show stats 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(
str,
"batch %02x:%02x:%02x:%02x:%02x\n"
"week %d year %d\n",
"week %02x year 20%02x\n",
data->batch[0],
data->batch[1],
data->batch[2],

21
applications/services/rpc/rpc_gui.c
View file

@ -55,6 +55,7 @@ typedef struct {
RpcSession* session;
Gui* gui;
const Icon* icon;
FuriPubSub* input_events;
// Receive part
ViewPort* virtual_display_view_port;
@ -234,10 +235,7 @@ static void
}
// Submit event
FuriPubSub* input_events = furi_record_open(RECORD_INPUT_EVENTS);
furi_check(input_events);
furi_pubsub_publish(input_events, &event);
furi_record_close(RECORD_INPUT_EVENTS);
furi_pubsub_publish(rpc_gui->input_events, &event);
rpc_send_and_release_empty(session, request->command_id, PB_CommandStatus_OK);
}
@ -401,6 +399,7 @@ void* rpc_system_gui_alloc(RpcSession* session) {
RpcGuiSystem* rpc_gui = malloc(sizeof(RpcGuiSystem));
rpc_gui->gui = furi_record_open(RECORD_GUI);
rpc_gui->input_events = furi_record_open(RECORD_INPUT_EVENTS);
rpc_gui->session = session;
// Active session icon
@ -447,6 +446,19 @@ void rpc_system_gui_free(void* context) {
RpcGuiSystem* rpc_gui = context;
furi_assert(rpc_gui->gui);
// Release ongoing inputs to avoid lockup
for(InputKey key = 0; key < InputKeyMAX; key++) {
if(rpc_gui->input_key_counter[key] != RPC_GUI_INPUT_RESET) {
InputEvent event = {
.key = key,
.type = InputTypeRelease,
.sequence_source = INPUT_SEQUENCE_SOURCE_SOFTWARE,
.sequence_counter = rpc_gui->input_key_counter[key],
};
furi_pubsub_publish(rpc_gui->input_events, &event);
}
}
if(rpc_gui->virtual_display_view_port) {
gui_remove_view_port(rpc_gui->gui, rpc_gui->virtual_display_view_port);
view_port_free(rpc_gui->virtual_display_view_port);
@ -474,6 +486,7 @@ void rpc_system_gui_free(void* context) {
free(rpc_gui->transmit_frame);
rpc_gui->transmit_frame = NULL;
}
furi_record_close(RECORD_INPUT_EVENTS);
furi_record_close(RECORD_GUI);
free(rpc_gui);
}