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

@@ -460,6 +460,8 @@ int32_t bt_srv(void* p) {
FURI_LOG_W(TAG, "Skipping start in special boot mode");
ble_glue_wait_for_c2_start(FURI_HAL_BT_C2_START_TIMEOUT);
furi_record_create(RECORD_BT, bt);
furi_thread_suspend(furi_thread_get_current_id());
return 0;
}

View File

@@ -1,7 +1,7 @@
#include "cli_i.h" // IWYU pragma: keep
#include <furi_hal_usb_cdc.h>
#include <furi_hal.h>
#include <furi.h>
#include "cli_i.h"
#define TAG "CliVcp"

View File

@@ -8,7 +8,6 @@
#include "animation_manager.h"
#include "animation_storage.h"
#include "animation_storage_i.h"
#include <assets_dolphin_internal.h>
#include <assets_dolphin_blocking.h>

View File

@@ -1,6 +1,5 @@
#include "../animation_manager.h"
#include "../animation_storage.h"
#include "bubble_animation_view.h"
#include <furi_hal.h>

View File

@@ -442,6 +442,8 @@ int32_t desktop_srv(void* p) {
if(furi_hal_rtc_get_boot_mode() != FuriHalRtcBootModeNormal) {
FURI_LOG_W(TAG, "Skipping start in special boot mode");
furi_thread_suspend(furi_thread_get_current_id());
return 0;
}

View File

@@ -7,8 +7,6 @@
#include <furi_hal.h>
#include <gui/gui.h>
#include "../desktop_i.h"
static const NotificationSequence sequence_pin_fail = {
&message_display_backlight_on,

View File

@@ -8,9 +8,7 @@
#include "../desktop_i.h"
#include <desktop/desktop_settings.h>
#include "../views/desktop_view_lock_menu.h"
#include "desktop_scene_i.h"
#include "desktop_scene.h"
#include "../helpers/pin.h"
#define TAG "DesktopSceneLock"

View File

@@ -9,7 +9,6 @@
#include "../helpers/pin.h"
#include "../animations/animation_manager.h"
#include "../views/desktop_events.h"
#include "../views/desktop_view_pin_input.h"
#include "../views/desktop_view_locked.h"
#include "desktop_scene.h"
#include "desktop_scene_i.h"

View File

@@ -8,7 +8,6 @@
#include "../views/desktop_events.h"
#include "../views/desktop_view_main.h"
#include "desktop_scene.h"
#include "desktop_scene_i.h"
#define TAG "DesktopSrv"

View File

@@ -8,12 +8,10 @@
#include "../desktop.h"
#include "../desktop_i.h"
#include "../animations/animation_manager.h"
#include "../views/desktop_events.h"
#include "../views/desktop_view_pin_input.h"
#include "../helpers/pin.h"
#include "desktop_scene.h"
#include "desktop_scene_i.h"
#define WRONG_PIN_HEADER_TIMEOUT 3000
#define INPUT_PIN_VIEW_TIMEOUT 15000

View File

@@ -1,11 +1,9 @@
#include <furi.h>
#include <FreeRTOS.h>
#include <gui/scene_manager.h>
#include "../desktop_i.h"
#include "../views/desktop_view_pin_timeout.h"
#include "desktop_scene.h"
#include "desktop_scene_i.h"
static void desktop_scene_pin_timeout_callback(void* context) {
Desktop* desktop = (Desktop*)context;

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)

View File

@@ -1,5 +1,4 @@
#include "dialogs/dialogs_message.h"
#include "dialogs_i.h"
#include <toolbox/api_lock.h>
#include "dialogs_module_file_browser.h"
#include "dialogs_module_message.h"

View File

@@ -1,5 +1,4 @@
#include "dialogs_message.h"
#include "dialogs_i.h"
#include <toolbox/api_lock.h>
#include <assets_icons.h>
#include <storage/storage.h>

View File

@@ -1,5 +1,4 @@
#include "dialogs_i.h"
#include "dialogs_message.h"
#include <gui/modules/file_browser.h>
#include <toolbox/api_lock.h>

View File

@@ -1,4 +1,6 @@
#include "dialogs_i.h"
#include "dialogs.h"
#include "dialogs_message.h"
#include <gui/view_holder.h>
#include <toolbox/api_lock.h>
#include <gui/modules/dialog_ex.h>

View File

@@ -1,7 +1,6 @@
#include "dolphin/dolphin.h"
#include "dolphin/helpers/dolphin_state.h"
#include "dolphin.h"
#include "helpers/dolphin_state.h"
#include "dolphin_i.h"
#include "projdefs.h"
#include <furi_hal.h>
#include <stdint.h>
#include <furi.h>
@@ -149,6 +148,8 @@ int32_t dolphin_srv(void* p) {
if(furi_hal_rtc_get_boot_mode() != FuriHalRtcBootModeNormal) {
FURI_LOG_W(TAG, "Skipping start in special boot mode");
furi_thread_suspend(furi_thread_get_current_id());
return 0;
}

View File

@@ -6,7 +6,6 @@
#include <storage/storage.h>
#include <furi.h>
#include <furi_hal.h>
#include <math.h>
#include <toolbox/saved_struct.h>
#define TAG "DolphinState"

View File

@@ -9,7 +9,6 @@
#include <gui/icon_animation_i.h>
#include <furi.h>
#include "canvas_i.h"
#include <math.h>
#include <string.h>

View File

@@ -1,5 +1,5 @@
#include "icon.h"
#include "icon_i.h"
#include "icon_i.h" // IWYU pragma: keep
#include <furi.h>
#include <furi.h>

View File

@@ -1,5 +1,5 @@
#include "icon_animation_i.h"
#include "icon_i.h"
#include "icon_i.h" // IWYU pragma: keep
#include <furi.h>

View File

@@ -39,7 +39,7 @@ typedef struct ButtonItem {
void* callback_context;
} ButtonItem;
ARRAY_DEF(ButtonArray, ButtonItem*, M_PTR_OPLIST);
ARRAY_DEF(ButtonArray, ButtonItem*, M_PTR_OPLIST); // NOLINT
#define M_OPL_ButtonArray_t() ARRAY_OPLIST(ButtonArray, M_PTR_OPLIST)
ARRAY_DEF(ButtonMatrix, ButtonArray_t);
#define M_OPL_ButtonMatrix_t() ARRAY_OPLIST(ButtonMatrix, M_OPL_ButtonArray_t())

View File

@@ -3,7 +3,7 @@
#include <furi.h>
#include <m-array.h>
ARRAY_DEF(ElementArray, WidgetElement*, M_PTR_OPLIST);
ARRAY_DEF(ElementArray, WidgetElement*, M_PTR_OPLIST); // NOLINT
struct Widget {
View* view;

View File

@@ -1,7 +1,6 @@
#include <furi.h>
#include <furi_hal.h>
#include "notification.h"
#include "notification_messages.h"
#include "notification_app.h"
void notification_message(NotificationApp* app, const NotificationSequence* sequence) {

View File

@@ -393,6 +393,8 @@ int32_t power_srv(void* p) {
if(furi_hal_rtc_get_boot_mode() != FuriHalRtcBootModeNormal) {
FURI_LOG_W(TAG, "Skipping start in special boot mode");
furi_thread_suspend(furi_thread_get_current_id());
return 0;
}

View File

@@ -1,4 +1,3 @@
#include "profiles/serial_profile.h"
#include "rpc_i.h"
#include <pb.h>

View File

@@ -1,7 +1,6 @@
#include "flipper.pb.h"
#include "rpc_i.h"
#include <desktop/desktop.h>
#include "desktop.pb.h"
#define TAG "RpcDesktop"

View File

@@ -1,7 +1,7 @@
#include <core/log.h>
#include <core/record.h>
#include "storage.h"
#include "storage_i.h"
#include "storage_i.h" // IWYU pragma: keep
#include "storage_message.h"
#include <toolbox/stream/file_stream.h>
#include <toolbox/dir_walk.h>