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

2026-05-13 13:08:36 -07:00 · 2024-04-25 22:19:03 +01:00
parent ed57426106 43c4381820
commit 41e0b478a3
13 changed files with 126 additions and 97 deletions
--- a/applications/services/desktop/views/desktop_events.h
+++ b/applications/services/desktop/views/desktop_events.h
@@ -47,6 +47,10 @@ typedef enum {
    DesktopSlideshowCompleted,
    DesktopSlideshowPoweroff,

+    DesktopHwMismatchExit,
+
+    DesktopEnclaveExit,
+
    // Global events
    DesktopGlobalBeforeAppStarted,
    DesktopGlobalAfterAppFinished,