diff --git a/.clangd b/.clangd index 3e0024e8c..12e13751d 100644 --- a/.clangd +++ b/.clangd @@ -5,6 +5,10 @@ CompileFlags: Remove: - -mword-relocations +Diagnostics: + ClangTidy: + FastCheckFilter: None + --- If: diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 40f72bd0b..d35ca0c17 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -64,6 +64,6 @@ jobs: python3 scripts/testing/units.py ${{steps.device.outputs.flipper}} - name: 'Check GDB output' - if: failure() + if: failure() && steps.flashing.outcome == 'success' run: | ./fbt gdb_trace_all SWD_TRANSPORT_SERIAL=2A0906016415303030303032 LIB_DEBUG=1 FIRMWARE_APP_SET=unit_tests FORCE=1 diff --git a/applications/debug/accessor/scene/accessor_scene_start.cpp b/applications/debug/accessor/scene/accessor_scene_start.cpp index d31001d2d..79f51f061 100644 --- a/applications/debug/accessor/scene/accessor_scene_start.cpp +++ b/applications/debug/accessor/scene/accessor_scene_start.cpp @@ -1,7 +1,6 @@ #include "../accessor_app.h" #include "../accessor_view_manager.h" #include "../accessor_event.h" -#include "callback_connector.h" #include "accessor_scene_start.h" void AccessorSceneStart::on_enter(AccessorApp* app) { diff --git a/applications/debug/battery_test_app/views/battery_info.c b/applications/debug/battery_test_app/views/battery_info.c index 4b5dcd627..5c5a3bd45 100644 --- a/applications/debug/battery_test_app/views/battery_info.c +++ b/applications/debug/battery_test_app/views/battery_info.c @@ -68,7 +68,7 @@ static void draw_battery(Canvas* canvas, BatteryInfoModel* data, int x, int y) { drain_current > HIGH_DRAIN_CURRENT_THRESHOLD ? "mA!" : "mA"); } else if(drain_current != 0) { snprintf(header, 20, "..."); - } else if(data->charging_voltage < 4.2) { + } else if(data->charging_voltage < 4.2f) { // Non-default battery charging limit, mention it snprintf(emote, sizeof(emote), "Charged!"); snprintf(header, sizeof(header), "Limited to"); diff --git a/applications/debug/display_test/display_test.c b/applications/debug/display_test/display_test.c index ac1b6c65d..3028a13b9 100644 --- a/applications/debug/display_test/display_test.c +++ b/applications/debug/display_test/display_test.c @@ -1,5 +1,3 @@ -#include "display_test.h" - #include #include diff --git a/applications/debug/display_test/display_test.h b/applications/debug/display_test/display_test.h deleted file mode 100644 index 6f70f09be..000000000 --- a/applications/debug/display_test/display_test.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.c b/applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.c index 6b9501e5b..ddca372e3 100644 --- a/applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.c +++ b/applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.c @@ -34,8 +34,8 @@ static void lfrfid_debug_view_tune_draw_callback(Canvas* canvas, void* _model) { canvas_set_color(canvas, ColorBlack); char buffer[TEMP_STR_LEN + 1]; - double freq = ((float)SystemCoreClock / ((float)model->ARR + 1)); - double duty = ((float)model->CCR + 1) / ((float)model->ARR + 1) * 100.0f; + double freq = ((double)SystemCoreClock / (model->ARR + 1)); + double duty = (double)((model->CCR + 1) * 100) / (model->ARR + 1); snprintf( buffer, TEMP_STR_LEN, diff --git a/applications/debug/subghz_test/scenes/subghz_test_scene.c b/applications/debug/subghz_test/scenes/subghz_test_scene.c index ff439ef0f..fad16ddb4 100644 --- a/applications/debug/subghz_test/scenes/subghz_test_scene.c +++ b/applications/debug/subghz_test/scenes/subghz_test_scene.c @@ -1,4 +1,4 @@ -#include "../subghz_test_app_i.h" +#include "../subghz_test_app_i.h" // IWYU pragma: keep // Generate scene on_enter handlers array #define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter, diff --git a/applications/debug/subghz_test/subghz_test_app_i.c b/applications/debug/subghz_test/subghz_test_app_i.c index 0ec6635a0..e0daee6a6 100644 --- a/applications/debug/subghz_test/subghz_test_app_i.c +++ b/applications/debug/subghz_test/subghz_test_app_i.c @@ -1,5 +1,3 @@ -#include "subghz_test_app_i.h" - #include #define TAG "SubGhzTest" diff --git a/applications/debug/subghz_test/views/subghz_test_carrier.c b/applications/debug/subghz_test/views/subghz_test_carrier.c index a941cd4bb..2c82380f7 100644 --- a/applications/debug/subghz_test/views/subghz_test_carrier.c +++ b/applications/debug/subghz_test/views/subghz_test_carrier.c @@ -1,5 +1,4 @@ #include "subghz_test_carrier.h" -#include "../subghz_test_app_i.h" #include "../helpers/subghz_test_frequency.h" #include @@ -74,7 +73,7 @@ void subghz_test_carrier_draw(Canvas* canvas, SubGhzTestCarrierModel* model) { sizeof(buffer), "RSSI: %ld.%ld dBm", (int32_t)(model->rssi), - (int32_t)fabs(model->rssi * 10) % 10); + (int32_t)fabsf(model->rssi * 10.f) % 10); canvas_draw_str(canvas, 0, 42, buffer); } else { canvas_draw_str(canvas, 0, 42, "TX"); diff --git a/applications/debug/subghz_test/views/subghz_test_packet.c b/applications/debug/subghz_test/views/subghz_test_packet.c index d50f10ad4..674e7c737 100644 --- a/applications/debug/subghz_test/views/subghz_test_packet.c +++ b/applications/debug/subghz_test/views/subghz_test_packet.c @@ -1,5 +1,4 @@ #include "subghz_test_packet.h" -#include "../subghz_test_app_i.h" #include "../helpers/subghz_test_frequency.h" #include @@ -123,7 +122,7 @@ static void subghz_test_packet_draw(Canvas* canvas, SubGhzTestPacketModel* model sizeof(buffer), "RSSI: %ld.%ld dBm", (int32_t)(model->rssi), - (int32_t)fabs(model->rssi * 10) % 10); + (int32_t)fabsf(model->rssi * 10.0f) % 10); canvas_draw_str(canvas, 0, 53, buffer); } else { canvas_draw_str(canvas, 0, 53, "TX"); diff --git a/applications/debug/subghz_test/views/subghz_test_static.c b/applications/debug/subghz_test/views/subghz_test_static.c index 22ad662c5..b7b514bd3 100644 --- a/applications/debug/subghz_test/views/subghz_test_static.c +++ b/applications/debug/subghz_test/views/subghz_test_static.c @@ -1,9 +1,7 @@ #include "subghz_test_static.h" -#include "../subghz_test_app_i.h" #include "../helpers/subghz_test_frequency.h" #include -#include #include #include #include diff --git a/applications/debug/unit_tests/tests/bit_lib/bit_lib_test.c b/applications/debug/unit_tests/tests/bit_lib/bit_lib_test.c index d12aeb2aa..1487cdb48 100644 --- a/applications/debug/unit_tests/tests/bit_lib/bit_lib_test.c +++ b/applications/debug/unit_tests/tests/bit_lib/bit_lib_test.c @@ -1,5 +1,5 @@ #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #include MU_TEST(test_bit_lib_increment_index) { diff --git a/applications/debug/unit_tests/tests/bt/bt_test.c b/applications/debug/unit_tests/tests/bt/bt_test.c index e7704381d..b65a35bf5 100644 --- a/applications/debug/unit_tests/tests/bt/bt_test.c +++ b/applications/debug/unit_tests/tests/bt/bt_test.c @@ -1,6 +1,6 @@ #include #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #include #include diff --git a/applications/debug/unit_tests/tests/compress/compress_test.c b/applications/debug/unit_tests/tests/compress/compress_test.c index 8f6153297..15984083d 100644 --- a/applications/debug/unit_tests/tests/compress/compress_test.c +++ b/applications/debug/unit_tests/tests/compress/compress_test.c @@ -1,4 +1,4 @@ -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #include diff --git a/applications/debug/unit_tests/tests/datetime/datetimelib_test.c b/applications/debug/unit_tests/tests/datetime/datetimelib_test.c index 7d90f18de..9ba3e59d1 100644 --- a/applications/debug/unit_tests/tests/datetime/datetimelib_test.c +++ b/applications/debug/unit_tests/tests/datetime/datetimelib_test.c @@ -1,5 +1,5 @@ #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #include diff --git a/applications/debug/unit_tests/tests/dialogs_file_browser_options/dialogs_file_browser_options.c b/applications/debug/unit_tests/tests/dialogs_file_browser_options/dialogs_file_browser_options.c index e42e00f9a..14cd078d5 100644 --- a/applications/debug/unit_tests/tests/dialogs_file_browser_options/dialogs_file_browser_options.c +++ b/applications/debug/unit_tests/tests/dialogs_file_browser_options/dialogs_file_browser_options.c @@ -1,6 +1,6 @@ #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep MU_TEST(test_dialog_file_browser_set_basic_options_should_init_all_fields) { mu_assert( diff --git a/applications/debug/unit_tests/tests/dirwalk/dirwalk_test.c b/applications/debug/unit_tests/tests/dirwalk/dirwalk_test.c index c2474e755..e0102a575 100644 --- a/applications/debug/unit_tests/tests/dirwalk/dirwalk_test.c +++ b/applications/debug/unit_tests/tests/dirwalk/dirwalk_test.c @@ -1,4 +1,4 @@ -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #include #include #include diff --git a/applications/debug/unit_tests/tests/expansion/expansion_test.c b/applications/debug/unit_tests/tests/expansion/expansion_test.c index 79d9b0a57..ea4fea28c 100644 --- a/applications/debug/unit_tests/tests/expansion/expansion_test.c +++ b/applications/debug/unit_tests/tests/expansion/expansion_test.c @@ -1,4 +1,4 @@ -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #include #include diff --git a/applications/debug/unit_tests/tests/flipper_format/flipper_format_test.c b/applications/debug/unit_tests/tests/flipper_format/flipper_format_test.c index 1a2eaf222..03a9e5ab0 100644 --- a/applications/debug/unit_tests/tests/flipper_format/flipper_format_test.c +++ b/applications/debug/unit_tests/tests/flipper_format/flipper_format_test.c @@ -2,7 +2,7 @@ #include #include #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #define TEST_DIR TEST_DIR_NAME "/" #define TEST_DIR_NAME EXT_PATH("unit_tests_tmp") diff --git a/applications/debug/unit_tests/tests/flipper_format_string/flipper_format_string_test.c b/applications/debug/unit_tests/tests/flipper_format_string/flipper_format_string_test.c index 821b1ba22..a6e1b7700 100644 --- a/applications/debug/unit_tests/tests/flipper_format_string/flipper_format_string_test.c +++ b/applications/debug/unit_tests/tests/flipper_format_string/flipper_format_string_test.c @@ -3,7 +3,7 @@ #include #include #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep static const char* test_filetype = "Flipper Format test"; static const uint32_t test_version = 666; diff --git a/applications/debug/unit_tests/tests/float_tools/float_tools_test.c b/applications/debug/unit_tests/tests/float_tools/float_tools_test.c index d016ca4a2..41d78da05 100644 --- a/applications/debug/unit_tests/tests/float_tools/float_tools_test.c +++ b/applications/debug/unit_tests/tests/float_tools/float_tools_test.c @@ -1,7 +1,7 @@ #include #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep MU_TEST(float_tools_equal_test) { mu_check(float_is_equal(FLT_MAX, FLT_MAX)); diff --git a/applications/debug/unit_tests/tests/furi/furi_memmgr_test.c b/applications/debug/unit_tests/tests/furi/furi_memmgr_test.c index 837fd6085..43a1d20eb 100644 --- a/applications/debug/unit_tests/tests/furi/furi_memmgr_test.c +++ b/applications/debug/unit_tests/tests/furi/furi_memmgr_test.c @@ -1,4 +1,4 @@ -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #include #include #include diff --git a/applications/debug/unit_tests/tests/furi/furi_pubsub_test.c b/applications/debug/unit_tests/tests/furi/furi_pubsub_test.c index fdf15e6f5..d9956b0ae 100644 --- a/applications/debug/unit_tests/tests/furi/furi_pubsub_test.c +++ b/applications/debug/unit_tests/tests/furi/furi_pubsub_test.c @@ -1,7 +1,7 @@ #include #include #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep const uint32_t context_value = 0xdeadbeef; const uint32_t notify_value_0 = 0x12345678; diff --git a/applications/debug/unit_tests/tests/furi/furi_record_test.c b/applications/debug/unit_tests/tests/furi/furi_record_test.c index 6a2b5a3d2..b192f1527 100644 --- a/applications/debug/unit_tests/tests/furi/furi_record_test.c +++ b/applications/debug/unit_tests/tests/furi/furi_record_test.c @@ -1,7 +1,5 @@ -#include -#include #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #define TEST_RECORD_NAME "test/holding" diff --git a/applications/debug/unit_tests/tests/furi/furi_test.c b/applications/debug/unit_tests/tests/furi/furi_test.c index eab9a917d..f08e4aa6b 100644 --- a/applications/debug/unit_tests/tests/furi/furi_test.c +++ b/applications/debug/unit_tests/tests/furi/furi_test.c @@ -1,7 +1,6 @@ -#include #include #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep // v2 tests void test_furi_create_open(void); diff --git a/applications/debug/unit_tests/tests/furi_hal/furi_hal_tests.c b/applications/debug/unit_tests/tests/furi_hal/furi_hal_tests.c index 985daa03d..4b515206c 100644 --- a/applications/debug/unit_tests/tests/furi_hal/furi_hal_tests.c +++ b/applications/debug/unit_tests/tests/furi_hal/furi_hal_tests.c @@ -1,11 +1,9 @@ -#include "furi_hal_rtc.h" #include #include #include #include #include -#include "../test.h" -#include +#include "../test.h" // IWYU pragma: keep #define DATA_SIZE 4 #define EEPROM_ADDRESS 0b10101000 diff --git a/applications/debug/unit_tests/tests/furi_hal_crypto/furi_hal_crypto_tests.c b/applications/debug/unit_tests/tests/furi_hal_crypto/furi_hal_crypto_tests.c index 0a264a18a..26527c669 100644 --- a/applications/debug/unit_tests/tests/furi_hal_crypto/furi_hal_crypto_tests.c +++ b/applications/debug/unit_tests/tests/furi_hal_crypto/furi_hal_crypto_tests.c @@ -1,7 +1,6 @@ -#include #include #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep static const uint8_t key_ctr_1[32] = { 0x77, 0x6B, 0xEF, 0xF2, 0x85, 0x1D, 0xB0, 0x6F, 0x4C, 0x8A, 0x05, 0x42, 0xC8, 0x69, 0x6F, 0x6C, diff --git a/applications/debug/unit_tests/tests/furi_string/furi_string_test.c b/applications/debug/unit_tests/tests/furi_string/furi_string_test.c index 949d8c048..df835006e 100644 --- a/applications/debug/unit_tests/tests/furi_string/furi_string_test.c +++ b/applications/debug/unit_tests/tests/furi_string/furi_string_test.c @@ -1,5 +1,5 @@ #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep static void test_setup(void) { } diff --git a/applications/debug/unit_tests/tests/infrared/infrared_test.c b/applications/debug/unit_tests/tests/infrared/infrared_test.c index 922577aa8..cf6a13220 100644 --- a/applications/debug/unit_tests/tests/infrared/infrared_test.c +++ b/applications/debug/unit_tests/tests/infrared/infrared_test.c @@ -2,7 +2,7 @@ #include #include #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #define IR_TEST_FILES_DIR EXT_PATH("unit_tests/infrared/") #define IR_TEST_FILE_PREFIX "test_" diff --git a/applications/debug/unit_tests/tests/lfrfid/lfrfid_protocols.c b/applications/debug/unit_tests/tests/lfrfid/lfrfid_protocols.c index fc380ecc4..8bf7753c0 100644 --- a/applications/debug/unit_tests/tests/lfrfid/lfrfid_protocols.c +++ b/applications/debug/unit_tests/tests/lfrfid/lfrfid_protocols.c @@ -1,5 +1,5 @@ #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #include #include #include diff --git a/applications/debug/unit_tests/tests/manifest/manifest.c b/applications/debug/unit_tests/tests/manifest/manifest.c index fcbab0ae8..b2c888f1a 100644 --- a/applications/debug/unit_tests/tests/manifest/manifest.c +++ b/applications/debug/unit_tests/tests/manifest/manifest.c @@ -1,5 +1,5 @@ -#include -#include "../test.h" +#include +#include "../test.h" // IWYU pragma: keep #include #define TAG "Manifest" diff --git a/applications/debug/unit_tests/tests/nfc/nfc_test.c b/applications/debug/unit_tests/tests/nfc/nfc_test.c index 4de364a09..94fe53632 100644 --- a/applications/debug/unit_tests/tests/nfc/nfc_test.c +++ b/applications/debug/unit_tests/tests/nfc/nfc_test.c @@ -24,7 +24,7 @@ #include #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #define TAG "NfcTest" diff --git a/applications/debug/unit_tests/tests/power/power_test.c b/applications/debug/unit_tests/tests/power/power_test.c index d121acba6..ae332c96d 100644 --- a/applications/debug/unit_tests/tests/power/power_test.c +++ b/applications/debug/unit_tests/tests/power/power_test.c @@ -1,6 +1,6 @@ #include #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep static void power_test_deinit(void) { // Try to reset to default charge voltage limit @@ -13,46 +13,47 @@ MU_TEST(test_power_charge_voltage_limit_exact) { // // This test may need adapted if other charge controllers are used in the future. for(uint16_t charge_mv = 3840; charge_mv <= 4208; charge_mv += 16) { - float charge_volt = (float)charge_mv / 1000.0f; + float charge_volt = (float)charge_mv / 1000; furi_hal_power_set_battery_charge_voltage_limit(charge_volt); - mu_assert_double_eq(charge_volt, furi_hal_power_get_battery_charge_voltage_limit()); + mu_assert_double_eq( + (double)charge_volt, (double)furi_hal_power_get_battery_charge_voltage_limit()); } } MU_TEST(test_power_charge_voltage_limit_floating_imprecision) { // 4.016f should act as 4.016 V, even with floating point imprecision furi_hal_power_set_battery_charge_voltage_limit(4.016f); - mu_assert_double_eq(4.016f, furi_hal_power_get_battery_charge_voltage_limit()); + mu_assert_double_eq(4.016, (double)furi_hal_power_get_battery_charge_voltage_limit()); } MU_TEST(test_power_charge_voltage_limit_inexact) { // Charge voltage limits that are not power of 16mV get truncated down furi_hal_power_set_battery_charge_voltage_limit(3.841f); - mu_assert_double_eq(3.840, furi_hal_power_get_battery_charge_voltage_limit()); + mu_assert_double_eq(3.840, (double)furi_hal_power_get_battery_charge_voltage_limit()); furi_hal_power_set_battery_charge_voltage_limit(3.900f); - mu_assert_double_eq(3.888, furi_hal_power_get_battery_charge_voltage_limit()); + mu_assert_double_eq(3.888, (double)furi_hal_power_get_battery_charge_voltage_limit()); furi_hal_power_set_battery_charge_voltage_limit(4.200f); - mu_assert_double_eq(4.192, furi_hal_power_get_battery_charge_voltage_limit()); + mu_assert_double_eq(4.192, (double)furi_hal_power_get_battery_charge_voltage_limit()); } MU_TEST(test_power_charge_voltage_limit_invalid_clamped) { // Out-of-range charge voltage limits get clamped to 3.840 V and 4.208 V furi_hal_power_set_battery_charge_voltage_limit(3.808f); - mu_assert_double_eq(3.840, furi_hal_power_get_battery_charge_voltage_limit()); + mu_assert_double_eq(3.840, (double)furi_hal_power_get_battery_charge_voltage_limit()); furi_hal_power_set_battery_charge_voltage_limit(1.0f); - mu_assert_double_eq(3.840, furi_hal_power_get_battery_charge_voltage_limit()); + mu_assert_double_eq(3.840, (double)furi_hal_power_get_battery_charge_voltage_limit()); // NOTE: Intentionally picking a small increment above 4.208 V to reduce the risk of an // unhappy battery if this fails. furi_hal_power_set_battery_charge_voltage_limit(4.240f); - mu_assert_double_eq(4.208, furi_hal_power_get_battery_charge_voltage_limit()); + mu_assert_double_eq(4.208, (double)furi_hal_power_get_battery_charge_voltage_limit()); // Likewise, picking a number that the uint8_t wraparound in the driver would result in a // VREG value under 23 if this test fails. // E.g. (uint8_t)((8105-3840)/16) -> 10 furi_hal_power_set_battery_charge_voltage_limit(8.105f); - mu_assert_double_eq(4.208, furi_hal_power_get_battery_charge_voltage_limit()); + mu_assert_double_eq(4.208, (double)furi_hal_power_get_battery_charge_voltage_limit()); } MU_TEST_SUITE(test_power_suite) { diff --git a/applications/debug/unit_tests/tests/protocol_dict/protocol_dict_test.c b/applications/debug/unit_tests/tests/protocol_dict/protocol_dict_test.c index 9ced106ab..4e2975218 100644 --- a/applications/debug/unit_tests/tests/protocol_dict/protocol_dict_test.c +++ b/applications/debug/unit_tests/tests/protocol_dict/protocol_dict_test.c @@ -1,5 +1,5 @@ #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #include typedef enum { diff --git a/applications/debug/unit_tests/tests/rpc/rpc_test.c b/applications/debug/unit_tests/tests/rpc/rpc_test.c index be7b331f9..fdbfb6c7a 100644 --- a/applications/debug/unit_tests/tests/rpc/rpc_test.c +++ b/applications/debug/unit_tests/tests/rpc/rpc_test.c @@ -17,7 +17,7 @@ #include #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #include #include diff --git a/applications/debug/unit_tests/tests/storage/storage_test.c b/applications/debug/unit_tests/tests/storage/storage_test.c index 1d887ced0..65a25cf49 100644 --- a/applications/debug/unit_tests/tests/storage/storage_test.c +++ b/applications/debug/unit_tests/tests/storage/storage_test.c @@ -1,4 +1,4 @@ -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #include #include diff --git a/applications/debug/unit_tests/tests/stream/stream_test.c b/applications/debug/unit_tests/tests/stream/stream_test.c index a9c22c723..ad41c08ec 100644 --- a/applications/debug/unit_tests/tests/stream/stream_test.c +++ b/applications/debug/unit_tests/tests/stream/stream_test.c @@ -4,7 +4,7 @@ #include #include #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep static const char* stream_test_data = "I write differently from what I speak, " "I speak differently from what I think, " diff --git a/applications/debug/unit_tests/tests/subghz/subghz_test.c b/applications/debug/unit_tests/tests/subghz/subghz_test.c index 030a4223f..6a4129359 100644 --- a/applications/debug/unit_tests/tests/subghz/subghz_test.c +++ b/applications/debug/unit_tests/tests/subghz/subghz_test.c @@ -1,6 +1,6 @@ #include #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #include #include #include diff --git a/applications/debug/unit_tests/tests/varint/varint_test.c b/applications/debug/unit_tests/tests/varint/varint_test.c index 3fdf5115a..6a9d94c16 100644 --- a/applications/debug/unit_tests/tests/varint/varint_test.c +++ b/applications/debug/unit_tests/tests/varint/varint_test.c @@ -1,7 +1,7 @@ #include #include -#include "../test.h" +#include "../test.h" // IWYU pragma: keep #include #include diff --git a/applications/main/archive/helpers/archive_apps.c b/applications/main/archive/helpers/archive_apps.c index c8ad67625..43befc055 100644 --- a/applications/main/archive/helpers/archive_apps.c +++ b/applications/main/archive/helpers/archive_apps.c @@ -1,4 +1,3 @@ -#include "archive_files.h" #include "archive_apps.h" #include "archive_browser.h" diff --git a/applications/main/archive/helpers/archive_browser.c b/applications/main/archive/helpers/archive_browser.c index 51457fe81..ea9cdbdc3 100644 --- a/applications/main/archive/helpers/archive_browser.c +++ b/applications/main/archive/helpers/archive_browser.c @@ -7,7 +7,6 @@ #include #include #include -#include static void archive_folder_open_cb(void* context, uint32_t item_cnt, int32_t file_idx, bool is_root) { diff --git a/applications/main/archive/scenes/archive_scene_browser.c b/applications/main/archive/scenes/archive_scene_browser.c index ba928c499..c08deb60a 100644 --- a/applications/main/archive/scenes/archive_scene_browser.c +++ b/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 "../views/archive_browser_view.h" diff --git a/applications/main/archive/scenes/archive_scene_delete.c b/applications/main/archive/scenes/archive_scene_delete.c index 45d5b47cc..cbeb4824d 100644 --- a/applications/main/archive/scenes/archive_scene_delete.c +++ b/applications/main/archive/scenes/archive_scene_delete.c @@ -1,5 +1,4 @@ #include "../archive_i.h" -#include "../helpers/archive_favorites.h" #include "../helpers/archive_files.h" #include "../helpers/archive_apps.h" #include "../helpers/archive_browser.h" diff --git a/applications/main/archive/views/archive_browser_view.c b/applications/main/archive/views/archive_browser_view.c index 6cdf12c62..de06b9684 100644 --- a/applications/main/archive/views/archive_browser_view.c +++ b/applications/main/archive/views/archive_browser_view.c @@ -1,7 +1,6 @@ #include "assets_icons.h" #include "toolbox/path.h" #include -#include "../archive_i.h" #include "archive_browser_view.h" #include "../helpers/archive_browser.h" diff --git a/applications/main/bad_usb/scenes/bad_usb_scene_config.c b/applications/main/bad_usb/scenes/bad_usb_scene_config.c index d5f6fce23..1acf3acb1 100644 --- a/applications/main/bad_usb/scenes/bad_usb_scene_config.c +++ b/applications/main/bad_usb/scenes/bad_usb_scene_config.c @@ -1,5 +1,4 @@ #include "../bad_usb_app_i.h" -#include "furi_hal_power.h" enum SubmenuIndex { ConfigIndexKeyboardLayout, diff --git a/applications/main/bad_usb/scenes/bad_usb_scene_config_layout.c b/applications/main/bad_usb/scenes/bad_usb_scene_config_layout.c index a5d0df94c..3f01d7090 100644 --- a/applications/main/bad_usb/scenes/bad_usb_scene_config_layout.c +++ b/applications/main/bad_usb/scenes/bad_usb_scene_config_layout.c @@ -1,5 +1,4 @@ #include "../bad_usb_app_i.h" -#include "furi_hal_power.h" #include static bool bad_usb_layout_select(BadUsbApp* bad_usb) { diff --git a/applications/main/gpio/views/gpio_usb_uart.c b/applications/main/gpio/views/gpio_usb_uart.c index f3d047d67..5e714576d 100644 --- a/applications/main/gpio/views/gpio_usb_uart.c +++ b/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 #include +#include struct GpioUsbUart { View* view; diff --git a/applications/main/infrared/scenes/infrared_scene_universal_ac.c b/applications/main/infrared/scenes/infrared_scene_universal_ac.c index b82bcc1f9..9288a4a4d 100644 --- a/applications/main/infrared/scenes/infrared_scene_universal_ac.c +++ b/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" diff --git a/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight.c b/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight.c index a4e0eade6..a3028905f 100644 --- a/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight.c +++ b/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); diff --git a/applications/main/nfc/plugins/supported_cards/troika.c b/applications/main/nfc/plugins/supported_cards/troika.c index 64a9ac5dc..de9a47fac 100644 --- a/applications/main/nfc/plugins/supported_cards/troika.c +++ b/applications/main/nfc/plugins/supported_cards/troika.c @@ -7,7 +7,6 @@ #include #include #include "../../api/mosgortrans/mosgortrans_util.h" -#include "furi_hal_rtc.h" #define TAG "Troika" diff --git a/applications/main/subghz/helpers/subghz_frequency_analyzer_worker.c b/applications/main/subghz/helpers/subghz_frequency_analyzer_worker.c index 995434631..624caf30e 100644 --- a/applications/main/subghz/helpers/subghz_frequency_analyzer_worker.c +++ b/applications/main/subghz/helpers/subghz_frequency_analyzer_worker.c @@ -49,7 +49,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; diff --git a/applications/main/subghz/helpers/subghz_threshold_rssi.c b/applications/main/subghz/helpers/subghz_threshold_rssi.c index 07d7bccf9..f9906b513 100644 --- a/applications/main/subghz/helpers/subghz_threshold_rssi.c +++ b/applications/main/subghz/helpers/subghz_threshold_rssi.c @@ -1,6 +1,6 @@ #include "subghz_threshold_rssi.h" +#include "../views/subghz_read_raw.h" #include -#include "../subghz_i.h" #define TAG "SubGhzThresholdRssi" #define THRESHOLD_RSSI_LOW_COUNT 10 diff --git a/applications/main/subghz/helpers/subghz_txrx.c b/applications/main/subghz/helpers/subghz_txrx.c index bcc0cc433..d14be4768 100644 --- a/applications/main/subghz/helpers/subghz_txrx.c +++ b/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 #include diff --git a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c index bafaef5ee..3e0656550 100644 --- a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c +++ b/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 #include diff --git a/applications/main/subghz/scenes/subghz_scene_delete_success.c b/applications/main/subghz/scenes/subghz_scene_delete_success.c index d5c2b391c..0150f2996 100644 --- a/applications/main/subghz/scenes/subghz_scene_delete_success.c +++ b/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) { diff --git a/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c b/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c index b48a821da..da861d718 100644 --- a/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c +++ b/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" void subghz_scene_frequency_analyzer_callback(SubGhzCustomEvent event, void* context) { diff --git a/applications/main/subghz/scenes/subghz_scene_radio_setting.c b/applications/main/subghz/scenes/subghz_scene_radio_setting.c index 1f8e4d83d..c324d0d2e 100644 --- a/applications/main/subghz/scenes/subghz_scene_radio_setting.c +++ b/applications/main/subghz/scenes/subghz_scene_radio_setting.c @@ -1,4 +1,4 @@ -#include "../subghz_i.h" +#include "../subghz_i.h" // IWYU pragma: keep #include #include #include diff --git a/applications/main/subghz/scenes/subghz_scene_read_raw.c b/applications/main/subghz/scenes/subghz_scene_read_raw.c index f2ab65770..a0578ff95 100644 --- a/applications/main/subghz/scenes/subghz_scene_read_raw.c +++ b/applications/main/subghz/scenes/subghz_scene_read_raw.c @@ -2,7 +2,7 @@ #include "../views/subghz_read_raw.h" #include #include -#include +#include #define RAW_FILE_NAME "Raw_signal_" #define TAG "SubGhzSceneReadRaw" diff --git a/applications/main/subghz/scenes/subghz_scene_region_info.c b/applications/main/subghz/scenes/subghz_scene_region_info.c index 61bd1acc8..ce123dab3 100644 --- a/applications/main/subghz/scenes/subghz_scene_region_info.c +++ b/applications/main/subghz/scenes/subghz_scene_region_info.c @@ -1,4 +1,4 @@ -#include "../subghz_i.h" +#include "../subghz_i.h" // IWYU pragma: keep #include diff --git a/applications/main/subghz/scenes/subghz_scene_saved_menu.c b/applications/main/subghz/scenes/subghz_scene_saved_menu.c index a65830f4b..61e362d5b 100644 --- a/applications/main/subghz/scenes/subghz_scene_saved_menu.c +++ b/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, diff --git a/applications/main/subghz/scenes/subghz_scene_show_error.c b/applications/main/subghz/scenes/subghz_scene_show_error.c index d52eca9b6..904663e0b 100644 --- a/applications/main/subghz/scenes/subghz_scene_show_error.c +++ b/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 subghs_sequence_sd_error = { diff --git a/applications/main/subghz/scenes/subghz_scene_show_error_sub.c b/applications/main/subghz/scenes/subghz_scene_show_error_sub.c index 0de48c442..e7eda9c71 100644 --- a/applications/main/subghz/scenes/subghz_scene_show_error_sub.c +++ b/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) { diff --git a/applications/main/subghz/subghz_i.c b/applications/main/subghz/subghz_i.c index b553d00de..243ad101f 100644 --- a/applications/main/subghz/subghz_i.c +++ b/applications/main/subghz/subghz_i.c @@ -2,7 +2,6 @@ #include "assets_icons.h" #include "subghz/types.h" -#include #include #include #include @@ -10,7 +9,6 @@ #include #include #include -#include "views/receiver.h" #include #include diff --git a/applications/main/subghz/views/receiver.c b/applications/main/subghz/views/receiver.c index ea332f544..39b5c78b9 100644 --- a/applications/main/subghz/views/receiver.c +++ b/applications/main/subghz/views/receiver.c @@ -1,7 +1,6 @@ #include "receiver.h" -#include "../subghz_i.h" -#include +#include "types.h" #include #include #include diff --git a/applications/main/subghz/views/subghz_frequency_analyzer.c b/applications/main/subghz/views/subghz_frequency_analyzer.c index 133868dde..b59426f02 100644 --- a/applications/main/subghz/views/subghz_frequency_analyzer.c +++ b/applications/main/subghz/views/subghz_frequency_analyzer.c @@ -1,7 +1,5 @@ #include "subghz_frequency_analyzer.h" -#include "../subghz_i.h" -#include #include #include #include diff --git a/applications/main/subghz/views/subghz_read_raw.c b/applications/main/subghz/views/subghz_read_raw.c index eff3eb1ab..322c0d499 100644 --- a/applications/main/subghz/views/subghz_read_raw.c +++ b/applications/main/subghz/views/subghz_read_raw.c @@ -1,7 +1,5 @@ #include "subghz_read_raw.h" -#include "../subghz_i.h" -#include #include #include #include @@ -72,7 +70,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( @@ -272,7 +270,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) { diff --git a/applications/main/subghz/views/transmitter.c b/applications/main/subghz/views/transmitter.c index f9b3f44ba..ab41ea956 100644 --- a/applications/main/subghz/views/transmitter.c +++ b/applications/main/subghz/views/transmitter.c @@ -1,6 +1,6 @@ #include "transmitter.h" -#include "../subghz_i.h" +#include #include #include diff --git a/applications/main/u2f/u2f.c b/applications/main/u2f/u2f.c index 2a2e91f21..b61cfa15d 100644 --- a/applications/main/u2f/u2f.c +++ b/applications/main/u2f/u2f.c @@ -1,5 +1,4 @@ #include "u2f.h" -#include "u2f_hid.h" #include "u2f_data.h" #include diff --git a/applications/services/cli/cli_vcp.c b/applications/services/cli/cli_vcp.c index 58c5c887f..cdabaaa05 100644 --- a/applications/services/cli/cli_vcp.c +++ b/applications/services/cli/cli_vcp.c @@ -1,7 +1,7 @@ +#include "cli_i.h" // IWYU pragma: keep #include #include #include -#include "cli_i.h" #define TAG "CliVcp" diff --git a/applications/services/desktop/animations/animation_storage.c b/applications/services/desktop/animations/animation_storage.c index c99cc7b5d..1db61f1ab 100644 --- a/applications/services/desktop/animations/animation_storage.c +++ b/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 #include diff --git a/applications/services/desktop/animations/views/bubble_animation_view.c b/applications/services/desktop/animations/views/bubble_animation_view.c index 9585b2771..cea039671 100644 --- a/applications/services/desktop/animations/views/bubble_animation_view.c +++ b/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 diff --git a/applications/services/desktop/helpers/pin.c b/applications/services/desktop/helpers/pin.c index 374b569f0..0b1149d6c 100644 --- a/applications/services/desktop/helpers/pin.c +++ b/applications/services/desktop/helpers/pin.c @@ -7,8 +7,6 @@ #include #include -#include "../desktop_i.h" - static const NotificationSequence sequence_pin_fail = { &message_display_backlight_on, diff --git a/applications/services/desktop/scenes/desktop_scene_lock_menu.c b/applications/services/desktop/scenes/desktop_scene_lock_menu.c index 105b2b37a..5951a8e4e 100644 --- a/applications/services/desktop/scenes/desktop_scene_lock_menu.c +++ b/applications/services/desktop/scenes/desktop_scene_lock_menu.c @@ -8,9 +8,7 @@ #include "../desktop_i.h" #include #include "../views/desktop_view_lock_menu.h" -#include "desktop_scene_i.h" #include "desktop_scene.h" -#include "../helpers/pin.h" #define TAG "DesktopSceneLock" diff --git a/applications/services/desktop/scenes/desktop_scene_locked.c b/applications/services/desktop/scenes/desktop_scene_locked.c index c4cd5748f..6d432858a 100644 --- a/applications/services/desktop/scenes/desktop_scene_locked.c +++ b/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" diff --git a/applications/services/desktop/scenes/desktop_scene_main.c b/applications/services/desktop/scenes/desktop_scene_main.c index 41b1c3e75..5f3778d13 100644 --- a/applications/services/desktop/scenes/desktop_scene_main.c +++ b/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" diff --git a/applications/services/desktop/scenes/desktop_scene_pin_input.c b/applications/services/desktop/scenes/desktop_scene_pin_input.c index f6de987bf..b1c0d4c85 100644 --- a/applications/services/desktop/scenes/desktop_scene_pin_input.c +++ b/applications/services/desktop/scenes/desktop_scene_pin_input.c @@ -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 diff --git a/applications/services/desktop/scenes/desktop_scene_pin_timeout.c b/applications/services/desktop/scenes/desktop_scene_pin_timeout.c index e3336ad76..82543a944 100644 --- a/applications/services/desktop/scenes/desktop_scene_pin_timeout.c +++ b/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; diff --git a/applications/services/desktop/views/desktop_view_lock_menu.c b/applications/services/desktop/views/desktop_view_lock_menu.c index 9f8b5f51a..1b6bdab9c 100644 --- a/applications/services/desktop/views/desktop_view_lock_menu.c +++ b/applications/services/desktop/views/desktop_view_lock_menu.c @@ -126,8 +126,8 @@ bool desktop_lock_menu_input_callback(InputEvent* event, void* context) { update); if(event->key == InputKeyOk) { - if((idx == DesktopLockMenuIndexLock)) { - if((event->type == InputTypeShort)) { + if(idx == DesktopLockMenuIndexLock) { + if(event->type == InputTypeShort) { lock_menu->callback(DesktopLockMenuEventLock, lock_menu->context); } } else if(idx == DesktopLockMenuIndexStealth) { diff --git a/applications/services/desktop/views/desktop_view_main.c b/applications/services/desktop/views/desktop_view_main.c index 0c1160d40..87f12d84a 100644 --- a/applications/services/desktop/views/desktop_view_main.c +++ b/applications/services/desktop/views/desktop_view_main.c @@ -6,7 +6,6 @@ #include #include -#include "../desktop_i.h" #include "desktop_view_main.h" struct DesktopMainView { diff --git a/applications/services/desktop/views/desktop_view_slideshow.c b/applications/services/desktop/views/desktop_view_slideshow.c index 84e4d5706..de8c1cb86 100644 --- a/applications/services/desktop/views/desktop_view_slideshow.c +++ b/applications/services/desktop/views/desktop_view_slideshow.c @@ -3,9 +3,7 @@ #include #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) diff --git a/applications/services/desktop/views/desktop_view_slideshow.h b/applications/services/desktop/views/desktop_view_slideshow.h index b9e610c62..942a0d25a 100644 --- a/applications/services/desktop/views/desktop_view_slideshow.h +++ b/applications/services/desktop/views/desktop_view_slideshow.h @@ -4,6 +4,7 @@ #include "desktop_events.h" #include "../helpers/slideshow_filename.h" +#include #define SLIDESHOW_FS_PATH INT_PATH(SLIDESHOW_FILE_NAME) diff --git a/applications/services/dialogs/dialogs.c b/applications/services/dialogs/dialogs.c index ec1289d5b..31856aa29 100644 --- a/applications/services/dialogs/dialogs.c +++ b/applications/services/dialogs/dialogs.c @@ -1,5 +1,4 @@ #include "dialogs/dialogs_message.h" -#include "dialogs_i.h" #include #include "dialogs_module_file_browser.h" #include "dialogs_module_message.h" diff --git a/applications/services/dialogs/dialogs_api.c b/applications/services/dialogs/dialogs_api.c index 73d1d876a..9df3eedb9 100644 --- a/applications/services/dialogs/dialogs_api.c +++ b/applications/services/dialogs/dialogs_api.c @@ -1,5 +1,4 @@ #include "dialogs_message.h" -#include "dialogs_i.h" #include #include #include diff --git a/applications/services/dialogs/dialogs_module_file_browser.c b/applications/services/dialogs/dialogs_module_file_browser.c index 79d151c59..b1558f1e9 100644 --- a/applications/services/dialogs/dialogs_module_file_browser.c +++ b/applications/services/dialogs/dialogs_module_file_browser.c @@ -1,5 +1,4 @@ -#include "dialogs_i.h" - +#include "dialogs_message.h" #include #include diff --git a/applications/services/dialogs/dialogs_module_message.c b/applications/services/dialogs/dialogs_module_message.c index 69d28c405..a71f403c5 100644 --- a/applications/services/dialogs/dialogs_module_message.c +++ b/applications/services/dialogs/dialogs_module_message.c @@ -1,4 +1,6 @@ -#include "dialogs_i.h" +#include "dialogs.h" +#include "dialogs_message.h" +#include #include #include diff --git a/applications/services/dolphin/dolphin.c b/applications/services/dolphin/dolphin.c index 5f3d5cb28..a838edc60 100644 --- a/applications/services/dolphin/dolphin.c +++ b/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 #include #include diff --git a/applications/services/dolphin/helpers/dolphin_state.c b/applications/services/dolphin/helpers/dolphin_state.c index 55c2286d9..724060e53 100644 --- a/applications/services/dolphin/helpers/dolphin_state.c +++ b/applications/services/dolphin/helpers/dolphin_state.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #define TAG "DolphinState" diff --git a/applications/services/gui/elements.c b/applications/services/gui/elements.c index 06b63fd90..5b38c5c79 100644 --- a/applications/services/gui/elements.c +++ b/applications/services/gui/elements.c @@ -9,7 +9,6 @@ #include #include -#include "canvas_i.h" #include #include diff --git a/applications/services/gui/icon.c b/applications/services/gui/icon.c index 6e015ed75..85d640f30 100644 --- a/applications/services/gui/icon.c +++ b/applications/services/gui/icon.c @@ -1,5 +1,5 @@ #include "icon.h" -#include "icon_i.h" +#include "icon_i.h" // IWYU pragma: keep #include #include diff --git a/applications/services/gui/icon_animation.c b/applications/services/gui/icon_animation.c index f887b90ac..f456ba368 100644 --- a/applications/services/gui/icon_animation.c +++ b/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 diff --git a/applications/services/gui/modules/button_panel.c b/applications/services/gui/modules/button_panel.c index d768b324a..0aa9dd005 100644 --- a/applications/services/gui/modules/button_panel.c +++ b/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()) diff --git a/applications/services/gui/modules/widget.c b/applications/services/gui/modules/widget.c index 50171e0cc..ea3315d8d 100644 --- a/applications/services/gui/modules/widget.c +++ b/applications/services/gui/modules/widget.c @@ -3,7 +3,7 @@ #include #include -ARRAY_DEF(ElementArray, WidgetElement*, M_PTR_OPLIST); +ARRAY_DEF(ElementArray, WidgetElement*, M_PTR_OPLIST); // NOLINT struct Widget { View* view; diff --git a/applications/services/notification/notification_app_api.c b/applications/services/notification/notification_app_api.c index 9c9a2680e..90e3f236e 100644 --- a/applications/services/notification/notification_app_api.c +++ b/applications/services/notification/notification_app_api.c @@ -1,7 +1,6 @@ #include #include #include "notification.h" -#include "notification_messages.h" #include "notification_app.h" void notification_message(NotificationApp* app, const NotificationSequence* sequence) { diff --git a/applications/services/power/power_service/power.c b/applications/services/power/power_service/power.c index 2db9bb1c3..557beaf64 100644 --- a/applications/services/power/power_service/power.c +++ b/applications/services/power/power_service/power.c @@ -13,7 +13,7 @@ void power_draw_battery_callback(Canvas* canvas, void* context) { if(power->info.gauge_is_ok) { canvas_draw_box(canvas, 2, 2, (power->info.charge + 4) / 5, 4); - if(power->info.voltage_battery_charge_limit < 4.2) { + if(power->info.voltage_battery_charge_limit < 4.2f) { // Battery charge voltage limit is modified, indicate with cross pattern canvas_invert_color(canvas); uint8_t battery_bar_width = (power->info.charge + 4) / 5; diff --git a/applications/services/rpc/rpc.c b/applications/services/rpc/rpc.c index 054a0286f..32371fa82 100644 --- a/applications/services/rpc/rpc.c +++ b/applications/services/rpc/rpc.c @@ -1,4 +1,3 @@ -#include "profiles/serial_profile.h" #include "rpc_i.h" #include diff --git a/applications/services/rpc/rpc_desktop.c b/applications/services/rpc/rpc_desktop.c index 0d72b43d5..a70e84363 100644 --- a/applications/services/rpc/rpc_desktop.c +++ b/applications/services/rpc/rpc_desktop.c @@ -1,7 +1,6 @@ #include "flipper.pb.h" #include "rpc_i.h" #include -#include "desktop.pb.h" #define TAG "RpcDesktop" diff --git a/applications/services/storage/storage_external_api.c b/applications/services/storage/storage_external_api.c index a377751ea..adc0e2465 100644 --- a/applications/services/storage/storage_external_api.c +++ b/applications/services/storage/storage_external_api.c @@ -1,7 +1,7 @@ #include #include #include "storage.h" -#include "storage_i.h" +#include "storage_i.h" // IWYU pragma: keep #include "storage_message.h" #include #include diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c index 2f21fd999..f31a96894 100644 --- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c +++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_done.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_done.c index 4cef4ba98..170e6bca5 100644 --- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_done.c +++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_done.c @@ -1,7 +1,6 @@ #include #include #include -#include #include #include diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_howto2.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_howto2.c index 0ebf85c64..efa39f1f0 100644 --- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_howto2.c +++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_setup_howto2.c @@ -1,6 +1,5 @@ #include #include -#include #include "desktop_settings_scene.h" #include "../desktop_settings_app.h" diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c index 8dec26016..7b3e5b96b 100644 --- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c +++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c @@ -3,7 +3,6 @@ #include "../desktop_settings_app.h" #include "desktop_settings_scene.h" -#include "desktop_settings_scene_i.h" typedef enum { DesktopSettingsPinSetup = 0, diff --git a/applications/settings/dolphin_passport/passport.c b/applications/settings/dolphin_passport/passport.c index d43f150c6..0f3008a36 100644 --- a/applications/settings/dolphin_passport/passport.c +++ b/applications/settings/dolphin_passport/passport.c @@ -1,12 +1,11 @@ -#include "assets_icons.h" -#include "dolphin/helpers/dolphin_state.h" -#include -#include #include -#include #include -#include "dolphin/dolphin.h" -#include "math.h" + +#include +#include +#include + +#include #define MOODS_TOTAL 3 #define BUTTHURT_MAX 3 diff --git a/applications/settings/power_settings_app/views/battery_info.c b/applications/settings/power_settings_app/views/battery_info.c index dd2ec2dbc..c626d1844 100644 --- a/applications/settings/power_settings_app/views/battery_info.c +++ b/applications/settings/power_settings_app/views/battery_info.c @@ -68,7 +68,7 @@ static void draw_battery(Canvas* canvas, BatteryInfoModel* data, int x, int y) { ABS(current), current < HIGH_DRAIN_CURRENT_THRESHOLD ? "mA!" : "mA"); } else if(data->vbus_voltage > 0) { - if(data->charge_voltage_limit < 4.2) { + if(data->charge_voltage_limit < 4.2f) { // Non-default battery charging limit, mention it snprintf(emote, sizeof(emote), "Charged!"); snprintf(header, sizeof(header), "Limited to"); diff --git a/applications/system/js_app/modules/js_flipper.c b/applications/system/js_app/modules/js_flipper.c index 17c0ad36b..4619a1593 100644 --- a/applications/system/js_app/modules/js_flipper.c +++ b/applications/system/js_app/modules/js_flipper.c @@ -1,5 +1,5 @@ +#include "../js_modules.h" // IWYU pragma: keep #include -#include "../js_modules.h" #include #include diff --git a/applications/system/js_app/plugin_api/app_api_table_i.h b/applications/system/js_app/plugin_api/app_api_table_i.h index d84ae8110..b48221343 100644 --- a/applications/system/js_app/plugin_api/app_api_table_i.h +++ b/applications/system/js_app/plugin_api/app_api_table_i.h @@ -1,4 +1,3 @@ -#include #include "js_plugin_api.h" /* * A list of app's private functions and objects to expose for plugins. diff --git a/furi/core/kernel.c b/furi/core/kernel.c index db3d6a716..52c0e285e 100644 --- a/furi/core/kernel.c +++ b/furi/core/kernel.c @@ -8,8 +8,6 @@ #include #include -#include CMSIS_device_header - bool furi_kernel_is_irq_or_masked(void) { bool irq = false; BaseType_t state; diff --git a/furi/core/memmgr.c b/furi/core/memmgr.c index 768adc05d..ba9a7336a 100644 --- a/furi/core/memmgr.c +++ b/furi/core/memmgr.c @@ -1,5 +1,4 @@ #include "memmgr.h" -#include "common_defines.h" #include #include diff --git a/furi/core/mutex.c b/furi/core/mutex.c index e32be1a39..4fc3099fe 100644 --- a/furi/core/mutex.c +++ b/furi/core/mutex.c @@ -120,7 +120,7 @@ FuriThreadId furi_mutex_get_owner(FuriMutex* instance) { hMutex = (SemaphoreHandle_t)((uint32_t)instance & ~1U); - if((hMutex == NULL)) { + if(hMutex == NULL) { owner = 0; } else if(FURI_IS_IRQ_MODE()) { owner = (FuriThreadId)xSemaphoreGetMutexHolderFromISR(hMutex); diff --git a/furi/core/pubsub.c b/furi/core/pubsub.c index bcabc74a7..0fdd5d02d 100644 --- a/furi/core/pubsub.c +++ b/furi/core/pubsub.c @@ -1,5 +1,4 @@ #include "pubsub.h" -#include "memmgr.h" #include "check.h" #include "mutex.h" diff --git a/furi/core/record.c b/furi/core/record.c index e9bd8edcd..6c44df846 100644 --- a/furi/core/record.c +++ b/furi/core/record.c @@ -1,6 +1,5 @@ #include "record.h" #include "check.h" -#include "memmgr.h" #include "mutex.h" #include "event_flag.h" diff --git a/furi/core/thread.c b/furi/core/thread.c index f9f73b4f7..3ae0b8c25 100644 --- a/furi/core/thread.c +++ b/furi/core/thread.c @@ -15,7 +15,9 @@ #define TAG "FuriThread" -#define THREAD_NOTIFY_INDEX 1 // Index 0 is used for stream buffers +#define THREAD_NOTIFY_INDEX (1) // Index 0 is used for stream buffers + +#define THREAD_MAX_STACK_SIZE (UINT16_MAX * sizeof(StackType_t)) typedef struct FuriThreadStdout FuriThreadStdout; @@ -49,7 +51,7 @@ struct FuriThread { bool is_service; bool heap_trace_enabled; - configSTACK_DEPTH_TYPE stack_size; + size_t stack_size; }; static size_t __furi_thread_stdout_write(FuriThread* thread, const char* data, size_t size); @@ -203,6 +205,7 @@ void furi_thread_set_stack_size(FuriThread* thread, size_t stack_size) { furi_check(thread); furi_check(thread->state == FuriThreadStateStopped); furi_check(stack_size % 4 == 0); + furi_check(stack_size <= THREAD_MAX_STACK_SIZE); thread->stack_size = stack_size; } @@ -263,7 +266,7 @@ void furi_thread_start(FuriThread* thread) { furi_check(thread); furi_check(thread->callback); furi_check(thread->state == FuriThreadStateStopped); - furi_check(thread->stack_size > 0 && thread->stack_size < (UINT16_MAX * sizeof(StackType_t))); + furi_check(thread->stack_size > 0); furi_thread_set_state(thread, FuriThreadStateStarting); diff --git a/furi/core/timer.c b/furi/core/timer.c index 2e688dcc3..671761fca 100644 --- a/furi/core/timer.c +++ b/furi/core/timer.c @@ -1,6 +1,5 @@ #include "timer.h" #include "check.h" -#include "memmgr.h" #include "kernel.h" #include diff --git a/furi/furi.c b/furi/furi.c index 628c47ea2..dca674da5 100644 --- a/furi/furi.c +++ b/furi/furi.c @@ -1,5 +1,4 @@ #include "furi.h" -#include #include #include diff --git a/lib/ble_profile/extra_services/hid_service.c b/lib/ble_profile/extra_services/hid_service.c index 92422d5d5..e46d2010c 100644 --- a/lib/ble_profile/extra_services/hid_service.c +++ b/lib/ble_profile/extra_services/hid_service.c @@ -1,5 +1,5 @@ #include "hid_service.h" -#include "app_common.h" +#include "app_common.h" // IWYU pragma: keep #include #include #include diff --git a/lib/drivers/lp5562.c b/lib/drivers/lp5562.c index e755d2d60..30a5b559a 100644 --- a/lib/drivers/lp5562.c +++ b/lib/drivers/lp5562.c @@ -3,8 +3,6 @@ #include "lp5562_reg.h" #include -#include - void lp5562_reset(FuriHalI2cBusHandle* handle) { Reg0D_Reset reg = {.value = 0xFF}; furi_hal_i2c_write_reg_8(handle, LP5562_ADDRESS, 0x0D, *(uint8_t*)®, LP5562_I2C_TIMEOUT); diff --git a/lib/flipper_application/application_assets.c b/lib/flipper_application/application_assets.c index ec3fc22ee..5fc250257 100644 --- a/lib/flipper_application/application_assets.c +++ b/lib/flipper_application/application_assets.c @@ -19,17 +19,13 @@ #define TAG "FapAssets" -#pragma pack(push, 1) - -typedef struct { +typedef struct FURI_PACKED { uint32_t magic; uint32_t version; uint32_t dirs_count; uint32_t files_count; } FlipperApplicationAssetsHeader; -#pragma pack(pop) - typedef enum { AssetsSignatureResultEqual, AssetsSignatureResultNotEqual, diff --git a/lib/flipper_application/flipper_application.c b/lib/flipper_application/flipper_application.c index 3c4a07f2f..a3509896f 100644 --- a/lib/flipper_application/flipper_application.c +++ b/lib/flipper_application/flipper_application.c @@ -18,7 +18,7 @@ struct FlipperApplication { /********************** Debugger access to loader state **********************/ -LIST_DEF(FlipperApplicationList, const FlipperApplication*, M_POD_OPLIST); +LIST_DEF(FlipperApplicationList, const FlipperApplication*, M_POD_OPLIST); // NOLINT FlipperApplicationList_t flipper_application_loaded_app_list = {0}; static bool flipper_application_loaded_app_list_initialized = false; @@ -277,8 +277,10 @@ static const char* preload_status_strings[] = { [FlipperApplicationPreloadStatusUnspecifiedError] = "Unknown error", [FlipperApplicationPreloadStatusInvalidFile] = "Invalid file", [FlipperApplicationPreloadStatusInvalidManifest] = "Invalid file manifest", - [FlipperApplicationPreloadStatusApiTooOld] = "Update Application to use with this Firmware (ApiTooOld)", - [FlipperApplicationPreloadStatusApiTooNew] = "Update Firmware to use with this Application (ApiTooNew)", + [FlipperApplicationPreloadStatusApiTooOld] = + "Update Application to use with this Firmware (ApiTooOld)", + [FlipperApplicationPreloadStatusApiTooNew] = + "Update Firmware to use with this Application (ApiTooNew)", [FlipperApplicationPreloadStatusTargetMismatch] = "Hardware target mismatch", }; @@ -286,7 +288,8 @@ static const char* load_status_strings[] = { [FlipperApplicationLoadStatusSuccess] = "Success", [FlipperApplicationLoadStatusUnspecifiedError] = "Unknown error", [FlipperApplicationLoadStatusNoFreeMemory] = "Out of memory", - [FlipperApplicationLoadStatusMissingImports] = "Update Firmware to use with this Application (MissingImports)", + [FlipperApplicationLoadStatusMissingImports] = + "Update Firmware to use with this Application (MissingImports)", }; const char* flipper_application_preload_status_to_string(FlipperApplicationPreloadStatus status) { diff --git a/lib/flipper_application/plugins/composite_resolver.c b/lib/flipper_application/plugins/composite_resolver.c index 03dcd95e7..78b611328 100644 --- a/lib/flipper_application/plugins/composite_resolver.c +++ b/lib/flipper_application/plugins/composite_resolver.c @@ -4,7 +4,7 @@ #include #include -LIST_DEF(ElfApiInterfaceList, const ElfApiInterface*, M_POD_OPLIST) +LIST_DEF(ElfApiInterfaceList, const ElfApiInterface*, M_POD_OPLIST) // NOLINT #define M_OPL_ElfApiInterfaceList_t() LIST_OPLIST(ElfApiInterfaceList, M_POD_OPLIST) struct CompositeApiResolver { diff --git a/lib/flipper_application/plugins/plugin_manager.c b/lib/flipper_application/plugins/plugin_manager.c index d0e294220..5caec162a 100644 --- a/lib/flipper_application/plugins/plugin_manager.c +++ b/lib/flipper_application/plugins/plugin_manager.c @@ -11,7 +11,7 @@ #define TAG "PluginManager" -ARRAY_DEF(FlipperApplicationList, FlipperApplication*, M_PTR_OPLIST) +ARRAY_DEF(FlipperApplicationList, FlipperApplication*, M_PTR_OPLIST) // NOLINT #define M_OPL_FlipperApplicationList_t() ARRAY_OPLIST(FlipperApplicationList, M_PTR_OPLIST) struct PluginManager { diff --git a/lib/lfrfid/protocols/protocol_pac_stanley.c b/lib/lfrfid/protocols/protocol_pac_stanley.c index 67bc3bf48..4eabe3659 100644 --- a/lib/lfrfid/protocols/protocol_pac_stanley.c +++ b/lib/lfrfid/protocols/protocol_pac_stanley.c @@ -96,7 +96,7 @@ bool protocol_pac_stanley_decoder_feed(ProtocolPACStanley* protocol, bool level, if(duration > PAC_STANLEY_MAX_TIME) return false; - uint8_t pulses = (uint8_t)round((float)duration / PAC_STANLEY_CYCLE_LENGTH); + uint8_t pulses = (uint8_t)roundf((float)duration / PAC_STANLEY_CYCLE_LENGTH); // Handle last stopbit & preamble (1 sb, 8 bit preamble) if(pulses >= 9 && !protocol->got_preamble) { diff --git a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.c b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.c index 751a1c4ff..52ba7e845 100644 --- a/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.c +++ b/lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_sync.c @@ -1,6 +1,6 @@ #include "iso14443_3a_poller_sync.h" -#include "iso14443_3a_poller_i.h" +#include "iso14443_3a_poller_i.h" // IWYU pragma: keep #include #include diff --git a/lib/nfc/protocols/iso14443_3b/iso14443_3b_i.c b/lib/nfc/protocols/iso14443_3b/iso14443_3b_i.c deleted file mode 100644 index cac7ed826..000000000 --- a/lib/nfc/protocols/iso14443_3b/iso14443_3b_i.c +++ /dev/null @@ -1 +0,0 @@ -#include "iso14443_3b_i.h" diff --git a/lib/nfc/protocols/iso14443_4b/iso14443_4b.c b/lib/nfc/protocols/iso14443_4b/iso14443_4b.c index b859f9b8e..6f849b1d4 100644 --- a/lib/nfc/protocols/iso14443_4b/iso14443_4b.c +++ b/lib/nfc/protocols/iso14443_4b/iso14443_4b.c @@ -1,4 +1,4 @@ -#include "iso14443_4b_i.h" +#include "iso14443_4b_i.h" // IWYU pragma: keep #include #include diff --git a/lib/pulse_reader/pulse_reader.c b/lib/pulse_reader/pulse_reader.c index 0fcafe67c..996a37d1e 100644 --- a/lib/pulse_reader/pulse_reader.c +++ b/lib/pulse_reader/pulse_reader.c @@ -1,6 +1,5 @@ #include "pulse_reader.h" -#include #include #include #include diff --git a/lib/signal_reader/signal_reader.c b/lib/signal_reader/signal_reader.c index f457cd29c..8df2d5c72 100644 --- a/lib/signal_reader/signal_reader.c +++ b/lib/signal_reader/signal_reader.c @@ -1,6 +1,5 @@ #include "signal_reader.h" -#include #include #include #include diff --git a/lib/subghz/blocks/const.c b/lib/subghz/blocks/const.c deleted file mode 100644 index 15719b2ac..000000000 --- a/lib/subghz/blocks/const.c +++ /dev/null @@ -1 +0,0 @@ -#include "const.h" diff --git a/lib/subghz/protocols/bin_raw.c b/lib/subghz/protocols/bin_raw.c index a5332ee4e..8f62ccb1f 100644 --- a/lib/subghz/protocols/bin_raw.c +++ b/lib/subghz/protocols/bin_raw.c @@ -529,7 +529,8 @@ static bool bin_raw_type = BinRAWTypeGap; //looking for the last occurrence of gap ind = instance->data_raw_ind - 1; - while((ind > 0) && (DURATION_DIFF(abs(instance->data_raw[ind]), gap) > gap_delta)) { + while((ind > 0) && + (DURATION_DIFF(abs(instance->data_raw[ind]), (int32_t)gap) > gap_delta)) { ind--; } gap_ind = ind; @@ -544,10 +545,10 @@ static bool uint16_t bit_count = 0; do { gap_ind--; - data_temp = (int)(round((float)(instance->data_raw[gap_ind]) / instance->te)); + data_temp = (int)(roundf((float)(instance->data_raw[gap_ind]) / instance->te)); bin_raw_debug("%d ", data_temp); if(data_temp == 0) bit_count++; //there is noise in the package - for(size_t i = 0; i < abs(data_temp); i++) { + for(size_t i = 0; i < (size_t)abs(data_temp); i++) { bit_count++; if(ind) { ind--; @@ -563,7 +564,7 @@ static bool } } //split into full bytes if gap is caught - if(DURATION_DIFF(abs(instance->data_raw[gap_ind]), gap) < gap_delta) { + if(DURATION_DIFF(abs(instance->data_raw[gap_ind]), (int32_t)gap) < gap_delta) { instance->data_markup[data_markup_ind].byte_bias = ind >> 3; instance->data_markup[data_markup_ind++].bit_count = bit_count; bit_count = 0; @@ -807,11 +808,11 @@ static bool bin_raw_debug_tag(TAG, "Sequence analysis without gap\r\n"); ind = 0; for(size_t i = 0; i < instance->data_raw_ind; i++) { - int data_temp = (int)(round((float)(instance->data_raw[i]) / instance->te)); + int data_temp = (int)(roundf((float)(instance->data_raw[i]) / instance->te)); if(data_temp == 0) break; //found an interval 2 times shorter than TE, this is noise bin_raw_debug("%d ", data_temp); - for(size_t k = 0; k < abs(data_temp); k++) { + for(size_t k = 0; k < (size_t)abs(data_temp); k++) { if(data_temp > 0) { subghz_protocol_blocks_set_bit_array( true, instance->data, ind++, BIN_RAW_BUF_DATA_SIZE); diff --git a/lib/subghz/protocols/intertechno_v3.c b/lib/subghz/protocols/intertechno_v3.c index 7fe952995..b9af72a57 100644 --- a/lib/subghz/protocols/intertechno_v3.c +++ b/lib/subghz/protocols/intertechno_v3.c @@ -470,6 +470,6 @@ void subghz_protocol_decoder_intertechno_v3_get_string(void* context, FuriString output, "Ch:" CH_PATTERN " Dimm:%d%%\r\n", CNT_TO_CH(instance->generic.cnt), - (int)(6.67 * (float)instance->generic.btn)); + (int)(6.67f * (float)instance->generic.btn)); } } diff --git a/lib/subghz/protocols/princeton.c b/lib/subghz/protocols/princeton.c index 60b394e78..59175de8f 100644 --- a/lib/subghz/protocols/princeton.c +++ b/lib/subghz/protocols/princeton.c @@ -267,7 +267,7 @@ void subghz_protocol_decoder_princeton_feed(void* context, bool level, uint32_t instance->generic.data = instance->decoder.decode_data; instance->generic.data_count_bit = instance->decoder.decode_count_bit; - instance->guard_time = round((float)duration / instance->te); + instance->guard_time = roundf((float)duration / instance->te); if(instance->base.callback) instance->base.callback(&instance->base, instance->base.context); diff --git a/lib/subghz/protocols/protocol_items.c b/lib/subghz/protocols/protocol_items.c index 472a354e3..e50d52ac1 100644 --- a/lib/subghz/protocols/protocol_items.c +++ b/lib/subghz/protocols/protocol_items.c @@ -1,4 +1,4 @@ -#include "protocol_items.h" +#include "protocol_items.h" // IWYU pragma: keep const SubGhzProtocol* subghz_protocol_registry_items[] = { &subghz_protocol_gate_tx, diff --git a/lib/subghz/protocols/raw.c b/lib/subghz/protocols/raw.c index 12599891d..b5677f9c2 100644 --- a/lib/subghz/protocols/raw.c +++ b/lib/subghz/protocols/raw.c @@ -3,10 +3,7 @@ #include "../subghz_file_encoder_worker.h" #include "../blocks/const.h" -#include "../blocks/decoder.h" -#include "../blocks/encoder.h" #include "../blocks/generic.h" -#include "../blocks/math.h" #include #include diff --git a/lib/subghz/receiver.c b/lib/subghz/receiver.c index c70229a12..88fac4e34 100644 --- a/lib/subghz/receiver.c +++ b/lib/subghz/receiver.c @@ -1,7 +1,6 @@ #include "receiver.h" #include "registry.h" -#include "protocols/protocol_items.h" #include diff --git a/lib/subghz/subghz_setting.c b/lib/subghz/subghz_setting.c index aacf2b4fe..ed1120a20 100644 --- a/lib/subghz/subghz_setting.c +++ b/lib/subghz/subghz_setting.c @@ -1,6 +1,5 @@ #include "subghz_setting.h" -#include "types.h" -//#include "subghz_i.h" +#include "types.h" // IWYU pragma: keep #include #include diff --git a/lib/subghz/transmitter.c b/lib/subghz/transmitter.c index 4f7922c35..20247d339 100644 --- a/lib/subghz/transmitter.c +++ b/lib/subghz/transmitter.c @@ -2,7 +2,6 @@ #include "protocols/base.h" #include "registry.h" -#include "protocols/protocol_items.h" struct SubGhzTransmitter { const SubGhzProtocol* protocol; diff --git a/lib/toolbox/manchester_encoder.c b/lib/toolbox/manchester_encoder.c index 38b94eb86..239e53250 100644 --- a/lib/toolbox/manchester_encoder.c +++ b/lib/toolbox/manchester_encoder.c @@ -1,5 +1,4 @@ #include "manchester_encoder.h" -#include #include void manchester_encoder_reset(ManchesterEncoderState* state) {