DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-12-19 19:31:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into leptoptilos

Browse Source
This commit is contained in:
MX 2024-01-05 18:39:42 +03:00
commit 66756853a6
No known key found for this signature in database
GPG Key ID: 7CCC66B7DBDD1C83
5 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
applications/main/subghz/views/transmitter.c
View File

@ -127,7 +127,8 @@ bool subghz_view_transmitter_input(InputEvent* event, void* context) {
SubGhzViewTransmitter* subghz_transmitter = context;
bool can_be_sent = false;
if(event->key == InputKeyBack && event->type == InputTypeShort) {
if(event->key == InputKeyBack && event->type == InputTypeLong) {
// Reset view model
with_view_model(
subghz_transmitter->view,
SubGhzViewTransmitterModel * model,

2
applications/services/desktop/desktop.c
View File

@ -415,7 +415,7 @@ bool desktop_api_is_locked(Desktop* instance) {
void desktop_api_unlock(Desktop* instance) {
furi_assert(instance);
view_dispatcher_send_custom_event(instance->view_dispatcher, DesktopLockedEventUnlocked);
view_dispatcher_send_custom_event(instance->view_dispatcher, DesktopGlobalApiUnlock);
}
FuriPubSub* desktop_api_get_status_pubsub(Desktop* instance) {

1
applications/services/desktop/scenes/desktop_scene_locked.c
View File

@ -83,6 +83,7 @@ bool desktop_scene_locked_on_event(void* context, SceneManagerEvent event) {
if(event.type == SceneManagerEventTypeCustom) {
switch(event.event) {
case DesktopLockedEventUnlocked:
case DesktopGlobalApiUnlock:
desktop_unlock(desktop);
consumed = true;
break;

1
applications/services/desktop/scenes/desktop_scene_pin_input.c
View File

@ -126,6 +126,7 @@ bool desktop_scene_pin_input_on_event(void* context, SceneManagerEvent event) {
consumed = true;
break;
case DesktopPinInputEventUnlocked:
case DesktopGlobalApiUnlock:
desktop_unlock(desktop);
consumed = true;
break;

1
applications/services/desktop/views/desktop_events.h
View File

@ -55,4 +55,5 @@ typedef enum {
DesktopGlobalBeforeAppStarted,
DesktopGlobalAfterAppFinished,
DesktopGlobalAutoLock,
DesktopGlobalApiUnlock,
} DesktopEvent;