Merge branch 'DarkFlippers:dev' into dev

.drone.yml

@@ -244,8 +244,7 @@ steps:
         from_secret: dep_port
       command_timeout: 30s
       script:
-        - cd web/unleashedflip.com/public_html/fw/dev
-        - rm -f ./*
+        - cd web/unleashedflip.com/public_html/fw/dev && rm -f ./*
 
   - name: "Upload default to updates srv"
     image: appleboy/drone-scp

.pvsconfig

@@ -1,4 +1,5 @@
 # MLib macros we can't do much about.
+//-V:M_LET:1048,1044
 //-V:M_EACH:1048,1044
 //-V:ARRAY_DEF:760,747,568,776,729,712,654
 //-V:LIST_DEF:760,747,568,712,729,654,776
@@ -16,8 +17,30 @@
 # Potentially null argument warnings
 //-V:memset:575
 //-V:memcpy:575
+//-V:memcmp:575
+//-V:strlen:575
 //-V:strcpy:575
+//-V:strncpy:575
 //-V:strchr:575
 
 # For loop warning on M_FOREACH
 //-V:for:1044
+
+# Bitwise OR
+//-V:bit:792
+
+# Do not complain about similar code
+//-V::525
+
+# Common embedded development pointer operations
+//-V::566
+//-V::1032
+
+# Warnings about length mismatch
+//-V:property_value_out:666
+
+# Model-related warnings
+//-V:with_view_model:1044,1048
+
+# Functions that always return the same error code
+//-V:picopass_device_decrypt:1048

.pvsoptions

@@ -1 +1 @@
---rules-config .pvsconfig -e lib/fatfs -e lib/fnv1a-hash -e lib/FreeRTOS-Kernel -e lib/heatshrink -e lib/libusb_stm32 -e lib/littlefs -e lib/mbedtls -e lib/micro-ecc -e lib/microtar -e lib/mlib -e lib/qrcode -e lib/ST25RFAL002 -e lib/STM32CubeWB -e lib/u8g2 -e */arm-none-eabi/*
+--rules-config .pvsconfig -e lib/fatfs -e lib/fnv1a-hash -e lib/FreeRTOS-Kernel -e lib/heatshrink -e lib/libusb_stm32 -e lib/littlefs -e lib/mbedtls -e lib/micro-ecc -e lib/microtar -e lib/mlib -e lib/qrcode -e lib/ST25RFAL002 -e lib/STM32CubeWB -e lib/u8g2 -e lib/nanopb -e */arm-none-eabi/* -e applications/plugins/dap_link/lib/free-dap

ReadMe.md

@@ -73,6 +73,17 @@ Also check changelog in releases for latest updates!
 - Star Line
 
 ## Please support development of the project
+The majority of this project is developed and maintained by me, @xMasterX.
+I'm unemployed because of the war, and the only income I receive is from your donations.
+Our team is small and the guys are working on this project as much as they can solely based on the enthusiasm they have for this project and the community.
+- @Svaarich - UI design and animations
+- @Amec0e - Infrared assets
+- Community moderators in Telegram, Discord, and Reddit
+- And of course our GitHub community. Your PRs are a very important part of this firmware and open-source development.
+
+The amount of work done on this project is huge and we need your support, no matter how large or small. Even if you just say, "Thank you Unleashed firmware developers!" somewhere. Doing so will help us continue our work and will help drive us to make the firmware better every time.
+Also, regarding our releases, every build has and always will be free and open-source. There will be no paywall releases or closed-source apps within the firmware. As long as I am working on this project it will never happen.
+You can support us by using links or addresses below:
 * Boosty: https://boosty.to/mmxdev
 * Ko-Fi: https://ko-fi.com/masterx
 * destream (100 EUR min): https://destream.net/live/MMX/donate
@@ -130,6 +141,7 @@ Games:
 - Game15 [(by x27)](https://github.com/x27/flipperzero-game15)
 - Solitaire [(by teeebor)](https://github.com/teeebor/flipper_games)
 - BlackJack [(by teeebor)](https://github.com/teeebor/flipper_games)
+- 2048 game [(by eugene-kirzhanov)](https://github.com/eugene-kirzhanov/flipper-zero-2048-game)
 
 ### Other changes
 

applications/debug/unit_tests/float_tools/float_tools_test.c

@@ -0,0 +1,60 @@
+#include <float.h>
+#include <float_tools.h>
+
+#include "../minunit.h"
+
+MU_TEST(float_tools_equal_test) {
+    mu_check(float_is_equal(FLT_MAX, FLT_MAX));
+    mu_check(float_is_equal(FLT_MIN, FLT_MIN));
+    mu_check(float_is_equal(-FLT_MAX, -FLT_MAX));
+    mu_check(float_is_equal(-FLT_MIN, -FLT_MIN));
+
+    mu_check(!float_is_equal(FLT_MIN, FLT_MAX));
+    mu_check(!float_is_equal(-FLT_MIN, FLT_MAX));
+    mu_check(!float_is_equal(FLT_MIN, -FLT_MAX));
+    mu_check(!float_is_equal(-FLT_MIN, -FLT_MAX));
+
+    const float pi = 3.14159f;
+    mu_check(float_is_equal(pi, pi));
+    mu_check(float_is_equal(-pi, -pi));
+    mu_check(!float_is_equal(pi, -pi));
+    mu_check(!float_is_equal(-pi, pi));
+
+    const float one_third = 1.f / 3.f;
+    const float one_third_dec = 0.3333333f;
+    mu_check(one_third != one_third_dec);
+    mu_check(float_is_equal(one_third, one_third_dec));
+
+    const float big_num = 1.e12f;
+    const float med_num = 95.389f;
+    const float smol_num = 1.e-12f;
+    mu_check(float_is_equal(big_num, big_num));
+    mu_check(float_is_equal(med_num, med_num));
+    mu_check(float_is_equal(smol_num, smol_num));
+    mu_check(!float_is_equal(smol_num, big_num));
+    mu_check(!float_is_equal(med_num, smol_num));
+    mu_check(!float_is_equal(big_num, med_num));
+
+    const float more_than_one = 1.f + FLT_EPSILON;
+    const float less_than_one = 1.f - FLT_EPSILON;
+    mu_check(!float_is_equal(more_than_one, less_than_one));
+    mu_check(!float_is_equal(more_than_one, -less_than_one));
+    mu_check(!float_is_equal(-more_than_one, less_than_one));
+    mu_check(!float_is_equal(-more_than_one, -less_than_one));
+
+    const float slightly_more_than_one = 1.f + FLT_EPSILON / 2.f;
+    const float slightly_less_than_one = 1.f - FLT_EPSILON / 2.f;
+    mu_check(float_is_equal(slightly_more_than_one, slightly_less_than_one));
+    mu_check(float_is_equal(-slightly_more_than_one, -slightly_less_than_one));
+    mu_check(!float_is_equal(slightly_more_than_one, -slightly_less_than_one));
+    mu_check(!float_is_equal(-slightly_more_than_one, slightly_less_than_one));
+}
+
+MU_TEST_SUITE(float_tools_suite) {
+    MU_RUN_TEST(float_tools_equal_test);
+}
+
+int run_minunit_test_float_tools() {
+    MU_RUN_SUITE(float_tools_suite);
+    return MU_EXIT_CODE;
+}

applications/debug/unit_tests/furi/furi_memmgr_test.c

@@ -3,98 +3,37 @@
 #include <string.h>
 #include <stdbool.h>
 
-// this test is not accurate, but gives a basic understanding
-// that memory management is working fine
-
-// do not include memmgr.h here
-// we also test that we are linking against stdlib
-extern size_t memmgr_get_free_heap(void);
-extern size_t memmgr_get_minimum_free_heap(void);
-
-// current heap management realization consume:
-// X bytes after allocate and 0 bytes after allocate and free,
-// where X = sizeof(void*) + sizeof(size_t), look to BlockLink_t
-const size_t heap_overhead_max_size = sizeof(void*) + sizeof(size_t);
-
-bool heap_equal(size_t heap_size, size_t heap_size_old) {
-    // heap borders with overhead
-    const size_t heap_low = heap_size_old - heap_overhead_max_size;
-    const size_t heap_high = heap_size_old + heap_overhead_max_size;
-
-    // not exact, so we must test it against bigger numbers than "overhead size"
-    const bool result = ((heap_size >= heap_low) && (heap_size <= heap_high));
-
-    // debug allocation info
-    if(!result) {
-        printf("\n(hl: %zu) <= (p: %zu) <= (hh: %zu)\n", heap_low, heap_size, heap_high);
-    }
-
-    return result;
-}
-
 void test_furi_memmgr() {
-    size_t heap_size = 0;
-    size_t heap_size_old = 0;
-    const int alloc_size = 128;
-
-    void* ptr = NULL;
-    void* original_ptr = NULL;
-
-    // do not include furi memmgr.h case
-#ifdef FURI_MEMMGR_GUARD
-    mu_fail("do not link against furi memmgr.h");
-#endif
+    void* ptr;
 
     // allocate memory case
-    heap_size_old = memmgr_get_free_heap();
-    ptr = malloc(alloc_size);
-    heap_size = memmgr_get_free_heap();
-    mu_assert_pointers_not_eq(ptr, NULL);
-    mu_assert(heap_equal(heap_size, heap_size_old - alloc_size), "allocate failed");
-
-    // free memory case
-    heap_size_old = memmgr_get_free_heap();
+    ptr = malloc(100);
+    mu_check(ptr != NULL);
+    // test that memory is zero-initialized after allocation
+    for(int i = 0; i < 100; i++) {
+        mu_assert_int_eq(0, ((uint8_t*)ptr)[i]);
+    }
     free(ptr);
-    ptr = NULL;
-    heap_size = memmgr_get_free_heap();
-    mu_assert(heap_equal(heap_size, heap_size_old + alloc_size), "free failed");
 
     // reallocate memory case
+    ptr = malloc(100);
+    memset(ptr, 66, 100);
+    ptr = realloc(ptr, 200);
+    mu_check(ptr != NULL);
 
-    // get filled array with some data
-    original_ptr = malloc(alloc_size);
-    mu_assert_pointers_not_eq(original_ptr, NULL);
-    for(int i = 0; i < alloc_size; i++) {
-        *(unsigned char*)(original_ptr + i) = i;
+    // test that memory is really reallocated
+    for(int i = 0; i < 100; i++) {
+        mu_assert_int_eq(66, ((uint8_t*)ptr)[i]);
     }
 
-    // malloc array and copy data
-    ptr = malloc(alloc_size);
-    mu_assert_pointers_not_eq(ptr, NULL);
-    memcpy(ptr, original_ptr, alloc_size);
-
-    // reallocate array
-    heap_size_old = memmgr_get_free_heap();
-    ptr = realloc(ptr, alloc_size * 2);
-    heap_size = memmgr_get_free_heap();
-    mu_assert(heap_equal(heap_size, heap_size_old - alloc_size), "reallocate failed");
-    mu_assert_int_eq(memcmp(original_ptr, ptr, alloc_size), 0);
-    free(original_ptr);
+    // TODO: fix realloc to copy only old size, and write testcase that leftover of reallocated memory is zero-initialized
     free(ptr);
 
     // allocate and zero-initialize array (calloc)
-    original_ptr = malloc(alloc_size);
-    mu_assert_pointers_not_eq(original_ptr, NULL);
-
-    for(int i = 0; i < alloc_size; i++) {
-        *(unsigned char*)(original_ptr + i) = 0;
+    ptr = calloc(100, 2);
+    mu_check(ptr != NULL);
+    for(int i = 0; i < 100 * 2; i++) {
+        mu_assert_int_eq(0, ((uint8_t*)ptr)[i]);
     }
-    heap_size_old = memmgr_get_free_heap();
-    ptr = calloc(1, alloc_size);
-    heap_size = memmgr_get_free_heap();
-    mu_assert(heap_equal(heap_size, heap_size_old - alloc_size), "callocate failed");
-    mu_assert_int_eq(memcmp(original_ptr, ptr, alloc_size), 0);
-
-    free(original_ptr);
     free(ptr);
 }

applications/debug/unit_tests/subghz/subghz_test.c

@@ -13,7 +13,7 @@
 #define CAME_ATOMO_DIR_NAME EXT_PATH("subghz/assets/came_atomo")
 #define NICE_FLOR_S_DIR_NAME EXT_PATH("subghz/assets/nice_flor_s")
 #define TEST_RANDOM_DIR_NAME EXT_PATH("unit_tests/subghz/test_random_raw.sub")
-#define TEST_RANDOM_COUNT_PARSE 253
+#define TEST_RANDOM_COUNT_PARSE 273
 #define TEST_TIMEOUT 10000
 
 static SubGhzEnvironment* environment_handler;
@@ -318,7 +318,10 @@ bool subghz_hal_async_tx_test_run(SubGhzHalAsyncTxTestType type) {
     furi_hal_subghz_load_preset(FuriHalSubGhzPresetOok650Async);
     furi_hal_subghz_set_frequency_and_path(433920000);
 
-    furi_hal_subghz_start_async_tx(subghz_hal_async_tx_test_yield, &test);
+    if(!furi_hal_subghz_start_async_tx(subghz_hal_async_tx_test_yield, &test)) {
+        return false;
+    }
+
     while(!furi_hal_subghz_is_async_tx_complete()) {
         furi_delay_ms(10);
     }
@@ -594,6 +597,13 @@ MU_TEST(subghz_decoder_smc5326_test) {
         "Test decoder " SUBGHZ_PROTOCOL_SMC5326_NAME " error\r\n");
 }
 
+MU_TEST(subghz_decoder_holtek_ht12x_test) {
+    mu_assert(
+        subghz_decoder_test(
+            EXT_PATH("unit_tests/subghz/holtek_ht12x_raw.sub"), SUBGHZ_PROTOCOL_HOLTEK_HT12X_NAME),
+        "Test decoder " SUBGHZ_PROTOCOL_HOLTEK_HT12X_NAME " error\r\n");
+}
+
 //test encoders
 MU_TEST(subghz_encoder_princeton_test) {
     mu_assert(
@@ -727,6 +737,12 @@ MU_TEST(subghz_encoder_smc5326_test) {
         "Test encoder " SUBGHZ_PROTOCOL_SMC5326_NAME " error\r\n");
 }
 
+MU_TEST(subghz_encoder_holtek_ht12x_test) {
+    mu_assert(
+        subghz_encoder_test(EXT_PATH("unit_tests/subghz/holtek_ht12x.sub")),
+        "Test encoder " SUBGHZ_PROTOCOL_HOLTEK_HT12X_NAME " error\r\n");
+}
+
 MU_TEST(subghz_random_test) {
     mu_assert(subghz_decode_random_test(TEST_RANDOM_DIR_NAME), "Random test error\r\n");
 }
@@ -771,6 +787,7 @@ MU_TEST_SUITE(subghz) {
     MU_RUN_TEST(subghz_decoder_clemsa_test);
     MU_RUN_TEST(subghz_decoder_ansonic_test);
     MU_RUN_TEST(subghz_decoder_smc5326_test);
+    MU_RUN_TEST(subghz_decoder_holtek_ht12x_test);
 
     MU_RUN_TEST(subghz_encoder_princeton_test);
     MU_RUN_TEST(subghz_encoder_came_test);
@@ -794,6 +811,7 @@ MU_TEST_SUITE(subghz) {
     MU_RUN_TEST(subghz_encoder_clemsa_test);
     MU_RUN_TEST(subghz_encoder_ansonic_test);
     MU_RUN_TEST(subghz_encoder_smc5326_test);
+    MU_RUN_TEST(subghz_encoder_holtek_ht12x_test);
 
     MU_RUN_TEST(subghz_random_test);
     subghz_test_deinit();

applications/debug/unit_tests/test_index.c

@@ -24,6 +24,7 @@ int run_minunit_test_protocol_dict();
 int run_minunit_test_lfrfid_protocols();
 int run_minunit_test_nfc();
 int run_minunit_test_bit_lib();
+int run_minunit_test_float_tools();
 int run_minunit_test_bt();
 
 typedef int (*UnitTestEntry)();
@@ -50,6 +51,7 @@ const UnitTest unit_tests[] = {
     {.name = "protocol_dict", .entry = run_minunit_test_protocol_dict},
     {.name = "lfrfid", .entry = run_minunit_test_lfrfid_protocols},
     {.name = "bit_lib", .entry = run_minunit_test_bit_lib},
+    {.name = "float_tools", .entry = run_minunit_test_float_tools},
     {.name = "bt", .entry = run_minunit_test_bt},
 };
 
@@ -73,7 +75,6 @@ void unit_tests_cli(Cli* cli, FuriString* args, void* context) {
     UNUSED(cli);
     UNUSED(args);
     UNUSED(context);
-    uint32_t failed_tests = 0;
     minunit_run = 0;
     minunit_assert = 0;
     minunit_fail = 0;
@@ -99,32 +100,35 @@ void unit_tests_cli(Cli* cli, FuriString* args, void* context) {
 
             if(furi_string_size(args)) {
                 if(furi_string_cmp_str(args, unit_tests[i].name) == 0) {
-                    failed_tests += unit_tests[i].entry();
+                    unit_tests[i].entry();
                 } else {
                     printf("Skipping %s\r\n", unit_tests[i].name);
                 }
             } else {
-                failed_tests += unit_tests[i].entry();
+                unit_tests[i].entry();
             }
         }
-        printf("\r\nFailed tests: %lu\r\n", failed_tests);
 
-        // Time report
-        cycle_counter = (furi_get_tick() - cycle_counter);
-        printf("Consumed: %lu ms\r\n", cycle_counter);
+        if(minunit_run != 0) {
+            printf("\r\nFailed tests: %u\r\n", minunit_fail);
 
-        // Wait for tested services and apps to deallocate memory
-        furi_delay_ms(200);
-        uint32_t heap_after = memmgr_get_free_heap();
-        printf("Leaked: %ld\r\n", heap_before - heap_after);
+            // Time report
+            cycle_counter = (furi_get_tick() - cycle_counter);
+            printf("Consumed: %lu ms\r\n", cycle_counter);
 
-        // Final Report
-        if(failed_tests == 0) {
-            notification_message(notification, &sequence_success);
-            printf("Status: PASSED\r\n");
-        } else {
-            notification_message(notification, &sequence_error);
-            printf("Status: FAILED\r\n");
+            // Wait for tested services and apps to deallocate memory
+            furi_delay_ms(200);
+            uint32_t heap_after = memmgr_get_free_heap();
+            printf("Leaked: %ld\r\n", heap_before - heap_after);
+
+            // Final Report
+            if(minunit_fail == 0) {
+                notification_message(notification, &sequence_success);
+                printf("Status: PASSED\r\n");
+            } else {
+                notification_message(notification, &sequence_error);
+                printf("Status: FAILED\r\n");
+            }
         }
     }
 

applications/main/archive/helpers/archive_apps.c

@@ -13,7 +13,7 @@ ArchiveAppTypeEnum archive_get_app_type(const char* path) {
     }
     app_name++;
 
-    for(size_t i = 0; i < COUNT_OF(known_apps); i++) {
+    for(size_t i = 0; i < COUNT_OF(known_apps); i++) { //-V1008
         if(strncmp(app_name, known_apps[i], strlen(known_apps[i])) == 0) {
             return i;
         }

applications/main/archive/helpers/archive_favorites.c

@@ -177,7 +177,7 @@ bool archive_favorites_read(void* context) {
 
     archive_set_item_count(browser, file_count);
 
-    if(need_refresh) {
+    if(need_refresh) { //-V547
         archive_favourites_rescan();
     }
 

applications/main/archive/scenes/archive_scene_browser.c

@@ -116,7 +116,7 @@ bool archive_scene_browser_on_event(void* context, SceneManagerEvent event) {
         case ArchiveBrowserEventFileMenuPin: {
             const char* name = archive_get_name(browser);
             if(favorites) {
-                archive_favorites_delete(name);
+                archive_favorites_delete("%s", name);
                 archive_file_array_rm_selected(browser);
                 archive_show_file_menu(browser, false);
             } else if(archive_is_known_app(selected->type)) {

applications/main/bad_usb/bad_usb_script.c

@@ -224,8 +224,8 @@ static bool ducky_string(BadUsbScript* bad_usb, const char* param) {
 }
 
 static uint16_t ducky_get_keycode(BadUsbScript* bad_usb, const char* param, bool accept_chars) {
-    for(uint8_t i = 0; i < (sizeof(ducky_keys) / sizeof(ducky_keys[0])); i++) {
-        uint8_t key_cmd_len = strlen(ducky_keys[i].name);
+    for(size_t i = 0; i < (sizeof(ducky_keys) / sizeof(ducky_keys[0])); i++) {
+        size_t key_cmd_len = strlen(ducky_keys[i].name);
         if((strncmp(param, ducky_keys[i].name, key_cmd_len) == 0) &&
            (ducky_is_line_end(param[key_cmd_len]))) {
             return ducky_keys[i].keycode;
@@ -426,7 +426,7 @@ static int32_t ducky_script_execute_next(BadUsbScript* bad_usb, File* script_fil
             return 0;
         } else if(delay_val < 0) { // Script error
             bad_usb->st.error_line = bad_usb->st.line_cur - 1;
-            FURI_LOG_E(WORKER_TAG, "Unknown command at line %u", bad_usb->st.line_cur - 1);
+            FURI_LOG_E(WORKER_TAG, "Unknown command at line %u", bad_usb->st.line_cur - 1U);
             return SCRIPT_STATE_ERROR;
         } else {
             return (delay_val + bad_usb->defdelay);
@@ -605,7 +605,9 @@ static int32_t bad_usb_worker(void* context) {
                 }
                 bad_usb->st.state = worker_state;
                 continue;
-            } else if((flags == FuriFlagErrorTimeout) || (flags == FuriFlagErrorResource)) {
+            } else if(
+                (flags == (unsigned)FuriFlagErrorTimeout) ||
+                (flags == (unsigned)FuriFlagErrorResource)) {
                 if(delay_val > 0) {
                     bad_usb->st.delay_remain--;
                     continue;
@@ -665,7 +667,7 @@ static void bad_usb_script_set_default_keyboard_layout(BadUsbScript* bad_usb) {
 BadUsbScript* bad_usb_script_open(FuriString* file_path) {
     furi_assert(file_path);
 
-    BadUsbScript* bad_usb = malloc(sizeof(BadUsbScript)); //-V773
+    BadUsbScript* bad_usb = malloc(sizeof(BadUsbScript));
     bad_usb->file_path = furi_string_alloc();
     furi_string_set(bad_usb->file_path, file_path);
     bad_usb_script_set_default_keyboard_layout(bad_usb);
@@ -676,7 +678,7 @@ BadUsbScript* bad_usb_script_open(FuriString* file_path) {
     bad_usb->thread = furi_thread_alloc_ex("BadUsbWorker", 2048, bad_usb_worker, bad_usb);
     furi_thread_start(bad_usb->thread);
     return bad_usb;
-}
+} //-V773
 
 void bad_usb_script_close(BadUsbScript* bad_usb) {
     furi_assert(bad_usb);

applications/main/fap_loader/fap_loader_app.c

@@ -156,7 +156,7 @@ static bool fap_loader_select_app(FapLoader* loader) {
 }
 
 static FapLoader* fap_loader_alloc(const char* path) {
-    FapLoader* loader = malloc(sizeof(FapLoader)); //-V773
+    FapLoader* loader = malloc(sizeof(FapLoader)); //-V799
     loader->fap_path = furi_string_alloc_set(path);
     loader->storage = furi_record_open(RECORD_STORAGE);
     loader->dialogs = furi_record_open(RECORD_DIALOGS);
@@ -167,7 +167,7 @@ static FapLoader* fap_loader_alloc(const char* path) {
         loader->view_dispatcher, loader->gui, ViewDispatcherTypeFullscreen);
     view_dispatcher_add_view(loader->view_dispatcher, 0, loading_get_view(loader->loading));
     return loader;
-}
+} //-V773
 
 static void fap_loader_free(FapLoader* loader) {
     view_dispatcher_remove_view(loader->view_dispatcher, 0);

applications/main/ibutton/ibutton.c

@@ -278,7 +278,7 @@ bool ibutton_save_key(iButton* ibutton, const char* key_name) {
 
     flipper_format_free(file);
 
-    if(!result) {
+    if(!result) { //-V547
         dialog_message_show_storage_error(ibutton->dialogs, "Cannot save\nkey file");
     }
 
@@ -302,7 +302,7 @@ void ibutton_text_store_set(iButton* ibutton, const char* text, ...) {
 }
 
 void ibutton_text_store_clear(iButton* ibutton) {
-    memset(ibutton->text_store, 0, IBUTTON_TEXT_STORE_SIZE);
+    memset(ibutton->text_store, 0, IBUTTON_TEXT_STORE_SIZE + 1);
 }
 
 void ibutton_notification_message(iButton* ibutton, uint32_t message) {
@@ -343,7 +343,7 @@ int32_t ibutton_app(void* p) {
     } else {
         view_dispatcher_attach_to_gui(
             ibutton->view_dispatcher, ibutton->gui, ViewDispatcherTypeFullscreen);
-        if(key_loaded) {
+        if(key_loaded) { //-V547
             scene_manager_next_scene(ibutton->scene_manager, iButtonSceneEmulate);
             DOLPHIN_DEED(DolphinDeedIbuttonEmulate);
         } else {

applications/main/infrared/infrared.c

@@ -360,7 +360,7 @@ void infrared_text_store_set(Infrared* infrared, uint32_t bank, const char* text
 }
 
 void infrared_text_store_clear(Infrared* infrared, uint32_t bank) {
-    memset(infrared->text_store[bank], 0, INFRARED_TEXT_STORE_SIZE);
+    memset(infrared->text_store[bank], 0, INFRARED_TEXT_STORE_SIZE + 1);
 }
 
 void infrared_play_notification_message(Infrared* infrared, uint32_t message) {
@@ -455,7 +455,7 @@ int32_t infrared_app(void* p) {
     } else {
         view_dispatcher_attach_to_gui(
             infrared->view_dispatcher, infrared->gui, ViewDispatcherTypeFullscreen);
-        if(is_remote_loaded) {
+        if(is_remote_loaded) { //-V547
             scene_manager_next_scene(infrared->scene_manager, InfraredSceneRemote);
         } else {
             scene_manager_next_scene(infrared->scene_manager, InfraredSceneStart);

applications/main/infrared/infrared_brute_force.c

@@ -65,7 +65,7 @@ bool infrared_brute_force_calculate_messages(InfraredBruteForce* brute_force) {
         while(flipper_format_read_string(ff, "name", signal_name)) {
             InfraredBruteForceRecord* record =
                 InfraredBruteForceRecordDict_get(brute_force->records, signal_name);
-            if(record) {
+            if(record) { //-V547
                 ++(record->count);
             }
         }

applications/main/infrared/infrared_cli.c

@@ -55,7 +55,7 @@ static void signal_received_callback(void* context, InfraredWorkerSignal* receiv
         size_t timings_cnt;
         infrared_worker_get_raw_signal(received_signal, &timings, &timings_cnt);
 
-        buf_cnt = snprintf(buf, sizeof(buf), "RAW, %d samples:\r\n", timings_cnt);
+        buf_cnt = snprintf(buf, sizeof(buf), "RAW, %zu samples:\r\n", timings_cnt);
         cli_write(cli, (uint8_t*)buf, buf_cnt);
         for(size_t i = 0; i < timings_cnt; ++i) {
             buf_cnt = snprintf(buf, sizeof(buf), "%lu ", timings[i]);
@@ -276,7 +276,9 @@ static bool infrared_cli_decode_file(FlipperFormat* input_file, FlipperFormat* o
         }
         InfraredRawSignal* raw_signal = infrared_signal_get_raw_signal(signal);
         printf(
-            "Raw signal: %s, %u samples\r\n", furi_string_get_cstr(tmp), raw_signal->timings_size);
+            "Raw signal: %s, %zu samples\r\n",
+            furi_string_get_cstr(tmp),
+            raw_signal->timings_size);
         if(!infrared_cli_decode_raw_signal(
                raw_signal, decoder, output_file, furi_string_get_cstr(tmp)))
             break;
@@ -382,7 +384,7 @@ static void infrared_cli_list_remote_signals(FuriString* remote_name) {
         while(flipper_format_read_string(ff, "name", signal_name)) {
             furi_string_set_str(key, furi_string_get_cstr(signal_name));
             int* v = dict_signals_get(signals_dict, key);
-            if(v != NULL) {
+            if(v != NULL) { //-V547
                 (*v)++;
                 max = M_MAX(*v, max);
             } else {
@@ -436,7 +438,7 @@ static void
             break;
         }
 
-        printf("Sending %ld signal(s)...\r\n", record_count);
+        printf("Sending %lu signal(s)...\r\n", record_count);
         printf("Press Ctrl-C to stop.\r\n");
 
         int records_sent = 0;

applications/main/infrared/infrared_remote.c

@@ -145,15 +145,14 @@ bool infrared_remote_load(InfraredRemote* remote, FuriString* path) {
     buf = furi_string_alloc();
 
     FURI_LOG_I(TAG, "load file: \'%s\'", furi_string_get_cstr(path));
-    bool success = flipper_format_buffered_file_open_existing(ff, furi_string_get_cstr(path));
+    bool success = false;
 
-    if(success) {
+    do {
+        if(!flipper_format_buffered_file_open_existing(ff, furi_string_get_cstr(path))) break;
         uint32_t version;
-        success = flipper_format_read_header(ff, buf, &version) &&
-                  !furi_string_cmp(buf, "IR signals file") && (version == 1);
-    }
+        if(!flipper_format_read_header(ff, buf, &version)) break;
+        if(!furi_string_equal(buf, "IR signals file") || (version != 1)) break;
 
-    if(success) {
         path_extract_filename(path, buf, true);
         infrared_remote_clear_buttons(remote);
         infrared_remote_set_name(remote, furi_string_get_cstr(buf));
@@ -169,7 +168,8 @@ bool infrared_remote_load(InfraredRemote* remote, FuriString* path) {
                 infrared_remote_button_free(button);
             }
         }
-    }
+        success = true;
+    } while(false);
 
     furi_string_free(buf);
     flipper_format_free(ff);

applications/main/infrared/infrared_signal.c

@@ -74,7 +74,7 @@ static bool infrared_signal_is_raw_valid(InfraredRawSignal* raw) {
     } else if((raw->timings_size <= 0) || (raw->timings_size > MAX_TIMINGS_AMOUNT)) {
         FURI_LOG_E(
             TAG,
-            "Timings amount is out of range (0 - %X): %X",
+            "Timings amount is out of range (0 - %X): %zX",
             MAX_TIMINGS_AMOUNT,
             raw->timings_size);
         return false;
@@ -275,8 +275,8 @@ bool infrared_signal_search_and_read(
             is_name_found = furi_string_equal(name, tmp);
             if(is_name_found) break;
         }
-        if(!is_name_found) break;
-        if(!infrared_signal_read_body(signal, ff)) break;
+        if(!is_name_found) break; //-V547
+        if(!infrared_signal_read_body(signal, ff)) break; //-V779
         success = true;
     } while(false);
 

applications/main/infrared/scenes/infrared_scene_debug.c

@@ -26,7 +26,7 @@ bool infrared_scene_debug_on_event(void* context, SceneManagerEvent event) {
                 InfraredRawSignal* raw = infrared_signal_get_raw_signal(signal);
                 infrared_debug_view_set_text(debug_view, "RAW\n%d samples\n", raw->timings_size);
 
-                printf("RAW, %d samples:\r\n", raw->timings_size);
+                printf("RAW, %zu samples:\r\n", raw->timings_size);
                 for(size_t i = 0; i < raw->timings_size; ++i) {
                     printf("%lu ", raw->timings[i]);
                 }

applications/main/lfrfid/lfrfid.c

@@ -32,7 +32,7 @@ static void rpc_command_callback(RpcAppSystemEvent rpc_event, void* context) {
 }
 
 static LfRfid* lfrfid_alloc() {
-    LfRfid* lfrfid = malloc(sizeof(LfRfid)); //-V773
+    LfRfid* lfrfid = malloc(sizeof(LfRfid));
 
     lfrfid->storage = furi_record_open(RECORD_STORAGE);
     lfrfid->dialogs = furi_record_open(RECORD_DIALOGS);
@@ -100,7 +100,7 @@ static LfRfid* lfrfid_alloc() {
         lfrfid->view_dispatcher, LfRfidViewRead, lfrfid_view_read_get_view(lfrfid->read_view));
 
     return lfrfid;
-}
+} //-V773
 
 static void lfrfid_free(LfRfid* lfrfid) {
     furi_assert(lfrfid);

applications/main/lfrfid/lfrfid_cli.c

@@ -88,7 +88,7 @@ static void lfrfid_cli_read(Cli* cli, FuriString* args) {
         uint32_t flags =
             furi_event_flag_wait(context.event, available_flags, FuriFlagWaitAny, 100);
 
-        if(flags != FuriFlagErrorTimeout) {
+        if(flags != (unsigned)FuriFlagErrorTimeout) {
             if(FURI_BIT(flags, LFRFIDWorkerReadDone)) {
                 break;
             }
@@ -154,7 +154,7 @@ static bool lfrfid_cli_parse_args(FuriString* args, ProtocolDict* dict, Protocol
 
             for(ProtocolId i = 0; i < LFRFIDProtocolMax; i++) {
                 printf(
-                    "\t%s, %d bytes long\r\n",
+                    "\t%s, %zu bytes long\r\n",
                     protocol_dict_get_name(dict, i),
                     protocol_dict_get_data_size(dict, i));
             }
@@ -166,7 +166,7 @@ static bool lfrfid_cli_parse_args(FuriString* args, ProtocolDict* dict, Protocol
         // check data arg
         if(!args_read_hex_bytes(data_text, data, data_size)) {
             printf(
-                "%s data needs to be %d bytes long\r\n",
+                "%s data needs to be %zu bytes long\r\n",
                 protocol_dict_get_name(dict, *protocol),
                 data_size);
             break;
@@ -212,7 +212,7 @@ static void lfrfid_cli_write(Cli* cli, FuriString* args) {
 
     while(!cli_cmd_interrupt_received(cli)) {
         uint32_t flags = furi_event_flag_wait(event, available_flags, FuriFlagWaitAny, 100);
-        if(flags != FuriFlagErrorTimeout) {
+        if(flags != (unsigned)FuriFlagErrorTimeout) {
             if(FURI_BIT(flags, LFRFIDWorkerWriteOK)) {
                 printf("Written!\r\n");
                 break;
@@ -310,9 +310,9 @@ static void lfrfid_cli_raw_analyze(Cli* cli, FuriString* args) {
                     warn = true;
                 }
 
-                furi_string_printf(info_string, "[%ld %ld]", pulse, duration);
+                furi_string_printf(info_string, "[%lu %lu]", pulse, duration);
                 printf("%-16s", furi_string_get_cstr(info_string));
-                furi_string_printf(info_string, "[%ld %ld]", pulse, duration - pulse);
+                furi_string_printf(info_string, "[%lu %lu]", pulse, duration - pulse);
                 printf("%-16s", furi_string_get_cstr(info_string));
 
                 if(warn) {
@@ -336,7 +336,7 @@ static void lfrfid_cli_raw_analyze(Cli* cli, FuriString* args) {
                 total_pulse += pulse;
                 total_duration += duration;
 
-                if(total_protocol != PROTOCOL_NO) {
+                if(total_protocol != PROTOCOL_NO) { //-V1051
                     break;
                 }
             } else {
@@ -347,9 +347,9 @@ static void lfrfid_cli_raw_analyze(Cli* cli, FuriString* args) {
 
         printf("   Frequency: %f\r\n", (double)frequency);
         printf("  Duty Cycle: %f\r\n", (double)duty_cycle);
-        printf("       Warns: %ld\r\n", total_warns);
-        printf("   Pulse sum: %ld\r\n", total_pulse);
-        printf("Duration sum: %ld\r\n", total_duration);
+        printf("       Warns: %lu\r\n", total_warns);
+        printf("   Pulse sum: %lu\r\n", total_pulse);
+        printf("Duration sum: %lu\r\n", total_duration);
         printf("     Average: %f\r\n", (double)((float)total_pulse / (float)total_duration));
         printf("    Protocol: ");
 
@@ -436,7 +436,7 @@ static void lfrfid_cli_raw_read(Cli* cli, FuriString* args) {
         while(true) {
             uint32_t flags = furi_event_flag_wait(event, available_flags, FuriFlagWaitAny, 100);
 
-            if(flags != FuriFlagErrorTimeout) {
+            if(flags != (unsigned)FuriFlagErrorTimeout) {
                 if(FURI_BIT(flags, LFRFIDWorkerReadRawFileError)) {
                     printf("File is not RFID raw file\r\n");
                     break;
@@ -511,7 +511,7 @@ static void lfrfid_cli_raw_emulate(Cli* cli, FuriString* args) {
         while(true) {
             uint32_t flags = furi_event_flag_wait(event, available_flags, FuriFlagWaitAny, 100);
 
-            if(flags != FuriFlagErrorTimeout) {
+            if(flags != (unsigned)FuriFlagErrorTimeout) {
                 if(FURI_BIT(flags, LFRFIDWorkerEmulateRawFileError)) {
                     printf("File is not RFID raw file\r\n");
                     break;
@@ -574,4 +574,4 @@ static void lfrfid_cli(Cli* cli, FuriString* args, void* context) {
     }
 
     furi_string_free(cmd);
-}
+}

applications/main/nfc/scenes/nfc_scene_emulate_uid.c

@@ -39,7 +39,7 @@ static void nfc_scene_emulate_uid_widget_config(Nfc* nfc, bool data_received) {
 
     widget_add_icon_element(widget, 0, 3, &I_NFC_dolphin_emulation_47x61);
     widget_add_string_element(widget, 57, 13, AlignLeft, AlignTop, FontPrimary, "Emulating UID");
-    if(strcmp(nfc->dev->dev_name, "")) {
+    if(strcmp(nfc->dev->dev_name, "") != 0) {
         furi_string_printf(info_str, "%s", nfc->dev->dev_name);
     } else {
         for(uint8_t i = 0; i < data->uid_len; i++) {

applications/main/nfc/scenes/nfc_scene_extra_actions.c

@@ -43,7 +43,7 @@ bool nfc_scene_extra_actions_on_event(void* context, SceneManagerEvent event) {
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == SubmenuIndexMfClassicKeys) {
-            if(mf_classic_dict_check_presence(MfClassicDictTypeFlipper)) {
+            if(mf_classic_dict_check_presence(MfClassicDictTypeSystem)) {
                 scene_manager_next_scene(nfc->scene_manager, NfcSceneMfClassicKeys);
             } else {
                 scene_manager_next_scene(nfc->scene_manager, NfcSceneDictNotFound);

applications/main/nfc/scenes/nfc_scene_mf_classic_dict_attack.c

@@ -53,10 +53,10 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(Nfc* nfc, DictAttackSt
     // Setup view
     if(state == DictAttackStateUserDictInProgress) {
         worker_state = NfcWorkerStateMfClassicDictAttack;
-        dict_attack_set_header(nfc->dict_attack, "Mf Classic User Dict.");
+        dict_attack_set_header(nfc->dict_attack, "MF Classic User Dictionary");
         dict = mf_classic_dict_alloc(MfClassicDictTypeUser);
 
-        // If failed to load user dictionary - try flipper dictionary
+        // If failed to load user dictionary - try the system dictionary
         if(!dict) {
             FURI_LOG_E(TAG, "User dictionary not found");
             state = DictAttackStateFlipperDictInProgress;
@@ -64,11 +64,11 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(Nfc* nfc, DictAttackSt
     }
     if(state == DictAttackStateFlipperDictInProgress) {
         worker_state = NfcWorkerStateMfClassicDictAttack;
-        dict_attack_set_header(nfc->dict_attack, "Mf Classic Flipper Dict.");
-        dict = mf_classic_dict_alloc(MfClassicDictTypeFlipper);
+        dict_attack_set_header(nfc->dict_attack, "MF Classic System Dictionary");
+        dict = mf_classic_dict_alloc(MfClassicDictTypeSystem);
         if(!dict) {
             FURI_LOG_E(TAG, "Flipper dictionary not found");
-            // Pass through to let worker handle the failure
+            // Pass through to let the worker handle the failure
         }
     }
     // Free previous dictionary
@@ -153,6 +153,15 @@ bool nfc_scene_mf_classic_dict_attack_on_event(void* context, SceneManagerEvent
                 nfc_worker_stop(nfc->worker);
                 consumed = true;
             }
+        } else if(event.event == NfcWorkerEventKeyAttackStart) {
+            dict_attack_set_key_attack(
+                nfc->dict_attack,
+                true,
+                nfc->dev->dev_data.mf_classic_dict_attack_data.current_sector);
+        } else if(event.event == NfcWorkerEventKeyAttackStop) {
+            dict_attack_set_key_attack(nfc->dict_attack, false, 0);
+        } else if(event.event == NfcWorkerEventKeyAttackNextSector) {
+            dict_attack_inc_key_attack_current_sector(nfc->dict_attack);
         }
     } else if(event.type == SceneManagerEventTypeBack) {
         scene_manager_next_scene(nfc->scene_manager, NfcSceneExitConfirm);

applications/main/nfc/scenes/nfc_scene_mf_classic_emulate.c

@@ -18,7 +18,7 @@ void nfc_scene_mf_classic_emulate_on_enter(void* context) {
     // Setup view
     Popup* popup = nfc->popup;
     popup_set_header(popup, "Emulating", 67, 13, AlignLeft, AlignTop);
-    if(strcmp(nfc->dev->dev_name, "")) {
+    if(strcmp(nfc->dev->dev_name, "") != 0) {
         nfc_text_store_set(nfc, "%s", nfc->dev->dev_name);
     } else {
         nfc_text_store_set(nfc, "MIFARE\nClassic");

applications/main/nfc/scenes/nfc_scene_mf_classic_keys.c

@@ -12,7 +12,7 @@ void nfc_scene_mf_classic_keys_on_enter(void* context) {
 
     // Load flipper dict keys total
     uint32_t flipper_dict_keys_total = 0;
-    MfClassicDict* dict = mf_classic_dict_alloc(MfClassicDictTypeFlipper);
+    MfClassicDict* dict = mf_classic_dict_alloc(MfClassicDictTypeSystem);
     if(dict) {
         flipper_dict_keys_total = mf_classic_dict_get_total_keys(dict);
         mf_classic_dict_free(dict);
@@ -26,11 +26,11 @@ void nfc_scene_mf_classic_keys_on_enter(void* context) {
     }
 
     widget_add_string_element(
-        nfc->widget, 0, 0, AlignLeft, AlignTop, FontPrimary, "Mifare Classic Keys");
+        nfc->widget, 0, 0, AlignLeft, AlignTop, FontPrimary, "MIFARE Classic Keys");
     char temp_str[32];
-    snprintf(temp_str, sizeof(temp_str), "Flipper list: %ld", flipper_dict_keys_total);
+    snprintf(temp_str, sizeof(temp_str), "System dict: %lu", flipper_dict_keys_total);
     widget_add_string_element(nfc->widget, 0, 20, AlignLeft, AlignTop, FontSecondary, temp_str);
-    snprintf(temp_str, sizeof(temp_str), "User list: %ld", user_dict_keys_total);
+    snprintf(temp_str, sizeof(temp_str), "User dict: %lu", user_dict_keys_total);
     widget_add_string_element(nfc->widget, 0, 32, AlignLeft, AlignTop, FontSecondary, temp_str);
     widget_add_button_element(
         nfc->widget, GuiButtonTypeCenter, "Add", nfc_scene_mf_classic_keys_widget_callback, nfc);

applications/main/nfc/scenes/nfc_scene_mf_classic_keys_list.c

@@ -27,7 +27,7 @@ void nfc_scene_mf_classic_keys_list_prepare(Nfc* nfc, MfClassicDict* dict) {
         char* current_key = (char*)malloc(sizeof(char) * 13);
         strncpy(current_key, furi_string_get_cstr(temp_key), 12);
         MfClassicUserKeys_push_back(nfc->mfc_key_strs, current_key);
-        FURI_LOG_D("ListKeys", "Key %ld: %s", index, current_key);
+        FURI_LOG_D("ListKeys", "Key %lu: %s", index, current_key);
         submenu_add_item(
             submenu, current_key, index++, nfc_scene_mf_classic_keys_list_submenu_callback, nfc);
     }

applications/main/nfc/scenes/nfc_scene_mf_desfire_read_success.c

@@ -26,13 +26,13 @@ void nfc_scene_mf_desfire_read_success_on_enter(void* context) {
         furi_string_cat_printf(temp_str, " %02X", nfc_data->uid[i]);
     }
 
-    uint32_t bytes_total = 1 << (data->version.sw_storage >> 1);
+    uint32_t bytes_total = 1UL << (data->version.sw_storage >> 1);
     uint32_t bytes_free = data->free_memory ? data->free_memory->bytes : 0;
-    furi_string_cat_printf(temp_str, "\n%ld", bytes_total);
+    furi_string_cat_printf(temp_str, "\n%lu", bytes_total);
     if(data->version.sw_storage & 1) {
         furi_string_push_back(temp_str, '+');
     }
-    furi_string_cat_printf(temp_str, " bytes, %ld bytes free\n", bytes_free);
+    furi_string_cat_printf(temp_str, " bytes, %lu bytes free\n", bytes_free);
 
     uint16_t n_apps = 0;
     uint16_t n_files = 0;

applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c

@@ -21,7 +21,7 @@ void nfc_scene_mf_ultralight_emulate_on_enter(void* context) {
                          (type == MfUltralightTypeUnknown);
     Popup* popup = nfc->popup;
     popup_set_header(popup, "Emulating", 67, 13, AlignLeft, AlignTop);
-    if(strcmp(nfc->dev->dev_name, "")) {
+    if(strcmp(nfc->dev->dev_name, "") != 0) {
         nfc_text_store_set(nfc, "%s", nfc->dev->dev_name);
     } else if(is_ultralight) {
         nfc_text_store_set(nfc, "MIFARE\nUltralight");

applications/main/nfc/scenes/nfc_scene_nfc_data_info.c

@@ -57,13 +57,13 @@ void nfc_scene_nfc_data_info_on_enter(void* context) {
     // Set application specific data
     if(protocol == NfcDeviceProtocolMifareDesfire) {
         MifareDesfireData* data = &dev_data->mf_df_data;
-        uint32_t bytes_total = 1 << (data->version.sw_storage >> 1);
+        uint32_t bytes_total = 1UL << (data->version.sw_storage >> 1);
         uint32_t bytes_free = data->free_memory ? data->free_memory->bytes : 0;
-        furi_string_cat_printf(temp_str, "\n%ld", bytes_total);
+        furi_string_cat_printf(temp_str, "\n%lu", bytes_total);
         if(data->version.sw_storage & 1) {
             furi_string_push_back(temp_str, '+');
         }
-        furi_string_cat_printf(temp_str, " bytes, %ld bytes free\n", bytes_free);
+        furi_string_cat_printf(temp_str, " bytes, %lu bytes free\n", bytes_free);
 
         uint16_t n_apps = 0;
         uint16_t n_files = 0;
@@ -147,4 +147,4 @@ void nfc_scene_nfc_data_info_on_exit(void* context) {
     Nfc* nfc = context;
 
     widget_reset(nfc->widget);
-}
+}

applications/main/nfc/scenes/nfc_scene_read.c

@@ -71,7 +71,7 @@ bool nfc_scene_read_on_event(void* context, SceneManagerEvent event) {
         } else if(event.event == NfcWorkerEventReadMfUltralight) {
             notification_message(nfc->notifications, &sequence_success);
             // Set unlock password input to 0xFFFFFFFF only on fresh read
-            memset(nfc->byte_input_store, 0xFF, 4);
+            memset(nfc->byte_input_store, 0xFF, sizeof(nfc->byte_input_store));
             scene_manager_next_scene(nfc->scene_manager, NfcSceneMfUltralightReadSuccess);
             DOLPHIN_DEED(DolphinDeedNfcReadSuccess);
             consumed = true;
@@ -91,7 +91,7 @@ bool nfc_scene_read_on_event(void* context, SceneManagerEvent event) {
             DOLPHIN_DEED(DolphinDeedNfcReadSuccess);
             consumed = true;
         } else if(event.event == NfcWorkerEventReadMfClassicDictAttackRequired) {
-            if(mf_classic_dict_check_presence(MfClassicDictTypeFlipper)) {
+            if(mf_classic_dict_check_presence(MfClassicDictTypeSystem)) {
                 scene_manager_next_scene(nfc->scene_manager, NfcSceneMfClassicDictAttack);
             } else {
                 scene_manager_next_scene(nfc->scene_manager, NfcSceneDictNotFound);

applications/main/nfc/scenes/nfc_scene_save_name.c

@@ -55,7 +55,7 @@ bool nfc_scene_save_name_on_event(void* context, SceneManagerEvent event) {
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == NfcCustomEventTextInputDone) {
-            if(strcmp(nfc->dev->dev_name, "")) {
+            if(strcmp(nfc->dev->dev_name, "") != 0) {
                 nfc_device_delete(nfc->dev, true);
             }
             if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneSetUid)) {

applications/main/nfc/views/dict_attack.c

@@ -24,6 +24,8 @@ typedef struct {
     uint8_t keys_found;
     uint16_t dict_keys_total;
     uint16_t dict_keys_current;
+    bool is_key_attack;
+    uint8_t key_attack_current_sector;
 } DictAttackViewModel;
 
 static void dict_attack_draw_callback(Canvas* canvas, void* model) {
@@ -36,10 +38,19 @@ static void dict_attack_draw_callback(Canvas* canvas, void* model) {
             canvas, 64, 23, AlignCenter, AlignTop, "Make sure the tag is\npositioned correctly.");
     } else if(m->state == DictAttackStateRead) {
         char draw_str[32] = {};
-        canvas_set_font(canvas, FontPrimary);
-        canvas_draw_str_aligned(
-            canvas, 64, 2, AlignCenter, AlignTop, furi_string_get_cstr(m->header));
         canvas_set_font(canvas, FontSecondary);
+        canvas_draw_str_aligned(
+            canvas, 64, 0, AlignCenter, AlignTop, furi_string_get_cstr(m->header));
+        if(m->is_key_attack) {
+            snprintf(
+                draw_str,
+                sizeof(draw_str),
+                "Reuse key check for sector: %d",
+                m->key_attack_current_sector);
+        } else {
+            snprintf(draw_str, sizeof(draw_str), "Unlocking sector: %d", m->sector_current);
+        }
+        canvas_draw_str_aligned(canvas, 0, 10, AlignLeft, AlignTop, draw_str);
         float dict_progress = m->dict_keys_total == 0 ?
                                   0 :
                                   (float)(m->dict_keys_current) / (float)(m->dict_keys_total);
@@ -49,13 +60,14 @@ static void dict_attack_draw_callback(Canvas* canvas, void* model) {
         if(progress > 1.0) {
             progress = 1.0;
         }
-        elements_progress_bar(canvas, 5, 15, 120, progress);
+        snprintf(draw_str, sizeof(draw_str), "%d/%d", m->dict_keys_current, m->dict_keys_total);
+        elements_progress_bar_with_text(canvas, 0, 20, 128, dict_progress, draw_str);
         canvas_set_font(canvas, FontSecondary);
         snprintf(draw_str, sizeof(draw_str), "Keys found: %d/%d", m->keys_found, m->keys_total);
-        canvas_draw_str_aligned(canvas, 1, 28, AlignLeft, AlignTop, draw_str);
+        canvas_draw_str_aligned(canvas, 0, 33, AlignLeft, AlignTop, draw_str);
         snprintf(
             draw_str, sizeof(draw_str), "Sectors Read: %d/%d", m->sectors_read, m->sectors_total);
-        canvas_draw_str_aligned(canvas, 1, 40, AlignLeft, AlignTop, draw_str);
+        canvas_draw_str_aligned(canvas, 0, 43, AlignLeft, AlignTop, draw_str);
     }
     elements_button_center(canvas, "Skip");
 }
@@ -113,6 +125,7 @@ void dict_attack_reset(DictAttack* dict_attack) {
             model->keys_found = 0;
             model->dict_keys_total = 0;
             model->dict_keys_current = 0;
+            model->is_key_attack = false;
             furi_string_reset(model->header);
         },
         false);
@@ -235,3 +248,28 @@ void dict_attack_inc_current_dict_key(DictAttack* dict_attack, uint16_t keys_tri
         },
         true);
 }
+
+void dict_attack_set_key_attack(DictAttack* dict_attack, bool is_key_attack, uint8_t sector) {
+    furi_assert(dict_attack);
+    with_view_model(
+        dict_attack->view,
+        DictAttackViewModel * model,
+        {
+            model->is_key_attack = is_key_attack;
+            model->key_attack_current_sector = sector;
+        },
+        true);
+}
+
+void dict_attack_inc_key_attack_current_sector(DictAttack* dict_attack) {
+    furi_assert(dict_attack);
+    with_view_model(
+        dict_attack->view,
+        DictAttackViewModel * model,
+        {
+            if(model->key_attack_current_sector < model->sectors_total) {
+                model->key_attack_current_sector++;
+            }
+        },
+        true);
+}

applications/main/nfc/views/dict_attack.h

@@ -38,3 +38,7 @@ void dict_attack_inc_keys_found(DictAttack* dict_attack);
 void dict_attack_set_total_dict_keys(DictAttack* dict_attack, uint16_t dict_keys_total);
 
 void dict_attack_inc_current_dict_key(DictAttack* dict_attack, uint16_t keys_tried);
+
+void dict_attack_set_key_attack(DictAttack* dict_attack, bool is_key_attack, uint8_t sector);
+
+void dict_attack_inc_key_attack_current_sector(DictAttack* dict_attack);

applications/main/subghz/helpers/subghz_frequency_analyzer_worker.c

@@ -2,6 +2,7 @@
 #include <lib/drivers/cc1101.h>
 
 #include <furi.h>
+#include <float_tools.h>
 
 #define TAG "SubghzFrequencyAnalyzerWorker"
 
@@ -200,7 +201,7 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
             rssi_temp = frequency_rssi.rssi_fine;
             frequency_temp = frequency_rssi.frequency_fine;
 
-            if(instance->filVal) {
+            if(!float_is_equal(instance->filVal, 0.f)) {
                 frequency_rssi.frequency_fine =
                     subghz_frequency_analyzer_worker_expRunningAverageAdaptive(
                         instance, frequency_rssi.frequency_fine);
@@ -225,7 +226,7 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
             instance->sample_hold_counter = 20;
             rssi_temp = frequency_rssi.rssi_coarse;
             frequency_temp = frequency_rssi.frequency_coarse;
-            if(instance->filVal) {
+            if(!float_is_equal(instance->filVal, 0.f)) {
                 frequency_rssi.frequency_coarse =
                     subghz_frequency_analyzer_worker_expRunningAverageAdaptive(
                         instance, frequency_rssi.frequency_coarse);

applications/main/subghz/scenes/subghz_scene_read_raw.c

@@ -3,6 +3,7 @@
 #include <dolphin/dolphin.h>
 #include <lib/subghz/protocols/raw.h>
 #include <lib/toolbox/path.h>
+#include <float_tools.h>
 
 #define RAW_FILE_NAME "RAW_"
 #define TAG "SubGhzSceneReadRAW"
@@ -370,7 +371,7 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) {
 
             float rssi = furi_hal_subghz_get_rssi();
 
-            if(subghz->txrx->raw_threshold_rssi == SUBGHZ_RAW_TRESHOLD_MIN) {
+            if(float_is_equal(subghz->txrx->raw_threshold_rssi, SUBGHZ_RAW_TRESHOLD_MIN)) {
                 subghz_read_raw_add_data_rssi(subghz->subghz_read_raw, rssi, true);
                 subghz_protocol_raw_save_to_file_pause(
                     (SubGhzProtocolDecoderRAW*)subghz->txrx->decoder_result, false);

applications/main/subghz/scenes/subghz_scene_save_name.c

@@ -97,7 +97,7 @@ bool subghz_scene_save_name_on_event(void* context, SceneManagerEvent event) {
         return true;
     } else if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == SubGhzCustomEventSceneSaveName) {
-            if(strcmp(subghz->file_name_tmp, "")) {
+            if(strcmp(subghz->file_name_tmp, "") != 0) {
                 furi_string_cat_printf(
                     subghz->file_path, "/%s%s", subghz->file_name_tmp, SUBGHZ_APP_EXTENSION);
                 if(subghz_path_is_file(subghz->file_path_tmp)) {

applications/main/subghz/scenes/subghz_scene_set_type.c

@@ -48,7 +48,7 @@ bool subghz_scene_set_type_submenu_gen_data_protocol(
 
         uint8_t key_data[sizeof(uint64_t)] = {0};
         for(size_t i = 0; i < sizeof(uint64_t); i++) {
-            key_data[sizeof(uint64_t) - i - 1] = (key >> i * 8) & 0xFF;
+            key_data[sizeof(uint64_t) - i - 1] = (key >> (i * 8)) & 0xFF;
         }
         if(!flipper_format_update_hex(subghz->txrx->fff_data, "Key", key_data, sizeof(uint64_t))) {
             FURI_LOG_E(TAG, "Unable to update Key");

applications/main/subghz/subghz_cli.c

@@ -147,11 +147,11 @@ void subghz_cli_command_tx(Cli* cli, FuriString* args, void* context) {
         "Protocol: Princeton\n"
         "Bit: 24\n"
         "Key: 00 00 00 00 00 %02X %02X %02X\n"
-        "TE: %ld\n"
-        "Repeat: %ld\n",
-        (uint8_t)((key >> 16) & 0xFF),
-        (uint8_t)((key >> 8) & 0xFF),
-        (uint8_t)(key & 0xFF),
+        "TE: %lu\n"
+        "Repeat: %lu\n",
+        (uint8_t)((key >> 16) & 0xFFU),
+        (uint8_t)((key >> 8) & 0xFFU),
+        (uint8_t)(key & 0xFFU),
         te,
         repeat);
     FlipperFormat* flipper_format = flipper_format_string_alloc();
@@ -295,7 +295,7 @@ void subghz_cli_command_rx(Cli* cli, FuriString* args, void* context) {
 
     furi_hal_power_suppress_charge_exit();
 
-    printf("\r\nPackets received %u\r\n", instance->packet_count);
+    printf("\r\nPackets received %zu\r\n", instance->packet_count);
 
     // Cleanup
     subghz_receiver_free(receiver);

applications/main/subghz/subghz_i.c

@@ -164,7 +164,7 @@ bool subghz_tx_start(SubGhz* subghz, FlipperFormat* flipper_format) {
 
         if(subghz->txrx->transmitter) {
             if(subghz_transmitter_deserialize(subghz->txrx->transmitter, flipper_format)) {
-                if(strcmp(furi_string_get_cstr(subghz->txrx->preset->name), "")) {
+                if(strcmp(furi_string_get_cstr(subghz->txrx->preset->name), "") != 0) {
                     subghz_begin(
                         subghz,
                         subghz_setting_get_preset_data_by_name(
@@ -551,11 +551,8 @@ void subghz_hopper_update(SubGhz* subghz) {
 
     switch(subghz->txrx->hopper_state) {
     case SubGhzHopperStateOFF:
-        return;
-        break;
     case SubGhzHopperStatePause:
         return;
-        break;
     case SubGhzHopperStateRSSITimeOut:
         if(subghz->txrx->hopper_timeout != 0) {
             subghz->txrx->hopper_timeout--;

applications/main/subghz/views/receiver.c

@@ -360,7 +360,8 @@ bool subghz_view_receiver_input(InputEvent* event, void* context) {
             subghz_receiver->view,
             SubGhzViewReceiverModel * model,
             {
-                if(model->idx != model->history_item - 1) model->idx++;
+                if((model->history_item != 0) && (model->idx != model->history_item - 1))
+                    model->idx++;
             },
             true);
     } else if(event->key == InputKeyLeft && event->type == InputTypeShort) {

applications/main/subghz/views/subghz_frequency_analyzer.c

@@ -10,6 +10,7 @@
 #include "../helpers/subghz_frequency_analyzer_worker.h"
 
 #include <assets_icons.h>
+#include <float_tools.h>
 
 #define TAG "frequency_analyzer"
 
@@ -425,7 +426,7 @@ void subghz_frequency_analyzer_pair_callback(
     float rssi,
     bool signal) {
     SubGhzFrequencyAnalyzer* instance = context;
-    if((rssi == 0.f) && (instance->locked)) {
+    if(float_is_equal(rssi, 0.f) && instance->locked) {
         if(instance->callback) {
             instance->callback(SubGhzCustomEventSceneAnalyzerUnlock, instance->context);
         }

applications/main/subghz/views/subghz_read_raw.c

@@ -92,7 +92,7 @@ void subghz_read_raw_update_sample_write(SubGhzReadRAW* instance, size_t sample)
     with_view_model(
         instance->view,
         SubGhzReadRAWModel * model,
-        { furi_string_printf(model->sample_write, "%d spl.", sample); },
+        { furi_string_printf(model->sample_write, "%zu spl.", sample); },
         false);
 }
 
@@ -162,7 +162,7 @@ void subghz_read_raw_draw_sin(Canvas* canvas, SubGhzReadRAWModel* model) {
         canvas_draw_line(
             canvas,
             i + 1,
-            32 - subghz_read_raw_tab_sin((i + model->ind_sin * 16)) / SUBGHZ_RAW_SIN_AMPLITUDE,
+            32 - subghz_read_raw_tab_sin(i + model->ind_sin * 16) / SUBGHZ_RAW_SIN_AMPLITUDE,
             i + 2,
             32 + subghz_read_raw_tab_sin((i + model->ind_sin * 16 + 1) * 2) /
                      SUBGHZ_RAW_SIN_AMPLITUDE);

applications/main/subghz/views/subghz_test_packet.c

@@ -114,7 +114,7 @@ static void subghz_test_packet_draw(Canvas* canvas, SubGhzTestPacketModel* model
     snprintf(buffer, sizeof(buffer), "Path: %d - %s", model->path, path_name);
     canvas_draw_str(canvas, 0, 31, buffer);
 
-    snprintf(buffer, sizeof(buffer), "Packets: %d", model->packets);
+    snprintf(buffer, sizeof(buffer), "Packets: %zu", model->packets);
     canvas_draw_str(canvas, 0, 42, buffer);
 
     if(model->status == SubGhzTestPacketModelStatusRx) {

applications/main/u2f/scenes/u2f_scene_main.c

@@ -58,7 +58,7 @@ bool u2f_scene_main_on_event(void* context, SceneManagerEvent event) {
                 app->event_cur = event.event;
                 if(event.event == U2fCustomEventRegister)
                     u2f_view_set_state(app->u2f_view, U2fMsgRegister);
-                else if(event.event == U2fCustomEventAuth)
+                else if(event.event == U2fCustomEventAuth) //-V547
                     u2f_view_set_state(app->u2f_view, U2fMsgAuth);
                 notification_message(app->notifications, &sequence_display_backlight_on);
                 notification_message(app->notifications, &sequence_single_vibro);

applications/main/u2f/u2f_data.c

@@ -402,9 +402,9 @@ bool u2f_data_cnt_read(uint32_t* cnt_val) {
                 FURI_LOG_E(TAG, "Unable to load encryption key");
                 break;
             }
-            memset(&cnt, 0, 32);
-            if(!furi_hal_crypto_decrypt(cnt_encr, (uint8_t*)&cnt, 32)) {
-                memset(&cnt, 0, 32);
+            memset(&cnt, 0, sizeof(U2fCounterData));
+            if(!furi_hal_crypto_decrypt(cnt_encr, (uint8_t*)&cnt, sizeof(U2fCounterData))) {
+                memset(&cnt, 0, sizeof(U2fCounterData));
                 FURI_LOG_E(TAG, "Decryption failed");
                 break;
             }

applications/main/u2f/u2f_hid.c

@@ -94,7 +94,7 @@ static void u2f_hid_send_response(U2fHid* u2f_hid) {
     uint16_t data_ptr = 0;
 
     memset(packet_buf, 0, HID_U2F_PACKET_LEN);
-    memcpy(packet_buf, &(u2f_hid->packet.cid), 4);
+    memcpy(packet_buf, &(u2f_hid->packet.cid), sizeof(uint32_t)); //-V1086
 
     // Init packet
     packet_buf[4] = u2f_hid->packet.cmd;
@@ -166,7 +166,7 @@ static bool u2f_hid_parse_request(U2fHid* u2f_hid) {
             return false;
         u2f_hid->packet.len = 17;
         uint32_t random_cid = furi_hal_random_get();
-        memcpy(&(u2f_hid->packet.payload[8]), &random_cid, 4);
+        memcpy(&(u2f_hid->packet.payload[8]), &random_cid, sizeof(uint32_t)); //-V1086
         u2f_hid->packet.payload[12] = 2; // Protocol version
         u2f_hid->packet.payload[13] = 1; // Device version major
         u2f_hid->packet.payload[14] = 0; // Device version minor
@@ -177,7 +177,7 @@ static bool u2f_hid_parse_request(U2fHid* u2f_hid) {
     } else if(u2f_hid->packet.cmd == U2F_HID_WINK) { // WINK - notify user
         if(u2f_hid->packet.len != 0) return false;
         u2f_wink(u2f_hid->u2f_instance);
-        u2f_hid->packet.len = 0;
+        u2f_hid->packet.len = 0; //-V1048
         u2f_hid_send_response(u2f_hid);
     } else
         return false;

applications/plugins/barcode_generator/barcode_generator.c

@@ -12,40 +12,88 @@ void init_types() {
     upcA->name = "UPC-A";
     upcA->numberOfDigits = 12;
     upcA->startPos = 19;
+    upcA->bartype = BarTypeUPCA;
     barcodeTypes[0] = upcA;
 
     BarcodeType* ean8 = malloc(sizeof(BarcodeType));
     ean8->name = "EAN-8";
     ean8->numberOfDigits = 8;
     ean8->startPos = 33;
+    ean8->bartype = BarTypeEAN8;
     barcodeTypes[1] = ean8;
+
+    BarcodeType* ean13 = malloc(sizeof(BarcodeType));
+    ean13->name = "EAN-13";
+    ean13->numberOfDigits = 13;
+    ean13->startPos = 19;
+    ean13->bartype = BarTypeEAN13;
+    barcodeTypes[2] = ean13;
 }
 
-void draw_digit(Canvas* canvas, int digit, bool rightHand, int startingPosition) {
+void draw_digit(
+    Canvas* canvas,
+    int digit,
+    BarEncodingType rightHand,
+    int startingPosition,
+    bool drawlines) {
     char digitStr[2];
     snprintf(digitStr, 2, "%u", digit);
     canvas_set_color(canvas, ColorBlack);
     canvas_draw_str(
         canvas, startingPosition, BARCODE_Y_START + BARCODE_HEIGHT + BARCODE_TEXT_OFFSET, digitStr);
-    if(rightHand) {
-        canvas_set_color(canvas, ColorBlack);
-    } else {
-        canvas_set_color(canvas, ColorWhite);
-    }
 
-    int count = 0;
-    for(int i = 0; i < 4; i++) {
-        canvas_draw_box(
-            canvas, startingPosition + count, BARCODE_Y_START, DIGITS[digit][i], BARCODE_HEIGHT);
-        canvas_invert_color(canvas);
-        count += DIGITS[digit][i];
+    if(drawlines) {
+        switch(rightHand) {
+        case BarEncodingTypeLeft:
+        case BarEncodingTypeRight:
+            canvas_set_color(
+                canvas, (rightHand == BarEncodingTypeRight) ? ColorBlack : ColorWhite);
+            //int count = 0;
+            for(int i = 0; i < 4; i++) {
+                canvas_draw_box(
+                    canvas, startingPosition, BARCODE_Y_START, DIGITS[digit][i], BARCODE_HEIGHT);
+                canvas_invert_color(canvas);
+                startingPosition += DIGITS[digit][i];
+            }
+            break;
+        case BarEncodingTypeG:
+            canvas_set_color(canvas, ColorWhite);
+            //int count = 0;
+            for(int i = 3; i >= 0; i--) {
+                canvas_draw_box(
+                    canvas, startingPosition, BARCODE_Y_START, DIGITS[digit][i], BARCODE_HEIGHT);
+                canvas_invert_color(canvas);
+                startingPosition += DIGITS[digit][i];
+            }
+            break;
+        default:
+            break;
+        }
     }
 }
 
 int get_digit_position(int index, BarcodeType* type) {
-    int pos = type->startPos + index * 7;
-    if(index >= type->numberOfDigits / 2) {
-        pos += 5;
+    int pos = 0;
+    switch(type->bartype) {
+    case BarTypeEAN8:
+    case BarTypeUPCA:
+        pos = type->startPos + index * 7;
+        if(index >= type->numberOfDigits / 2) {
+            pos += 5;
+        }
+        break;
+    case BarTypeEAN13:
+        if(index == 0)
+            pos = type->startPos - 10;
+        else {
+            pos = type->startPos + (index - 1) * 7;
+            if((index - 1) >= type->numberOfDigits / 2) {
+                pos += 5;
+            }
+        }
+        break;
+    default:
+        break;
     }
     return pos;
 }
@@ -54,18 +102,30 @@ int get_menu_text_location(int index) {
     return 20 + 10 * index;
 }
 
+int get_barcode_max_index(PluginState* plugin_state) {
+    return plugin_state->doParityCalculation ?
+               barcodeTypes[plugin_state->barcodeTypeIndex]->numberOfDigits - 1 :
+               barcodeTypes[plugin_state->barcodeTypeIndex]->numberOfDigits;
+}
+
 int calculate_check_digit(PluginState* plugin_state, BarcodeType* type) {
     int checkDigit = 0;
+    int checkDigitOdd = 0;
+    int checkDigitEven = 0;
     //add all odd positions. Confusing because 0index
     for(int i = 0; i < type->numberOfDigits - 1; i += 2) {
-        checkDigit += plugin_state->barcodeNumeral[i];
+        checkDigitOdd += plugin_state->barcodeNumeral[i];
     }
 
-    checkDigit = checkDigit * 3; //times 3
-
     //add all even positions to above. Confusing because 0index
     for(int i = 1; i < type->numberOfDigits - 1; i += 2) {
-        checkDigit += plugin_state->barcodeNumeral[i];
+        checkDigitEven += plugin_state->barcodeNumeral[i];
+    }
+
+    if(type->bartype == BarTypeEAN13) {
+        checkDigit = checkDigitEven * 3 + checkDigitOdd;
+    } else {
+        checkDigit = checkDigitOdd * 3 + checkDigitEven;
     }
 
     checkDigit = checkDigit % 10; //mod 10
@@ -103,34 +163,57 @@ static void render_callback(Canvas* const canvas, void* ctx) {
             AlignCenter,
             (barcodeTypes[plugin_state->barcodeTypeIndex])->name);
         canvas_draw_disc(
-            canvas, 40, get_menu_text_location(plugin_state->menuIndex) - 1, 2); //draw menu cursor
+            canvas,
+            40,
+            get_menu_text_location(plugin_state->menuIndex) - 1,
+            2); //draw menu cursor
     } else {
         BarcodeType* type = barcodeTypes[plugin_state->barcodeTypeIndex];
 
+        //start saftey
         canvas_set_color(canvas, ColorBlack);
         canvas_draw_box(canvas, type->startPos - 3, BARCODE_Y_START, 1, BARCODE_HEIGHT + 2);
-        canvas_draw_box(
-            canvas,
-            (type->startPos - 1),
-            BARCODE_Y_START,
-            1,
-            BARCODE_HEIGHT + 2); //start saftey
+        canvas_draw_box(canvas, (type->startPos - 1), BARCODE_Y_START, 1, BARCODE_HEIGHT + 2);
 
-        for(int index = 0; index < type->numberOfDigits; index++) {
-            bool isOnRight = false;
-            if(index >= type->numberOfDigits / 2) {
-                isOnRight = true;
-            }
-            if((index == type->numberOfDigits - 1) &&
-               (plugin_state->doParityCalculation)) { //calculate the check digit
-                int checkDigit = calculate_check_digit(plugin_state, type);
-                plugin_state->barcodeNumeral[type->numberOfDigits - 1] = checkDigit;
+        int startpos = 0;
+        int endpos = type->numberOfDigits;
+        if(type->bartype == BarTypeEAN13) {
+            startpos++;
+            draw_digit(
+                canvas,
+                plugin_state->barcodeNumeral[0],
+                BarEncodingTypeRight,
+                get_digit_position(0, barcodeTypes[plugin_state->barcodeTypeIndex]),
+                false);
+        }
+        if(plugin_state->doParityCalculation) { //calculate the check digit
+            plugin_state->barcodeNumeral[type->numberOfDigits - 1] =
+                calculate_check_digit(plugin_state, type);
+        }
+        for(int index = startpos; index < endpos; index++) {
+            BarEncodingType barEncodingType = BarEncodingTypeLeft;
+            if(type->bartype == BarTypeEAN13) {
+                if(index - 1 >= (type->numberOfDigits - 1) / 2) {
+                    barEncodingType = BarEncodingTypeRight;
+                } else {
+                    barEncodingType =
+                        (FURI_BIT(EAN13ENCODE[plugin_state->barcodeNumeral[0]], index - 1)) ?
+                            BarEncodingTypeG :
+                            BarEncodingTypeLeft;
+                }
+            } else {
+                if(index >= type->numberOfDigits / 2) {
+                    barEncodingType = BarEncodingTypeRight;
+                }
             }
+
             int digitPosition =
                 get_digit_position(index, barcodeTypes[plugin_state->barcodeTypeIndex]);
-            draw_digit(canvas, plugin_state->barcodeNumeral[index], isOnRight, digitPosition);
+            draw_digit(
+                canvas, plugin_state->barcodeNumeral[index], barEncodingType, digitPosition, true);
         }
 
+        //central separator
         canvas_set_color(canvas, ColorBlack);
         canvas_draw_box(canvas, 62, BARCODE_Y_START, 1, BARCODE_HEIGHT + 2);
         canvas_draw_box(canvas, 64, BARCODE_Y_START, 1, BARCODE_HEIGHT + 2);
@@ -147,15 +230,11 @@ static void render_callback(Canvas* const canvas, void* ctx) {
                 1); //draw editing cursor
         }
 
+        //end safety
         int endSafetyPosition = get_digit_position(type->numberOfDigits - 1, type) + 7;
         canvas_set_color(canvas, ColorBlack);
         canvas_draw_box(canvas, endSafetyPosition, BARCODE_Y_START, 1, BARCODE_HEIGHT + 2);
-        canvas_draw_box(
-            canvas,
-            (endSafetyPosition + 2),
-            BARCODE_Y_START,
-            1,
-            BARCODE_HEIGHT + 2); //end safety
+        canvas_draw_box(canvas, (endSafetyPosition + 2), BARCODE_Y_START, 1, BARCODE_HEIGHT + 2);
     }
 
     release_mutex((ValueMutex*)ctx, plugin_state);
@@ -169,7 +248,7 @@ static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queu
 }
 
 static void barcode_generator_state_init(PluginState* const plugin_state) {
-    for(int i = 0; i < 12; ++i) {
+    for(int i = 0; i < BARCODE_MAX_LENS; ++i) {
         plugin_state->barcodeNumeral[i] = i % 10;
     }
     plugin_state->editingIndex = 0;
@@ -194,9 +273,7 @@ static bool handle_key_press_view(InputKey key, PluginState* plugin_state) {
 }
 
 static bool handle_key_press_edit(InputKey key, PluginState* plugin_state) {
-    int barcodeMaxIndex = plugin_state->doParityCalculation ?
-                              barcodeTypes[plugin_state->barcodeTypeIndex]->numberOfDigits - 1 :
-                              barcodeTypes[plugin_state->barcodeTypeIndex]->numberOfDigits;
+    int barcodeMaxIndex = get_barcode_max_index(plugin_state);
 
     switch(key) {
     case InputKeyUp:
@@ -286,6 +363,9 @@ static bool handle_key_press_menu(InputKey key, PluginState* plugin_state) {
     default:
         break;
     }
+    int barcodeMaxIndex = get_barcode_max_index(plugin_state);
+    if(plugin_state->editingIndex >= barcodeMaxIndex)
+        plugin_state->editingIndex = barcodeMaxIndex - 1;
 
     return true;
 }

applications/plugins/barcode_generator/barcode_generator.h

@@ -1,7 +1,8 @@
 #define BARCODE_HEIGHT 50
 #define BARCODE_Y_START 3
 #define BARCODE_TEXT_OFFSET 9
-#define NUMBER_OF_BARCODE_TYPES 2
+#define BARCODE_MAX_LENS 13
+#define NUMBER_OF_BARCODE_TYPES 3
 #define MENU_INDEX_VIEW 0
 #define MENU_INDEX_EDIT 1
 #define MENU_INDEX_PARITY 2
@@ -23,14 +24,27 @@ typedef enum {
     MenuMode,
 } Mode;
 
+typedef enum {
+    BarEncodingTypeLeft,
+    BarEncodingTypeRight,
+    BarEncodingTypeG,
+} BarEncodingType;
+
+typedef enum {
+    BarTypeEAN8,
+    BarTypeUPCA,
+    BarTypeEAN13,
+} BarType;
+
 typedef struct {
     char* name;
     int numberOfDigits;
     int startPos;
+    BarType bartype;
 } BarcodeType;
 
 typedef struct {
-    int barcodeNumeral[12]; //The current barcode number
+    int barcodeNumeral[BARCODE_MAX_LENS]; //The current barcode number
     int editingIndex; //The index of the editing symbol
     int menuIndex; //The index of the menu cursor
     Mode mode; //View, edit or menu
@@ -50,3 +64,16 @@ static const int DIGITS[10][4] = {
     {1, 2, 1, 3},
     {3, 1, 1, 2},
 };
+
+static const uint8_t EAN13ENCODE[10] = {
+    0b000000,
+    0b110100,
+    0b101100,
+    0b011100,
+    0b110010,
+    0b100110,
+    0b001110,
+    0b101010,
+    0b011010,
+    0b010110,
+};

applications/plugins/dap_link/usb/dap_v2_usb.c

@@ -568,12 +568,12 @@ void dap_common_usb_set_state_callback(DapStateCallback callback) {
 static void* dap_usb_alloc_string_descr(const char* str) {
     furi_assert(str);
 
-    uint8_t len = strlen(str);
-    uint8_t wlen = (len + 1) * sizeof(uint16_t);
+    size_t len = strlen(str);
+    size_t wlen = (len + 1) * sizeof(uint16_t);
     struct usb_string_descriptor* dev_str_desc = malloc(wlen);
     dev_str_desc->bLength = wlen;
     dev_str_desc->bDescriptorType = USB_DTYPE_STRING;
-    for(uint8_t i = 0; i < len; i++) {
+    for(size_t i = 0; i < len; i++) {
         dev_str_desc->wString[i] = str[i];
     }
 
@@ -974,4 +974,4 @@ static usbd_respond hid_control(usbd_device* dev, usbd_ctlreq* req, usbd_rqc_cal
     }
 
     return usbd_fail;
-}
+}

applications/plugins/game_2048/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Eugene Kirzhanov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

applications/plugins/game_2048/README.md

@@ -0,0 +1,17 @@
+# "2048" game for Flipper Zero
+- play up to 65K
+- progress is saved on exit
+
+![Game screen](images/screenshot1.png)
+![Menu screen](images/screenshot2.png)
+
+#### TODO:
+ - add animations
+ 
+#### Thanks to:
+ - [DroomOne's FlappyBird](https://github.com/DroomOne/flipperzero-firmware/tree/dev/applications/flappy_bird)
+ - [x27's "15" Game](https://github.com/x27/flipperzero-game15)
+
+#### License
+[MIT](LICENSE)
+Copyright 2022 Eugene Kirzhanov

applications/plugins/game_2048/application.fam

@@ -0,0 +1,14 @@
+App(
+    appid="game_2048",
+    name="2048",
+    apptype=FlipperAppType.EXTERNAL,
+    entry_point="game_2048_app",
+    cdefines=["APP_GAME_2048"],
+    requires=[
+        "gui",
+    ],
+    stack_size=1 * 1024,
+    order=90,
+	fap_icon="game_2048.png",
+    fap_category="Games"
+)

applications/plugins/game_2048/array_utils.c

@@ -0,0 +1,40 @@
+#include "array_utils.h"
+
+void reverse_array(int length, uint8_t arr[length]) {
+    uint8_t tmp;
+    for(int low = 0, high = length - 1; low < high; low++, high--) {
+        tmp = arr[low];
+        arr[low] = arr[high];
+        arr[high] = tmp;
+    }
+}
+
+bool shift_array_to_left(int length, uint8_t arr[length], uint8_t from_index, uint8_t offset) {
+    if(from_index >= length) return false;
+    for(uint8_t i = from_index; i < length; i++) {
+        arr[i] = i < length - offset ? arr[i + offset] : 0;
+    }
+    return true;
+}
+
+void get_column_from_array(
+    int rows,
+    int cols,
+    uint8_t arr[rows][cols],
+    uint8_t column_index,
+    uint8_t* out) {
+    for(uint8_t i = 0; i < rows; i++) {
+        out[i] = arr[i][column_index];
+    }
+}
+
+void set_column_to_array(
+    int rows,
+    int cols,
+    uint8_t arr[rows][cols],
+    uint8_t column_index,
+    uint8_t* src) {
+    for(uint8_t i = 0; i < rows; i++) {
+        arr[i][column_index] = src[i];
+    }
+}

applications/plugins/game_2048/array_utils.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+void reverse_array(int length, uint8_t arr[length]);
+
+bool shift_array_to_left(int length, uint8_t arr[length], uint8_t from_index, uint8_t offset);
+
+void get_column_from_array(
+    int rows,
+    int cols,
+    uint8_t arr[rows][cols],
+    uint8_t column_index,
+    uint8_t* out);
+
+void set_column_to_array(
+    int rows,
+    int cols,
+    uint8_t arr[rows][cols],
+    uint8_t column_index,
+    uint8_t* src);

applications/plugins/game_2048/digits.h

@@ -0,0 +1,263 @@
+#pragma once
+
+#include <stdint.h>
+
+uint8_t digits[16][14][14] = {
+
+    // 2
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+
+    // 4
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+
+    // 8
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+
+    // 16
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0},
+     {0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0},
+     {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0},
+     {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0},
+     {0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0},
+     {0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0},
+     {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0},
+     {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0},
+     {0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0},
+     {0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+
+    // 32
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0},
+     {0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0},
+     {0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0},
+     {0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0},
+     {0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0},
+     {0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0},
+     {0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0},
+     {0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0},
+     {0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+
+    // 64
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0},
+     {0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0},
+     {0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0},
+     {0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0},
+     {0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0},
+     {0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0},
+     {0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0},
+     {0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0},
+     {0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0},
+     {0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+
+    // 128
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0},
+     {0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0},
+     {0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0},
+     {0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0},
+     {0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+
+    // 256
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0},
+     {0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0},
+     {0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0},
+     {0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0},
+     {0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+
+    // 512
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0},
+     {0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0},
+     {0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0},
+     {0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0},
+     {0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+
+    // 1K
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0},
+     {0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+
+    // 2K
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0},
+     {0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0},
+     {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+
+    // 4K
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0},
+     {0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+
+    // 8K
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0},
+     {0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0},
+     {0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0},
+     {0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+
+    // 16K
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0},
+     {0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0},
+     {0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0},
+     {0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+
+    // 32K
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0},
+     {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0},
+     {0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0},
+     {0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0},
+     {0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+
+    // 64K
+    {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0},
+     {0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0},
+     {0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0},
+     {0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0},
+     {0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}
+
+};

applications/plugins/game_2048/game_2048.c

@@ -0,0 +1,509 @@
+/* 
+ * Copyright 2022 Eugene Kirzhanov
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT
+ * 
+ * Thanks to:
+ *  - DroomOne: https://github.com/DroomOne/flipperzero-firmware
+ *  - x27: https://github.com/x27/flipperzero-game15
+ */
+
+#include <furi.h>
+#include <gui/gui.h>
+#include <input/input.h>
+#include <storage/storage.h>
+
+#include "digits.h"
+#include "array_utils.h"
+
+#define CELLS_COUNT 4
+#define CELL_INNER_SIZE 14
+#define FRAME_LEFT 10
+#define FRAME_TOP 1
+#define FRAME_SIZE 61
+
+#define SAVING_DIRECTORY "/ext/apps/Games"
+#define SAVING_FILENAME SAVING_DIRECTORY "/game_2048.save"
+
+typedef enum {
+    GameStateMenu,
+    GameStateInProgress,
+    GameStateGameOver,
+} State;
+
+typedef struct {
+    State state;
+    uint8_t table[CELLS_COUNT][CELLS_COUNT];
+    uint32_t score;
+    uint32_t moves;
+    int8_t selected_menu_item;
+    uint32_t top_score;
+} GameState;
+
+typedef struct {
+    uint32_t points;
+    bool is_table_updated;
+} MoveResult;
+
+#define MENU_ITEMS_COUNT 2
+static const char* popup_menu_strings[] = {"Resume", "New Game"};
+
+static void input_callback(InputEvent* input_event, void* ctx) {
+    furi_assert(ctx);
+    FuriMessageQueue* event_queue = ctx;
+    furi_message_queue_put(event_queue, input_event, FuriWaitForever);
+}
+
+static void draw_frame(Canvas* canvas) {
+    canvas_draw_frame(canvas, FRAME_LEFT, FRAME_TOP, FRAME_SIZE, FRAME_SIZE);
+
+    uint8_t offs = FRAME_LEFT + CELL_INNER_SIZE + 1;
+    for(uint8_t i = 0; i < CELLS_COUNT - 1; i++) {
+        canvas_draw_line(canvas, offs, FRAME_TOP + 1, offs, FRAME_TOP + FRAME_SIZE - 2);
+        offs += CELL_INNER_SIZE + 1;
+    }
+    offs = FRAME_TOP + CELL_INNER_SIZE + 1;
+    for(uint8_t i = 0; i < CELLS_COUNT - 1; i++) {
+        canvas_draw_line(canvas, FRAME_LEFT + 1, offs, FRAME_LEFT + FRAME_SIZE - 2, offs);
+        offs += CELL_INNER_SIZE + 1;
+    }
+}
+
+static void draw_digit(Canvas* canvas, uint8_t row, uint8_t column, uint8_t value) {
+    if(value == 0) return;
+
+    uint8_t left = FRAME_LEFT + 1 + (column * (CELL_INNER_SIZE + 1));
+    uint8_t top = FRAME_TOP + 1 + (row * (CELL_INNER_SIZE + 1));
+
+    for(uint8_t r = 0; r < CELL_INNER_SIZE; r++) {
+        for(u_int8_t c = 0; c < CELL_INNER_SIZE; c++) {
+            if(digits[value - 1][r][c] == 1) {
+                canvas_draw_dot(canvas, left + c, top + r);
+            }
+        }
+    }
+}
+
+static void draw_table(Canvas* canvas, const uint8_t table[CELLS_COUNT][CELLS_COUNT]) {
+    for(uint8_t row = 0; row < CELLS_COUNT; row++) {
+        for(uint8_t column = 0; column < CELLS_COUNT; column++) {
+            draw_digit(canvas, row, column, table[row][column]);
+        }
+    }
+}
+
+static void gray_canvas(Canvas* const canvas) {
+    canvas_set_color(canvas, ColorWhite);
+    for(int x = 0; x < 128; x += 2) {
+        for(int y = 0; y < 64; y++) {
+            canvas_draw_dot(canvas, x + (y % 2 == 1 ? 0 : 1), y);
+        }
+    }
+}
+
+static void draw_callback(Canvas* const canvas, void* ctx) {
+    const GameState* game_state = acquire_mutex((ValueMutex*)ctx, 25);
+    if(game_state == NULL) return;
+
+    canvas_clear(canvas);
+
+    draw_frame(canvas);
+    draw_table(canvas, game_state->table);
+
+    canvas_set_font(canvas, FontPrimary);
+    canvas_draw_str_aligned(canvas, 128, FRAME_TOP, AlignRight, AlignTop, "Score");
+    canvas_draw_str_aligned(canvas, 128, FRAME_TOP + 20, AlignRight, AlignTop, "Moves");
+    canvas_draw_str_aligned(canvas, 128, FRAME_TOP + 40, AlignRight, AlignTop, "Top Score");
+
+    int bufSize = 12;
+    char buf[bufSize];
+    snprintf(buf, sizeof(buf), "%lu", game_state->score);
+    canvas_set_font(canvas, FontSecondary);
+    canvas_draw_str_aligned(canvas, 128, FRAME_TOP + 10, AlignRight, AlignTop, buf);
+
+    memset(buf, 0, bufSize);
+    snprintf(buf, sizeof(buf), "%lu", game_state->moves);
+    canvas_set_font(canvas, FontSecondary);
+    canvas_draw_str_aligned(canvas, 128, FRAME_TOP + 30, AlignRight, AlignTop, buf);
+
+    memset(buf, 0, bufSize);
+    snprintf(buf, sizeof(buf), "%lu", game_state->top_score);
+    canvas_set_font(canvas, FontSecondary);
+    canvas_draw_str_aligned(canvas, 128, FRAME_TOP + 50, AlignRight, AlignTop, buf);
+
+    if(game_state->state == GameStateMenu) {
+        gray_canvas(canvas);
+
+        canvas_set_color(canvas, ColorWhite);
+        canvas_draw_rbox(canvas, 28, 16, 72, 32, 4);
+        canvas_set_color(canvas, ColorBlack);
+        canvas_draw_rframe(canvas, 28, 16, 72, 32, 4);
+
+        for(int i = 0; i < MENU_ITEMS_COUNT; i++) {
+            if(i == game_state->selected_menu_item) {
+                canvas_set_color(canvas, ColorBlack);
+                canvas_draw_box(canvas, 34, 20 + 12 * i, 60, 12);
+            }
+
+            canvas_set_color(
+                canvas, i == game_state->selected_menu_item ? ColorWhite : ColorBlack);
+            canvas_draw_str_aligned(
+                canvas, 64, 26 + 12 * i, AlignCenter, AlignCenter, popup_menu_strings[i]);
+        }
+
+    } else if(game_state->state == GameStateGameOver) {
+        gray_canvas(canvas);
+
+        bool record_broken = game_state->score > game_state->top_score;
+
+        canvas_set_color(canvas, ColorWhite);
+        canvas_draw_rbox(canvas, 14, 12, 100, 40, 4);
+
+        canvas_set_color(canvas, ColorBlack);
+        canvas_draw_line(canvas, 14, 26, 114, 26);
+        canvas_draw_rframe(canvas, 14, 12, 100, 40, 4);
+
+        canvas_set_font(canvas, FontPrimary);
+        canvas_draw_str_aligned(canvas, 64, 15, AlignCenter, AlignTop, "Game Over");
+
+        canvas_set_font(canvas, FontSecondary);
+        if(record_broken) {
+            canvas_draw_str_aligned(canvas, 64, 29, AlignCenter, AlignTop, "New Top Score!!!");
+        } else {
+            canvas_draw_str_aligned(canvas, 64, 29, AlignCenter, AlignTop, "Your Score");
+        }
+
+        memset(buf, 0, bufSize);
+        snprintf(buf, sizeof(buf), "%lu", game_state->score);
+        canvas_set_font(canvas, FontPrimary);
+        canvas_draw_str_aligned(canvas, 64, 48, AlignCenter, AlignBottom, buf);
+    }
+
+    release_mutex((ValueMutex*)ctx, game_state);
+}
+
+void calculate_move_to_left(uint8_t arr[], MoveResult* const move_result) {
+    uint8_t index = 0;
+    uint8_t next_index;
+    uint8_t offset;
+    bool was_moved;
+    while(index < CELLS_COUNT - 1) {
+        // find offset from [index] to next non-empty value
+        offset = 1;
+        while(index + offset < CELLS_COUNT && arr[index + offset] == 0) offset++;
+
+        // if all remaining values in this row are empty then go to next row
+        if(index + offset >= CELLS_COUNT) break;
+
+        // if current cell is empty then shift all cells [index+offset .. CELLS_COUNT-1] to [index]
+        if(arr[index] == 0) {
+            was_moved = shift_array_to_left(CELLS_COUNT, arr, index, offset);
+            if(was_moved) move_result->is_table_updated = true;
+        }
+
+        next_index = index + 1;
+        if(arr[next_index] == 0) {
+            // find offset from [next_index] to next non-empty value
+            offset = 1;
+            while(next_index + offset < CELLS_COUNT && arr[next_index + offset] == 0) offset++;
+
+            // if all remaining values in this row are empty then go to next row
+            if(next_index + offset >= CELLS_COUNT) break;
+
+            // if next cell is empty then shift cells [next_index+offset .. CELLS_COUNT-1] to [next_index]
+            was_moved = shift_array_to_left(CELLS_COUNT, arr, next_index, offset);
+            if(was_moved) move_result->is_table_updated = true;
+        }
+
+        if(arr[index] == arr[next_index]) {
+            arr[index]++;
+            shift_array_to_left(CELLS_COUNT, arr, next_index, 1);
+
+            move_result->is_table_updated = true;
+            move_result->points += 2 << (arr[index] - 1);
+        }
+
+        index++;
+    }
+}
+
+void move_left(uint8_t table[CELLS_COUNT][CELLS_COUNT], MoveResult* const move_result) {
+    for(uint8_t row_index = 0; row_index < CELLS_COUNT; row_index++) {
+        calculate_move_to_left(table[row_index], move_result);
+    }
+}
+
+void move_right(uint8_t table[CELLS_COUNT][CELLS_COUNT], MoveResult* const move_result) {
+    for(uint8_t row_index = 0; row_index < CELLS_COUNT; row_index++) {
+        reverse_array(CELLS_COUNT, table[row_index]);
+        calculate_move_to_left(table[row_index], move_result);
+        reverse_array(CELLS_COUNT, table[row_index]);
+    }
+}
+
+void move_up(uint8_t table[CELLS_COUNT][CELLS_COUNT], MoveResult* const move_result) {
+    uint8_t column[CELLS_COUNT];
+    for(uint8_t column_index = 0; column_index < CELLS_COUNT; column_index++) {
+        get_column_from_array(CELLS_COUNT, CELLS_COUNT, table, column_index, column);
+        calculate_move_to_left(column, move_result);
+        set_column_to_array(CELLS_COUNT, CELLS_COUNT, table, column_index, column);
+    }
+}
+
+void move_down(uint8_t table[CELLS_COUNT][CELLS_COUNT], MoveResult* const move_result) {
+    uint8_t column[CELLS_COUNT];
+    for(uint8_t column_index = 0; column_index < CELLS_COUNT; column_index++) {
+        get_column_from_array(CELLS_COUNT, CELLS_COUNT, table, column_index, column);
+        reverse_array(CELLS_COUNT, column);
+        calculate_move_to_left(column, move_result);
+        reverse_array(CELLS_COUNT, column);
+        set_column_to_array(CELLS_COUNT, CELLS_COUNT, table, column_index, column);
+    }
+}
+
+void add_new_digit(GameState* const game_state) {
+    uint8_t empty_cell_indexes[CELLS_COUNT * CELLS_COUNT];
+    uint8_t empty_cells_count = 0;
+    for(u_int8_t i = 0; i < CELLS_COUNT; i++) {
+        for(u_int8_t j = 0; j < CELLS_COUNT; j++) {
+            if(game_state->table[i][j] == 0) {
+                empty_cell_indexes[empty_cells_count++] = i * CELLS_COUNT + j;
+            }
+        }
+    }
+    if(empty_cells_count == 0) return;
+
+    int random_empty_cell_index = empty_cell_indexes[random() % empty_cells_count];
+    u_int8_t row = random_empty_cell_index / CELLS_COUNT;
+    u_int8_t col = random_empty_cell_index % CELLS_COUNT;
+
+    int random_value_percent = random() % 100;
+    game_state->table[row][col] = random_value_percent < 90 ? 1 : 2; // 90% for 2, 25% for 4
+}
+
+void init_game(GameState* const game_state, bool clear_top_score) {
+    memset(game_state->table, 0, CELLS_COUNT * CELLS_COUNT * sizeof(uint8_t));
+    add_new_digit(game_state);
+    add_new_digit(game_state);
+
+    game_state->score = 0;
+    game_state->moves = 0;
+    game_state->state = GameStateInProgress;
+    game_state->selected_menu_item = 0;
+    if(clear_top_score) {
+        game_state->top_score = 0;
+    }
+}
+
+bool load_game(GameState* game_state) {
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+
+    File* file = storage_file_alloc(storage);
+    uint16_t bytes_readed = 0;
+    if(storage_file_open(file, SAVING_FILENAME, FSAM_READ, FSOM_OPEN_EXISTING)) {
+        bytes_readed = storage_file_read(file, game_state, sizeof(GameState));
+    }
+    storage_file_close(file);
+    storage_file_free(file);
+
+    furi_record_close(RECORD_STORAGE);
+
+    return bytes_readed == sizeof(GameState);
+}
+
+void save_game(GameState* game_state) {
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+
+    if(storage_common_stat(storage, SAVING_DIRECTORY, NULL) == FSE_NOT_EXIST) {
+        if(!storage_simply_mkdir(storage, SAVING_DIRECTORY)) {
+            return;
+        }
+    }
+
+    File* file = storage_file_alloc(storage);
+    if(storage_file_open(file, SAVING_FILENAME, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
+        storage_file_write(file, game_state, sizeof(GameState));
+    }
+    storage_file_close(file);
+    storage_file_free(file);
+
+    furi_record_close(RECORD_STORAGE);
+}
+
+bool is_game_over(GameState* const game_state) {
+    FURI_LOG_I("is_game_over", "====check====");
+
+    // check if table contains at least one empty cell
+    for(uint8_t i = 0; i < CELLS_COUNT; i++) {
+        for(u_int8_t j = 0; j < CELLS_COUNT; j++) {
+            if(game_state->table[i][j] == 0) {
+                FURI_LOG_I("is_game_over", "has empty cells");
+                return false;
+            }
+        }
+    }
+    FURI_LOG_I("is_game_over", "no empty cells");
+
+    uint8_t tmp_table[CELLS_COUNT][CELLS_COUNT];
+    MoveResult* tmp_move_result = malloc(sizeof(MoveResult));
+
+    // check if we can move to any direction
+    memcpy(tmp_table, game_state->table, CELLS_COUNT * CELLS_COUNT * sizeof(uint8_t));
+    move_left(tmp_table, tmp_move_result);
+    if(tmp_move_result->is_table_updated) return false;
+    FURI_LOG_I("is_game_over", "can't move left");
+
+    memcpy(tmp_table, game_state->table, CELLS_COUNT * CELLS_COUNT * sizeof(uint8_t));
+    move_right(tmp_table, tmp_move_result);
+    if(tmp_move_result->is_table_updated) return false;
+    FURI_LOG_I("is_game_over", "can't move right");
+
+    memcpy(tmp_table, game_state->table, CELLS_COUNT * CELLS_COUNT * sizeof(uint8_t));
+    move_up(tmp_table, tmp_move_result);
+    if(tmp_move_result->is_table_updated) return false;
+    FURI_LOG_I("is_game_over", "can't move up");
+
+    memcpy(tmp_table, game_state->table, CELLS_COUNT * CELLS_COUNT * sizeof(uint8_t));
+    move_down(tmp_table, tmp_move_result);
+    if(tmp_move_result->is_table_updated) return false;
+    FURI_LOG_I("is_game_over", "can't move down");
+
+    return true;
+}
+
+int32_t game_2048_app() {
+    GameState* game_state = malloc(sizeof(GameState));
+    if(!load_game(game_state)) {
+        init_game(game_state, true);
+    }
+
+    MoveResult* move_result = malloc(sizeof(MoveResult));
+
+    ValueMutex state_mutex;
+    if(!init_mutex(&state_mutex, game_state, sizeof(GameState))) {
+        FURI_LOG_E("SnakeGame", "cannot create mutex\r\n");
+        free(game_state);
+        return 255;
+    }
+
+    InputEvent input;
+    FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(InputEvent));
+
+    ViewPort* view_port = view_port_alloc();
+    view_port_draw_callback_set(view_port, draw_callback, &state_mutex);
+    view_port_input_callback_set(view_port, input_callback, event_queue);
+
+    Gui* gui = furi_record_open(RECORD_GUI);
+    gui_add_view_port(gui, view_port, GuiLayerFullscreen);
+
+    bool is_finished = false;
+    while(!is_finished) {
+        FuriStatus event_status = furi_message_queue_get(event_queue, &input, FuriWaitForever);
+        if(event_status == FuriStatusOk) {
+            // handle only press event, ignore repeat/release events
+            if(input.type != InputTypePress) continue;
+
+            GameState* game_state = (GameState*)acquire_mutex_block(&state_mutex);
+
+            switch(game_state->state) {
+            case GameStateMenu:
+
+                switch(input.key) {
+                case InputKeyUp:
+                    game_state->selected_menu_item--;
+                    if(game_state->selected_menu_item < 0) {
+                        game_state->selected_menu_item = MENU_ITEMS_COUNT - 1;
+                    }
+                    break;
+                case InputKeyDown:
+                    game_state->selected_menu_item++;
+                    if(game_state->selected_menu_item >= MENU_ITEMS_COUNT) {
+                        game_state->selected_menu_item = 0;
+                    }
+                    break;
+                case InputKeyOk:
+                    if(game_state->selected_menu_item == 1) {
+                        // new game
+                        init_game(game_state, false);
+                        save_game(game_state);
+                    }
+                    game_state->state = GameStateInProgress;
+                    break;
+                case InputKeyBack:
+                    game_state->state = GameStateInProgress;
+                    break;
+                default:
+                    break;
+                }
+
+                break;
+            case GameStateInProgress:
+                move_result->is_table_updated = false;
+                move_result->points = 0;
+
+                switch(input.key) {
+                case InputKeyLeft:
+                    move_left(game_state->table, move_result);
+                    break;
+                case InputKeyRight:
+                    move_right(game_state->table, move_result);
+                    break;
+                case InputKeyUp:
+                    move_up(game_state->table, move_result);
+                    break;
+                case InputKeyDown:
+                    move_down(game_state->table, move_result);
+                    break;
+                case InputKeyOk:
+                    game_state->state = GameStateMenu;
+                    game_state->selected_menu_item = 0;
+                    break;
+                case InputKeyBack:
+                    save_game(game_state);
+                    is_finished = true;
+                    break;
+                case InputKeyMAX:
+                    break;
+                }
+                game_state->score += move_result->points;
+
+                if(move_result->is_table_updated) {
+                    game_state->moves++;
+                    add_new_digit(game_state);
+                }
+
+                if(is_game_over(game_state)) {
+                    game_state->state = GameStateGameOver;
+                    if(game_state->score >= game_state->top_score) {
+                        game_state->top_score = game_state->score;
+                    }
+                }
+
+                break;
+            case GameStateGameOver:
+                if(input.key == InputKeyOk || input.key == InputKeyBack) {
+                    init_game(game_state, false);
+                    save_game(game_state);
+                }
+            }
+
+            view_port_update(view_port);
+            release_mutex(&state_mutex, game_state);
+        }
+    }
+
+    gui_remove_view_port(gui, view_port);
+    furi_record_close(RECORD_GUI);
+
+    view_port_free(view_port);
+
+    furi_message_queue_free(event_queue);
+
+    delete_mutex(&state_mutex);
+
+    free(game_state);
+    free(move_result);
+
+    return 0;
+}

