Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-16 04:24:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Willy-JL
2024-04-25 22:19:03 +01:00
parent ed57426106 43c4381820
commit 41e0b478a3
13 changed files with 126 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/services/desktop/desktop_i.h
View File

@@ -27,7 +27,8 @@ typedef enum {
DesktopViewIdMain,
DesktopViewIdLockMenu,
DesktopViewIdLocked,
DesktopViewIdHwMismatch,
_DesktopViewIdDebug, // Unused, kept for compatibility
DesktopViewIdPopup,
DesktopViewIdPinInput,
DesktopViewIdPinTimeout,
DesktopViewIdSlideshow,
@@ -42,7 +43,7 @@ struct Desktop {
ViewDispatcher* view_dispatcher;
SceneManager* scene_manager;
Popup* hw_mismatch_popup;
Popup* popup;
DesktopLockMenuView* lock_menu;
DesktopDebugView* _debug_view; // Unused, kept for compatibility
DesktopViewLocked* locked_view;