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

applications/main/archive/helpers/archive_apps.c

@@ -1,4 +1,3 @@
-#include "archive_files.h"
 #include "archive_apps.h"
 #include "archive_browser.h"
 #include <applications/main/u2f/u2f_data.h>

applications/main/archive/helpers/archive_browser.c

@@ -7,7 +7,6 @@
 #include <core/log.h>
 #include <gui/modules/file_browser_worker.h>
 #include <flipper_application/flipper_application.h>
-#include <math.h>
 #include <furi_hal.h>
 
 static void

applications/main/archive/scenes/archive_scene_browser.c

@@ -1,6 +1,5 @@
 #include "../archive_i.h"
 #include "../helpers/archive_files.h"
-#include "../helpers/archive_apps.h"
 #include "../helpers/archive_favorites.h"
 #include "../helpers/archive_browser.h"
 #include "../helpers/archive_helpers_ext.h"

applications/main/archive/scenes/archive_scene_delete.c

@@ -1,4 +1,5 @@
 #include "../archive_i.h"
+#include "../helpers/archive_files.h"
 #include "../helpers/archive_apps.h"
 #include "../helpers/archive_browser.h"
 

applications/main/archive/views/archive_browser_view.c

@@ -1,7 +1,6 @@
 #include "assets_icons.h"
 #include "toolbox/path.h"
 #include <furi.h>
-#include "../archive_i.h"
 #include "archive_browser_view.h"
 #include "../helpers/archive_browser.h"
 

applications/main/bad_kb/scenes/bad_kb_scene_config.c

@@ -1,5 +1,4 @@
 #include "../bad_kb_app_i.h"