applications/plugins/hid_app/hid.c

@@ -42,10 +42,12 @@ static void bt_hid_connection_status_changed_callback(BtStatus status, void* con
     furi_assert(context);
     Hid* hid = context;
     bool connected = (status == BtStatusConnected);
-    if(connected) {
-        notification_internal_message(hid->notifications, &sequence_set_blue_255);
-    } else {
-        notification_internal_message(hid->notifications, &sequence_reset_blue);
+    if(hid->transport == HidTransportBle) {
+        if(connected) {
+            notification_internal_message(hid->notifications, &sequence_set_blue_255);
+        } else {
+            notification_internal_message(hid->notifications, &sequence_reset_blue);
+        }
     }
     hid_keynote_set_connected_status(hid->hid_keynote, connected);
     hid_keyboard_set_connected_status(hid->hid_keyboard, connected);
@@ -186,7 +188,9 @@ void hid_free(Hid* app) {
     furi_assert(app);
 
     // Reset notification
-    notification_internal_message(app->notifications, &sequence_reset_blue);
+    if(app->transport == HidTransportBle) {
+        notification_internal_message(app->notifications, &sequence_reset_blue);
+    }
 
     // Free views
     view_dispatcher_remove_view(app->view_dispatcher, HidViewSubmenu);

applications/plugins/hid_app/views/hid_keyboard.c

@@ -25,6 +25,7 @@ typedef struct {
     bool back_pressed;
     bool connected;
     char key_string[5];
+    HidTransport transport;
 } HidKeyboardModel;
 
 typedef struct {
@@ -207,7 +208,7 @@ static void hid_keyboard_draw_callback(Canvas* canvas, void* context) {
     HidKeyboardModel* model = context;
 
     // Header
-    if(!model->connected) {
+    if((!model->connected) && (model->transport == HidTransportBle)) {
         canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
         canvas_set_font(canvas, FontPrimary);
         elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Keyboard");
@@ -249,30 +250,19 @@ static void hid_keyboard_draw_callback(Canvas* canvas, void* context) {
 
 static uint8_t hid_keyboard_get_selected_key(HidKeyboardModel* model) {
     HidKeyboardKey key = hid_keyboard_keyset[model->y][model->x];
-    // Use upper case if shift is toggled
-    bool useUppercase = model->shift;
-    // Check if the key has an upper case version
-    bool hasUppercase = key.shift_key != 0;
-    if(useUppercase && hasUppercase)
-        return key.value;
-    else
-        return key.value;
+    return key.value;
 }
 
 static void hid_keyboard_get_select_key(HidKeyboardModel* model, HidKeyboardPoint delta) {
     // Keep going until a valid spot is found, this allows for nulls and zero width keys in the map
     do {
-        if(((int8_t)model->y) + delta.y < 0)
-            model->y = ROW_COUNT - 1;
-        else
-            model->y = (model->y + delta.y) % ROW_COUNT;
+        const int delta_sum = model->y + delta.y;
+        model->y = delta_sum < 0 ? ROW_COUNT - 1 : delta_sum % ROW_COUNT;
     } while(delta.y != 0 && hid_keyboard_keyset[model->y][model->x].value == 0);
 
     do {
-        if(((int8_t)model->x) + delta.x < 0)
-            model->x = COLUMN_COUNT - 1;
-        else
-            model->x = (model->x + delta.x) % COLUMN_COUNT;
+        const int delta_sum = model->x + delta.x;
+        model->x = delta_sum < 0 ? COLUMN_COUNT - 1 : delta_sum % COLUMN_COUNT;
     } while(delta.x != 0 && hid_keyboard_keyset[model->y][model->x].width ==
                                 0); // Skip zero width keys, pretend they are one key
 }
@@ -372,6 +362,12 @@ HidKeyboard* hid_keyboard_alloc(Hid* bt_hid) {
     view_set_draw_callback(hid_keyboard->view, hid_keyboard_draw_callback);
     view_set_input_callback(hid_keyboard->view, hid_keyboard_input_callback);
 
+    with_view_model(
+        hid_keyboard->view,
+        HidKeyboardModel * model,
+        { model->transport = bt_hid->transport; },
+        true);
+
     return hid_keyboard;
 }
 

applications/plugins/hid_app/views/hid_keynote.c

@@ -19,6 +19,7 @@ typedef struct {
     bool ok_pressed;
     bool back_pressed;
     bool connected;
+    HidTransport transport;
 } HidKeynoteModel;
 
 static void hid_keynote_draw_arrow(Canvas* canvas, uint8_t x, uint8_t y, CanvasDirection dir) {
@@ -39,11 +40,14 @@ static void hid_keynote_draw_callback(Canvas* canvas, void* context) {
     HidKeynoteModel* model = context;
 
     // Header
-    if(model->connected) {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
-    } else {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
+    if(model->transport == HidTransportBle) {
+        if(model->connected) {
+            canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
+        } else {
+            canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
+        }
     }
+
     canvas_set_font(canvas, FontPrimary);
     elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Keynote");
 
@@ -186,6 +190,9 @@ HidKeynote* hid_keynote_alloc(Hid* hid) {
     view_set_draw_callback(hid_keynote->view, hid_keynote_draw_callback);
     view_set_input_callback(hid_keynote->view, hid_keynote_input_callback);
 
+    with_view_model(
+        hid_keynote->view, HidKeynoteModel * model, { model->transport = hid->transport; }, true);
+
     return hid_keynote;
 }
 

applications/plugins/hid_app/views/hid_media.c

@@ -21,6 +21,7 @@ typedef struct {
     bool down_pressed;
     bool ok_pressed;
     bool connected;
+    HidTransport transport;
 } HidMediaModel;
 
 static void hid_media_draw_arrow(Canvas* canvas, uint8_t x, uint8_t y, CanvasDirection dir) {
@@ -41,11 +42,14 @@ static void hid_media_draw_callback(Canvas* canvas, void* context) {
     HidMediaModel* model = context;
 
     // Header
-    if(model->connected) {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
-    } else {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
+    if(model->transport == HidTransportBle) {
+        if(model->connected) {
+            canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
+        } else {
+            canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
+        }
     }
+
     canvas_set_font(canvas, FontPrimary);
     elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Media");
     canvas_set_font(canvas, FontSecondary);
@@ -190,6 +194,9 @@ HidMedia* hid_media_alloc(Hid* hid) {
     view_set_draw_callback(hid_media->view, hid_media_draw_callback);
     view_set_input_callback(hid_media->view, hid_media_input_callback);
 
+    with_view_model(
+        hid_media->view, HidMediaModel * model, { model->transport = hid->transport; }, true);
+
     return hid_media;
 }
 

applications/plugins/hid_app/views/hid_mouse.c

@@ -20,6 +20,7 @@ typedef struct {
     bool left_mouse_held;
     bool right_mouse_pressed;
     bool connected;
+    HidTransport transport;
 } HidMouseModel;
 
 static void hid_mouse_draw_callback(Canvas* canvas, void* context) {
@@ -27,11 +28,14 @@ static void hid_mouse_draw_callback(Canvas* canvas, void* context) {
     HidMouseModel* model = context;
 
     // Header
-    if(model->connected) {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
-    } else {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
+    if(model->transport == HidTransportBle) {
+        if(model->connected) {
+            canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
+        } else {
+            canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
+        }
     }
+
     canvas_set_font(canvas, FontPrimary);
     elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Mouse");
     canvas_set_font(canvas, FontSecondary);
@@ -198,6 +202,9 @@ HidMouse* hid_mouse_alloc(Hid* hid) {
     view_set_draw_callback(hid_mouse->view, hid_mouse_draw_callback);
     view_set_input_callback(hid_mouse->view, hid_mouse_input_callback);
 
+    with_view_model(
+        hid_mouse->view, HidMouseModel * model, { model->transport = hid->transport; }, true);
+
     return hid_mouse;
 }
 

applications/plugins/hid_app/views/hid_mouse_jiggler.c

@@ -16,6 +16,7 @@ typedef struct {
     bool connected;
     bool running;
     uint8_t counter;
+    HidTransport transport;
 } HidMouseJigglerModel;
 
 static void hid_mouse_jiggler_draw_callback(Canvas* canvas, void* context) {
@@ -23,11 +24,14 @@ static void hid_mouse_jiggler_draw_callback(Canvas* canvas, void* context) {
     HidMouseJigglerModel* model = context;
 
     // Header
-    if(model->connected) {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
-    } else {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
+    if(model->transport == HidTransportBle) {
+        if(model->connected) {
+            canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
+        } else {
+            canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
+        }
     }
+
     canvas_set_font(canvas, FontPrimary);
     elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Mouse Jiggler");
 
@@ -120,6 +124,12 @@ HidMouseJiggler* hid_mouse_jiggler_alloc(Hid* hid) {
     hid_mouse_jiggler->timer = furi_timer_alloc(
         hid_mouse_jiggler_timer_callback, FuriTimerTypePeriodic, hid_mouse_jiggler);
 
+    with_view_model(
+        hid_mouse_jiggler->view,
+        HidMouseJigglerModel * model,
+        { model->transport = hid->transport; },
+        true);
+
     return hid_mouse_jiggler;
 }
 

applications/plugins/hid_app/views/hid_tiktok.c

@@ -19,6 +19,7 @@ typedef struct {
     bool ok_pressed;
     bool connected;
     bool is_cursor_set;
+    HidTransport transport;
 } HidTikTokModel;
 
 static void hid_tiktok_draw_callback(Canvas* canvas, void* context) {
@@ -26,11 +27,14 @@ static void hid_tiktok_draw_callback(Canvas* canvas, void* context) {
     HidTikTokModel* model = context;
 
     // Header
-    if(model->connected) {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
-    } else {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
+    if(model->transport == HidTransportBle) {
+        if(model->connected) {
+            canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
+        } else {
+            canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
+        }
     }
+
     canvas_set_font(canvas, FontPrimary);
     elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "TikTok");
     canvas_set_font(canvas, FontSecondary);
@@ -207,6 +211,9 @@ HidTikTok* hid_tiktok_alloc(Hid* bt_hid) {
     view_set_draw_callback(hid_tiktok->view, hid_tiktok_draw_callback);
     view_set_input_callback(hid_tiktok->view, hid_tiktok_input_callback);
 
+    with_view_model(
+        hid_tiktok->view, HidTikTokModel * model, { model->transport = bt_hid->transport; }, true);
+
     return hid_tiktok;
 }
 

applications/plugins/music_player/music_player.c

@@ -180,7 +180,7 @@ static void render_callback(Canvas* canvas, void* ctx) {
 
     // note stack view_port
     x_pos = 73;
-    y_pos = 0;
+    y_pos = 0; //-V1048
     canvas_set_color(canvas, ColorBlack);
     canvas_set_font(canvas, FontPrimary);
     canvas_draw_frame(canvas, x_pos, y_pos, 49, 64);

applications/plugins/picopass/lib/loclass/optimized_cipher.c

@@ -111,9 +111,9 @@ static void init_opt_select_LUT(void) {
 ***********************************************************************************/
 
 #define loclass_opt__select(x, y, r)                                                        \
-    (4 & (((r & (r << 2)) >> 5) ^ ((r & ~(r << 2)) >> 4) ^ ((r | r << 2) >> 3))) |          \
-        (2 & (((r | r << 2) >> 6) ^ ((r | r << 2) >> 1) ^ (r >> 5) ^ r ^ ((x ^ y) << 1))) | \
-        (1 & (((r & ~(r << 2)) >> 4) ^ ((r & (r << 2)) >> 3) ^ r ^ x))
+    (4 & ((((r) & ((r) << 2)) >> 5) ^ (((r) & ~((r) << 2)) >> 4) ^ (((r) | (r) << 2) >> 3))) |          \
+        (2 & ((((r) | (r) << 2) >> 6) ^ (((r) | (r) << 2) >> 1) ^ ((r) >> 5) ^ (r) ^ (((x) ^ (y)) << 1))) | \
+        (1 & ((((r) & ~((r) << 2)) >> 4) ^ (((r) & ((r) << 2)) >> 3) ^ (r) ^ (x)))
 
 static void loclass_opt_successor(const uint8_t* k, LoclassState_t* s, uint8_t y) {
     uint16_t Tt = s->t & 0xc533;
@@ -149,30 +149,11 @@ static void loclass_opt_suc(
     uint8_t length,
     bool add32Zeroes) {
     for(int i = 0; i < length; i++) {
-        uint8_t head;
-        head = in[i];
-        loclass_opt_successor(k, s, head);
-
-        head >>= 1;
-        loclass_opt_successor(k, s, head);
-
-        head >>= 1;
-        loclass_opt_successor(k, s, head);
-
-        head >>= 1;
-        loclass_opt_successor(k, s, head);
-
-        head >>= 1;
-        loclass_opt_successor(k, s, head);
-
-        head >>= 1;
-        loclass_opt_successor(k, s, head);
-
-        head >>= 1;
-        loclass_opt_successor(k, s, head);
-
-        head >>= 1;
-        loclass_opt_successor(k, s, head);
+        uint8_t head = in[i];
+        for(int j = 0; j < 8; j++) {
+            loclass_opt_successor(k, s, head);
+            head >>= 1;
+        }
     }
     //For tag MAC, an additional 32 zeroes
     if(add32Zeroes) {

applications/plugins/picopass/picopass_worker.c

@@ -143,7 +143,7 @@ ReturnCode picopass_read_preauth(PicopassBlock* AA1) {
         AA1[PICOPASS_CSN_BLOCK_INDEX].data[7]);
 
     rfalPicoPassReadBlockRes cfg = {0};
-    err = rfalPicoPassPollerReadBlock(PICOPASS_CONFIG_BLOCK_INDEX, &cfg);
+    rfalPicoPassPollerReadBlock(PICOPASS_CONFIG_BLOCK_INDEX, &cfg);
     memcpy(AA1[PICOPASS_CONFIG_BLOCK_INDEX].data, cfg.data, sizeof(cfg.data));
     FURI_LOG_D(
         TAG,
@@ -158,7 +158,7 @@ ReturnCode picopass_read_preauth(PicopassBlock* AA1) {
         AA1[PICOPASS_CONFIG_BLOCK_INDEX].data[7]);
 
     rfalPicoPassReadBlockRes aia;
-    err = rfalPicoPassPollerReadBlock(PICOPASS_AIA_BLOCK_INDEX, &aia);
+    rfalPicoPassPollerReadBlock(PICOPASS_AIA_BLOCK_INDEX, &aia);
     memcpy(AA1[PICOPASS_AIA_BLOCK_INDEX].data, aia.data, sizeof(aia.data));
     FURI_LOG_D(
         TAG,
@@ -221,7 +221,7 @@ ReturnCode picopass_auth(PicopassBlock* AA1, PicopassPacs* pacs) {
     while(iclass_elite_dict_get_next_key(dict, key)) {
         FURI_LOG_D(
             TAG,
-            "Try to auth with key %d %02x%02x%02x%02x%02x%02x%02x%02x",
+            "Try to auth with key %zu %02x%02x%02x%02x%02x%02x%02x%02x",
             index++,
             key[0],
             key[1],
@@ -249,9 +249,7 @@ ReturnCode picopass_auth(PicopassBlock* AA1, PicopassPacs* pacs) {
         }
     }
 
-    if(dict) {
-        iclass_elite_dict_free(dict);
-    }
+    iclass_elite_dict_free(dict);
 
     return err;
 }

applications/plugins/picopass/scenes/picopass_scene_save_name.c

@@ -54,7 +54,7 @@ bool picopass_scene_save_name_on_event(void* context, SceneManagerEvent event) {
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == PicopassCustomEventTextInputDone) {
-            if(strcmp(picopass->dev->dev_name, "")) {
+            if(strcmp(picopass->dev->dev_name, "") != 0) {
                 // picopass_device_delete(picopass->dev, true);
             }
             strlcpy(

applications/plugins/pocsag_pager/views/pocsag_pager_receiver.c

@@ -307,7 +307,7 @@ bool pcsg_view_receiver_input(InputEvent* event, void* context) {
             pcsg_receiver->view,
             PCSGReceiverModel * model,
             {
-                if(model->idx != model->history_item - 1) model->idx++;
+                if(model->history_item && model->idx != model->history_item - 1) model->idx++;
             },
             true);
     } else if(event->key == InputKeyLeft && event->type == InputTypeShort) {

applications/plugins/signal_generator/scenes/signal_gen_scene_pwm.c

@@ -15,12 +15,12 @@ static void
     app->pwm_freq = freq;
     app->pwm_duty = duty;
 
-    if(app->pwm_ch != pwm_ch_id[channel_id]) {
+    if(app->pwm_ch != pwm_ch_id[channel_id]) { //-V1051
         app->pwm_ch_prev = app->pwm_ch;
         app->pwm_ch = pwm_ch_id[channel_id];
         view_dispatcher_send_custom_event(app->view_dispatcher, SignalGenPwmEventChannelChange);
     } else {
-        app->pwm_ch = pwm_ch_id[channel_id];
+        app->pwm_ch = pwm_ch_id[channel_id]; //-V1048
         view_dispatcher_send_custom_event(app->view_dispatcher, SignalGenPwmEventUpdate);
     }
 }

applications/plugins/signal_generator/views/signal_gen_pwm.c

@@ -127,12 +127,12 @@ static void signal_gen_pwm_draw_callback(Canvas* canvas, void* _model) {
     char* line_label = NULL;
     char val_text[16];
 
-    for(uint8_t line = 0; line < LineIndexTotalCount; line++) {
+    for(size_t line = 0; line < LineIndexTotalCount; line++) {
         if(line == LineIndexChannel) {
             line_label = "GPIO Pin";
         } else if(line == LineIndexFrequency) {
             line_label = "Frequency";
-        } else if(line == LineIndexDuty) {
+        } else if(line == LineIndexDuty) { //-V547
             line_label = "Pulse width";
         }
 
@@ -169,7 +169,7 @@ static void signal_gen_pwm_draw_callback(Canvas* canvas, void* _model) {
                 canvas_draw_icon(canvas, icon_x, text_y - 9, &I_SmallArrowUp_3x5);
                 canvas_draw_icon(canvas, icon_x, text_y + 5, &I_SmallArrowDown_3x5);
             }
-        } else if(line == LineIndexDuty) {
+        } else if(line == LineIndexDuty) { //-V547
             snprintf(val_text, sizeof(val_text), "%d%%", model->duty);
             canvas_draw_str_aligned(canvas, VALUE_X, text_y, AlignCenter, AlignCenter, val_text);
             if(model->duty != 0) {

applications/plugins/snake_game/snake_game.c

@@ -130,7 +130,7 @@ static void snake_game_render_callback(Canvas* const canvas, void* ctx) {
 
         canvas_set_font(canvas, FontSecondary);
         char buffer[12];
-        snprintf(buffer, sizeof(buffer), "Score: %u", snake_state->len - 7);
+        snprintf(buffer, sizeof(buffer), "Score: %u", snake_state->len - 7U);
         canvas_draw_str_aligned(canvas, 64, 41, AlignCenter, AlignBottom, buffer);
     }
 
@@ -153,7 +153,7 @@ static void snake_game_update_timer_callback(FuriMessageQueue* event_queue) {
 
 static void snake_game_init_game(SnakeState* const snake_state) {
     Point p[] = {{8, 6}, {7, 6}, {6, 6}, {5, 6}, {4, 6}, {3, 6}, {2, 6}};
-    memcpy(snake_state->points, p, sizeof(p));
+    memcpy(snake_state->points, p, sizeof(p)); //-V1086
 
     snake_state->len = 7;
 

applications/plugins/totp/cli/cli_helpers.h

@@ -38,6 +38,9 @@
     TOTP_CLI_PRINTF(                       \
         "Invalid command arguments. use \"help\" command to get list of available commands")
 
+#define TOTP_CLI_PRINT_ERROR_UPDATING_CONFIG_FILE() \
+    TOTP_CLI_PRINTF("An error has occurred during updating config file\r\n")
+
 /**
  * @brief Checks whether user is authenticated and entered correct PIN.
  *        If user is not authenticated it prompts user to enter correct PIN to authenticate.

applications/plugins/totp/cli/commands/add/add.c

@@ -206,11 +206,13 @@ void totp_cli_command_add_handle(PluginState* plugin_state, FuriString* args, Cl
 
     TOTP_LIST_INIT_OR_ADD(plugin_state->tokens_list, token_info, furi_check);
     plugin_state->tokens_count++;
-    totp_config_file_save_new_token(token_info);
+    if(totp_config_file_save_new_token(token_info) == TotpConfigFileUpdateSuccess) {
+        TOTP_CLI_PRINTF("Token \"%s\" has been successfully added\r\n", token_info->name);
+    } else {
+        TOTP_CLI_PRINT_ERROR_UPDATING_CONFIG_FILE();
+    }
 
     if(load_generate_token_scene) {
         totp_scene_director_activate_scene(plugin_state, TotpSceneGenerateToken, NULL);
     }
-
-    TOTP_CLI_PRINTF("Token \"%s\" has been successfully added\r\n", token_info->name);
 }

applications/plugins/totp/cli/commands/delete/delete.c

@@ -93,14 +93,17 @@ void totp_cli_command_delete_handle(PluginState* plugin_state, FuriString* args,
         plugin_state->tokens_list = list_remove(plugin_state->tokens_list, list_node);
         plugin_state->tokens_count--;
 
-        totp_full_save_config_file(plugin_state);
+        if(totp_full_save_config_file(plugin_state) == TotpConfigFileUpdateSuccess) {
+            TOTP_CLI_PRINTF("Token \"%s\" has been successfully deleted\r\n", token_info->name);
+        } else {
+            TOTP_CLI_PRINT_ERROR_UPDATING_CONFIG_FILE();
+        }
+
+        token_info_free(token_info);
 
         if(activate_generate_token_scene) {
             totp_scene_director_activate_scene(plugin_state, TotpSceneGenerateToken, NULL);
         }
-
-        TOTP_CLI_PRINTF("Token \"%s\" has been successfully deleted\r\n", token_info->name);
-        token_info_free(token_info);
     } else {
         TOTP_CLI_PRINTF("User not confirmed\r\n");
     }

applications/plugins/totp/cli/commands/move/move.c

@@ -147,18 +147,18 @@ void totp_cli_command_move_handle(PluginState* plugin_state, FuriString* args, C
     }
 
     if(token_updated) {
-        totp_full_save_config_file(plugin_state);
+        if(totp_full_save_config_file(plugin_state) == TotpConfigFileUpdateSuccess) {
+            TOTP_CLI_PRINTF("Token \"%s\" has been successfully updated\r\n", token_info->name);
+        } else {
+            TOTP_CLI_PRINT_ERROR_UPDATING_CONFIG_FILE();
+        }
+    } else {
+        TOTP_CLI_PRINT_INVALID_ARGUMENTS();
     }
 
     if(activate_generate_token_scene) {
         totp_scene_director_activate_scene(plugin_state, TotpSceneGenerateToken, NULL);
     }
 
-    if(token_updated) {
-        TOTP_CLI_PRINTF("Token \"%s\" has been successfully updated\r\n", token_info->name);
-    } else {
-        TOTP_CLI_PRINT_INVALID_ARGUMENTS();
-    }
-
     furi_string_free(temp_str);
 }

applications/plugins/totp/cli/commands/notification/notification.c

@@ -86,15 +86,18 @@ void totp_cli_command_notification_handle(PluginState* plugin_state, FuriString*
             }
 
             plugin_state->notification_method = new_method;
-            totp_config_file_update_notification_method(new_method);
+            if(totp_config_file_update_notification_method(new_method) ==
+               TotpConfigFileUpdateSuccess) {
+                TOTP_CLI_PRINTF("Notification method is set to ");
+                totp_cli_command_notification_print_method(new_method);
+                cli_nl();
+            } else {
+                TOTP_CLI_PRINT_ERROR_UPDATING_CONFIG_FILE();
+            }
 
             if(previous_scene != TotpSceneNone) {
                 totp_scene_director_activate_scene(plugin_state, previous_scene, NULL);
             }
-
-            TOTP_CLI_PRINTF("Notification method is set to ");
-            totp_cli_command_notification_print_method(new_method);
-            cli_nl();
         } else {
             TOTP_CLI_PRINTF("Current notification method is ");
             totp_cli_command_notification_print_method(plugin_state->notification_method);

applications/plugins/totp/cli/commands/pin/pin.c

@@ -134,8 +134,14 @@ void totp_cli_command_pin_handle(PluginState* plugin_state, FuriString* args, Cl
                 plugin_state->crypto_verify_data = NULL;
             }
 
-            totp_crypto_seed_iv(
-                plugin_state, new_pin_length > 0 ? &new_pin[0] : NULL, new_pin_length);
+            if(!totp_crypto_seed_iv(
+                   plugin_state, new_pin_length > 0 ? &new_pin[0] : NULL, new_pin_length)) {
+                memset_s(&new_pin[0], TOTP_IV_SIZE, 0, TOTP_IV_SIZE);
+                TOTP_CLI_PRINT_ERROR_UPDATING_CONFIG_FILE();
+                break;
+            }
+
+            memset_s(&new_pin[0], TOTP_IV_SIZE, 0, TOTP_IV_SIZE);
 
             TOTP_LIST_FOREACH(plugin_state->tokens_list, node, {
                 TokenInfo* token_info = node->data;
@@ -152,15 +158,18 @@ void totp_cli_command_pin_handle(PluginState* plugin_state, FuriString* args, Cl
                 free(plain_token);
             });
 
-            totp_full_save_config_file(plugin_state);
-
             TOTP_CLI_DELETE_LAST_LINE();
 
-            if(do_change) {
-                TOTP_CLI_PRINTF("PIN has been successfully changed\r\n");
-            } else if(do_remove) {
-                TOTP_CLI_PRINTF("PIN has been successfully removed\r\n");
+            if(totp_full_save_config_file(plugin_state) == TotpConfigFileUpdateSuccess) {
+                if(do_change) {
+                    TOTP_CLI_PRINTF("PIN has been successfully changed\r\n");
+                } else if(do_remove) {
+                    TOTP_CLI_PRINTF("PIN has been successfully removed\r\n");
+                }
+            } else {
+                TOTP_CLI_PRINT_ERROR_UPDATING_CONFIG_FILE();
             }
+
         } while(false);
 
         if(load_generate_token_scene) {

applications/plugins/totp/cli/commands/timezone/timezone.c

@@ -33,8 +33,11 @@ void totp_cli_command_timezone_handle(PluginState* plugin_state, FuriString* arg
         float tz = strtof(furi_string_get_cstr(temp_str), NULL);
         if(tz >= -12.75f && tz <= 12.75f) {
             plugin_state->timezone_offset = tz;
-            totp_config_file_update_timezone_offset(tz);
-            TOTP_CLI_PRINTF("Timezone is set to %f\r\n", tz);
+            if(totp_config_file_update_timezone_offset(tz) == TotpConfigFileUpdateSuccess) {
+                TOTP_CLI_PRINTF("Timezone is set to %f\r\n", tz);
+            } else {
+                TOTP_CLI_PRINT_ERROR_UPDATING_CONFIG_FILE();
+            }
             if(plugin_state->current_scene == TotpSceneGenerateToken) {
                 totp_scene_director_activate_scene(plugin_state, TotpSceneNone, NULL);
                 totp_scene_director_activate_scene(plugin_state, TotpSceneGenerateToken, NULL);

applications/plugins/totp/services/config/config.c

@@ -6,9 +6,12 @@
 #include "../../types/token_info.h"
 #include "migrations/config_migration_v1_to_v2.h"
 
-#define CONFIG_FILE_DIRECTORY_PATH "/ext/apps/Misc"
+#define CONFIG_FILE_DIRECTORY_PATH EXT_PATH("authenticator")
 #define CONFIG_FILE_PATH CONFIG_FILE_DIRECTORY_PATH "/totp.conf"
 #define CONFIG_FILE_BACKUP_PATH CONFIG_FILE_PATH ".backup"
+#define CONFIG_FILE_TEMP_PATH CONFIG_FILE_PATH ".tmp"
+#define CONFIG_FILE_ORIG_PATH CONFIG_FILE_PATH ".orig"
+#define CONFIG_FILE_PATH_PREVIOUS EXT_PATH("apps/Misc") "/totp.conf"
 
 static char* token_info_get_algo_as_cstr(const TokenInfo* token_info) {
     switch(token_info->algo) {
@@ -35,15 +38,38 @@ static void token_info_set_algo_from_str(TokenInfo* token_info, const FuriString
     }
 }
 
-Storage* totp_open_storage() {
+/**
+ * @brief Opens storage record
+ * @return Storage record
+ */
+static Storage* totp_open_storage() {
     return furi_record_open(RECORD_STORAGE);
 }
 
-void totp_close_storage() {
+/**
+ * @brief Closes storage record
+ */
+static void totp_close_storage() {
     furi_record_close(RECORD_STORAGE);
 }
 
-FlipperFormat* totp_open_config_file(Storage* storage) {
+/**
+ * @brief Closes config file
+ * @param file config file reference
+ */
+static void totp_close_config_file(FlipperFormat* file) {
+    if(file == NULL) return;
+    flipper_format_file_close(file);
+    flipper_format_free(file);
+}
+
+/**
+ * @brief Opens or creates TOTP application standard config file
+ * @param storage storage record to use
+ * @param[out] file opened config file
+ * @return Config file open result
+ */
+static TotpConfigFileOpenResult totp_open_config_file(Storage* storage, FlipperFormat** file) {
     FlipperFormat* fff_data_file = flipper_format_file_alloc(storage);
 
     if(storage_common_stat(storage, CONFIG_FILE_PATH, NULL) == FSE_OK) {
@@ -51,8 +77,28 @@ FlipperFormat* totp_open_config_file(Storage* storage) {
         if(!flipper_format_file_open_existing(fff_data_file, CONFIG_FILE_PATH)) {
             FURI_LOG_E(LOGGING_TAG, "Error opening existing file %s", CONFIG_FILE_PATH);
             totp_close_config_file(fff_data_file);
-            return NULL;
+            return TotpConfigFileOpenError;
         }
+    } else if(storage_common_stat(storage, CONFIG_FILE_PATH_PREVIOUS, NULL) == FSE_OK) {
+        FURI_LOG_D(LOGGING_TAG, "Old config file %s found", CONFIG_FILE_PATH_PREVIOUS);
+        if(storage_common_stat(storage, CONFIG_FILE_DIRECTORY_PATH, NULL) == FSE_NOT_EXIST) {
+            FURI_LOG_D(
+                LOGGING_TAG,
+                "Directory %s doesn't exist. Will create new.",
+                CONFIG_FILE_DIRECTORY_PATH);
+            if(!storage_simply_mkdir(storage, CONFIG_FILE_DIRECTORY_PATH)) {
+                FURI_LOG_E(LOGGING_TAG, "Error creating directory %s", CONFIG_FILE_DIRECTORY_PATH);
+                totp_close_config_file(fff_data_file);
+                return TotpConfigFileOpenError;
+            }
+        }
+        if(storage_common_rename(storage, CONFIG_FILE_PATH_PREVIOUS, CONFIG_FILE_PATH) != FSE_OK) {
+            FURI_LOG_E(LOGGING_TAG, "Error moving config to %s", CONFIG_FILE_PATH);
+            totp_close_config_file(fff_data_file);
+            return TotpConfigFileOpenError;
+        }
+        FURI_LOG_I(LOGGING_TAG, "Applied config file path migration");
+        return totp_open_config_file(storage, file);
     } else {
         FURI_LOG_D(LOGGING_TAG, "Config file %s is not found. Will create new.", CONFIG_FILE_PATH);
         if(storage_common_stat(storage, CONFIG_FILE_DIRECTORY_PATH, NULL) == FSE_NOT_EXIST) {
@@ -62,14 +108,14 @@ FlipperFormat* totp_open_config_file(Storage* storage) {
                 CONFIG_FILE_DIRECTORY_PATH);
             if(!storage_simply_mkdir(storage, CONFIG_FILE_DIRECTORY_PATH)) {
                 FURI_LOG_E(LOGGING_TAG, "Error creating directory %s", CONFIG_FILE_DIRECTORY_PATH);
-                return NULL;
+                return TotpConfigFileOpenError;
             }
         }
 
         if(!flipper_format_file_open_new(fff_data_file, CONFIG_FILE_PATH)) {
             totp_close_config_file(fff_data_file);
             FURI_LOG_E(LOGGING_TAG, "Error creating new file %s", CONFIG_FILE_PATH);
-            return NULL;
+            return TotpConfigFileOpenError;
         }
 
         flipper_format_write_header_cstr(
@@ -134,228 +180,415 @@ FlipperFormat* totp_open_config_file(Storage* storage) {
         if(!flipper_format_rewind(fff_data_file)) {
             totp_close_config_file(fff_data_file);
             FURI_LOG_E(LOGGING_TAG, "Rewind error");
-            return NULL;
+            return TotpConfigFileOpenError;
         }
     }
 
-    return fff_data_file;
+    *file = fff_data_file;
+    return TotpConfigFileOpenSuccess;
 }
 
-void totp_config_file_save_new_token_i(FlipperFormat* file, const TokenInfo* token_info) {
-    flipper_format_seek_to_end(file);
-    flipper_format_write_string_cstr(file, TOTP_CONFIG_KEY_TOKEN_NAME, token_info->name);
-    bool token_is_valid = token_info->token != NULL && token_info->token_length > 0;
-    if(!token_is_valid) {
-        flipper_format_write_comment_cstr(file, "!!! WARNING BEGIN: INVALID TOKEN !!!");
+TotpConfigFileUpdateResult
+    totp_config_file_save_new_token_i(FlipperFormat* file, const TokenInfo* token_info) {
+    TotpConfigFileUpdateResult update_result;
+    do {
+        if(!flipper_format_seek_to_end(file)) {
+            update_result = TotpConfigFileUpdateError;
+            break;
+        }
+
+        if(!flipper_format_write_string_cstr(file, TOTP_CONFIG_KEY_TOKEN_NAME, token_info->name)) {
+            update_result = TotpConfigFileUpdateError;
+            break;
+        }
+
+        bool token_is_valid = token_info->token != NULL && token_info->token_length > 0;
+        if(!token_is_valid &&
+           !flipper_format_write_comment_cstr(file, "!!! WARNING BEGIN: INVALID TOKEN !!!")) {
+            update_result = TotpConfigFileUpdateError;
+            break;
+        }
+
+        if(!flipper_format_write_hex(
+               file, TOTP_CONFIG_KEY_TOKEN_SECRET, token_info->token, token_info->token_length)) {
+            update_result = TotpConfigFileUpdateError;
+            break;
+        }
+
+        if(!token_is_valid && !flipper_format_write_comment_cstr(file, "!!! WARNING END !!!")) {
+            update_result = TotpConfigFileUpdateError;
+            break;
+        }
+
+        if(!flipper_format_write_string_cstr(
+               file, TOTP_CONFIG_KEY_TOKEN_ALGO, token_info_get_algo_as_cstr(token_info))) {
+            update_result = TotpConfigFileUpdateError;
+            break;
+        }
+
+        uint32_t tmp_uint32 = token_info->digits;
+        if(!flipper_format_write_uint32(file, TOTP_CONFIG_KEY_TOKEN_DIGITS, &tmp_uint32, 1)) {
+            update_result = TotpConfigFileUpdateError;
+            break;
+        }
+
+        update_result = TotpConfigFileUpdateSuccess;
+    } while(false);
+
+    return update_result;
+}
+
+TotpConfigFileUpdateResult totp_config_file_save_new_token(const TokenInfo* token_info) {
+    Storage* cfg_storage = totp_open_storage();
+    FlipperFormat* file;
+    TotpConfigFileUpdateResult update_result;
+
+    if(totp_open_config_file(cfg_storage, &file) == TotpConfigFileOpenSuccess) {
+        do {
+            if(totp_config_file_save_new_token_i(file, token_info) !=
+               TotpConfigFileUpdateSuccess) {
+                update_result = TotpConfigFileUpdateError;
+                break;
+            }
+
+            update_result = TotpConfigFileUpdateSuccess;
+        } while(false);
+
+        totp_close_config_file(file);
+    } else {
+        update_result = TotpConfigFileUpdateError;
     }
-    flipper_format_write_hex(
-        file, TOTP_CONFIG_KEY_TOKEN_SECRET, token_info->token, token_info->token_length);
-    if(!token_is_valid) {
-        flipper_format_write_comment_cstr(file, "!!! WARNING END !!!");
+
+    totp_close_storage();
+    return update_result;
+}
+
+TotpConfigFileUpdateResult totp_config_file_update_timezone_offset(float new_timezone_offset) {
+    Storage* cfg_storage = totp_open_storage();
+    FlipperFormat* file;
+    TotpConfigFileUpdateResult update_result;
+
+    if(totp_open_config_file(cfg_storage, &file) == TotpConfigFileOpenSuccess) {
+        do {
+            if(!flipper_format_insert_or_update_float(
+                   file, TOTP_CONFIG_KEY_TIMEZONE, &new_timezone_offset, 1)) {
+                update_result = TotpConfigFileUpdateError;
+                break;
+            }
+
+            update_result = TotpConfigFileUpdateSuccess;
+        } while(false);
+
+        totp_close_config_file(file);
+    } else {
+        update_result = TotpConfigFileUpdateError;
     }
-    flipper_format_write_string_cstr(
-        file, TOTP_CONFIG_KEY_TOKEN_ALGO, token_info_get_algo_as_cstr(token_info));
-    uint32_t tmp_uint32 = token_info->digits;
-    flipper_format_write_uint32(file, TOTP_CONFIG_KEY_TOKEN_DIGITS, &tmp_uint32, 1);
-}
 
-void totp_config_file_save_new_token(const TokenInfo* token_info) {
-    Storage* cfg_storage = totp_open_storage();
-    FlipperFormat* file = totp_open_config_file(cfg_storage);
-
-    totp_config_file_save_new_token_i(file, token_info);
-
-    totp_close_config_file(file);
     totp_close_storage();
+    return update_result;
 }
 
-void totp_config_file_update_timezone_offset(float new_timezone_offset) {
+TotpConfigFileUpdateResult
+    totp_config_file_update_notification_method(NotificationMethod new_notification_method) {
     Storage* cfg_storage = totp_open_storage();
-    FlipperFormat* file = totp_open_config_file(cfg_storage);
+    FlipperFormat* file;
+    TotpConfigFileUpdateResult update_result;
 
-    flipper_format_insert_or_update_float(file, TOTP_CONFIG_KEY_TIMEZONE, &new_timezone_offset, 1);
+    if(totp_open_config_file(cfg_storage, &file) == TotpConfigFileOpenSuccess) {
+        do {
+            uint32_t tmp_uint32 = new_notification_method;
+            if(!flipper_format_insert_or_update_uint32(
+                   file, TOTP_CONFIG_KEY_NOTIFICATION_METHOD, &tmp_uint32, 1)) {
+                update_result = TotpConfigFileUpdateError;
+                break;
+            }
+
+            update_result = TotpConfigFileUpdateSuccess;
+        } while(false);
+
+        totp_close_config_file(file);
+    } else {
+        update_result = TotpConfigFileUpdateError;
+    }
 
-    totp_close_config_file(file);
     totp_close_storage();
+    return update_result;
 }
 
-void totp_config_file_update_notification_method(NotificationMethod new_notification_method) {
+TotpConfigFileUpdateResult totp_config_file_update_user_settings(const PluginState* plugin_state) {
     Storage* cfg_storage = totp_open_storage();
-    FlipperFormat* file = totp_open_config_file(cfg_storage);
+    FlipperFormat* file;
+    TotpConfigFileUpdateResult update_result;
+    if(totp_open_config_file(cfg_storage, &file) == TotpConfigFileOpenSuccess) {
+        do {
+            if(!flipper_format_insert_or_update_float(
+                   file, TOTP_CONFIG_KEY_TIMEZONE, &plugin_state->timezone_offset, 1)) {
+                update_result = TotpConfigFileUpdateError;
+                break;
+            }
+            uint32_t tmp_uint32 = plugin_state->notification_method;
+            if(!flipper_format_insert_or_update_uint32(
+                   file, TOTP_CONFIG_KEY_NOTIFICATION_METHOD, &tmp_uint32, 1)) {
+                update_result = TotpConfigFileUpdateError;
+                break;
+            }
 
-    uint32_t tmp_uint32 = new_notification_method;
-    flipper_format_insert_or_update_uint32(
-        file, TOTP_CONFIG_KEY_NOTIFICATION_METHOD, &tmp_uint32, 1);
+            update_result = TotpConfigFileUpdateSuccess;
+        } while(false);
+
+        totp_close_config_file(file);
+    } else {
+        update_result = TotpConfigFileUpdateError;
+    }
 
-    totp_close_config_file(file);
     totp_close_storage();
+    return update_result;
 }
 
-void totp_config_file_update_user_settings(const PluginState* plugin_state) {
-    Storage* cfg_storage = totp_open_storage();
-    FlipperFormat* file = totp_open_config_file(cfg_storage);
-
-    flipper_format_insert_or_update_float(
-        file, TOTP_CONFIG_KEY_TIMEZONE, &plugin_state->timezone_offset, 1);
-    uint32_t tmp_uint32 = plugin_state->notification_method;
-    flipper_format_insert_or_update_uint32(
-        file, TOTP_CONFIG_KEY_NOTIFICATION_METHOD, &tmp_uint32, 1);
-
-    totp_close_config_file(file);
-    totp_close_storage();
-}
-
-void totp_full_save_config_file(const PluginState* const plugin_state) {
+TotpConfigFileUpdateResult totp_full_save_config_file(const PluginState* const plugin_state) {
     Storage* storage = totp_open_storage();
     FlipperFormat* fff_data_file = flipper_format_file_alloc(storage);
+    TotpConfigFileUpdateResult result = TotpConfigFileUpdateSuccess;
 
-    flipper_format_file_open_always(fff_data_file, CONFIG_FILE_PATH);
-    flipper_format_write_header_cstr(
-        fff_data_file, CONFIG_FILE_HEADER, CONFIG_FILE_ACTUAL_VERSION);
-    flipper_format_write_hex(
-        fff_data_file, TOTP_CONFIG_KEY_BASE_IV, &plugin_state->base_iv[0], TOTP_IV_SIZE);
-    flipper_format_write_hex(
-        fff_data_file,
-        TOTP_CONFIG_KEY_CRYPTO_VERIFY,
-        plugin_state->crypto_verify_data,
-        plugin_state->crypto_verify_data_length);
-    flipper_format_write_float(
-        fff_data_file, TOTP_CONFIG_KEY_TIMEZONE, &plugin_state->timezone_offset, 1);
-    flipper_format_write_bool(fff_data_file, TOTP_CONFIG_KEY_PINSET, &plugin_state->pin_set, 1);
-    uint32_t tmp_uint32 = plugin_state->notification_method;
-    flipper_format_write_uint32(
-        fff_data_file, TOTP_CONFIG_KEY_NOTIFICATION_METHOD, &tmp_uint32, 1);
+    do {
+        if(!flipper_format_file_open_always(fff_data_file, CONFIG_FILE_TEMP_PATH)) {
+            result = TotpConfigFileUpdateError;
+            break;
+        }
 
-    TOTP_LIST_FOREACH(plugin_state->tokens_list, node, {
-        const TokenInfo* token_info = node->data;
-        totp_config_file_save_new_token_i(fff_data_file, token_info);
-    });
+        if(!flipper_format_write_header_cstr(
+               fff_data_file, CONFIG_FILE_HEADER, CONFIG_FILE_ACTUAL_VERSION)) {
+            result = TotpConfigFileUpdateError;
+            break;
+        }
+
+        if(!flipper_format_write_hex(
+               fff_data_file, TOTP_CONFIG_KEY_BASE_IV, &plugin_state->base_iv[0], TOTP_IV_SIZE)) {
+            result = TotpConfigFileUpdateError;
+            break;
+        }
+
+        if(!flipper_format_write_hex(
+               fff_data_file,
+               TOTP_CONFIG_KEY_CRYPTO_VERIFY,
+               plugin_state->crypto_verify_data,
+               plugin_state->crypto_verify_data_length)) {
+            result = TotpConfigFileUpdateError;
+            break;
+        }
+
+        if(!flipper_format_write_float(
+               fff_data_file, TOTP_CONFIG_KEY_TIMEZONE, &plugin_state->timezone_offset, 1)) {
+            result = TotpConfigFileUpdateError;
+            break;
+        }
+
+        if(!flipper_format_write_bool(
+               fff_data_file, TOTP_CONFIG_KEY_PINSET, &plugin_state->pin_set, 1)) {
+            result = TotpConfigFileUpdateError;
+            break;
+        }
+        uint32_t tmp_uint32 = plugin_state->notification_method;
+        if(!flipper_format_write_uint32(
+               fff_data_file, TOTP_CONFIG_KEY_NOTIFICATION_METHOD, &tmp_uint32, 1)) {
+            result = TotpConfigFileUpdateError;
+            break;
+        }
+
+        bool tokens_written = true;
+        TOTP_LIST_FOREACH(plugin_state->tokens_list, node, {
+            const TokenInfo* token_info = node->data;
+            tokens_written = tokens_written &&
+                             totp_config_file_save_new_token_i(fff_data_file, token_info) ==
+                                 TotpConfigFileUpdateSuccess;
+        });
+
+        if(!tokens_written) {
+            result = TotpConfigFileUpdateError;
+            break;
+        }
+    } while(false);
 
     totp_close_config_file(fff_data_file);
+
+    if(result == TotpConfigFileUpdateSuccess) {
+        if(storage_file_exists(storage, CONFIG_FILE_ORIG_PATH)) {
+            storage_simply_remove(storage, CONFIG_FILE_ORIG_PATH);
+        }
+
+        if(storage_common_rename(storage, CONFIG_FILE_PATH, CONFIG_FILE_ORIG_PATH) != FSE_OK) {
+            result = TotpConfigFileUpdateError;
+        } else if(storage_common_rename(storage, CONFIG_FILE_TEMP_PATH, CONFIG_FILE_PATH) != FSE_OK) {
+            result = TotpConfigFileUpdateError;
+        } else if(!storage_simply_remove(storage, CONFIG_FILE_ORIG_PATH)) {
+            result = TotpConfigFileUpdateError;
+        }
+    }
+
     totp_close_storage();
+    return result;
 }
 
-void totp_config_file_load_base(PluginState* const plugin_state) {
+TotpConfigFileOpenResult totp_config_file_load_base(PluginState* const plugin_state) {
     Storage* storage = totp_open_storage();
-    FlipperFormat* fff_data_file = totp_open_config_file(storage);
+    FlipperFormat* fff_data_file;
+
+    TotpConfigFileOpenResult result;
+    if((result = totp_open_config_file(storage, &fff_data_file)) != TotpConfigFileOpenSuccess) {
+        totp_close_storage();
+        return result;
+    }
 
     plugin_state->timezone_offset = 0;
 
     FuriString* temp_str = furi_string_alloc();
 
-    uint32_t file_version;
-    if(!flipper_format_read_header(fff_data_file, temp_str, &file_version)) {
-        FURI_LOG_E(LOGGING_TAG, "Missing or incorrect header");
-        furi_string_free(temp_str);
-        return;
-    }
-
-    if(file_version < CONFIG_FILE_ACTUAL_VERSION) {
-        FURI_LOG_I(
-            LOGGING_TAG,
-            "Obsolete config file version detected. Current version: %" PRIu32
-            "; Actual version: %" PRId16,
-            file_version,
-            CONFIG_FILE_ACTUAL_VERSION);
-        totp_close_config_file(fff_data_file);
-
-        if(storage_common_stat(storage, CONFIG_FILE_BACKUP_PATH, NULL) == FSE_OK) {
-            storage_simply_remove(storage, CONFIG_FILE_BACKUP_PATH);
+    do {
+        uint32_t file_version;
+        if(!flipper_format_read_header(fff_data_file, temp_str, &file_version)) {
+            FURI_LOG_E(LOGGING_TAG, "Missing or incorrect header");
+            result = TotpConfigFileOpenError;
+            break;
         }
 
-        if(storage_common_copy(storage, CONFIG_FILE_PATH, CONFIG_FILE_BACKUP_PATH) == FSE_OK) {
-            FURI_LOG_I(LOGGING_TAG, "Took config file backup to %s", CONFIG_FILE_BACKUP_PATH);
-            fff_data_file = totp_open_config_file(storage);
-            FlipperFormat* fff_backup_data_file = flipper_format_file_alloc(storage);
-            flipper_format_file_open_existing(fff_backup_data_file, CONFIG_FILE_BACKUP_PATH);
+        if(file_version < CONFIG_FILE_ACTUAL_VERSION) {
+            FURI_LOG_I(
+                LOGGING_TAG,
+                "Obsolete config file version detected. Current version: %" PRIu32
+                "; Actual version: %" PRId16,
+                file_version,
+                CONFIG_FILE_ACTUAL_VERSION);
+            totp_close_config_file(fff_data_file);
 
-            if(file_version == 1) {
-                if(totp_config_migrate_v1_to_v2(fff_data_file, fff_backup_data_file)) {
-                    FURI_LOG_I(LOGGING_TAG, "Applied migration from v1 to v2");
-                } else {
-                    FURI_LOG_W(LOGGING_TAG, "An error occurred during migration from v1 to v2");
-                }
+            if(storage_common_stat(storage, CONFIG_FILE_BACKUP_PATH, NULL) == FSE_OK) {
+                storage_simply_remove(storage, CONFIG_FILE_BACKUP_PATH);
             }
 
-            flipper_format_file_close(fff_backup_data_file);
-            flipper_format_free(fff_backup_data_file);
-            flipper_format_rewind(fff_data_file);
-        } else {
-            FURI_LOG_E(
-                LOGGING_TAG,
-                "An error occurred during taking backup of %s into %s before migration",
-                CONFIG_FILE_PATH,
-                CONFIG_FILE_BACKUP_PATH);
+            if(storage_common_copy(storage, CONFIG_FILE_PATH, CONFIG_FILE_BACKUP_PATH) == FSE_OK) {
+                FURI_LOG_I(LOGGING_TAG, "Took config file backup to %s", CONFIG_FILE_BACKUP_PATH);
+                if(totp_open_config_file(storage, &fff_data_file) != TotpConfigFileOpenSuccess) {
+                    result = TotpConfigFileOpenError;
+                    break;
+                }
+
+                FlipperFormat* fff_backup_data_file = flipper_format_file_alloc(storage);
+                if(!flipper_format_file_open_existing(
+                       fff_backup_data_file, CONFIG_FILE_BACKUP_PATH)) {
+                    flipper_format_file_close(fff_backup_data_file);
+                    flipper_format_free(fff_backup_data_file);
+                    result = TotpConfigFileOpenError;
+                    break;
+                }
+
+                if(file_version == 1) {
+                    if(totp_config_migrate_v1_to_v2(fff_data_file, fff_backup_data_file)) {
+                        FURI_LOG_I(LOGGING_TAG, "Applied migration from v1 to v2");
+                    } else {
+                        FURI_LOG_W(
+                            LOGGING_TAG, "An error occurred during migration from v1 to v2");
+                        result = TotpConfigFileOpenError;
+                        break;
+                    }
+                }
+
+                flipper_format_file_close(fff_backup_data_file);
+                flipper_format_free(fff_backup_data_file);
+                flipper_format_rewind(fff_data_file);
+            } else {
+                FURI_LOG_E(
+                    LOGGING_TAG,
+                    "An error occurred during taking backup of %s into %s before migration",
+                    CONFIG_FILE_PATH,
+                    CONFIG_FILE_BACKUP_PATH);
+                result = TotpConfigFileOpenError;
+                break;
+            }
         }
-    }
 
-    if(!flipper_format_read_hex(
-           fff_data_file, TOTP_CONFIG_KEY_BASE_IV, &plugin_state->base_iv[0], TOTP_IV_SIZE)) {
-        FURI_LOG_D(LOGGING_TAG, "Missing base IV");
-    }
-
-    flipper_format_rewind(fff_data_file);
-
-    uint32_t crypto_size;
-    if(flipper_format_get_value_count(fff_data_file, TOTP_CONFIG_KEY_CRYPTO_VERIFY, &crypto_size) &&
-       crypto_size > 0) {
-        plugin_state->crypto_verify_data = malloc(sizeof(uint8_t) * crypto_size);
-        furi_check(plugin_state->crypto_verify_data != NULL);
-        plugin_state->crypto_verify_data_length = crypto_size;
         if(!flipper_format_read_hex(
-               fff_data_file,
-               TOTP_CONFIG_KEY_CRYPTO_VERIFY,
-               plugin_state->crypto_verify_data,
-               crypto_size)) {
-            FURI_LOG_D(LOGGING_TAG, "Missing crypto verify token");
-            free(plugin_state->crypto_verify_data);
+               fff_data_file, TOTP_CONFIG_KEY_BASE_IV, &plugin_state->base_iv[0], TOTP_IV_SIZE)) {
+            FURI_LOG_D(LOGGING_TAG, "Missing base IV");
+        }
+
+        if(!flipper_format_rewind(fff_data_file)) {
+            result = TotpConfigFileOpenError;
+            break;
+        }
+
+        uint32_t crypto_size;
+        if(flipper_format_get_value_count(
+               fff_data_file, TOTP_CONFIG_KEY_CRYPTO_VERIFY, &crypto_size) &&
+           crypto_size > 0) {
+            plugin_state->crypto_verify_data = malloc(sizeof(uint8_t) * crypto_size);
+            furi_check(plugin_state->crypto_verify_data != NULL);
+            plugin_state->crypto_verify_data_length = crypto_size;
+            if(!flipper_format_read_hex(
+                   fff_data_file,
+                   TOTP_CONFIG_KEY_CRYPTO_VERIFY,
+                   plugin_state->crypto_verify_data,
+                   crypto_size)) {
+                FURI_LOG_D(LOGGING_TAG, "Missing crypto verify token");
+                free(plugin_state->crypto_verify_data);
+                plugin_state->crypto_verify_data = NULL;
+                plugin_state->crypto_verify_data_length = 0;
+            }
+        } else {
             plugin_state->crypto_verify_data = NULL;
             plugin_state->crypto_verify_data_length = 0;
         }
-    } else {
-        plugin_state->crypto_verify_data = NULL;
-        plugin_state->crypto_verify_data_length = 0;
-    }
 
-    flipper_format_rewind(fff_data_file);
+        if(!flipper_format_rewind(fff_data_file)) {
+            result = TotpConfigFileOpenError;
+            break;
+        }
 
-    if(!flipper_format_read_float(
-           fff_data_file, TOTP_CONFIG_KEY_TIMEZONE, &plugin_state->timezone_offset, 1)) {
-        plugin_state->timezone_offset = 0;
-        FURI_LOG_D(LOGGING_TAG, "Missing timezone offset information, defaulting to 0");
-    }
+        if(!flipper_format_read_float(
+               fff_data_file, TOTP_CONFIG_KEY_TIMEZONE, &plugin_state->timezone_offset, 1)) {
+            plugin_state->timezone_offset = 0;
+            FURI_LOG_D(LOGGING_TAG, "Missing timezone offset information, defaulting to 0");
+        }
 
-    flipper_format_rewind(fff_data_file);
+        if(!flipper_format_rewind(fff_data_file)) {
+            result = TotpConfigFileOpenError;
+            break;
+        }
 
-    if(!flipper_format_read_bool(
-           fff_data_file, TOTP_CONFIG_KEY_PINSET, &plugin_state->pin_set, 1)) {
-        plugin_state->pin_set = true;
-    }
+        if(!flipper_format_read_bool(
+               fff_data_file, TOTP_CONFIG_KEY_PINSET, &plugin_state->pin_set, 1)) {
+            plugin_state->pin_set = true;
+        }
 
-    flipper_format_rewind(fff_data_file);
+        flipper_format_rewind(fff_data_file);
 
-    uint32_t tmp_uint32;
-    if(!flipper_format_read_uint32(
-           fff_data_file, TOTP_CONFIG_KEY_NOTIFICATION_METHOD, &tmp_uint32, 1)) {
-        tmp_uint32 = NotificationMethodSound | NotificationMethodVibro;
-    }
+        uint32_t tmp_uint32;
+        if(!flipper_format_read_uint32(
+               fff_data_file, TOTP_CONFIG_KEY_NOTIFICATION_METHOD, &tmp_uint32, 1)) {
+            tmp_uint32 = NotificationMethodSound | NotificationMethodVibro;
+        }
 
-    plugin_state->notification_method = tmp_uint32;
+        plugin_state->notification_method = tmp_uint32;
+    } while(false);
 
     furi_string_free(temp_str);
     totp_close_config_file(fff_data_file);
     totp_close_storage();
+    return result;
 }
 
 TokenLoadingResult totp_config_file_load_tokens(PluginState* const plugin_state) {
     Storage* storage = totp_open_storage();
-    FlipperFormat* fff_data_file = totp_open_config_file(storage);
+    FlipperFormat* fff_data_file;
+    if(totp_open_config_file(storage, &fff_data_file) != TotpConfigFileOpenSuccess) {
+        totp_close_storage();
+        return TokenLoadingResultError;
+    }
 
     FuriString* temp_str = furi_string_alloc();
     uint32_t temp_data32;
 
     if(!flipper_format_read_header(fff_data_file, temp_str, &temp_data32)) {
         FURI_LOG_E(LOGGING_TAG, "Missing or incorrect header");
+        totp_close_storage();
         furi_string_free(temp_str);
         return TokenLoadingResultError;
     }
@@ -459,8 +692,42 @@ TokenLoadingResult totp_config_file_load_tokens(PluginState* const plugin_state)
     return result;
 }
 
-void totp_close_config_file(FlipperFormat* file) {
-    if(file == NULL) return;
-    flipper_format_file_close(file);
-    flipper_format_free(file);
-}
+TotpConfigFileUpdateResult
+    totp_config_file_update_crypto_signatures(const PluginState* plugin_state) {
+    Storage* storage = totp_open_storage();
+    FlipperFormat* config_file;
+    TotpConfigFileUpdateResult update_result;
+    if(totp_open_config_file(storage, &config_file) == TotpConfigFileOpenSuccess) {
+        do {
+            if(!flipper_format_insert_or_update_hex(
+                   config_file, TOTP_CONFIG_KEY_BASE_IV, plugin_state->base_iv, TOTP_IV_SIZE)) {
+                update_result = TotpConfigFileUpdateError;
+                break;
+            }
+
+            if(!flipper_format_insert_or_update_hex(
+                   config_file,
+                   TOTP_CONFIG_KEY_CRYPTO_VERIFY,
+                   plugin_state->crypto_verify_data,
+                   plugin_state->crypto_verify_data_length)) {
+                update_result = TotpConfigFileUpdateError;
+                break;
+            }
+
+            if(!flipper_format_insert_or_update_bool(
+                   config_file, TOTP_CONFIG_KEY_PINSET, &plugin_state->pin_set, 1)) {
+                update_result = TotpConfigFileUpdateError;
+                break;
+            }
+
+            update_result = TotpConfigFileUpdateSuccess;
+        } while(false);
+
+        totp_close_config_file(config_file);
+    } else {
+        update_result = TotpConfigFileUpdateError;
+    }
+
+    totp_close_storage();
+    return update_result;
+}

applications/plugins/totp/services/config/config.h

@@ -7,6 +7,8 @@
 #include "constants.h"
 
 typedef uint8_t TokenLoadingResult;
+typedef uint8_t TotpConfigFileOpenResult;
+typedef uint8_t TotpConfigFileUpdateResult;
 
 /**
  * @brief Token loading results
@@ -29,40 +31,48 @@ enum TokenLoadingResults {
 };
 
 /**
- * @brief Opens storage record
- * @return Storage record
+ * @brief Config file opening result
  */
-Storage* totp_open_storage();
+enum TotpConfigFileOpenResults {
+    /**
+     * @brief Config file opened successfully
+     */
+    TotpConfigFileOpenSuccess = 0,
+
+    /**
+     * @brief An error has occurred during opening config file
+     */
+    TotpConfigFileOpenError = 1
+};
 
 /**
- * @brief Closes storage record
+ * @brief Config file updating result
  */
-void totp_close_storage();
+enum TotpConfigFileUpdateResults {
+    /**
+     * @brief Config file updated successfully
+     */
+    TotpConfigFileUpdateSuccess,
 
-/**
- * @brief Opens or creates TOTP application standard config file
- * @param storage storage record to use
- * @return Config file reference
- */
-FlipperFormat* totp_open_config_file(Storage* storage);
-
-/**
- * @brief Closes config file
- * @param file config file reference
- */
-void totp_close_config_file(FlipperFormat* file);
+    /**
+     * @brief An error has occurred during updating config file
+     */
+    TotpConfigFileUpdateError
+};
 
 /**
  * @brief Saves all the settings and tokens to an application config file
  * @param plugin_state application state
+ * @return Config file update result
  */
-void totp_full_save_config_file(const PluginState* const plugin_state);
+TotpConfigFileUpdateResult totp_full_save_config_file(const PluginState* const plugin_state);
 
 /**
  * @brief Loads basic information from an application config file into application state without loading all the tokens
  * @param plugin_state application state
+ * @return Config file open result
  */
-void totp_config_file_load_base(PluginState* const plugin_state);
+TotpConfigFileOpenResult totp_config_file_load_base(PluginState* const plugin_state);
 
 /**
  * @brief Loads tokens from an application config file into application state
@@ -74,23 +84,36 @@ TokenLoadingResult totp_config_file_load_tokens(PluginState* const plugin_state)
 /**
  * @brief Add new token to the end of the application config file
  * @param token_info token information to be saved
+ * @return Config file update result
  */
-void totp_config_file_save_new_token(const TokenInfo* token_info);
+TotpConfigFileUpdateResult totp_config_file_save_new_token(const TokenInfo* token_info);
 
 /**
  * @brief Updates timezone offset in an application config file
  * @param new_timezone_offset new timezone offset to be set
+ * @return Config file update result
  */
-void totp_config_file_update_timezone_offset(float new_timezone_offset);
+TotpConfigFileUpdateResult totp_config_file_update_timezone_offset(float new_timezone_offset);
 
 /**
  * @brief Updates notification method in an application config file
  * @param new_notification_method new notification method to be set
+ * @return Config file update result
  */
-void totp_config_file_update_notification_method(NotificationMethod new_notification_method);
+TotpConfigFileUpdateResult
+    totp_config_file_update_notification_method(NotificationMethod new_notification_method);
 
 /**
  * @brief Updates application user settings
  * @param plugin_state application state
+ * @return Config file update result
  */
-void totp_config_file_update_user_settings(const PluginState* plugin_state);
+TotpConfigFileUpdateResult totp_config_file_update_user_settings(const PluginState* plugin_state);
+
+/**
+ * @brief Updates crypto signatures information
+ * @param plugin_state application state
+ * @return Config file update result
+ */
+TotpConfigFileUpdateResult
+    totp_config_file_update_crypto_signatures(const PluginState* plugin_state);

applications/plugins/totp/services/crypto/crypto.c

@@ -61,7 +61,7 @@ uint8_t* totp_crypto_decrypt(
     return decrypted_data;
 }
 
-void totp_crypto_seed_iv(PluginState* plugin_state, const uint8_t* pin, uint8_t pin_length) {
+bool totp_crypto_seed_iv(PluginState* plugin_state, const uint8_t* pin, uint8_t pin_length) {
     if(plugin_state->crypto_verify_data == NULL) {
         FURI_LOG_D(LOGGING_TAG, "Generating new IV");
         furi_hal_random_fill_buf(&plugin_state->base_iv[0], TOTP_IV_SIZE);
@@ -94,13 +94,12 @@ void totp_crypto_seed_iv(PluginState* plugin_state, const uint8_t* pin, uint8_t
         }
     }
 
+    bool result = true;
     if(plugin_state->crypto_verify_data == NULL) {
         FURI_LOG_D(LOGGING_TAG, "Generating crypto verify data");
         plugin_state->crypto_verify_data = malloc(CRYPTO_VERIFY_KEY_LENGTH);
         furi_check(plugin_state->crypto_verify_data != NULL);
         plugin_state->crypto_verify_data_length = CRYPTO_VERIFY_KEY_LENGTH;
-        Storage* storage = totp_open_storage();
-        FlipperFormat* config_file = totp_open_config_file(storage);
 
         plugin_state->crypto_verify_data = totp_crypto_encrypt(
             (uint8_t*)CRYPTO_VERIFY_KEY,
@@ -108,19 +107,13 @@ void totp_crypto_seed_iv(PluginState* plugin_state, const uint8_t* pin, uint8_t
             &plugin_state->iv[0],
             &plugin_state->crypto_verify_data_length);
 
-        flipper_format_insert_or_update_hex(
-            config_file, TOTP_CONFIG_KEY_BASE_IV, plugin_state->base_iv, TOTP_IV_SIZE);
-        flipper_format_insert_or_update_hex(
-            config_file,
-            TOTP_CONFIG_KEY_CRYPTO_VERIFY,
-            plugin_state->crypto_verify_data,
-            CRYPTO_VERIFY_KEY_LENGTH);
         plugin_state->pin_set = pin != NULL && pin_length > 0;
-        flipper_format_insert_or_update_bool(
-            config_file, TOTP_CONFIG_KEY_PINSET, &plugin_state->pin_set, 1);
-        totp_close_config_file(config_file);
-        totp_close_storage();
+
+        result = totp_config_file_update_crypto_signatures(plugin_state) ==
+                 TotpConfigFileUpdateSuccess;
     }
+
+    return result;
 }
 
 bool totp_crypto_verify_key(const PluginState* plugin_state) {

applications/plugins/totp/services/crypto/crypto.h

@@ -35,8 +35,9 @@ uint8_t* totp_crypto_decrypt(
  * @param plugin_state application state
  * @param pin user's PIN
  * @param pin_length user's PIN length
+ * @return \c true on success; \c false otherwise
  */
-void totp_crypto_seed_iv(PluginState* plugin_state, const uint8_t* pin, uint8_t pin_length);
+bool totp_crypto_seed_iv(PluginState* plugin_state, const uint8_t* pin, uint8_t pin_length);
 
 /**
  * @brief Verifies whether cryptographic information (certificate + IV) is valid and can be used for encryption and decryption

applications/plugins/totp/services/hmac/memxor.c

@@ -18,8 +18,6 @@
 /* Written by Simon Josefsson.  The interface was inspired by memxor
    in Niels Möller's Nettle. */
 
-/* #include <config.h> */
-
 #include "memxor.h"
 
 void* memxor(void* /*restrict*/ dest, const void* /*restrict*/ src, size_t n) {

applications/plugins/totp/totp_app.c

@@ -15,6 +15,7 @@
 #include "types/common.h"
 #include "ui/scene_director.h"
 #include "ui/constants.h"
+#include "ui/common_dialogs.h"
 #include "services/crypto/crypto.h"
 #include "cli/cli.h"
 
@@ -36,17 +37,7 @@ static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queu
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static bool totp_plugin_state_init(PluginState* const plugin_state) {
-    plugin_state->gui = furi_record_open(RECORD_GUI);
-    plugin_state->notification_app = furi_record_open(RECORD_NOTIFICATION);
-    plugin_state->dialogs_app = furi_record_open(RECORD_DIALOGS);
-
-    totp_config_file_load_base(plugin_state);
-
-    totp_cli_register_command_handler(plugin_state);
-
-    totp_scene_director_init_scenes(plugin_state);
-
+static bool totp_activate_initial_scene(PluginState* const plugin_state) {
     if(plugin_state->crypto_verify_data == NULL) {
         DialogMessage* message = dialog_message_alloc();
         dialog_message_set_buttons(message, "No", NULL, "Yes");
@@ -63,13 +54,19 @@ static bool totp_plugin_state_init(PluginState* const plugin_state) {
         if(dialog_result == DialogMessageButtonRight) {
             totp_scene_director_activate_scene(plugin_state, TotpSceneAuthentication, NULL);
         } else {
-            totp_crypto_seed_iv(plugin_state, NULL, 0);
+            if(!totp_crypto_seed_iv(plugin_state, NULL, 0)) {
+                totp_dialogs_config_loading_error(plugin_state);
+                return false;
+            }
             totp_scene_director_activate_scene(plugin_state, TotpSceneGenerateToken, NULL);
         }
     } else if(plugin_state->pin_set) {
         totp_scene_director_activate_scene(plugin_state, TotpSceneAuthentication, NULL);
     } else {
-        totp_crypto_seed_iv(plugin_state, NULL, 0);
+        if(!totp_crypto_seed_iv(plugin_state, NULL, 0)) {
+            totp_dialogs_config_loading_error(plugin_state);
+            return false;
+        }
         if(totp_crypto_verify_key(plugin_state)) {
             totp_scene_director_activate_scene(plugin_state, TotpSceneGenerateToken, NULL);
         } else {
@@ -94,13 +91,20 @@ static bool totp_plugin_state_init(PluginState* const plugin_state) {
     return true;
 }
 
+static bool totp_plugin_state_init(PluginState* const plugin_state) {
+    plugin_state->gui = furi_record_open(RECORD_GUI);
+    plugin_state->notification_app = furi_record_open(RECORD_NOTIFICATION);
+    plugin_state->dialogs_app = furi_record_open(RECORD_DIALOGS);
+
+    if(totp_config_file_load_base(plugin_state) != TotpConfigFileOpenSuccess) {
+        totp_dialogs_config_loading_error(plugin_state);
+        return false;
+    }
+
+    return true;
+}
+
 static void totp_plugin_state_free(PluginState* plugin_state) {
-    totp_cli_unregister_command_handler();
-
-    totp_scene_director_deactivate_active_scene(plugin_state);
-
-    totp_scene_director_dispose(plugin_state);
-
     furi_record_close(RECORD_GUI);
     furi_record_close(RECORD_NOTIFICATION);
     furi_record_close(RECORD_DIALOGS);
@@ -139,6 +143,14 @@ int32_t totp_app() {
         return 255;
     }
 
+    totp_cli_register_command_handler(plugin_state);
+    totp_scene_director_init_scenes(plugin_state);
+    if(!totp_activate_initial_scene(plugin_state)) {
+        FURI_LOG_E(LOGGING_TAG, "An error ocurred during activating initial scene\r\n");
+        totp_plugin_state_free(plugin_state);
+        return 253;
+    }
+
     // Set system callbacks
     ViewPort* view_port = view_port_alloc();
     view_port_draw_callback_set(view_port, render_callback, &state_mutex);
@@ -171,6 +183,10 @@ int32_t totp_app() {
         release_mutex(&state_mutex, plugin_state_m);
     }
 
+    totp_cli_unregister_command_handler();
+    totp_scene_director_deactivate_active_scene(plugin_state);
+    totp_scene_director_dispose(plugin_state);
+
     view_port_enabled_set(view_port, false);
     gui_remove_view_port(plugin_state->gui, view_port);
     view_port_free(view_port);

applications/plugins/totp/ui/common_dialogs.c

@@ -0,0 +1,20 @@
+#include "common_dialogs.h"
+#include "constants.h"
+
+static DialogMessageButton totp_dialogs_common(PluginState* plugin_state, const char* text) {
+    DialogMessage* message = dialog_message_alloc();
+    dialog_message_set_buttons(message, "Exit", NULL, NULL);
+    dialog_message_set_text(
+        message, text, SCREEN_WIDTH_CENTER, SCREEN_HEIGHT_CENTER, AlignCenter, AlignCenter);
+    DialogMessageButton result = dialog_message_show(plugin_state->dialogs_app, message);
+    dialog_message_free(message);
+    return result;
+}
+
+DialogMessageButton totp_dialogs_config_loading_error(PluginState* plugin_state) {
+    return totp_dialogs_common(plugin_state, "An error has occurred\nduring loading config file");
+}
+
+DialogMessageButton totp_dialogs_config_updating_error(PluginState* plugin_state) {
+    return totp_dialogs_common(plugin_state, "An error has occurred\nduring updating config file");
+}

applications/plugins/totp/ui/common_dialogs.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include <dialogs/dialogs.h>
+#include "../types/plugin_state.h"
+
+DialogMessageButton totp_dialogs_config_loading_error(PluginState* plugin_state);
+DialogMessageButton totp_dialogs_config_updating_error(PluginState* plugin_state);

applications/plugins/totp/ui/scenes/add_new_token/totp_scene_add_new_token.c

@@ -7,6 +7,7 @@
 #include "../../../lib/list/list.h"
 #include "../../../services/config/config.h"
 #include "../../ui_controls.h"
+#include "../../common_dialogs.h"
 #include "../../../lib/roll_value/roll_value.h"
 #include "../../../types/nullable.h"
 #include "../generate_token/totp_scene_generate_token.h"
@@ -248,7 +249,11 @@ bool totp_scene_add_new_token_handle_event(PluginEvent* const event, PluginState
                 TOTP_LIST_INIT_OR_ADD(plugin_state->tokens_list, tokenInfo, furi_check);
                 plugin_state->tokens_count++;
 
-                totp_config_file_save_new_token(tokenInfo);
+                if(totp_config_file_save_new_token(tokenInfo) != TotpConfigFileUpdateSuccess) {
+                    token_info_free(tokenInfo);
+                    totp_dialogs_config_updating_error(plugin_state);
+                    return false;
+                }
 
                 GenerateTokenSceneContext generate_scene_context = {
                     .current_token_index = plugin_state->tokens_count - 1};

applications/plugins/totp/ui/scenes/app_settings/totp_app_settings.c

@@ -2,6 +2,7 @@
 #include <math.h>
 #include <totp_icons.h>
 #include "../../ui_controls.h"
+#include "../../common_dialogs.h"
 #include "../../scene_director.h"
 #include "../token_menu/totp_scene_token_menu.h"
 #include "../../constants.h"
@@ -202,7 +203,12 @@ bool totp_scene_app_settings_handle_event(
                                                    NotificationMethodNone) |
                 (scene_state->notification_vibro ? NotificationMethodVibro :
                                                    NotificationMethodNone);
-            totp_config_file_update_user_settings(plugin_state);
+
+            if(totp_config_file_update_user_settings(plugin_state) !=
+               TotpConfigFileUpdateSuccess) {
+                totp_dialogs_config_updating_error(plugin_state);
+                return false;
+            }
 
             if(!scene_state->current_token_index.is_null) {
                 TokenMenuSceneContext generate_scene_context = {

applications/plugins/totp/ui/scenes/generate_token/totp_scene_generate_token.c

@@ -128,7 +128,7 @@ static void int_token_to_str(uint32_t i_token_code, char* str, TokenDigitsCount
     str[len] = '\0';
 }
 
-TOTP_ALGO get_totp_algo_impl(TokenHashAlgo algo) {
+static TOTP_ALGO get_totp_algo_impl(TokenHashAlgo algo) {
     switch(algo) {
     case SHA1:
         return TOTP_ALGO_SHA1;
@@ -143,7 +143,7 @@ TOTP_ALGO get_totp_algo_impl(TokenHashAlgo algo) {
     return NULL;
 }
 
-void update_totp_params(PluginState* const plugin_state) {
+static void update_totp_params(PluginState* const plugin_state) {
     SceneState* scene_state = (SceneState*)plugin_state->current_scene_state;
 
     if(scene_state->current_token_index < plugin_state->tokens_count) {

applications/plugins/totp/ui/scenes/token_menu/totp_scene_token_menu.c

@@ -2,6 +2,7 @@
 #include <gui/gui.h>
 #include <dialogs/dialogs.h>
 #include "../../ui_controls.h"
+#include "../../common_dialogs.h"
 #include "../../constants.h"
 #include "../../scene_director.h"
 #include "../../../services/config/config.h"
@@ -156,7 +157,10 @@ bool totp_scene_token_menu_handle_event(const PluginEvent* const event, PluginSt
                 furi_check(tokenInfo != NULL);
                 token_info_free(tokenInfo);
 
-                totp_full_save_config_file(plugin_state);
+                if(totp_full_save_config_file(plugin_state) != TotpConfigFileUpdateSuccess) {
+                    totp_dialogs_config_updating_error(plugin_state);
+                    return false;
+                }
                 totp_scene_director_activate_scene(plugin_state, TotpSceneGenerateToken, NULL);
             }
             break;

applications/plugins/unitemp/README.md

@@ -4,6 +4,6 @@
 [![GitHub](https://img.shields.io/github/license/quen0n/unitemp-flipperzero)](https://github.com/quen0n/unitemp-flipperzero/blob/dev/LICENSE.md)  
 [Flipper Zero](https://flipperzero.one/) application for reading temperature, humidity and pressure sensors using Onewire, Singlewire, I2C protocols.   
 ## List of supported sensors (supplemented)
-![image](https://user-images.githubusercontent.com/10090793/208763931-d15e9883-1016-4add-bd00-14d7842fd82d.png)
+![image](https://user-images.githubusercontent.com/10090793/209491886-f4c5ef6e-38b2-45b8-a8e7-4aeca9e155f2.png)
 ## Installation
 Copy the contents of the repository to the `applications/plugins/unitemp` folder and build the project. Flash FZ along with resources. [More...](https://github.com/flipperdevices/flipperzero-firmware/blob/dev/documentation/fbt.md)

applications/plugins/unitemp/Sensors.c

@@ -81,6 +81,8 @@ static const SensorType* sensorTypes[] = {
     &AM2320_SW,
     &AM2320_I2C,
     &AHT10,
+    &SHT30,
+    &GXHT30,
     &LM75,
     &BMP280,
     &BME280};

applications/plugins/unitemp/Sensors.h

@@ -322,4 +322,5 @@ const GPIO*
 #include "./sensors/BMx280.h"
 #include "./sensors/AM2320.h"
 #include "./sensors/DHT20.h"
+#include "./sensors/SHT30.h"
 #endif

applications/plugins/unitemp/sensors/SHT30.c

@@ -0,0 +1,90 @@
+/*
+    Unitemp - Universal temperature reader
+    Copyright (C) 2022  Victor Nikitchuk (https://github.com/quen0n)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+#include "SHT30.h"
+#include "../interfaces/I2CSensor.h"
+
+const SensorType SHT30 = {
+    .typename = "SHT30",
+    .altname = "SHT30/31/35",
+    .interface = &I2C,
+    .datatype = UT_TEMPERATURE | UT_HUMIDITY,
+    .pollingInterval = 1000,
+    .allocator = unitemp_SHT30_I2C_alloc,
+    .mem_releaser = unitemp_SHT30_I2C_free,
+    .initializer = unitemp_SHT30_init,
+    .deinitializer = unitemp_SHT30_I2C_deinit,
+    .updater = unitemp_SHT30_I2C_update};
+const SensorType GXHT30 = {
+    .typename = "GXHT30",
+    .altname = "GXHT30/31/35",
+    .interface = &I2C,
+    .datatype = UT_TEMPERATURE | UT_HUMIDITY,
+    .pollingInterval = 1000,
+    .allocator = unitemp_SHT30_I2C_alloc,
+    .mem_releaser = unitemp_SHT30_I2C_free,
+    .initializer = unitemp_GXHT30_init,
+    .deinitializer = unitemp_SHT30_I2C_deinit,
+    .updater = unitemp_SHT30_I2C_update};
+
+bool unitemp_SHT30_I2C_alloc(Sensor* sensor, char* args) {
+    UNUSED(args);
+    I2CSensor* i2c_sensor = (I2CSensor*)sensor->instance;
+
+    //Адреса на шине I2C (7 бит)
+    i2c_sensor->minI2CAdr = 0x44 << 1;
+    i2c_sensor->maxI2CAdr = 0x45 << 1;
+    return true;
+}
+
+bool unitemp_SHT30_I2C_free(Sensor* sensor) {
+    //Нечего высвобождать, так как ничего не было выделено
+    UNUSED(sensor);
+    return true;
+}
+
+bool unitemp_SHT30_init(Sensor* sensor) {
+    UNUSED(sensor);
+    return true;
+}
+
+bool unitemp_GXHT30_init(Sensor* sensor) {
+    I2CSensor* i2c_sensor = (I2CSensor*)sensor->instance;
+    //Включение режима автоматического преобразования 2 раза в сек
+    uint8_t data[2] = {0x22, 0x36};
+    if(!unitemp_i2c_writeArray(i2c_sensor, 2, data)) return false;
+    return true;
+}
+
+bool unitemp_SHT30_I2C_deinit(Sensor* sensor) {
+    //Нечего деинициализировать
+    UNUSED(sensor);
+    return true;
+}
+
+UnitempStatus unitemp_SHT30_I2C_update(Sensor* sensor) {
+    I2CSensor* i2c_sensor = (I2CSensor*)sensor->instance;
+    //Получение данных
+    uint8_t data[6] = {0xE0, 0x00};
+    if(!unitemp_i2c_writeArray(i2c_sensor, 2, data)) return UT_SENSORSTATUS_TIMEOUT;
+    if(!unitemp_i2c_readArray(i2c_sensor, 6, data)) return UT_SENSORSTATUS_TIMEOUT;
+
+    sensor->temp = -45 + 175 * (((uint16_t)(data[0] << 8) | data[1]) / 65535.0f);
+    sensor->hum = 100 * (((uint16_t)(data[3] << 8) | data[4]) / 65535.0f);
+
+    return UT_SENSORSTATUS_OK;
+}