Merge remote-tracking branch 'OFW/dev' into dev

This commit is contained in:
MX
2024-06-06 00:35:40 +03:00
151 changed files with 703 additions and 612 deletions

View File

@@ -126,7 +126,7 @@ bool desktop_lock_menu_input_callback(InputEvent* event, void* context) {
update);
if(event->key == InputKeyOk) {
if((idx == DesktopLockMenuIndexLock)) {
if(idx == DesktopLockMenuIndexLock) {
if(event->type == InputTypeShort) {
lock_menu->callback(DesktopLockMenuEventLock, lock_menu->context);
}

View File

@@ -6,7 +6,6 @@
#include <input/input.h>
#include <dolphin/dolphin.h>
#include "../desktop_i.h"
#include "desktop_view_main.h"
struct DesktopMainView {

View File

@@ -2,7 +2,6 @@
#include <furi.h>
#include <stdint.h>
#include <stdio.h>
#include <FreeRTOS.h>
#include <projdefs.h>
#include <input/input.h>
#include <gui/canvas.h>

View File

@@ -3,9 +3,7 @@
#include <gui/elements.h>
#include "desktop_view_slideshow.h"
#include "../desktop_i.h"
#include "../helpers/slideshow.h"
#include "../helpers/slideshow_filename.h"
#define DESKTOP_SLIDESHOW_POWEROFF_SHORT 5000
#define DESKTOP_SLIDESHOW_POWEROFF_LONG (60 * 60 * 1000)

View File

@@ -4,6 +4,7 @@
#include "desktop_events.h"
#include "../helpers/slideshow_filename.h"
#include <storage/storage.h>
#define SLIDESHOW_FS_PATH INT_PATH(SLIDESHOW_FILE_NAME)