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

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

Browse Source
This commit is contained in:
Willy-JL
2024-01-05 21:51:29 +00:00
parent 00fbf4a9c7 7eeb60e17e
commit 3041db537e
66 changed files with 166 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -401,7 +401,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

@@ -92,6 +92,7 @@ bool desktop_scene_locked_on_event(void* context, SceneManagerEvent event) {
break;
}
case DesktopLockedEventUnlocked:
case DesktopGlobalApiUnlock:
desktop_unlock(desktop);
consumed = true;
break;

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

@@ -134,6 +134,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

@@ -51,6 +51,7 @@ typedef enum {
DesktopGlobalBeforeAppStarted,
DesktopGlobalAfterAppFinished,
DesktopGlobalAutoLock,
DesktopGlobalApiUnlock,
DesktopMainEventLockKeypad,
DesktopLockedEventOpenPowerOff,

18
applications/services/notification/notification_messages.c
View File

@@ -519,6 +519,24 @@ const NotificationSequence sequence_success = {
NULL,
};
const NotificationSequence sequence_semi_success = {
&message_display_backlight_on,
&message_green_255,
&message_vibro_on,
&message_note_c4,
&message_delay_50,
&message_note_e4,
&message_delay_50,
&message_note_g4,
&message_delay_50,
&message_sound_off,
&message_delay_50,
&message_note_c5,
&message_delay_50,
&message_sound_off,
NULL,
};
const NotificationSequence sequence_error = {
&message_display_backlight_on,
&message_red_255,

1
applications/services/notification/notification_messages.h
View File

@@ -138,6 +138,7 @@ extern const NotificationSequence sequence_blink_stop;
extern const NotificationSequence sequence_single_vibro;
extern const NotificationSequence sequence_double_vibro;
extern const NotificationSequence sequence_success;
extern const NotificationSequence sequence_semi_success;
extern const NotificationSequence sequence_error;
extern const NotificationSequence sequence_audiovisual_alert;