-#include "furi_hal_power.h"
 
 enum VarItemListIndex {
     VarItemListIndexKeyboardLayout,

applications/main/bad_kb/scenes/bad_kb_scene_config_layout.c

@@ -1,5 +1,4 @@
 #include "../bad_kb_app_i.h"
-#include "furi_hal_power.h"
 #include <storage/storage.h>
 
 static bool bad_kb_layout_select(BadKbApp* bad_kb) {

applications/main/bad_kb/scenes/bad_kb_scene_file_select.c

@@ -1,5 +1,4 @@
 #include "../bad_kb_app_i.h"
-#include <furi_hal_power.h>
 #include <storage/storage.h>
 
 static bool bad_kb_file_select(BadKbApp* bad_kb) {

applications/main/gpio/views/gpio_usb_uart.c

@@ -1,7 +1,8 @@
+#include "gpio_usb_uart.h"
 #include "../usb_uart_bridge.h"
-#include "../gpio_app_i.h"
 #include <furi_hal.h>
 #include <gui/elements.h>
+#include <assets_icons.h>
 
 struct GpioUsbUart {
     View* view;

applications/main/infrared/scenes/infrared_scene_universal_ac.c

@@ -1,4 +1,4 @@
-#include "../infrared_app_i.h"
+#include "../infrared_app_i.h" // IWYU pragma: keep
 
 #include "common/infrared_scene_universal_common.h"
 

applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight.c

@@ -167,7 +167,7 @@ bool nfc_scene_read_on_event_mf_ultralight(NfcApp* instance, SceneManagerEvent e
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == NfcCustomEventCardDetected) {
             nfc_unlock_helper_card_detected_handler(instance);
-        } else if((event.event == NfcCustomEventPollerIncomplete)) {
+        } else if(event.event == NfcCustomEventPollerIncomplete) {
             notification_message(instance->notifications, &sequence_semi_success);
             scene_manager_next_scene(instance->scene_manager, NfcSceneReadSuccess);
             dolphin_deed(DolphinDeedNfcReadSuccess);

applications/main/nfc/plugins/supported_cards/troika.c

@@ -7,7 +7,6 @@
 #include <bit_lib/bit_lib.h>
 #include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
 #include "../../api/mosgortrans/mosgortrans_util.h"
-#include "furi_hal_rtc.h"
 
 #define TAG "Troika"
 

applications/main/subghz/helpers/subghz_frequency_analyzer_worker.c

@@ -58,7 +58,7 @@ static uint32_t subghz_frequency_analyzer_worker_expRunningAverageAdaptive(
     float k;
     float newValFloat = newVal;
     // the sharpness of the filter depends on the absolute value of the difference
-    if(fabs(newValFloat - instance->filVal) > 500000)
+    if(fabsf(newValFloat - instance->filVal) > 500000.f)
         k = 0.9;
     else
         k = 0.03;

applications/main/subghz/helpers/subghz_threshold_rssi.c

@@ -1,6 +1,6 @@
 #include "subghz_threshold_rssi.h"
+#include "../views/subghz_read_raw.h"
 #include <float_tools.h>
-#include "../subghz_i.h"
 
 #define TAG "SubGhzThresholdRssi"
 #define THRESHOLD_RSSI_LOW_COUNT 10

applications/main/subghz/helpers/subghz_txrx.c

@@ -1,4 +1,4 @@
-#include "subghz_txrx_i.h"
+#include "subghz_txrx_i.h" // IWYU pragma: keep
 
 #include <lib/subghz/protocols/protocol_items.h>
 #include <applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h>

applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c

@@ -1,4 +1,4 @@
-#include "subghz_txrx_i.h"
+#include "subghz_txrx_i.h" // IWYU pragma: keep
 #include "subghz_txrx_create_protocol_key.h"
 #include <lib/subghz/transmitter.h>
 #include <lib/subghz/protocols/protocol_items.h>

applications/main/subghz/scenes/subghz_scene_delete_success.c

@@ -1,4 +1,4 @@
-#include "../subghz_i.h"
+#include "../subghz_i.h" // IWYU pragma: keep
 #include "../helpers/subghz_custom_event.h"
 
 void subghz_scene_delete_success_popup_callback(void* context) {

applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c

@@ -1,4 +1,4 @@
-#include "../subghz_i.h"
+#include "../subghz_i.h" // IWYU pragma: keep
 #include "../views/subghz_frequency_analyzer.h"
 
 #define TAG "SubGhzSceneFrequencyAnalyzer"

applications/main/subghz/scenes/subghz_scene_read_raw.c

@@ -2,7 +2,7 @@
 #include "../views/subghz_read_raw.h"
 #include <dolphin/dolphin.h>
 #include <lib/subghz/protocols/raw.h>
-#include <lib/toolbox/path.h>
+#include <toolbox/path.h>
 #include <float_tools.h>
 
 #define RAW_FILE_NAME "RAW_"

applications/main/subghz/scenes/subghz_scene_saved_menu.c

@@ -1,4 +1,4 @@
-#include "../subghz_i.h"
+#include "../subghz_i.h" // IWYU pragma: keep
 
 enum SubmenuIndex {
     SubmenuIndexEmulate,

applications/main/subghz/scenes/subghz_scene_show_error.c

@@ -1,4 +1,4 @@
-#include "../subghz_i.h"
+#include "../subghz_i.h" // IWYU pragma: keep
 #include "../helpers/subghz_custom_event.h"
 
 static const NotificationSequence subghz_sequence_sd_error = {

applications/main/subghz/scenes/subghz_scene_show_error_sub.c

@@ -1,4 +1,4 @@
-#include "../subghz_i.h"
+#include "../subghz_i.h" // IWYU pragma: keep
 #include "../helpers/subghz_custom_event.h"
 
 void subghz_scene_show_error_sub_popup_callback(void* context) {

applications/main/subghz/subghz_i.c

@@ -2,11 +2,11 @@
 
 #include "assets_icons.h"
 #include "subghz/types.h"
-#include <math.h>
 #include <furi.h>
 #include <notification/notification.h>
 #include <notification/notification_messages.h>
 #include <flipper_format/flipper_format.h>
+
 #include <flipper_format/flipper_format_i.h>
 
 #define TAG "SubGhz"

applications/main/subghz/views/receiver.c

@@ -1,7 +1,6 @@
 #include "receiver.h"
-#include "../subghz_i.h"
-#include <math.h>
 
+#include "types.h"
 #include <input/input.h>
 #include <gui/elements.h>
 #include <assets_icons.h>

applications/main/subghz/views/subghz_frequency_analyzer.c

@@ -1,7 +1,5 @@
 #include "subghz_frequency_analyzer.h"
-#include "../subghz_i.h"
 
-#include <math.h>
 #include <furi.h>
 #include <furi_hal.h>
 #include <input/input.h>

applications/main/subghz/views/subghz_read_raw.c

@@ -1,7 +1,5 @@
 #include "subghz_read_raw.h"
-#include "../subghz_i.h"
 
-#include <math.h>
 #include <furi.h>
 #include <furi_hal.h>
 #include <input/input.h>
@@ -74,7 +72,7 @@ void subghz_read_raw_add_data_rssi(SubGhzReadRAW* instance, float rssi, bool tra
     if(rssi < SUBGHZ_RAW_THRESHOLD_MIN) {
         u_rssi = 0;
     } else {
-        u_rssi = (uint8_t)((rssi - SUBGHZ_RAW_THRESHOLD_MIN) / 2.7);
+        u_rssi = (uint8_t)((rssi - SUBGHZ_RAW_THRESHOLD_MIN) / 2.7f);
     }
 
     with_view_model(
@@ -277,7 +275,7 @@ void subghz_read_raw_draw_threshold_rssi(Canvas* canvas, SubGhzReadRAWModel* mod
 
     if(model->raw_threshold_rssi > SUBGHZ_RAW_THRESHOLD_MIN) {
         uint8_t x = 118;
-        y -= (uint8_t)((model->raw_threshold_rssi - SUBGHZ_RAW_THRESHOLD_MIN) / 2.7);
+        y -= (uint8_t)((model->raw_threshold_rssi - SUBGHZ_RAW_THRESHOLD_MIN) / 2.7f);
 
         uint8_t width = 3;
         for(uint8_t i = 0; i < x; i += width * 2) {

applications/main/subghz/views/transmitter.c

@@ -1,6 +1,6 @@
 #include "transmitter.h"
-#include "../subghz_i.h"
 
+#include <assets_icons.h>
 #include <input/input.h>
 #include <gui/elements.h>
 

applications/main/u2f/u2f.c

@@ -1,5 +1,4 @@
 #include "u2f.h"
-#include "u2f_hid.h"
 #include "u2f_data.h"
 
 #include <furi.h>