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

applications/services/cli/cli_vcp.c

@@ -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"
 

applications/services/desktop/animations/animation_storage.c

@@ -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>
 #include <momentum/momentum.h>

applications/services/desktop/animations/views/bubble_animation_view.c

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

applications/services/desktop/helpers/pin.c

@@ -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,
 

applications/services/desktop/scenes/desktop_scene_lock_menu.c

@@ -9,9 +9,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"
 #include <power/power_service/power.h>
 #define TAG "DesktopSceneLock"
 

applications/services/desktop/scenes/desktop_scene_locked.c

@@ -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"

applications/services/desktop/scenes/desktop_scene_main.c

@@ -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"
 

applications/services/desktop/scenes/desktop_scene_pin_input.c

@@ -9,12 +9,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

applications/services/desktop/scenes/desktop_scene_pin_timeout.c

@@ -5,7 +5,6 @@
 #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;

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 {

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

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")
 

applications/services/dialogs/dialogs.c

@@ -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"

applications/services/dialogs/dialogs_api.c

@@ -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>

applications/services/dialogs/dialogs_module_file_browser.c

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

applications/services/dialogs/dialogs_module_message.c

@@ -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>
 

applications/services/dolphin/dolphin.c

@@ -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>

applications/services/dolphin/helpers/dolphin_state.c

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

applications/services/gui/elements.c

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

applications/services/gui/icon.c

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

applications/services/gui/icon_animation.c

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

applications/services/gui/modules/button_panel.c

@@ -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())

applications/services/gui/modules/widget.c

@@ -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;

applications/services/notification/notification_app_api.c

@@ -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) {

applications/services/power/power_service/power.c

@@ -81,7 +81,7 @@ void power_draw_battery_callback(Canvas* canvas, void* context) {
             (battery_icon == BatteryIconBarPercent) &&
             (power->state != PowerStateCharging) && // Default bar display with percentage
             (power->info.voltage_battery_charge_limit >=
-             4.2)) { // not looking nice with low voltage indicator
+             4.2f)) { // not looking nice with low voltage indicator
             canvas_set_font(canvas, FontBatteryPercent);
 
             // align charge display value with digits to draw
@@ -135,7 +135,7 @@ void power_draw_battery_callback(Canvas* canvas, void* context) {
         }
 
         // TODO: Verify if it displays correctly with custom battery skins !!!
-        if(power->info.voltage_battery_charge_limit < 4.2) {
+        if(power->info.voltage_battery_charge_limit < 4.2f) {
             // Battery charging voltage is modified, indicate with cross pattern
             canvas_invert_color(canvas);
             uint8_t battery_bar_width = (power->info.charge + 4) / 5;

applications/services/rpc/rpc.c

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

applications/services/rpc/rpc_desktop.c

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

applications/services/storage/storage_external_api.c

@@ -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>