mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-12 23:28:36 -07:00
Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev --nobuild
IR univeral not merged as commands are all already present here
This commit is contained in:
@@ -57,6 +57,7 @@ typedef struct {
|
||||
RpcSession* session;
|
||||
Gui* gui;
|
||||
const Icon* icon;
|
||||
FuriPubSub* input_events;
|
||||
|
||||
// Receive part
|
||||
ViewPort* virtual_display_view_port;
|
||||
@@ -264,10 +265,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);
|
||||
}
|
||||
|
||||
@@ -431,6 +429,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
|
||||
@@ -486,10 +485,7 @@ void rpc_system_gui_free(void* context) {
|
||||
.sequence_source = INPUT_SEQUENCE_SOURCE_SOFTWARE,
|
||||
.sequence_counter = rpc_gui->input_key_counter[key],
|
||||
};
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -520,6 +516,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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user