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

2026-05-14 10:28:36 -07:00 · 2024-06-04 03:01:51 +01:00
parent 9b748ea792 03196fa110
commit 23da827361
132 changed files with 120 additions and 188 deletions
--- a/applications/services/desktop/views/desktop_view_main.c
+++ b/applications/services/desktop/views/desktop_view_main.c
@@ -6,7 +6,6 @@
 #include <input/input.h>
 #include <dolphin/dolphin.h>

-#include "../desktop_i.h"
 #include "desktop_view_main.h"

 struct DesktopMainView {
--- a/applications/services/desktop/views/desktop_view_slideshow.c
+++ b/applications/services/desktop/views/desktop_view_slideshow.c
@@ -3,7 +3,6 @@
 #include <gui/elements.h>

 #include "desktop_view_slideshow.h"
-#include "../desktop_i.h"
 #include "../helpers/slideshow.h"

 #define DESKTOP_SLIDESHOW_POWEROFF_SHORT 5000
--- a/applications/services/desktop/views/desktop_view_slideshow.h
+++ b/applications/services/desktop/views/desktop_view_slideshow.h
@@ -3,6 +3,7 @@
 #include <gui/view.h>

 #include "desktop_events.h"
+#include <storage/storage.h>

 #define SLIDESHOW_FS_PATH EXT_PATH(".slideshow")