bip parser refactor

Co-authored-by: hedger <hedger@users.noreply.github.com>
Co-authored-by: あく <alleteam@gmail.com>

.ci_files/anims_ofw.txt

@@ -168,3 +168,17 @@ Max butthurt: 13
 Min level: 1
 Max level: 3
 Weight: 4
+
+Name: L2_Coding_in_the_shell_128x64
+Min butthurt: 0
+Max butthurt: 12
+Min level: 2
+Max level: 3
+Weight: 4
+
+Name: L2_Secret_door_128x64
+Min butthurt: 0
+Max butthurt: 12
+Min level: 2
+Max level: 3
+Weight: 4

.ci_files/rgb.patch

@@ -1,5 +1,5 @@
 diff --git a/applications/services/notification/notification_app.c b/applications/services/notification/notification_app.c
-index 2f947fe..03c4c76 100644
+index 9baa738..91ad7c1 100644
 --- a/applications/services/notification/notification_app.c
 +++ b/applications/services/notification/notification_app.c
 @@ -9,6 +9,7 @@
@@ -10,7 +10,7 @@ index 2f947fe..03c4c76 100644
  
  #define TAG "NotificationSrv"
  
-@@ -579,6 +580,7 @@ int32_t notification_srv(void* p) {
+@@ -589,6 +590,7 @@ int32_t notification_srv(void* p) {
              break;
          case SaveSettingsMessage:
              notification_save_settings(app);
@@ -19,7 +19,7 @@ index 2f947fe..03c4c76 100644
          }
  
 diff --git a/applications/settings/notification_settings/notification_settings_app.c b/applications/settings/notification_settings/notification_settings_app.c
-index 565d4f1..bae9299 100644
+index 2a1d988..dda86f3 100644
 --- a/applications/settings/notification_settings/notification_settings_app.c
 +++ b/applications/settings/notification_settings/notification_settings_app.c
 @@ -3,6 +3,7 @@
@@ -30,10 +30,20 @@ index 565d4f1..bae9299 100644
  
  #define MAX_NOTIFICATION_SETTINGS 4
  
-@@ -162,6 +163,14 @@ static void vibro_changed(VariableItem* item) {
+@@ -13,6 +14,8 @@ typedef struct {
+     VariableItemList* variable_item_list;
+ } NotificationAppSettings;
+ 
++static VariableItem* temp_item;
++
+ static const NotificationSequence sequence_note_c = {
+     &message_note_c5,
+     &message_delay_100,
+@@ -168,6 +171,59 @@ static void vibro_changed(VariableItem* item) {
      notification_message(app->notification, &sequence_single_vibro);
  }
  
++// Set RGB backlight color
 +static void color_changed(VariableItem* item) {
 +    NotificationAppSettings* app = variable_item_get_context(item);
 +    uint8_t index = variable_item_get_current_value_index(item);
@@ -41,31 +51,102 @@ index 565d4f1..bae9299 100644
 +    variable_item_set_current_value_text(item, rgb_backlight_get_color_text(index));
 +    notification_message(app->notification, &sequence_display_backlight_on);
 +}
++
++// TODO: refactor and fix this
++static void color_set_custom_red(VariableItem* item) {
++    NotificationAppSettings* app = variable_item_get_context(item);
++    uint8_t index = variable_item_get_current_value_index(item);
++    rgb_backlight_set_custom_color(index, 0);
++    char valtext[4] = {};
++    snprintf(valtext, sizeof(valtext), "%d", index);
++    variable_item_set_current_value_text(item, valtext);
++    rgb_backlight_set_color(13);
++    rgb_backlight_update(app->notification->settings.display_brightness * 0xFF, true);
++    // Set to custom color explicitly
++    variable_item_set_current_value_index(temp_item, 13);
++    variable_item_set_current_value_text(temp_item, rgb_backlight_get_color_text(13));
++    notification_message(app->notification, &sequence_display_backlight_on);
++}
++static void color_set_custom_green(VariableItem* item) {
++    NotificationAppSettings* app = variable_item_get_context(item);
++    uint8_t index = variable_item_get_current_value_index(item);
++    rgb_backlight_set_custom_color(index, 1);
++    char valtext[4] = {};
++    snprintf(valtext, sizeof(valtext), "%d", index);
++    variable_item_set_current_value_text(item, valtext);
++    rgb_backlight_set_color(13);
++    rgb_backlight_update(app->notification->settings.display_brightness * 0xFF, true);
++    // Set to custom color explicitly
++    variable_item_set_current_value_index(temp_item, 13);
++    variable_item_set_current_value_text(temp_item, rgb_backlight_get_color_text(13));
++    notification_message(app->notification, &sequence_display_backlight_on);
++}
++static void color_set_custom_blue(VariableItem* item) {
++    NotificationAppSettings* app = variable_item_get_context(item);
++    uint8_t index = variable_item_get_current_value_index(item);
++    rgb_backlight_set_custom_color(index, 2);
++    char valtext[4] = {};
++    snprintf(valtext, sizeof(valtext), "%d", index);
++    variable_item_set_current_value_text(item, valtext);
++    rgb_backlight_set_color(13);
++    rgb_backlight_update(app->notification->settings.display_brightness * 0xFF, true);
++    // Set to custom color explicitly
++    variable_item_set_current_value_index(temp_item, 13);
++    variable_item_set_current_value_text(temp_item, rgb_backlight_get_color_text(13));
++    notification_message(app->notification, &sequence_display_backlight_on);
++}
 +
  static uint32_t notification_app_settings_exit(void* context) {
      UNUSED(context);
      return VIEW_NONE;
-@@ -187,7 +196,13 @@ static NotificationAppSettings* alloc_settings() {
+@@ -192,8 +248,40 @@ static NotificationAppSettings* alloc_settings() {
+     variable_item_set_current_value_index(item, value_index);
      variable_item_set_current_value_text(item, contrast_text[value_index]);
  
-     item = variable_item_list_add(
--        app->variable_item_list, "LCD Backlight", BACKLIGHT_COUNT, backlight_changed, app);
++    // RGB Colors
++    item = variable_item_list_add(
 +        app->variable_item_list, "LCD Color", rgb_backlight_get_color_count(), color_changed, app);
 +    value_index = rgb_backlight_get_settings()->display_color_index;
 +    variable_item_set_current_value_index(item, value_index);
 +    variable_item_set_current_value_text(item, rgb_backlight_get_color_text(value_index));
++    temp_item = item;
++
++    // Custom Color - REFACTOR THIS
++    item = variable_item_list_add(
++        app->variable_item_list, "Custom Red", 255, color_set_custom_red, app);
++    value_index = rgb_backlight_get_settings()->custom_r;
++    variable_item_set_current_value_index(item, value_index);
++    char valtext[4] = {};
++    snprintf(valtext, sizeof(valtext), "%d", value_index);
++    variable_item_set_current_value_text(item, valtext);
 +
 +    item = variable_item_list_add(
++        app->variable_item_list, "Custom Green", 255, color_set_custom_green, app);
++    value_index = rgb_backlight_get_settings()->custom_g;
++    variable_item_set_current_value_index(item, value_index);
++    snprintf(valtext, sizeof(valtext), "%d", value_index);
++    variable_item_set_current_value_text(item, valtext);
++
++    item = variable_item_list_add(
++        app->variable_item_list, "Custom Blue", 255, color_set_custom_blue, app);
++    value_index = rgb_backlight_get_settings()->custom_b;
++    variable_item_set_current_value_index(item, value_index);
++    snprintf(valtext, sizeof(valtext), "%d", value_index);
++    variable_item_set_current_value_text(item, valtext);
++    // End of RGB
++
+     item = variable_item_list_add(
+-        app->variable_item_list, "LCD Backlight", BACKLIGHT_COUNT, backlight_changed, app);
 +        app->variable_item_list, "LCD Brightness", BACKLIGHT_COUNT, backlight_changed, app);
      value_index = value_index_float(
          app->notification->settings.display_brightness, backlight_value, BACKLIGHT_COUNT);
      variable_item_set_current_value_index(item, value_index);
 diff --git a/applications/settings/notification_settings/rgb_backlight.c b/applications/settings/notification_settings/rgb_backlight.c
 new file mode 100644
-index 0000000..269b544
+index 0000000..98f0d3a
 --- /dev/null
 +++ b/applications/settings/notification_settings/rgb_backlight.c
-@@ -0,0 +1,171 @@
+@@ -0,0 +1,217 @@
 +/*
 +    RGB backlight FlipperZero driver
 +    Copyright (C) 2022-2023 Victor Nikitchuk (https://github.com/quen0n)
@@ -88,9 +169,9 @@ index 0000000..269b544
 +#include <furi_hal.h>
 +#include <storage/storage.h>
 +
-+#define RGB_BACKLIGHT_SETTINGS_VERSION 5
++#define RGB_BACKLIGHT_SETTINGS_VERSION 6
 +#define RGB_BACKLIGHT_SETTINGS_FILE_NAME ".rgb_backlight.settings"
-+#define RGB_BACKLIGHT_SETTINGS_PATH EXT_PATH(RGB_BACKLIGHT_SETTINGS_FILE_NAME)
++#define RGB_BACKLIGHT_SETTINGS_PATH INT_PATH(RGB_BACKLIGHT_SETTINGS_FILE_NAME)
 +
 +#define COLOR_COUNT (sizeof(colors) / sizeof(RGBBacklightColor))
 +
@@ -99,11 +180,14 @@ index 0000000..269b544
 +static RGBBacklightSettings rgb_settings = {
 +    .version = RGB_BACKLIGHT_SETTINGS_VERSION,
 +    .display_color_index = 0,
++    .custom_r = 254,
++    .custom_g = 254,
++    .custom_b = 254,
 +    .settings_is_loaded = false};
 +
 +static const RGBBacklightColor colors[] = {
 +    {"Orange", 255, 60, 0},
-+    {"Yellow", 255, 150, 0},
++    {"Yellow", 255, 144, 0},
 +    {"Spring", 167, 255, 0},
 +    {"Lime", 0, 255, 0},
 +    {"Aqua", 0, 255, 127},
@@ -114,7 +198,8 @@ index 0000000..269b544
 +    {"Magenta", 210, 0, 210},
 +    {"Pink", 255, 0, 127},
 +    {"Red", 255, 0, 0},
-+    {"White", 150, 150, 110},
++    {"White", 254, 210, 200},
++    {"Custom", 0, 0, 0},
 +};
 +
 +uint8_t rgb_backlight_get_color_count(void) {
@@ -126,18 +211,28 @@ index 0000000..269b544
 +}
 +
 +void rgb_backlight_load_settings(void) {
-+    //Не загружать данные из внутренней памяти при загрузке в режиме DFU
-+    FuriHalRtcBootMode bm = furi_hal_rtc_get_boot_mode();
-+    if(bm == FuriHalRtcBootModeDfu) {
++    // Do not load settings if we are in other boot modes than normal
++    if(furi_hal_rtc_get_boot_mode() != FuriHalRtcBootModeNormal) {
 +        rgb_settings.settings_is_loaded = true;
 +        return;
 +    }
 +
++    // Wait for all required services to start and create their records
++    uint8_t timeout = 0;
++    while(!furi_record_exists(RECORD_STORAGE)) {
++        timeout++;
++        if(timeout > 150) {
++            rgb_settings.settings_is_loaded = true;
++            return;
++        }
++        furi_delay_ms(5);
++    }
++
 +    RGBBacklightSettings settings;
 +    File* file = storage_file_alloc(furi_record_open(RECORD_STORAGE));
 +    const size_t settings_size = sizeof(RGBBacklightSettings);
 +
-+    FURI_LOG_I(TAG, "loading settings from \"%s\"", RGB_BACKLIGHT_SETTINGS_PATH);
++    FURI_LOG_D(TAG, "loading settings from \"%s\"", RGB_BACKLIGHT_SETTINGS_PATH);
 +    bool fs_result =
 +        storage_file_open(file, RGB_BACKLIGHT_SETTINGS_PATH, FSAM_READ, FSOM_OPEN_EXISTING);
 +
@@ -150,7 +245,7 @@ index 0000000..269b544
 +    }
 +
 +    if(fs_result) {
-+        FURI_LOG_I(TAG, "load success");
++        FURI_LOG_D(TAG, "load success");
 +        if(settings.version != RGB_BACKLIGHT_SETTINGS_VERSION) {
 +            FURI_LOG_E(
 +                TAG,
@@ -175,7 +270,7 @@ index 0000000..269b544
 +    File* file = storage_file_alloc(furi_record_open(RECORD_STORAGE));
 +    const size_t settings_size = sizeof(RGBBacklightSettings);
 +
-+    FURI_LOG_I(TAG, "saving settings to \"%s\"", RGB_BACKLIGHT_SETTINGS_PATH);
++    FURI_LOG_D(TAG, "saving settings to \"%s\"", RGB_BACKLIGHT_SETTINGS_PATH);
 +
 +    memcpy(&settings, &rgb_settings, settings_size);
 +
@@ -191,7 +286,7 @@ index 0000000..269b544
 +    }
 +
 +    if(fs_result) {
-+        FURI_LOG_I(TAG, "save success");
++        FURI_LOG_D(TAG, "save success");
 +    } else {
 +        FURI_LOG_E(TAG, "save failed, %s", storage_file_get_error_desc(file));
 +    }
@@ -213,36 +308,68 @@ index 0000000..269b544
 +    rgb_settings.display_color_index = color_index;
 +}
 +
-+void rgb_backlight_update(uint8_t brightness) {
++void rgb_backlight_set_custom_color(uint8_t color, uint8_t index) {
++    if(index > 2) return;
++    if(index == 0) {
++        rgb_settings.custom_r = color;
++    } else if(index == 1) {
++        rgb_settings.custom_g = color;
++    } else if(index == 2) {
++        rgb_settings.custom_b = color;
++    }
++}
++
++void rgb_backlight_update(uint8_t brightness, bool bypass) {
 +    if(!rgb_settings.settings_is_loaded) {
 +        rgb_backlight_load_settings();
 +    }
 +
-+    static uint8_t last_color_index = 255;
-+    static uint8_t last_brightness = 123;
++    if(!bypass) {
++        static uint8_t last_color_index = 255;
++        static uint8_t last_brightness = 123;
 +
-+    if(last_brightness == brightness && last_color_index == rgb_settings.display_color_index)
-+        return;
++        if(last_brightness == brightness && last_color_index == rgb_settings.display_color_index) {
++            return;
++        }
 +
-+    last_brightness = brightness;
-+    last_color_index = rgb_settings.display_color_index;
++        last_brightness = brightness;
++        last_color_index = rgb_settings.display_color_index;
++    }
 +
 +    for(uint8_t i = 0; i < SK6805_get_led_count(); i++) {
-+        uint8_t r = colors[rgb_settings.display_color_index].red * (brightness / 255.0f);
-+        uint8_t g = colors[rgb_settings.display_color_index].green * (brightness / 255.0f);
-+        uint8_t b = colors[rgb_settings.display_color_index].blue * (brightness / 255.0f);
++        if(rgb_settings.display_color_index == 13) {
++            uint8_t r = rgb_settings.custom_r * (brightness / 255.0f);
++            uint8_t g = rgb_settings.custom_g * (brightness / 255.0f);
++            uint8_t b = rgb_settings.custom_b * (brightness / 255.0f);
 +
-+        SK6805_set_led_color(i, r, g, b);
++            SK6805_set_led_color(i, r, g, b);
++        } else {
++            if((colors[rgb_settings.display_color_index].red == 0) &&
++               (colors[rgb_settings.display_color_index].green == 0) &&
++               (colors[rgb_settings.display_color_index].blue == 0)) {
++                uint8_t r = colors[0].red * (brightness / 255.0f);
++                uint8_t g = colors[0].green * (brightness / 255.0f);
++                uint8_t b = colors[0].blue * (brightness / 255.0f);
++
++                SK6805_set_led_color(i, r, g, b);
++            } else {
++                uint8_t r = colors[rgb_settings.display_color_index].red * (brightness / 255.0f);
++                uint8_t g = colors[rgb_settings.display_color_index].green * (brightness / 255.0f);
++                uint8_t b = colors[rgb_settings.display_color_index].blue * (brightness / 255.0f);
++
++                SK6805_set_led_color(i, r, g, b);
++            }
++        }
 +    }
 +
 +    SK6805_update();
 +}
 diff --git a/applications/settings/notification_settings/rgb_backlight.h b/applications/settings/notification_settings/rgb_backlight.h
 new file mode 100644
-index 0000000..b63d223
+index 0000000..68dacda
 --- /dev/null
 +++ b/applications/settings/notification_settings/rgb_backlight.h
-@@ -0,0 +1,79 @@
+@@ -0,0 +1,91 @@
 +/*
 +    RGB backlight FlipperZero driver
 +    Copyright (C) 2022-2023 Victor Nikitchuk (https://github.com/quen0n)
@@ -274,6 +401,9 @@ index 0000000..b63d223
 +typedef struct {
 +    uint8_t version;
 +    uint8_t display_color_index;
++    uint8_t custom_r;
++    uint8_t custom_g;
++    uint8_t custom_b;
 +    bool settings_is_loaded;
 +} RGBBacklightSettings;
 +
@@ -298,8 +428,9 @@ index 0000000..b63d223
 + * @brief Применить текущие настройки RGB-подсветки
 + *
 + * @param brightness Яркость свечения (0-255)
++ * @param bypass Применить настройки принудительно
 + */
-+void rgb_backlight_update(uint8_t brightness);
++void rgb_backlight_update(uint8_t brightness, bool bypass);
 +
 +/**
 + * @brief Установить цвет RGB-подсветки
@@ -309,6 +440,14 @@ index 0000000..b63d223
 +void rgb_backlight_set_color(uint8_t color_index);
 +
 +/**
++ * @brief Set custom color values by index - 0=R 1=G 2=B
++ *
++ * @param color - color value (0-255)
++ * @param index - color index (0-2) 0=R 1=G 2=B
++ */
++void rgb_backlight_set_custom_color(uint8_t color, uint8_t index);
++
++/**
 + * @brief Получить количество доступных цветов
 + *
 + * @return Число доступных вариантов цвета
@@ -323,54 +462,6 @@ index 0000000..b63d223
 + */
 +const char* rgb_backlight_get_color_text(uint8_t index);
 \ No newline at end of file
-diff --git a/firmware/targets/f7/furi_hal/furi_hal_light.c b/firmware/targets/f7/furi_hal/furi_hal_light.c
-index 83e1603..cad5b86 100644
---- a/firmware/targets/f7/furi_hal/furi_hal_light.c
-+++ b/firmware/targets/f7/furi_hal/furi_hal_light.c
-@@ -3,6 +3,7 @@
- #include <furi_hal_light.h>
- #include <lp5562.h>
- #include <stdint.h>
-+#include <applications/settings/notification_settings/rgb_backlight.h>
- 
- #define LED_CURRENT_RED 50
- #define LED_CURRENT_GREEN 50
-@@ -31,22 +32,21 @@ void furi_hal_light_init() {
- }
- 
- void furi_hal_light_set(Light light, uint8_t value) {
--    furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
--    if(light & LightRed) {
--        lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelRed, value);
--    }
--    if(light & LightGreen) {
--        lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelGreen, value);
--    }
--    if(light & LightBlue) {
--        lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelBlue, value);
--    }
-     if(light & LightBacklight) {
--        uint8_t prev = lp5562_get_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelWhite);
--        lp5562_execute_ramp(
--            &furi_hal_i2c_handle_power, LP5562Engine1, LP5562ChannelWhite, prev, value, 100);
-+        rgb_backlight_update(value);
-+    } else {
-+        furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
-+        if(light & LightRed) {
-+            lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelRed, value);
-+        }
-+        if(light & LightGreen) {
-+            lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelGreen, value);
-+        }
-+        if(light & LightBlue) {
-+            lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelBlue, value);
-+        }
-+        furi_hal_i2c_release(&furi_hal_i2c_handle_power);
-     }
--    furi_hal_i2c_release(&furi_hal_i2c_handle_power);
- }
- 
- void furi_hal_light_blink_start(Light light, uint8_t brightness, uint16_t on_time, uint16_t period) {
 diff --git a/lib/drivers/SK6805.c b/lib/drivers/SK6805.c
 new file mode 100644
 index 0000000..572e1df
@@ -536,3 +627,51 @@ index 0000000..7c58956
 +
 +#endif /* SK6805_H_ */
 \ No newline at end of file
+diff --git a/targets/f7/furi_hal/furi_hal_light.c b/targets/f7/furi_hal/furi_hal_light.c
+index 83e1603..45798ca 100644
+--- a/targets/f7/furi_hal/furi_hal_light.c
++++ b/targets/f7/furi_hal/furi_hal_light.c
+@@ -3,6 +3,7 @@
+ #include <furi_hal_light.h>
+ #include <lp5562.h>
+ #include <stdint.h>
++#include <applications/settings/notification_settings/rgb_backlight.h>
+ 
+ #define LED_CURRENT_RED 50
+ #define LED_CURRENT_GREEN 50
+@@ -31,22 +32,21 @@ void furi_hal_light_init() {
+ }
+ 
+ void furi_hal_light_set(Light light, uint8_t value) {
+-    furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
+-    if(light & LightRed) {
+-        lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelRed, value);
+-    }
+-    if(light & LightGreen) {
+-        lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelGreen, value);
+-    }
+-    if(light & LightBlue) {
+-        lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelBlue, value);
+-    }
+     if(light & LightBacklight) {
+-        uint8_t prev = lp5562_get_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelWhite);
+-        lp5562_execute_ramp(
+-            &furi_hal_i2c_handle_power, LP5562Engine1, LP5562ChannelWhite, prev, value, 100);
++        rgb_backlight_update(value, false);
++    } else {
++        furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
++        if(light & LightRed) {
++            lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelRed, value);
++        }
++        if(light & LightGreen) {
++            lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelGreen, value);
++        }
++        if(light & LightBlue) {
++            lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelBlue, value);
++        }
++        furi_hal_i2c_release(&furi_hal_i2c_handle_power);
+     }
+-    furi_hal_i2c_release(&furi_hal_i2c_handle_power);
+ }
+ 
+ void furi_hal_light_blink_start(Light light, uint8_t brightness, uint16_t on_time, uint16_t period) {

.drone.yml

@@ -22,7 +22,8 @@ steps:
       - export DIST_SUFFIX=${DRONE_TAG}c
       - export WORKFLOW_BRANCH_OR_TAG=release-cfw
       - export FORCE_NO_DIRTY=yes
-      - rm -rf assets/resources/apps/
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
+      - rm -rf applications/main/clock_app/resources/apps/
       - rm -rf build/
       - rm -rf dist/
       - rm -rf .sconsign.dblite
@@ -42,9 +43,13 @@ steps:
       - export DIST_SUFFIX=${DRONE_TAG}
       - export WORKFLOW_BRANCH_OR_TAG=release-cfw
       - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
       - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz
-      - tar zxvf all-the-apps-base.tgz
-      - cp -R base_pack_build/artifacts-base/* assets/resources/apps/
+      - tar zxf all-the-apps-base.tgz
+      - mkdir -p applications/main/clock_app/resources/apps
+      - mkdir -p applications/main/clock_app/resources/apps_data
+      - cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/
+      - cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/
       - rm -rf base_pack_build
       - rm -rf all-the-apps-base.tgz
       - rm -f build/f7-firmware-C/toolbox/version.*
@@ -62,12 +67,14 @@ steps:
     pull: never
     commands:
       - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-extra.tgz
-      - tar zxvf all-the-apps-extra.tgz
-      - cp -R extra_pack_build/artifacts-extra/* assets/resources/apps/
+      - tar zxf all-the-apps-extra.tgz
+      - mkdir -p applications/main/clock_app/resources/apps
+      - cp -R extra_pack_build/artifacts-extra/* applications/main/clock_app/resources/apps/
       - rm -rf extra_pack_build
       - export DIST_SUFFIX=${DRONE_TAG}e
       - export WORKFLOW_BRANCH_OR_TAG=release-cfw
       - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
       - rm -f build/f7-firmware-C/toolbox/version.*
       - ./fbt COMPACT=1 DEBUG=0 updater_package
       - mkdir artifacts-extra-apps
@@ -86,6 +93,7 @@ steps:
       - export DIST_SUFFIX=${DRONE_TAG}r
       - export WORKFLOW_BRANCH_OR_TAG=release-cfw-rgb
       - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
       - rm -f build/f7-firmware-C/toolbox/version.*
       - ./fbt COMPACT=1 DEBUG=0 updater_package
       - mkdir artifacts-rgb-patch
@@ -104,15 +112,19 @@ steps:
       - git checkout -- .
       - rm -f assets/dolphin/external/manifest.txt
       - cp .ci_files/anims_ofw.txt assets/dolphin/external/manifest.txt
-      - rm -rf assets/resources/apps/
+      - rm -rf applications/main/clock_app/resources/apps/
       - export DIST_SUFFIX=${DRONE_TAG}n
       - export WORKFLOW_BRANCH_OR_TAG=no-custom-anims
       - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
       - rm -f build/f7-firmware-C/toolbox/version.*
       - ./fbt COMPACT=1 DEBUG=0 updater_package
       - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz
-      - tar zxvf all-the-apps-base.tgz
-      - cp -R base_pack_build/artifacts-base/* assets/resources/apps/
+      - tar zxf all-the-apps-base.tgz
+      - mkdir -p applications/main/clock_app/resources/apps
+      - mkdir -p applications/main/clock_app/resources/apps_data
+      - cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/
+      - cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/
       - rm -rf base_pack_build
       - rm -rf all-the-apps-base.tgz
       - rm -f build/f7-firmware-C/toolbox/version.*
@@ -329,9 +341,10 @@ steps:
       DISCORD_WEBHOOK:
         from_secret: dis_release_webhook
     commands:
-      - wget "https://raw.githubusercontent.com/fieu/discord.sh/e1dc1a7595efad2cad8f072f0b3531c470f5b7c8/discord.sh"
+      - wget "https://raw.githubusercontent.com/fieu/discord.sh/2253303efc0e7211ac2777d2535054cbb872f1e0/discord.sh"
       - chmod +x ./discord.sh
-      - ./discord.sh --text 'New Unleashed firmware released!\n\nVersion - '${DRONE_TAG}'\n\n[-> Sponsor our project](https://boosty.to/mmxdev)\n\n[[Github - Changelog]](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')\n\n[-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)\n\n[-Download latest extra apps pack-](https://github.com/xMasterX/all-the-plugins/releases/latest)\n\n[-Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/'${DRONE_TAG}'/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=release-cfw&version='${DRONE_TAG}')\n\n[-Version with only main apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'c.tgz&channel=release-cfw&version='${DRONE_TAG}'c)\n\n[-Version without custom animations - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-'${DRONE_TAG}'n.tgz&channel=release-cfw&version='${DRONE_TAG}'n)\n\n[-Version with RGB patch - only for hardware mod! - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz&channel=release-cfw&version='${DRONE_TAG}'r)\n\n[-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz)\n\n[-Version with Extra apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'e.tgz&channel=release-cfw&version='${DRONE_TAG}'e)'
+      - echo 'New Unleashed firmware released!\n\nVersion - '${DRONE_TAG}'\n\n[-> Sponsor our project](https://boosty.to/mmxdev)\n\n[[Github - Changelog]](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')\n\n[-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)\n\n[-Download latest extra apps pack-](https://github.com/xMasterX/all-the-plugins/releases/latest)\n\n[-Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/'${DRONE_TAG}'/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=release-cfw&version='${DRONE_TAG}')\n\n[-Version with only main apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'c.tgz&channel=release-cfw&version='${DRONE_TAG}'c)\n\n[-Version without custom animations - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-'${DRONE_TAG}'n.tgz&channel=release-cfw&version='${DRONE_TAG}'n)\n\n[-Version with RGB patch - only for hardware mod! - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz&channel=release-cfw&version='${DRONE_TAG}'r)\n\n[-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz)\n\n[-Version with Extra apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'e.tgz&channel=release-cfw&version='${DRONE_TAG}'e)' > messagedisc.txt 
+      - ./discord.sh --text "$(jq -Rs . <messagedisc.txt | cut -c 2- | rev | cut -c 2- | rev)"
 
   - name: "Send clean build to telegram"
     image: appleboy/drone-telegram
@@ -362,7 +375,7 @@ trigger:
     - tag
 
 node:
-  typ: haupt
+  typ: dev1
 
 ---
 kind: pipeline
@@ -389,7 +402,8 @@ steps:
       - export DIST_SUFFIX=${DRONE_BUILD_NUMBER}c
       - export WORKFLOW_BRANCH_OR_TAG=dev-cfw
       - export FORCE_NO_DIRTY=yes
-      - rm -rf assets/resources/apps/
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
+      - rm -rf applications/main/clock_app/resources/apps/
       - rm -rf build/
       - rm -rf dist/
       - rm -rf .sconsign.dblite
@@ -410,9 +424,13 @@ steps:
       - export DIST_SUFFIX=${DRONE_BUILD_NUMBER}
       - export WORKFLOW_BRANCH_OR_TAG=dev-cfw
       - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
       - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz
-      - tar zxvf all-the-apps-base.tgz
-      - cp -R base_pack_build/artifacts-base/* assets/resources/apps/
+      - tar zxf all-the-apps-base.tgz
+      - mkdir -p applications/main/clock_app/resources/apps
+      - mkdir -p applications/main/clock_app/resources/apps_data
+      - cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/
+      - cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/
       - rm -rf base_pack_build
       - rm -rf all-the-apps-base.tgz
       - rm -f build/f7-firmware-C/toolbox/version.*
@@ -430,12 +448,14 @@ steps:
     pull: never
     commands:
       - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-extra.tgz
-      - tar zxvf all-the-apps-extra.tgz
-      - cp -R extra_pack_build/artifacts-extra/* assets/resources/apps/
+      - tar zxf all-the-apps-extra.tgz
+      - mkdir -p applications/main/clock_app/resources/apps
+      - cp -R extra_pack_build/artifacts-extra/* applications/main/clock_app/resources/apps/
       - rm -rf extra_pack_build
       - export DIST_SUFFIX=${DRONE_BUILD_NUMBER}e
       - export WORKFLOW_BRANCH_OR_TAG=dev-cfw
       - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
       - rm -f build/f7-firmware-C/toolbox/version.*
       - ./fbt COMPACT=1 DEBUG=0 updater_package
       - mkdir artifacts-extra-apps
@@ -454,6 +474,7 @@ steps:
       - export DIST_SUFFIX=${DRONE_BUILD_NUMBER}r
       - export WORKFLOW_BRANCH_OR_TAG=dev-cfw-rgb
       - export FORCE_NO_DIRTY=yes
+      - export FBT_GIT_SUBMODULE_SHALLOW=1
       - rm -f build/f7-firmware-C/toolbox/version.*
       - ./fbt COMPACT=1 DEBUG=0 updater_package
       - mkdir artifacts-rgb-patch
@@ -645,9 +666,10 @@ steps:
       DISCORD_WEBHOOK:
         from_secret: dis_dev_webhook
     commands:
-      - wget "https://raw.githubusercontent.com/fieu/discord.sh/e1dc1a7595efad2cad8f072f0b3531c470f5b7c8/discord.sh"
+      - wget "https://raw.githubusercontent.com/fieu/discord.sh/2253303efc0e7211ac2777d2535054cbb872f1e0/discord.sh"
       - chmod +x ./discord.sh
-      - ./discord.sh --text 'Unleashed firmware dev build successful!\n\nBuild - '${DRONE_BUILD_NUMBER}'\n\nCommit - https://github.com/DarkFlippers/unleashed-firmware/commit/'${DRONE_COMMIT_SHA}'\n\n[-> Sponsor our project](https://boosty.to/mmxdev)\n\n[-Version with Extra apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'e.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'e)\n\n[-Version with only main apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'c.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'c)\n\n[-Version with RGB patch - only for hardware mod! - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'r.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'r)\n\n[-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'r.tgz)\n\n[-Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/dev/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}')'
+      - echo 'Unleashed firmware dev build successful!\n\nBuild - '${DRONE_BUILD_NUMBER}'\n\nCommit - https://github.com/DarkFlippers/unleashed-firmware/commit/'${DRONE_COMMIT_SHA}'\n\n[-> Sponsor our project](https://boosty.to/mmxdev)\n\n[-Version with Extra apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'e.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'e)\n\n[-Version with only main apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'c.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'c)\n\n[-Version with RGB patch - only for hardware mod! - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'r.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'r)\n\n[-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'r.tgz)\n\n[-Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/dev/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}')' > messagedisc.txt
+      - ./discord.sh --text "$(jq -Rs . <messagedisc.txt | cut -c 2- | rev | cut -c 2- | rev)"
 
 trigger:
   branch:
@@ -656,4 +678,4 @@ trigger:
     - push
 
 node:
-  typ: haupt
+  typ: dev1

.github/workflows/codeql.yml

@@ -0,0 +1,114 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+run-name: "CodeQL Analyze ${{ github.ref_name }} by @${{ github.ACTOR }}"
+
+on:
+  push:
+    branches: ["dev"]
+  workflow_dispatch:
+
+jobs:
+  analyze:
+    name: Analyze
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners
+    # Consider using larger runners for possible analysis time improvements.
+    runs-on: [ "ubuntu-latest" ]
+    timeout-minutes: 60
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ["cpp"]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+    env:
+      PATH_SARIF_DIR: ".github/results.sarif"
+      PATH_SARIF_FILE: ".github/results.sarif/${{ matrix.language }}.sarif"
+      FBT_NO_SYNC: 0
+      DIST_SUFFIX: "codeql"
+      WORKFLOW_BRANCH_OR_TAG: release-cfw
+      LANG_CATEGORY: "/language:${{matrix.language}}"
+
+    steps:
+      - name: Checkout Firmware Files
+        uses: actions/checkout@v3
+        with:
+          clean: "true"
+          submodules: "true"
+          fetch-depth: "0"
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          setup-python-dependencies: true
+
+      - name: Resolve CodeQL Build Env
+        uses: github/codeql-action/resolve-environment@v2
+        with:
+          language: ${{ matrix.language }}
+          #debug: true
+
+      - name: Build Firmware
+        shell: bash
+        if: ${{ success() }}
+        run: |
+          ./fbt COMPACT=1 DEBUG=0 FBT_NO_SYNC=${{ env.FBT_NO_SYNC }}
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        if: ${{ success() }}
+        with:
+          threads: 4
+          category: "${{ env.LANG_CATEGORY }}"
+          output: "${{ env.PATH_SARIF_DIR }}"
+          upload-database: false
+          upload: "failure-only" # disable the upload here - we will upload in a different action
+
+      - name: Filter dirs for SARIF
+        uses: advanced-security/filter-sarif@v1
+        if: ${{ success() }}
+        with:
+          # filter out all test files unless they contain a sql-injection vulnerability
+          patterns: |
+            -build/**
+            -dist/**
+            -toolchain/**
+            -lib/**
+          input: "${{ env.PATH_SARIF_FILE }}"
+          output: "${{ env.PATH_SARIF_FILE }}"
+
+      - name: Upload CodeQL SARIF
+        uses: github/codeql-action/upload-sarif@v2
+        if: ${{ success() }}
+        with:
+          category: "${{ env.LANG_CATEGORY }}"
+          sarif_file: "${{ env.PATH_SARIF_FILE }}"
+
+      # optional: for debugging the uploaded sarif
+      # - name: Upload loc as a Build Artifact
+      #   uses: actions/upload-artifact@v3
+      #   with:
+      #     name: sarif-results
+      #     path: sarif-results
+      #     retention-days: 1

.pvsoptions

@@ -1 +1 @@
---ignore-ccache -C gccarm --rules-config .pvsconfig -e lib/cmsis_core -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/stm32wb_cmsis -e lib/stm32wb_copro -e lib/stm32wb_hal -e lib/u8g2 -e lib/nanopb -e */arm-none-eabi/*
+--ignore-ccache -C gccarm --rules-config .pvsconfig -e lib/cmsis_core -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/microtar -e lib/mlib -e lib/stm32wb_cmsis -e lib/stm32wb_copro -e lib/stm32wb_hal -e lib/u8g2 -e lib/nanopb -e lib/mjs -e */arm-none-eabi/*

.vscode/example/cpptools/c_cpp_properties.json

@@ -5,27 +5,24 @@
             "compilerPath": "${workspaceFolder}/toolchain/x86_64-windows/bin/arm-none-eabi-gcc.exe",
             "intelliSenseMode": "gcc-arm",
             "compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
-            "configurationProvider": "ms-vscode.cpptools",
-            "cStandard": "gnu17",
-            "cppStandard": "c++17"
+            "cStandard": "gnu23",
+            "cppStandard": "c++20"
         },
         {
             "name": "Linux",
             "compilerPath": "${workspaceFolder}/toolchain/x86_64-linux/bin/arm-none-eabi-gcc",
             "intelliSenseMode": "gcc-arm",
             "compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
-            "configurationProvider": "ms-vscode.cpptools",
-            "cStandard": "gnu17",
-            "cppStandard": "c++17"
+            "cStandard": "gnu23",
+            "cppStandard": "c++20"
         },
         {
             "name": "Mac",
             "compilerPath": "${workspaceFolder}/toolchain/x86_64-darwin/bin/arm-none-eabi-gcc",
             "intelliSenseMode": "gcc-arm",
             "compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
-            "configurationProvider": "ms-vscode.cpptools",
-            "cStandard": "gnu17",
-            "cppStandard": "c++17"
+            "cStandard": "gnu23",
+            "cppStandard": "c++20"
         }
     ],
     "version": 4

.vscode/example/settings.json

@@ -1,20 +1,14 @@
 {
-    "C_Cpp.default.cStandard": "gnu17",
-    "C_Cpp.default.cppStandard": "c++17",
+    "C_Cpp.default.cStandard": "gnu23",
+    "C_Cpp.default.cppStandard": "c++20",
     "python.formatting.provider": "black",
     "workbench.tree.indent": 12,
     "cortex-debug.enableTelemetry": false,
     "cortex-debug.variableUseNaturalFormat": true,
     "cortex-debug.showRTOS": true,
-    "cortex-debug.armToolchainPath.windows": "${workspaceFolder}/toolchain/x86_64-windows/bin",
-    "cortex-debug.armToolchainPath.linux": "${workspaceFolder}/toolchain/x86_64-linux/bin",
-    "cortex-debug.armToolchainPath.osx": "${workspaceFolder}/toolchain/x86_64-darwin/bin",
-    "cortex-debug.openocdPath.windows": "${workspaceFolder}/toolchain/x86_64-windows/openocd/bin/openocd.exe",
-    "cortex-debug.openocdPath.linux": "${workspaceFolder}/toolchain/x86_64-linux/openocd/bin/openocd",
-    "cortex-debug.openocdPath.osx": "${workspaceFolder}/toolchain/x86_64-darwin/openocd/bin/openocd",
-    "cortex-debug.gdbPath.windows": "${workspaceFolder}/toolchain/x86_64-windows/bin/arm-none-eabi-gdb-py.bat",
-    "cortex-debug.gdbPath.linux": "${workspaceFolder}/toolchain/x86_64-linux/bin/arm-none-eabi-gdb-py",
-    "cortex-debug.gdbPath.osx": "${workspaceFolder}/toolchain/x86_64-darwin/bin/arm-none-eabi-gdb-py",
+    "cortex-debug.armToolchainPath": "${workspaceFolder}/toolchain/current/bin",
+    "cortex-debug.openocdPath": "${workspaceFolder}/toolchain/current/bin/openocd",
+    "cortex-debug.gdbPath": "${workspaceFolder}/toolchain/current/bin/arm-none-eabi-gdb-py3",
     "editor.formatOnSave": true,
     "files.associations": {
         "*.scons": "python",

CHANGELOG.md

@@ -1,41 +1,60 @@
 ## New changes
-* **Apple BLE Spam app** (by @Willy-JL | Plus research from ECTO-1A, xMasterX and techryptic) -> (app can be found in builds ` `, `e`, `n`, `r`)
-* SubGHz: **FAAC SLH - Programming mode** (by @xMasterX & @Eng1n33r (full research and PoC by @Skorpionm)| PR #585) -> [How to use](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
-* SubGHz: FAAC SLH -> Add manually new options
-* SubGHz: Fix 0xFFFF counter value being skipped
-* SubGHz: Fix path reset on save name scene exit
-* SubGHz: Various fixes
-* SubGHz Remote: Fix Sub-GHz Remote folder name (by @OperKH | PR #583)
-* SubGHz Remote: submodule (by @gid9798 | PR #592)
-* Infrared: Updated universal assets (by @amec0e | PR #594)
-* Infrared: Remake custom universal remotes to use new design (New icons by @Svaarich)
-* UI: Keyboard ok to toggle select all in cursor mode (by @Willy-JL)
-* CI/CD: Fixed regular builds having `c` in version name in the device info while not being actual `c` build
-* Docs: New FAAC SLH instructions
-* Docs: Readme & Changelog fixes (by @gid9798 | PR #586)
-* OFW: iButton: Return to the file selection if file is corrupted
-* OFW: Account for the "-" in line carry-over
-* OFW: github: workflow improvements
-* OFW: Storage: force mount
-* OFW: Add File Naming setting for more detailed naming -> **Breaking API change, API 35.x -> API 36.x** - **Update your apps!**
-* OFW: Disconnect from BLE on protobuf error
-* OFW: Add support for Mifare Classic 4k SAK 0x38 ATQA 0x02, 0x04, 0x08
-* OFW: Undo some TODO
-* OFW: Check the filetype of the update manifest
-* OFW: StorageListRequest: size filter 
-* OFW: SubGhz: heap overflow text error 
-* OFW: nfc: add rfal wrong state error handling
-* OFW: Rfid: fix crash on broken key launch from archive (fix was already done in UL in similar way)
-* OFW: AC OFF button
-* OFW: New IR universal remote graphics
-* OFW: Intelligent probing with warnings for fwflash.py
-* OFW: FuriHal: explicitly pull display pins at early init stage, move PUPD config to early stage 
-* OFW: Fix display last symbol in multiline text
-* OFW: Properly reset the NFC device data
-* OFW: fbt: various improvements and bug fixes
-* OFW: Littlefs updated to v2.7.0
-* OFW: loader: restored support for debug apps
-* OFW: Removed explicit dependency on scons for external scripting
+* NFC: **Fixed stuck Saved success screen**
+* NFC: **Fixed crash when reading mifare classic tag then going to add manually menu and adding NFC-A tag**
+* NFC: Fixed EMV txs render
+* NFC/LFRFID: Don't Stop emulation after 5 mins to avoid antenna damage if debug is ON (by @Leptopt1los)
+* LFRFID: Fixed T5577 custom password input (by @Leptopt1los)
+* OFW PR 3410: lfrfid/em4100: added support for different bit rates - by @Mrkvak (RF/32 full support, RF/16 support without reading (16clk removed for now))
+* OFW PR 3412: Fixed MyKey LockID - by @zProAle
+<br>----<br>
+**Changes from 070 release:**<br>
+* NFC: **EMV parser** added (by @Leptopt1los and @wosk | PR #700)
+* NFC: Metromoney parser balance fix (by @Leptopt1los | PR #699)
+* NFC/LFRFID: Stop emulation after 5 mins to avoid antenna damage (by @Leptopt1los)
+* Archive: Fix two filebrowser bugs
+* SubGHz: **Programming mode for Dea Mio** (right arrow button)
+* SubGHz: **Keeloq fix emulation for multiple systems and extend add manually support** for 2 of them (Dea Mio, Genius Bravo, GSN, Normstahl)
+* SubGHz: Fixed hopper state when entering Read via Freq analyzer
+* SubGHz: Raw erase fixes (by @Willy-JL)
+* SubGHz: Subghz save files with receive time (by @Willy-JL)
+* NFC: Fix NFC V dumps with v3 (pre refactor saves) crashing at info page
+* NFC: Zolotaya Korona Online parser added (by @Leptopt1los)
+* NFC: Add NFC **NDEF parser** (by @Willy-JL)
+* LF RFID: **Write T5577 with random and custom password** added (clear password via Extra actions) (by @Leptopt1los)
+* SubGHz: Update honeywell protocol (by @Willy-JL)
+* System: More contrast values for replacement displays (up to +8 or -8)
+* USB/BLE HID: Add macOS Music app volume control
+* Apps: **Check out Apps updates by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
+* OFW PR 3384: NFC: Display unread Mifare Classic bytes as question marks - by @TollyH
+* OFW PR 3396: NFC: **fix application opening from browser** - by @RebornedBrain (+ fix for leftover issues)
+* OFW PR 3382: NFC UI refactor - by @RebornedBrain
+* OFW PR 3391: Rework more info scene for Ultralight cards - by @RebornedBrain
+* OFW PR 3401: it-IT-mac layout - by @nminaylov
+* OFW: Fix expansion protocol crash when fed lots of garbage
+* OFW: 0.98.0-rc various fixes
+* OFW: RFID CLI: better usage
+* OFW: **Mf DESFire fixes**
+* OFW: NFC UI refactor
+* OFW: **Expansion module protocol** (+ expansion settings read and store in ram by @Willy-JL) 
+* OFW: Bugfix: Strip last parity bit from decoded FDX-B data
+* OFW: FuriHal: interrupt priorities and documentation
+* OFW: FuriHal: **UART refactoring**
+* OFW: SubGhz: add `subghz tx_from_file` CLI cmd, major TX flow refactoring, various improvements and bug fixes
+* OFW: Furi_hal_rtc: new function
+* OFW: NFC UI refactor 
+* OFW: assets: checking limits on image size; ufbt: cdb target
+* OFW: NFC: system dict skip when user dict is skipped fix (replaces our fix)
+* OFW: FuriHal: fix start duration furi_hal_subghz_async_tx
+* OFW: NFC: parsers minor cleanup
+* OFW: NFC Ntag success write freeze when not saved card
+* OFW: ufbt: fixed generated project paths on Windows 
+<br><br>
+#### Known NFC post-refactor regressions list: 
+- Mifare Mini clones reading is broken (original mini working fine) (OFW)
+- Option to unlock Slix-L (NFC V) with preset or custom password was removed with refactoring (OFW)
+- NFC CLI was removed with refactoring (OFW)
+- Current list of affected apps: https://github.com/xMasterX/all-the-plugins/tree/dev/apps_broken_by_last_refactors
+- Also in app **Enhanced Sub-GHz Chat** - NFC part was temporarily removed to make app usable, NFC part of the app requires remaking it with new nfc stack
 
 ----
 
@@ -59,8 +78,8 @@
 |XMR|(Monero)| `41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`|
 |TON||`EQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmpGf`|
 
-#### Thanks to our sponsors:
-callmezimbra, Quen0n, MERRON, grvpvl (lvpvrg), art_col, ThurstonWaffles, Moneron, UterGrooll, LUCFER, Northpirate, zloepuzo, T.Rat, Alexey B., ionelife, ...
+#### Thanks to our sponsors who supported project in the past and special thanks to sponsors who supports us on regular basis:
+ClaraCrazy, Pathfinder [Count Zero cDc], callmezimbra, Quen0n, MERRON, grvpvl (lvpvrg), art_col, ThurstonWaffles, Moneron, UterGrooll, LUCFER, Northpirate, zloepuzo, T.Rat, Alexey B., ionelife, ...
 and all other great people who supported our project and me (xMasterX), thanks to you all!
 
 
@@ -78,7 +97,7 @@ What build I should download and what this name means - `flipper-z-f7-update-(ve
 | `c` | ✅ |  |  |  |
 | `n` |  | ✅ |  |  |
 | `e` | ✅ | ✅ | ✅ |  |
-| `r` | ✅ | ✅ | ✅ | ✅ |
+| `r` | ✅ | ✅ | ✅ | ⚠️ |
 
 ⚠️This is [hardware mod](https://github.com/quen0n/flipperzero-firmware-rgb#readme), works only on modded flippers! do not install on non modded device!
 

ReadMe.md

@@ -33,6 +33,9 @@
 
 <br>
 
+## FAQ (frequently asked questions)
+[Follow this link to find answers to most asked questions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/FAQ.md)
+
 ## Dev builds (unstable)
 - https://dev.unleashedflip.com/
 - https://t.me/kotnehleb
@@ -52,13 +55,13 @@
 	- New frequency analyzer [(by ClusterM)](https://github.com/DarkFlippers/unleashed-firmware/pull/43)
 	- Press OK in frequency analyzer to use detected frequency in Read modes [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
 	- Long press OK button in Sub-GHz Frequency analyzer to switch to Read menu [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/79)
-	- New option to use timestamps + protocol name when you saving file, instead of random name - Enable in `Radio Settings -> Time in names = ON`
+	- New option to use timestamps + protocol name when you saving file, instead of random name or timestamp only - Enable in `Radio Settings -> Protocol Names = ON`
 	- Read mode UI improvements (shows time when signal was received) (by @wosk)
 	- External CC1101 module support (Hardware SPI used)
 	- **Hold right in received signal list to delete selected signal**
 	- **Custom buttons for Keeloq / Alutech AT4N / Nice Flor S / Somfy Telis / Security+ 2.0 / CAME Atomo** - now you can use arrow buttons to send signal with different button code
 	-   `Add manually` menu extended with new protocols
-	- FAAC SLH, BFT Mitto / Somfy Telis / Nice Flor S / CAME Atomo, etc.. manual creation with programming new remote into receiver (use button 0xF for BFT Mitto, 0x8 (Prog) on Somfy Telis)
+	- FAAC SLH, BFT Mitto / Somfy Telis / Nice Flor S / CAME Atomo, etc.. manual creation with programming new remote into receiver (use button 0xF for BFT Mitto, 0x8 (Prog) on Somfy Telis, (right arrow button for other protocols))
 	- Debug mode counter increase settings (+1 -> +5, +10, default: +1)
 	- Debug PIN output settings for protocol development
 	
@@ -76,13 +79,15 @@
 - **NFC/RFID/iButton**
 	* LFRFID/iButton Fuzzer plugins
 	* Extra Mifare Classic keys
-	* `Add manually` -> Mifare Classic with custom UID
-	* Picopass/iClass plugin (now with emulation support!) included in releases
+	* EMV Protocol + Public data parser (by @Leptopt1los and @wosk)
+	* NFC/LFRFID - Stop emulation after 5 mins to avoid antenna damage (by @Leptopt1los)
+	* NFC `Add manually` -> Mifare Classic with custom UID
+	* NFC parsers: Umarsh, Zolotaya Korona, Kazan, Metromoney, Moscow Social Card, Troika (reworked) and [many others](https://github.com/DarkFlippers/unleashed-firmware/tree/dev/applications/main/nfc/plugins/supported_cards) (by @Leptopt1los and @assasinfil)
 - **Quality of life & other features**
 	- Customizable Flipper name **Update! Now can be changed in Settings->Desktop** (by @xMasterX and @Willy-JL)
 	- Text Input UI element -> Cursor feature (by @Willy-JL)
-	- Byte Input Mini editor -> **Press UP** multiple times until the nibble editor appears
-	- Clock on Desktop -> `Settings -> Desktop -> Show Clock`
+	- Byte Input Mini editor -> **Press UP** multiple times until the nibble editor appears (by @gid9798)
+	- Clock on Desktop -> `Settings -> Desktop -> Show Clock` (by @gid9798)
 	- Battery percentage display with different styles `Settings -> Desktop -> Battery View`
 	- More games in Dummy Mode -> click or hold any of arrow buttons
 	- Lock device with pin(or regular lock if pin not set) by holding UP button on main screen [(by an4tur0r)](https://github.com/DarkFlippers/unleashed-firmware/pull/107)
@@ -97,25 +102,12 @@ Also check the [changelog in releases](https://github.com/DarkFlippers/unleashed
 ### Current modified and new Sub-GHz protocols list:
 Thanks to Official team (to their SubGHz Developer, Skorp) for implementing decoders for these protocols in OFW.
 
-Keeloq [Not ALL systems supported for decode or emulation yet!] - [Supported manufacturers list](https://0bin.net/paste/VwR2lNJY#WH9vnPgvcp7w6zVKucFCuNREKAcOij8KsJ6vqLfMn3b)
+Keeloq [Not ALL systems supported for decode or emulation!] - [Supported manufacturers list](https://pastes.io/raw/unuj9bhe4m)
 
 Encoders or sending made by @xMasterX:
 - Nero Radio 57bit (+ 56bit encoder improvements)
 - CAME 12bit/24bit encoder fixes (Fixes now merged in OFW)
-- Keeloq: HCS101
-- Keeloq: AN-Motors
-- Keeloq: JCM Tech
-- Keeloq: MHouse
-- Keeloq: Nice Smilo
-- Keeloq: DTM Neo
-- Keeloq: FAAC RC,XT
-- Keeloq: Mutancode
-- Keeloq: Normstahl
-- Keeloq: Beninca + Allmatic
-- Keeloq: Stilmatic
-- Keeloq: CAME Space
-- Keeloq: Aprimatic (model TR and similar)
-- Keeloq: Centurion Nova (thanks Carlos !)
+- Keeloq: Dea Mio, Genius Bravo, GSN, HCS101, AN-Motors, JCM Tech, MHouse, Nice Smilo, DTM Neo, FAAC RC,XT, Mutancode, Normstahl, Beninca + Allmatic, Stilmatic, CAME Space, Aprimatic (model TR and similar), Centurion Nova (thanks Carlos !)
 
 Encoders or sending made by @Eng1n33r(first implementation in Q2 2022) & @xMasterX (current version):
 - CAME Atomo -> Update! check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
@@ -136,10 +128,11 @@ Encoders made by @assasinfil & @xMasterX:
 The majority of this project is developed and maintained by me, @xMasterX.
 I'm unemployed, 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.
+- @Leptopt1los - NFC, RFID, IR Assets (only ACs), Plugins, and many other things
 - @gid9798 - SubGHz, Plugins, many other things
-- @assasinfil - SubGHz protocols
+- @assasinfil - SubGHz protocols, NFC parsers
 - @Svaarich - UI design and animations
-- @amec0e & @Leptopt1los - Infrared assets
+- @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.
 
@@ -164,15 +157,15 @@ You can support us by using links or addresses below:
 ## Community apps included
 
 ### [🎲 Download Extra plugins for Unleashed](https://github.com/xMasterX/all-the-plugins/releases/latest)
-### [List of Extra pack](https://github.com/xMasterX/all-the-plugins/tree/dev#extra-pack) | [List of Base *(Deafult)* pack](https://github.com/xMasterX/all-the-plugins/tree/dev#default-pack)
+### [List of Extra pack](https://github.com/xMasterX/all-the-plugins/tree/dev#extra-pack) | [List of Base *(Default)* pack](https://github.com/xMasterX/all-the-plugins/tree/dev#default-pack)
 
-See full list and sources here: [xMasterX/all-the-plugin](https://github.com/xMasterX/all-the-plugins/tree/dev)
+See full list and sources here: [xMasterX/all-the-plugins](https://github.com/xMasterX/all-the-plugins/tree/dev)
 
 ### Official Flipper Zero Apps Catalog [web version](https://lab.flipper.net/apps) or mobile app
 
 # Instructions
-## First lock official docs [docs.flipper.net](https://docs.flipper.net/)
-## [How to install](/documentation/HowToInstall.md) - [versions info](/CHANGELOG.md#what-n-r-e--c-means-what-i-need-to-download-if-i-dont-want-to-use-web-updater): `n`,` `,`e`...
+## First look at official docs [docs.flipper.net](https://docs.flipper.net/)
+## [How to install](/documentation/HowToInstall.md) - [versions info](/CHANGELOG.md#recommended-update-option---web-updater): `n`,` `,`e`...
 ## Firmware & Development
 
 ### - **[How to build](/documentation/HowToBuild.md#how-to-build-by-yourself) | [Project-structure](#project-structure)**
@@ -193,22 +186,20 @@ See full list and sources here: [xMasterX/all-the-plugin](https://github.com/xMa
 
 ## **Sub-GHz**
 
+### - [How to use Flipper as new remote (Nice FlorS, BFT Mitto, Somfy Telis, Aprimatic, AN-Motors, etc..)](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
+
 ### - External Radio: [How to connect CC1101 module](https://github.com/quen0n/flipperzero-ext-cc1101)
 
 ### - Transmission is blocked? [How to extend Sub-GHz frequency range](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/DangerousSettings.md)
 
 ### - [How to add extra Sub-GHz frequencies](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzSettings.md)
 
-### - [How to use Flipper as new remote (Nice FlorS, BFT Mitto, Somfy Telis, Aprimatic, AN-Motors, etc..)](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
-
-### - [~~Configure Sub-GHz Remote App~~](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemotePlugin.md) Not recomeded, please use embedded configurator
+### - [~~Configure Sub-GHz Remote App~~](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemotePlugin.md) Not recommended, please use embedded configurator
 
 ## **Plugins**
 
 ### - TOTP (Authenticator): [config description](https://github.com/akopachov/flipper-zero_authenticator/blob/master/docs/conf-file_description.md)
 
-### - Mifare Nested plugin: [How to recover keys](https://github.com/AloneLiberty/FlipperNested#how-to-use-it)
-
 ### - Barcode Generator: [How to use](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/BarcodeGenerator.md)
 
 ### - Multi Converter: [How to use](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/MultiConverter.md)

SConstruct

@@ -66,21 +66,24 @@ if GetOption("fullenv") or any(
 
     # Target for self-update package
     dist_basic_arguments = [
+        "${ARGS}",
         "--bundlever",
-        '"${UPDATE_VERSION_STRING}"',
+        "${UPDATE_VERSION_STRING}",
     ]
     dist_radio_arguments = [
         "--radio",
-        '"${ROOT_DIR.abspath}/${COPRO_STACK_BIN_DIR}/${COPRO_STACK_BIN}"',
+        "${ROOT_DIR.abspath}/${COPRO_STACK_BIN_DIR}/${COPRO_STACK_BIN}",
         "--radiotype",
         "${COPRO_STACK_TYPE}",
         "${COPRO_DISCLAIMER}",
         "--obdata",
-        '"${ROOT_DIR.abspath}/${COPRO_OB_DATA}"',
+        "${ROOT_DIR.abspath}/${COPRO_OB_DATA}",
+        "--stackversion",
+        "${COPRO_CUBE_VERSION}",
     ]
     dist_resource_arguments = [
         "-r",
-        '"${ROOT_DIR.abspath}/assets/resources"',
+        firmware_env.subst("${RESOURCES_ROOT}"),
     ]
     dist_splash_arguments = (
         [
@@ -93,7 +96,7 @@ if GetOption("fullenv") or any(
 
     selfupdate_dist = distenv.DistCommand(
         "updater_package",
-        (distenv["DIST_DEPENDS"], firmware_env["FW_RESOURCES"]),
+        (distenv["DIST_DEPENDS"], firmware_env["FW_RESOURCES_MANIFEST"]),
         DIST_EXTRA=[
             *dist_basic_arguments,
             *dist_radio_arguments,
@@ -126,7 +129,8 @@ if GetOption("fullenv") or any(
 
     # Installation over USB & CLI
     usb_update_package = distenv.AddUsbFlashTarget(
-        "#build/usbinstall.flag", (firmware_env["FW_RESOURCES"], selfupdate_dist)
+        "#build/usbinstall.flag",
+        (firmware_env["FW_RESOURCES_MANIFEST"], selfupdate_dist),
     )
     distenv.Alias("flash_usb_full", usb_update_package)
 
@@ -164,17 +168,28 @@ Depends(
     list(app_artifact.validator for app_artifact in external_app_list),
 )
 Alias("fap_dist", fap_dist)
-# distenv.Default(fap_dist)
-
-distenv.Depends(firmware_env["FW_RESOURCES"], external_apps_artifacts.resources_dist)
 
 # Copy all faps to device
 
 fap_deploy = distenv.PhonyTarget(
     "fap_deploy",
-    "${PYTHON3} ${FBT_SCRIPT_DIR}/storage.py -p ${FLIP_PORT} send ${SOURCE} /ext/apps",
-    source=Dir("#/assets/resources/apps"),
+    Action(
+        [
+            [
+                "${PYTHON3}",
+                "${FBT_SCRIPT_DIR}/storage.py",
+                "-p",
+                "${FLIP_PORT}",
+                "send",
+                "${SOURCE}",
+                "/ext/apps",
+                "${ARGS}",
+            ]
+        ]
+    ),
+    source=firmware_env.Dir(("${RESOURCES_ROOT}/apps")),
 )
+Depends(fap_deploy, firmware_env["FW_RESOURCES_MANIFEST"])
 
 
 # Target for bundling core2 package for qFlipper
@@ -195,7 +210,7 @@ distenv.Alias("jflash", firmware_jflash)
 
 distenv.PhonyTarget(
     "gdb_trace_all",
-    "$GDB $GDBOPTS $SOURCES $GDBFLASH",
+    [["${GDB}", "${GDBOPTS}", "${SOURCES}", "${GDBFLASH}"]],
     source=firmware_env["FW_ELF"],
     GDBOPTS="${GDBOPTS_BASE}",
     GDBREMOTE="${OPENOCD_GDB_PIPE}",
@@ -250,7 +265,7 @@ distenv.PhonyTarget(
 distenv.PhonyTarget(
     "debug_other_blackmagic",
     "${GDBPYCOM}",
-    GDBOPTS="${GDBOPTS_BASE}  ${GDBOPTS_BLACKMAGIC}",
+    GDBOPTS="${GDBOPTS_BASE} ${GDBOPTS_BLACKMAGIC}",
     GDBREMOTE="${BLACKMAGIC_ADDR}",
     GDBPYOPTS=debug_other_opts,
 )
@@ -259,29 +274,49 @@ distenv.PhonyTarget(
 # Just start OpenOCD
 distenv.PhonyTarget(
     "openocd",
-    "${OPENOCDCOM}",
+    [["${OPENOCDCOM}", "${ARGS}"]],
 )
 
 # Linter
 distenv.PhonyTarget(
     "lint",
-    "${PYTHON3} ${FBT_SCRIPT_DIR}/lint.py check ${LINT_SOURCES}",
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/lint.py",
+            "check",
+            "${LINT_SOURCES}",
+            "${ARGS}",
+        ]
+    ],
     LINT_SOURCES=[n.srcnode() for n in firmware_env["LINT_SOURCES"]],
 )
 
 distenv.PhonyTarget(
     "format",
-    "${PYTHON3} ${FBT_SCRIPT_DIR}/lint.py format ${LINT_SOURCES}",
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/lint.py",
+            "format",
+            "${LINT_SOURCES}",
+            "${ARGS}",
+        ]
+    ],
     LINT_SOURCES=[n.srcnode() for n in firmware_env["LINT_SOURCES"]],
 )
 
-# PY_LINT_SOURCES contains recursively-built modules' SConscript files + application manifests
+# PY_LINT_SOURCES contains recursively-built modules' SConscript files
 # Here we add additional Python files residing in repo root
 firmware_env.Append(
     PY_LINT_SOURCES=[
         # Py code folders
         "site_scons",
         "scripts",
+        "applications",
+        "applications_user",
+        "assets",
+        "targets",
         # Extra files
         "SConstruct",
         "firmware.scons",
@@ -290,8 +325,20 @@ firmware_env.Append(
 )
 
 
-black_commandline = "@${PYTHON3} -m black ${PY_BLACK_ARGS} ${PY_LINT_SOURCES}"
-black_base_args = ["--include", '"\\.scons|\\.py|SConscript|SConstruct"']
+black_commandline = [
+    [
+        "@${PYTHON3}",
+        "-m",
+        "black",
+        "${PY_BLACK_ARGS}",
+        "${PY_LINT_SOURCES}",
+        "${ARGS}",
+    ]
+]
+black_base_args = [
+    "--include",
+    '"(\\.scons|\\.py|SConscript|SConstruct|\\.fam)$"',
+]
 
 distenv.PhonyTarget(
     "lint_py",
@@ -313,11 +360,29 @@ distenv.PhonyTarget(
 
 # Start Flipper CLI via PySerial's miniterm
 distenv.PhonyTarget(
-    "cli", "${PYTHON3} ${FBT_SCRIPT_DIR}/serial_cli.py  -p ${FLIP_PORT}"
+    "cli",
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/serial_cli.py",
+            "-p",
+            "${FLIP_PORT}",
+            "${ARGS}",
+        ]
+    ],
 )
 
-# Update WiFi devboard firmware
-distenv.PhonyTarget("devboard_flash", "${PYTHON3} ${FBT_SCRIPT_DIR}/wifi_board.py")
+# Update WiFi devboard firmware with release channel
+distenv.PhonyTarget(
+    "devboard_flash",
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/wifi_board.py",
+            "${ARGS}",
+        ]
+    ],
+)
 
 
 # Find blackmagic probe
@@ -331,7 +396,7 @@ distenv.PhonyTarget(
 distenv.PhonyTarget(
     "get_stlink",
     distenv.Action(
-        lambda **kw: distenv.GetDevices(),
+        lambda **_: distenv.GetDevices(),
         None,
     ),
 )
@@ -347,10 +412,10 @@ vscode_dist = distenv.Install(
 )
 distenv.Precious(vscode_dist)
 distenv.NoClean(vscode_dist)
-distenv.Alias("vscode_dist", vscode_dist)
+distenv.Alias("vscode_dist", (vscode_dist, firmware_env["FW_CDB"]))
 
 # Configure shell with build tools
 distenv.PhonyTarget(
     "env",
-    "@echo $( ${FBT_SCRIPT_DIR}/toolchain/fbtenv.sh $)",
+    "@echo $( ${FBT_SCRIPT_DIR.abspath}/toolchain/fbtenv.sh $)",
 )

applications/ReadMe.md

@@ -40,7 +40,6 @@ Applications for main Flipper menu.
 Background services providing system APIs to applications.
 
 - `applications.h`      - Firmware application list header
-
 - `bt`                  - BLE service and application
 - `cli`                 - Console service and API
 - `crypto`              - Crypto cli tools
@@ -72,7 +71,10 @@ Small applications providing configuration for basic firmware and its services.
 
 ## system
 
-Utility apps not visible in other menus.
+Utility apps not visible in other menus, plus few external apps pre-packaged with the firmware.
 
+- `hid_app`             - BLE & USB HID remote
+- `js_app`              - JS engine runner
+- `snake_game`          - Snake game
 - `storage_move_to_sd`  - Data migration tool for internal storage
 - `updater`             - Update service & application

applications/debug/accessor/accessor_view_manager.cpp

@@ -1,6 +1,6 @@
 #include "accessor_view_manager.h"
 #include "accessor_event.h"
-#include <callback-connector.h>
+#include "callback_connector.h"
 
 AccessorAppViewManager::AccessorAppViewManager() {
     event_queue = furi_message_queue_alloc(10, sizeof(AccessorEvent));

applications/debug/accessor/application.fam

@@ -4,7 +4,6 @@ App(
     apptype=FlipperAppType.DEBUG,
     targets=["f7"],
     entry_point="accessor_app",
-    cdefines=["APP_ACCESSOR"],
     requires=["gui"],
     stack_size=4 * 1024,
     order=40,

applications/debug/accessor/callback_connector.h

@@ -1,10 +1,13 @@
 #ifndef CALLBACKCONNECTOR_H
 #define CALLBACKCONNECTOR_H
+
+#ifdef __cplusplus
 #include <functional>
 namespace cbc {
 namespace Details {
 
-template <std::size_t Tag, typename T, typename Ret, typename... Args> class FuncMemberWrapper {
+template <std::size_t Tag, typename T, typename Ret, typename... Args>
+class FuncMemberWrapper {
 public:
     FuncMemberWrapper() = delete;
     using member_fun_t = Ret (T::*)(Args...);
@@ -43,7 +46,8 @@ template <std::size_t Tag, typename T, typename Ret, typename... Args>
 typename FuncMemberWrapper<Tag, T, Ret, Args...>::const_member_fun_t
     FuncMemberWrapper<Tag, T, Ret, Args...>::const_member{};
 
-template <typename Functor, typename Ret, typename... Args> struct FunctorWrapper {
+template <typename Functor, typename Ret, typename... Args>
+struct FunctorWrapper {
 public:
     static std::function<Ret(Args...)> functor;
     static auto instatiate(Functor fn) {
@@ -75,7 +79,8 @@ auto const_instantiate(T* t, Ret (T::*ptr)(Args...) const) {
     return FuncMemberWrapper<tag, T, Ret, Args...>::instantiate(t, ptr);
 }
 
-template <std::size_t tag, typename T, typename Func> auto const_instantiate(T* t, Func ptr) {
+template <std::size_t tag, typename T, typename Func>
+auto const_instantiate(T* t, Func ptr) {
     return const_instantiate(t, ptr);
 }
 
@@ -91,9 +96,11 @@ auto obtain_connector(T* t, Ret (T::*ptr)(Args...) const) {
     return Details::FuncMemberWrapper<tag, T, Ret, Args...>::instantiate(t, ptr);
 }
 
-template <typename Functor> auto obtain_connector(Functor functor) {
+template <typename Functor>
+auto obtain_connector(Functor functor) {
     return Details::deducer(std::move(functor), &Functor::operator());
 }
 } //end of cbc scope
 
+#endif // __cplusplus
 #endif // CALLBACKCONNECTOR_H

applications/debug/accessor/helpers/wiegand.cpp

@@ -2,12 +2,12 @@
 #include <furi.h>
 #include <furi_hal.h>
 
-volatile unsigned long WIEGAND::_cardTempHigh = 0;
-volatile unsigned long WIEGAND::_cardTemp = 0;
-volatile unsigned long WIEGAND::_lastWiegand = 0;
+unsigned long WIEGAND::_cardTempHigh = 0;
+unsigned long WIEGAND::_cardTemp = 0;
+unsigned long WIEGAND::_lastWiegand = 0;
 unsigned long WIEGAND::_code = 0;
 unsigned long WIEGAND::_codeHigh = 0;
-volatile int WIEGAND::_bitCount = 0;
+int WIEGAND::_bitCount = 0;
 int WIEGAND::_wiegandType = 0;
 
 constexpr uint32_t clocks_in_ms = 64 * 1000;
@@ -98,10 +98,7 @@ void WIEGAND::ReadD1() {
     _lastWiegand = DWT->CYCCNT; // Keep track of last wiegand bit received
 }
 
-unsigned long WIEGAND::GetCardId(
-    volatile unsigned long* codehigh,
-    volatile unsigned long* codelow,
-    char bitlength) {
+unsigned long WIEGAND::GetCardId(unsigned long* codehigh, unsigned long* codelow, char bitlength) {
     if(bitlength == 26) // EM tag
         return (*codelow & 0x1FFFFFE) >> 1;
 

applications/debug/accessor/helpers/wiegand.h

@@ -15,15 +15,13 @@ public:
 
 private:
     static bool DoWiegandConversion();
-    static unsigned long GetCardId(
-        volatile unsigned long* codehigh,
-        volatile unsigned long* codelow,
-        char bitlength);
+    static unsigned long
+        GetCardId(unsigned long* codehigh, unsigned long* codelow, char bitlength);
 
-    static volatile unsigned long _cardTempHigh;
-    static volatile unsigned long _cardTemp;
-    static volatile unsigned long _lastWiegand;
-    static volatile int _bitCount;
+    static unsigned long _cardTempHigh;
+    static unsigned long _cardTemp;
+    static unsigned long _lastWiegand;
+    static int _bitCount;
     static int _wiegandType;
     static unsigned long _code;
     static unsigned long _codeHigh;

applications/debug/accessor/scene/accessor_scene_start.cpp

@@ -1,7 +1,7 @@
 #include "../accessor_app.h"
 #include "../accessor_view_manager.h"
 #include "../accessor_event.h"
-#include <callback-connector.h>
+#include "callback_connector.h"
 #include "accessor_scene_start.h"
 
 void AccessorSceneStart::on_enter(AccessorApp* app) {

applications/debug/battery_test_app/application.fam

@@ -3,7 +3,6 @@ App(
     name="Battery Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="battery_test_app",
-    cdefines=["APP_BATTERY_TEST"],
     requires=[
         "gui",
         "power",

applications/debug/battery_test_app/battery_test_app.c

@@ -12,7 +12,8 @@ void battery_test_dialog_callback(DialogExResult result, void* context) {
     }
 }
 
-uint32_t battery_test_exit_confirm_view() {
+uint32_t battery_test_exit_confirm_view(void* context) {
+    UNUSED(context);
     return BatteryTestAppViewExitDialog;
 }
 

applications/debug/blink_test/application.fam

@@ -3,7 +3,6 @@ App(
     name="Blink Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="blink_test_app",
-    cdefines=["APP_BLINK"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=10,

applications/debug/ccid_test/application.fam

@@ -0,0 +1,15 @@
+App(
+    appid="ccid_test",
+    name="CCID Debug",
+    apptype=FlipperAppType.DEBUG,
+    entry_point="ccid_test_app",
+    requires=[
+        "gui",
+    ],
+    provides=[
+        "ccid_test",
+    ],
+    stack_size=1 * 1024,
+    order=120,
+    fap_category="Debug",
+)

applications/debug/ccid_test/ccid_test_app.c

@@ -0,0 +1,169 @@
+#include <stdint.h>
+#include <furi.h>
+#include <furi_hal.h>
+
+#include <gui/view.h>
+#include <gui/view_dispatcher.h>
+#include <gui/modules/submenu.h>
+#include <gui/gui.h>
+
+#include "iso7816_t0_apdu.h"
+
+typedef enum {
+    EventTypeInput,
+} EventType;
+
+typedef struct {
+    Gui* gui;
+    ViewPort* view_port;
+    FuriMessageQueue* event_queue;
+    FuriHalUsbCcidConfig ccid_cfg;
+} CcidTestApp;
+
+typedef struct {
+    union {
+        InputEvent input;
+    };
+    EventType type;
+} CcidTestAppEvent;
+
+typedef enum {
+    CcidTestSubmenuIndexInsertSmartcard,
+    CcidTestSubmenuIndexRemoveSmartcard,
+    CcidTestSubmenuIndexInsertSmartcardReader
+} SubmenuIndex;
+
+void icc_power_on_callback(uint8_t* atrBuffer, uint32_t* atrlen, void* context) {
+    UNUSED(context);
+
+    iso7816_answer_to_reset(atrBuffer, atrlen);
+}
+
+//dataBlock points to the buffer
+//dataBlockLen tells reader how nany bytes should be read
+void xfr_datablock_callback(
+    const uint8_t* dataBlock,
+    uint32_t dataBlockLen,
+    uint8_t* responseDataBlock,
+    uint32_t* responseDataBlockLen,
+    void* context) {
+    UNUSED(context);
+
+    struct ISO7816_Command_APDU commandAPDU;
+    iso7816_read_command_apdu(&commandAPDU, dataBlock, dataBlockLen);
+
+    struct ISO7816_Response_APDU responseAPDU;
+    //class not supported
+    responseAPDU.SW1 = 0x6E;
+    responseAPDU.SW2 = 0x00;
+
+    iso7816_write_response_apdu(&responseAPDU, responseDataBlock, responseDataBlockLen);
+}
+
+static const CcidCallbacks ccid_cb = {
+    icc_power_on_callback,
+    xfr_datablock_callback,
+};
+
+static void ccid_test_app_render_callback(Canvas* canvas, void* ctx) {
+    UNUSED(ctx);
+    canvas_clear(canvas);
+
+    canvas_set_font(canvas, FontPrimary);
+    canvas_draw_str(canvas, 0, 10, "CCID Test App");
+
+    canvas_set_font(canvas, FontSecondary);
+    canvas_draw_str(canvas, 0, 63, "Hold [back] to exit");
+}
+
+static void ccid_test_app_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
+
+    CcidTestAppEvent event;
+    event.type = EventTypeInput;
+    event.input = *input_event;
+    furi_message_queue_put(event_queue, &event, FuriWaitForever);
+}
+
+uint32_t ccid_test_exit(void* context) {
+    UNUSED(context);
+    return VIEW_NONE;
+}
+
+CcidTestApp* ccid_test_app_alloc() {
+    CcidTestApp* app = malloc(sizeof(CcidTestApp));
+
+    // Gui
+    app->gui = furi_record_open(RECORD_GUI);
+
+    //viewport
+    app->view_port = view_port_alloc();
+    gui_add_view_port(app->gui, app->view_port, GuiLayerFullscreen);
+    view_port_draw_callback_set(app->view_port, ccid_test_app_render_callback, NULL);
+
+    //message queue
+    app->event_queue = furi_message_queue_alloc(8, sizeof(CcidTestAppEvent));
+    furi_check(app->event_queue);
+    view_port_input_callback_set(app->view_port, ccid_test_app_input_callback, app->event_queue);
+
+    return app;
+}
+
+void ccid_test_app_free(CcidTestApp* app) {
+    furi_assert(app);
+
+    //message queue
+    furi_message_queue_free(app->event_queue);
+
+    //view port
+    gui_remove_view_port(app->gui, app->view_port);
+    view_port_free(app->view_port);
+
+    // Close gui record
+    furi_record_close(RECORD_GUI);
+    app->gui = NULL;
+
+    // Free rest
+    free(app);
+}
+
+int32_t ccid_test_app(void* p) {
+    UNUSED(p);
+
+    //setup view
+    CcidTestApp* app = ccid_test_app_alloc();
+
+    //setup CCID USB
+    // On linux: set VID PID using: /usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist
+    app->ccid_cfg.vid = 0x1234;
+    app->ccid_cfg.pid = 0x5678;
+
+    FuriHalUsbInterface* usb_mode_prev = furi_hal_usb_get_config();
+    furi_hal_usb_unlock();
+    furi_hal_ccid_set_callbacks((CcidCallbacks*)&ccid_cb);
+    furi_check(furi_hal_usb_set_config(&usb_ccid, &app->ccid_cfg) == true);
+
+    //handle button events
+    CcidTestAppEvent event;
+    while(1) {
+        FuriStatus event_status =
+            furi_message_queue_get(app->event_queue, &event, FuriWaitForever);
+
+        if(event_status == FuriStatusOk) {
+            if(event.type == EventTypeInput) {
+                if(event.input.type == InputTypeLong && event.input.key == InputKeyBack) {
+                    break;
+                }
+            }
+        }
+        view_port_update(app->view_port);
+    }
+
+    //tear down USB
+    furi_hal_usb_set_config(usb_mode_prev, NULL);
+    furi_hal_ccid_set_callbacks(NULL);
+
+    //teardown view
+    ccid_test_app_free(app);
+    return 0;
+}

applications/debug/ccid_test/iso7816_t0_apdu.c

@@ -0,0 +1,37 @@
+/* Implements rudimentary iso7816-3 support for APDU (T=0) */
+#include <stdint.h>
+#include <string.h>
+#include <furi.h>
+#include "iso7816_t0_apdu.h"
+
+void iso7816_answer_to_reset(uint8_t* dataBuffer, uint32_t* atrlen) {
+    //minimum valid ATR: https://smartcard-atr.apdu.fr/parse?ATR=3B+00
+    uint8_t AtrBuffer[2] = {
+        0x3B, //TS (direct convention)
+        0x00 // T0 (Y(1): b0000, K: 0 (historical bytes))
+    };
+    *atrlen = 2;
+
+    memcpy(dataBuffer, AtrBuffer, sizeof(uint8_t) * (*atrlen));
+}
+
+void iso7816_read_command_apdu(
+    struct ISO7816_Command_APDU* command,
+    const uint8_t* dataBuffer,
+    uint32_t dataLen) {
+    UNUSED(dataLen);
+    command->CLA = dataBuffer[0];
+    command->INS = dataBuffer[1];
+    command->P1 = dataBuffer[2];
+    command->P2 = dataBuffer[3];
+    command->Lc = dataBuffer[4];
+}
+
+void iso7816_write_response_apdu(
+    const struct ISO7816_Response_APDU* response,
+    uint8_t* dataBuffer,
+    uint32_t* dataLen) {
+    dataBuffer[0] = response->SW1;
+    dataBuffer[1] = response->SW2;
+    *dataLen = 2;
+}

applications/debug/ccid_test/iso7816_t0_apdu.h

@@ -0,0 +1,32 @@
+#ifndef _ISO7816_T0_APDU_H_
+#define _ISO7816_T0_APDU_H_
+
+#include <stdint.h>
+
+struct ISO7816_Command_APDU {
+    //header
+    uint8_t CLA;
+    uint8_t INS;
+    uint8_t P1;
+    uint8_t P2;
+
+    //body
+    uint8_t Lc;
+    uint8_t Le;
+} FURI_PACKED;
+
+struct ISO7816_Response_APDU {
+    uint8_t SW1;
+    uint8_t SW2;
+} FURI_PACKED;
+
+void iso7816_answer_to_reset(uint8_t* atrBuffer, uint32_t* atrlen);
+void iso7816_read_command_apdu(
+    struct ISO7816_Command_APDU* command,
+    const uint8_t* dataBuffer,
+    uint32_t dataLen);
+void iso7816_write_response_apdu(
+    const struct ISO7816_Response_APDU* response,
+    uint8_t* dataBuffer,
+    uint32_t* dataLen);
+#endif //_ISO7816_T0_APDU_H_

applications/debug/crash_test/application.fam

@@ -3,7 +3,6 @@ App(
     name="Crash Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="crash_test_app",
-    cdefines=["APP_CRASH_TEST"],
     requires=["gui"],
     stack_size=1 * 1024,
     fap_category="Debug",

applications/debug/direct_draw/direct_draw.c

@@ -71,7 +71,7 @@ static void direct_draw_run(DirectDraw* instance) {
     size_t counter = 0;
     float fps = 0;
 
-    vTaskPrioritySet(furi_thread_get_current_id(), FuriThreadPriorityIdle);
+    furi_thread_set_current_priority(FuriThreadPriorityIdle);
 
     do {
         size_t elapsed = DWT->CYCCNT - start;

applications/debug/display_test/application.fam

@@ -3,9 +3,8 @@ App(
     name="Display Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="display_test_app",
-    cdefines=["APP_DISPLAY_TEST"],
     requires=["gui"],
-    fap_libs=["misc"],
+    fap_libs=["u8g2"],
     stack_size=1 * 1024,
     order=120,
     fap_category="Debug",

applications/debug/expansion_test/application.fam

@@ -0,0 +1,12 @@
+App(
+    appid="expansion_test",
+    name="Expansion Module Test",
+    apptype=FlipperAppType.DEBUG,
+    entry_point="expansion_test_app",
+    requires=["expansion_start"],
+    fap_libs=["assets"],
+    stack_size=1 * 1024,
+    order=20,
+    fap_category="Debug",
+    fap_file_assets="assets",
+)

applications/debug/expansion_test/assets/test.txt

@@ -0,0 +1,9 @@
+"Did you ever hear the tragedy of Darth Plagueis the Wise?"
+"No."
+"I thought not. It's not a story the Jedi would tell you. It's a Sith legend. Darth Plagueis... was a Dark Lord of the Sith so powerful and so wise, he could use the Force to influence the midi-chlorians... to create... life. He had such a knowledge of the dark side, he could even keep the ones he cared about... from dying."
+"He could actually... save people from death?"
+"The dark side of the Force is a pathway to many abilities... some consider to be unnatural."
+"Wh– What happened to him?"
+"He became so powerful, the only thing he was afraid of was... losing his power. Which eventually, of course, he did. Unfortunately, he taught his apprentice everything he knew. Then his apprentice killed him in his sleep. It's ironic. He could save others from death, but not himself."
+"Is it possible to learn this power?"
+"Not from a Jedi."

applications/debug/expansion_test/expansion_test.c

@@ -0,0 +1,457 @@
+/**
+ * @file expansion_test.c
+ * @brief Expansion module support testing application.
+ *
+ * Before running, connect pins using the following scheme:
+ * 13 -> 16 (USART TX to LPUART RX)
+ * 14 -> 15 (USART RX to LPUART TX)
+ *
+ * What this application does:
+ *
+ * - Enables module support and emulates the module on a single device
+ *   (hence the above connection),
+ * - Connects to the expansion module service, sets baud rate,
+ * - Starts the RPC session,
+ * - Creates a directory at `/ext/ExpansionTest` and writes a file
+ *   named `test.txt` under it,
+ * - Plays an audiovisual alert (sound and blinking display),
+ * - Waits 10 cycles of idle loop,
+ * - Stops the RPC session,
+ * - Waits another 10 cycles of idle loop,
+ * - Exits (plays a sound if any of the above steps failed).
+ */
+#include <furi.h>
+
+#include <furi_hal_resources.h>
+
+#include <furi_hal_serial.h>
+#include <furi_hal_serial_control.h>
+
+#include <pb.h>
+#include <pb_decode.h>
+#include <pb_encode.h>
+
+#include <flipper.pb.h>
+
+#include <storage/storage.h>
+#include <expansion/expansion.h>
+#include <notification/notification_messages.h>
+#include <expansion/expansion_protocol.h>
+
+#define TAG "ExpansionTest"
+
+#define TEST_DIR_PATH EXT_PATH(TAG)
+#define TEST_FILE_NAME "test.txt"
+#define TEST_FILE_PATH EXT_PATH(TAG "/" TEST_FILE_NAME)
+
+#define HOST_SERIAL_ID (FuriHalSerialIdLpuart)
+#define MODULE_SERIAL_ID (FuriHalSerialIdUsart)
+
+#define RECEIVE_BUFFER_SIZE (sizeof(ExpansionFrame) + sizeof(ExpansionFrameChecksum))
+
+typedef enum {
+    ExpansionTestAppFlagData = 1U << 0,
+    ExpansionTestAppFlagExit = 1U << 1,
+} ExpansionTestAppFlag;
+
+#define EXPANSION_TEST_APP_ALL_FLAGS (ExpansionTestAppFlagData | ExpansionTestAppFlagExit)
+
+typedef struct {
+    FuriThreadId thread_id;
+    Expansion* expansion;
+    FuriHalSerialHandle* handle;
+    FuriStreamBuffer* buf;
+    ExpansionFrame frame;
+    PB_Main msg;
+    Storage* storage;
+} ExpansionTestApp;
+
+static void expansion_test_app_serial_rx_callback(
+    FuriHalSerialHandle* handle,
+    FuriHalSerialRxEvent event,
+    void* context) {
+    furi_assert(handle);
+    furi_assert(context);
+    ExpansionTestApp* app = context;
+
+    if(event == FuriHalSerialRxEventData) {
+        const uint8_t data = furi_hal_serial_async_rx(handle);
+        furi_stream_buffer_send(app->buf, &data, sizeof(data), 0);
+        furi_thread_flags_set(app->thread_id, ExpansionTestAppFlagData);
+    }
+}
+
+static ExpansionTestApp* expansion_test_app_alloc() {
+    ExpansionTestApp* instance = malloc(sizeof(ExpansionTestApp));
+    instance->buf = furi_stream_buffer_alloc(RECEIVE_BUFFER_SIZE, 1);
+    return instance;
+}
+
+static void expansion_test_app_free(ExpansionTestApp* instance) {
+    furi_stream_buffer_free(instance->buf);
+    free(instance);
+}
+
+static void expansion_test_app_start(ExpansionTestApp* instance) {
+    instance->thread_id = furi_thread_get_current_id();
+    instance->expansion = furi_record_open(RECORD_EXPANSION);
+    instance->handle = furi_hal_serial_control_acquire(MODULE_SERIAL_ID);
+    furi_check(instance->handle);
+    // Configure the serial port
+    furi_hal_serial_init(instance->handle, EXPANSION_PROTOCOL_DEFAULT_BAUD_RATE);
+    // Start waiting for the initial pulse
+    expansion_set_listen_serial(instance->expansion, HOST_SERIAL_ID);
+
+    furi_hal_serial_async_rx_start(
+        instance->handle, expansion_test_app_serial_rx_callback, instance, false);
+}
+
+static void expansion_test_app_stop(ExpansionTestApp* instance) {
+    // Disable expansion module support
+    expansion_disable(instance->expansion);
+    // Give back the module handle
+    furi_hal_serial_control_release(instance->handle);
+    // Restore expansion user settings
+    expansion_enable(instance->expansion);
+    furi_record_close(RECORD_EXPANSION);
+}
+
+static inline bool expansion_test_app_is_success_response(const ExpansionFrame* response) {
+    return response->header.type == ExpansionFrameTypeStatus &&
+           response->content.status.error == ExpansionFrameErrorNone;
+}
+
+static inline bool expansion_test_app_is_success_rpc_message(const PB_Main* message) {
+    return (message->command_status == PB_CommandStatus_OK ||
+            message->command_status == PB_CommandStatus_ERROR_STORAGE_EXIST) &&
+           (message->which_content == PB_Main_empty_tag);
+}
+
+static size_t expansion_test_app_receive_callback(uint8_t* data, size_t data_size, void* context) {
+    ExpansionTestApp* instance = context;
+
+    size_t received_size = 0;
+
+    while(true) {
+        received_size += furi_stream_buffer_receive(
+            instance->buf, data + received_size, data_size - received_size, 0);
+        if(received_size == data_size) break;
+
+        const uint32_t flags = furi_thread_flags_wait(
+            EXPANSION_TEST_APP_ALL_FLAGS, FuriFlagWaitAny, EXPANSION_PROTOCOL_TIMEOUT_MS);
+
+        // Exit on any error
+        if(flags & FuriFlagError) break;
+    }
+
+    return received_size;
+}
+
+static size_t
+    expansion_test_app_send_callback(const uint8_t* data, size_t data_size, void* context) {
+    ExpansionTestApp* instance = context;
+
+    furi_hal_serial_tx(instance->handle, data, data_size);
+    furi_hal_serial_tx_wait_complete(instance->handle);
+
+    return data_size;
+}
+
+static bool expansion_test_app_receive_frame(ExpansionTestApp* instance, ExpansionFrame* frame) {
+    return expansion_protocol_decode(frame, expansion_test_app_receive_callback, instance) ==
+           ExpansionProtocolStatusOk;
+}
+
+static bool
+    expansion_test_app_send_status_response(ExpansionTestApp* instance, ExpansionFrameError error) {
+    ExpansionFrame frame = {
+        .header.type = ExpansionFrameTypeStatus,
+        .content.status.error = error,
+    };
+    return expansion_protocol_encode(&frame, expansion_test_app_send_callback, instance) ==
+           ExpansionProtocolStatusOk;
+}
+
+static bool expansion_test_app_send_heartbeat(ExpansionTestApp* instance) {
+    ExpansionFrame frame = {
+        .header.type = ExpansionFrameTypeHeartbeat,
+        .content.heartbeat = {},
+    };
+    return expansion_protocol_encode(&frame, expansion_test_app_send_callback, instance) ==
+           ExpansionProtocolStatusOk;
+}
+
+static bool
+    expansion_test_app_send_baud_rate_request(ExpansionTestApp* instance, uint32_t baud_rate) {
+    ExpansionFrame frame = {
+        .header.type = ExpansionFrameTypeBaudRate,
+        .content.baud_rate.baud = baud_rate,
+    };
+    return expansion_protocol_encode(&frame, expansion_test_app_send_callback, instance) ==
+           ExpansionProtocolStatusOk;
+}
+
+static bool expansion_test_app_send_control_request(
+    ExpansionTestApp* instance,
+    ExpansionFrameControlCommand command) {
+    ExpansionFrame frame = {
+        .header.type = ExpansionFrameTypeControl,
+        .content.control.command = command,
+    };
+    return expansion_protocol_encode(&frame, expansion_test_app_send_callback, instance) ==
+           ExpansionProtocolStatusOk;
+}
+
+static bool expansion_test_app_send_data_request(
+    ExpansionTestApp* instance,
+    const uint8_t* data,
+    size_t data_size) {
+    furi_assert(data_size <= EXPANSION_PROTOCOL_MAX_DATA_SIZE);
+
+    ExpansionFrame frame = {
+        .header.type = ExpansionFrameTypeData,
+        .content.data.size = data_size,
+    };
+
+    memcpy(frame.content.data.bytes, data, data_size);
+    return expansion_protocol_encode(&frame, expansion_test_app_send_callback, instance) ==
+           ExpansionProtocolStatusOk;
+}
+
+static bool expansion_test_app_rpc_encode_callback(
+    pb_ostream_t* stream,
+    const pb_byte_t* data,
+    size_t data_size) {
+    ExpansionTestApp* instance = stream->state;
+
+    size_t size_sent = 0;
+
+    while(size_sent < data_size) {
+        const size_t current_size = MIN(data_size - size_sent, EXPANSION_PROTOCOL_MAX_DATA_SIZE);
+        if(!expansion_test_app_send_data_request(instance, data + size_sent, current_size)) break;
+        if(!expansion_test_app_receive_frame(instance, &instance->frame)) break;
+        if(!expansion_test_app_is_success_response(&instance->frame)) break;
+        size_sent += current_size;
+    }
+
+    return size_sent == data_size;
+}
+
+static bool expansion_test_app_send_rpc_request(ExpansionTestApp* instance, PB_Main* message) {
+    pb_ostream_t stream = {
+        .callback = expansion_test_app_rpc_encode_callback,
+        .state = instance,
+        .max_size = SIZE_MAX,
+        .bytes_written = 0,
+        .errmsg = NULL,
+    };
+
+    const bool success = pb_encode_ex(&stream, &PB_Main_msg, message, PB_ENCODE_DELIMITED);
+    pb_release(&PB_Main_msg, message);
+    return success;
+}
+
+static bool expansion_test_app_receive_rpc_request(ExpansionTestApp* instance, PB_Main* message) {
+    bool success = false;
+
+    do {
+        if(!expansion_test_app_receive_frame(instance, &instance->frame)) break;
+        if(!expansion_test_app_send_status_response(instance, ExpansionFrameErrorNone)) break;
+        if(instance->frame.header.type != ExpansionFrameTypeData) break;
+        pb_istream_t stream = pb_istream_from_buffer(
+            instance->frame.content.data.bytes, instance->frame.content.data.size);
+        if(!pb_decode_ex(&stream, &PB_Main_msg, message, PB_DECODE_DELIMITED)) break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+static bool expansion_test_app_send_presence(ExpansionTestApp* instance) {
+    // Send pulses to emulate module insertion
+    const uint8_t init = 0xAA;
+    furi_hal_serial_tx(instance->handle, &init, sizeof(init));
+    furi_hal_serial_tx_wait_complete(instance->handle);
+    return true;
+}
+
+static bool expansion_test_app_wait_ready(ExpansionTestApp* instance) {
+    bool success = false;
+
+    do {
+        if(!expansion_test_app_receive_frame(instance, &instance->frame)) break;
+        if(instance->frame.header.type != ExpansionFrameTypeHeartbeat) break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+static bool expansion_test_app_handshake(ExpansionTestApp* instance) {
+    bool success = false;
+
+    do {
+        if(!expansion_test_app_send_baud_rate_request(instance, 230400)) break;
+        if(!expansion_test_app_receive_frame(instance, &instance->frame)) break;
+        if(!expansion_test_app_is_success_response(&instance->frame)) break;
+        furi_hal_serial_set_br(instance->handle, 230400);
+        furi_delay_ms(EXPANSION_PROTOCOL_BAUD_CHANGE_DT_MS);
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+static bool expansion_test_app_start_rpc(ExpansionTestApp* instance) {
+    bool success = false;
+
+    do {
+        if(!expansion_test_app_send_control_request(instance, ExpansionFrameControlCommandStartRpc))
+            break;
+        if(!expansion_test_app_receive_frame(instance, &instance->frame)) break;
+        if(!expansion_test_app_is_success_response(&instance->frame)) break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+static bool expansion_test_app_rpc_mkdir(ExpansionTestApp* instance) {
+    bool success = false;
+
+    instance->msg.command_id++;
+    instance->msg.command_status = PB_CommandStatus_OK;
+    instance->msg.which_content = PB_Main_storage_mkdir_request_tag;
+    instance->msg.has_next = false;
+    instance->msg.content.storage_mkdir_request.path = TEST_DIR_PATH;
+
+    do {
+        if(!expansion_test_app_send_rpc_request(instance, &instance->msg)) break;
+        if(!expansion_test_app_receive_rpc_request(instance, &instance->msg)) break;
+        if(!expansion_test_app_is_success_rpc_message(&instance->msg)) break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+static bool expansion_test_app_rpc_write(ExpansionTestApp* instance) {
+    bool success = false;
+
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    File* file = storage_file_alloc(storage);
+
+    do {
+        if(!storage_file_open(file, APP_ASSETS_PATH(TEST_FILE_NAME), FSAM_READ, FSOM_OPEN_EXISTING))
+            break;
+
+        const uint64_t file_size = storage_file_size(file);
+
+        instance->msg.command_id++;
+        instance->msg.command_status = PB_CommandStatus_OK;
+        instance->msg.which_content = PB_Main_storage_write_request_tag;
+        instance->msg.has_next = false;
+        instance->msg.content.storage_write_request.path = TEST_FILE_PATH;
+        instance->msg.content.storage_write_request.has_file = true;
+        instance->msg.content.storage_write_request.file.data =
+            malloc(PB_BYTES_ARRAY_T_ALLOCSIZE(file_size));
+        instance->msg.content.storage_write_request.file.data->size = file_size;
+
+        const size_t bytes_read = storage_file_read(
+            file, instance->msg.content.storage_write_request.file.data->bytes, file_size);
+
+        if(bytes_read != file_size) {
+            pb_release(&PB_Main_msg, &instance->msg);
+            break;
+        }
+
+        if(!expansion_test_app_send_rpc_request(instance, &instance->msg)) break;
+        if(!expansion_test_app_receive_rpc_request(instance, &instance->msg)) break;
+        if(!expansion_test_app_is_success_rpc_message(&instance->msg)) break;
+        success = true;
+    } while(false);
+
+    storage_file_free(file);
+    furi_record_close(RECORD_STORAGE);
+
+    return success;
+}
+
+static bool expansion_test_app_rpc_alert(ExpansionTestApp* instance) {
+    bool success = false;
+
+    instance->msg.command_id++;
+    instance->msg.command_status = PB_CommandStatus_OK;
+    instance->msg.which_content = PB_Main_system_play_audiovisual_alert_request_tag;
+    instance->msg.has_next = false;
+
+    do {
+        if(!expansion_test_app_send_rpc_request(instance, &instance->msg)) break;
+        if(!expansion_test_app_receive_rpc_request(instance, &instance->msg)) break;
+        if(instance->msg.which_content != PB_Main_empty_tag) break;
+        if(instance->msg.command_status != PB_CommandStatus_OK) break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+static bool expansion_test_app_idle(ExpansionTestApp* instance, uint32_t num_cycles) {
+    uint32_t num_cycles_done;
+    for(num_cycles_done = 0; num_cycles_done < num_cycles; ++num_cycles_done) {
+        if(!expansion_test_app_send_heartbeat(instance)) break;
+        if(!expansion_test_app_receive_frame(instance, &instance->frame)) break;
+        if(instance->frame.header.type != ExpansionFrameTypeHeartbeat) break;
+        furi_delay_ms(EXPANSION_PROTOCOL_TIMEOUT_MS - 50);
+    }
+
+    return num_cycles_done == num_cycles;
+}
+
+static bool expansion_test_app_stop_rpc(ExpansionTestApp* instance) {
+    bool success = false;
+
+    do {
+        if(!expansion_test_app_send_control_request(instance, ExpansionFrameControlCommandStopRpc))
+            break;
+        if(!expansion_test_app_receive_frame(instance, &instance->frame)) break;
+        if(!expansion_test_app_is_success_response(&instance->frame)) break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+int32_t expansion_test_app(void* p) {
+    UNUSED(p);
+
+    ExpansionTestApp* instance = expansion_test_app_alloc();
+    expansion_test_app_start(instance);
+
+    bool success = false;
+
+    do {
+        if(!expansion_test_app_send_presence(instance)) break;
+        if(!expansion_test_app_wait_ready(instance)) break;
+        if(!expansion_test_app_handshake(instance)) break;
+        if(!expansion_test_app_start_rpc(instance)) break;
+        if(!expansion_test_app_rpc_mkdir(instance)) break;
+        if(!expansion_test_app_rpc_write(instance)) break;
+        if(!expansion_test_app_rpc_alert(instance)) break;
+        if(!expansion_test_app_idle(instance, 10)) break;
+        if(!expansion_test_app_stop_rpc(instance)) break;
+        if(!expansion_test_app_idle(instance, 10)) break;
+        success = true;
+    } while(false);
+
+    expansion_test_app_stop(instance);
+    expansion_test_app_free(instance);
+
+    if(!success) {
+        NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION);
+        notification_message(notification, &sequence_error);
+        furi_record_close(RECORD_NOTIFICATION);
+    }
+
+    return 0;
+}

applications/debug/file_browser_test/application.fam

@@ -3,7 +3,6 @@ App(
     name="File Browser Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="file_browser_app",
-    cdefines=["APP_FILE_BROWSER_TEST"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=150,

applications/debug/keypad_test/application.fam

@@ -3,7 +3,6 @@ App(
     name="Keypad Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="keypad_test_app",
-    cdefines=["APP_KEYPAD_TEST"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=30,

applications/debug/locale_test/application.fam

@@ -3,7 +3,6 @@ App(
     name="Locale Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="locale_test_app",
-    cdefines=["APP_LOCALE"],
     requires=["gui", "locale"],
     stack_size=2 * 1024,
     order=70,

applications/debug/locale_test/locale_test.c

@@ -30,7 +30,7 @@ static void locale_test_view_draw_callback(Canvas* canvas, void* _model) {
     }
     canvas_draw_str(canvas, 0, 10, furi_string_get_cstr(tmp_string));
 
-    FuriHalRtcDateTime datetime;
+    DateTime datetime;
     furi_hal_rtc_get_datetime(&datetime);
 
     locale_format_time(tmp_string, &datetime, locale_get_time_format(), false);

applications/debug/rpc_debug_app/rpc_debug_app.c

@@ -21,22 +21,51 @@ static void rpc_debug_app_tick_event_callback(void* context) {
     scene_manager_handle_tick_event(app->scene_manager);
 }
 
-static void rpc_debug_app_rpc_command_callback(RpcAppSystemEvent event, void* context) {
+static void
+    rpc_debug_app_format_hex(const uint8_t* data, size_t data_size, char* buf, size_t buf_size) {
+    if(data == NULL || data_size == 0) {
+        strncpy(buf, "<Data empty>", buf_size);
+        return;
+    }
+
+    const size_t byte_width = 3;
+    const size_t line_width = 7;
+
+    data_size = MIN(data_size, buf_size / (byte_width + 1));
+
+    for(size_t i = 0; i < data_size; ++i) {
+        char* p = buf + (i * byte_width);
+        char sep = !((i + 1) % line_width) ? '\n' : ' ';
+        snprintf(p, byte_width + 1, "%02X%c", data[i], sep);
+    }
+
+    buf[buf_size - 1] = '\0';
+}
+
+static void rpc_debug_app_rpc_command_callback(const RpcAppSystemEvent* event, void* context) {
     furi_assert(context);
     RpcDebugApp* app = context;
     furi_assert(app->rpc);
 
-    if(event == RpcAppEventSessionClose) {
+    if(event->type == RpcAppEventTypeSessionClose) {
         scene_manager_stop(app->scene_manager);
         view_dispatcher_stop(app->view_dispatcher);
         rpc_system_app_set_callback(app->rpc, NULL, NULL);
         app->rpc = NULL;
-    } else if(event == RpcAppEventAppExit) {
+    } else if(event->type == RpcAppEventTypeAppExit) {
         scene_manager_stop(app->scene_manager);
         view_dispatcher_stop(app->view_dispatcher);
-        rpc_system_app_confirm(app->rpc, RpcAppEventAppExit, true);
+        rpc_system_app_confirm(app->rpc, true);
+    } else if(event->type == RpcAppEventTypeDataExchange) {
+        furi_assert(event->data.type == RpcAppSystemEventDataTypeBytes);
+
+        rpc_debug_app_format_hex(
+            event->data.bytes.ptr, event->data.bytes.size, app->text_store, TEXT_STORE_SIZE);
+
+        view_dispatcher_send_custom_event(
+            app->view_dispatcher, RpcDebugAppCustomEventRpcDataExchange);
     } else {
-        rpc_system_app_confirm(app->rpc, event, false);
+        rpc_system_app_confirm(app->rpc, false);
     }
 }
 

applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_receive_data_exchange.c

@@ -1,40 +1,5 @@
 #include "../rpc_debug_app.h"
 
-static void rpc_debug_app_scene_start_format_hex(
-    const uint8_t* data,
-    size_t data_size,
-    char* buf,
-    size_t buf_size) {
-    furi_assert(data);
-    furi_assert(buf);
-
-    const size_t byte_width = 3;
-    const size_t line_width = 7;
-
-    data_size = MIN(data_size, buf_size / (byte_width + 1));
-
-    for(size_t i = 0; i < data_size; ++i) {
-        char* p = buf + (i * byte_width);
-        char sep = !((i + 1) % line_width) ? '\n' : ' ';
-        snprintf(p, byte_width + 1, "%02X%c", data[i], sep);
-    }
-
-    buf[buf_size - 1] = '\0';
-}
-
-static void rpc_debug_app_scene_receive_data_exchange_callback(
-    const uint8_t* data,
-    size_t data_size,
-    void* context) {
-    RpcDebugApp* app = context;
-    if(data) {
-        rpc_debug_app_scene_start_format_hex(data, data_size, app->text_store, TEXT_STORE_SIZE);
-    } else {
-        strncpy(app->text_store, "<Data empty>", TEXT_STORE_SIZE);
-    }
-    view_dispatcher_send_custom_event(app->view_dispatcher, RpcDebugAppCustomEventRpcDataExchange);
-}
-
 void rpc_debug_app_scene_receive_data_exchange_on_enter(void* context) {
     RpcDebugApp* app = context;
     strncpy(app->text_store, "Received data will appear here...", TEXT_STORE_SIZE);
@@ -42,8 +7,6 @@ void rpc_debug_app_scene_receive_data_exchange_on_enter(void* context) {
     text_box_set_text(app->text_box, app->text_store);
     text_box_set_font(app->text_box, TextBoxFontHex);
 
-    rpc_system_app_set_data_exchange_callback(
-        app->rpc, rpc_debug_app_scene_receive_data_exchange_callback, app);
     view_dispatcher_switch_to_view(app->view_dispatcher, RpcDebugAppViewTextBox);
 }
 
@@ -53,6 +16,7 @@ bool rpc_debug_app_scene_receive_data_exchange_on_event(void* context, SceneMana
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == RpcDebugAppCustomEventRpcDataExchange) {
+            rpc_system_app_confirm(app->rpc, true);
             notification_message(app->notifications, &sequence_blink_cyan_100);
             notification_message(app->notifications, &sequence_display_backlight_on);
             text_box_set_text(app->text_box, app->text_store);
@@ -66,5 +30,4 @@ bool rpc_debug_app_scene_receive_data_exchange_on_event(void* context, SceneMana
 void rpc_debug_app_scene_receive_data_exchange_on_exit(void* context) {
     RpcDebugApp* app = context;
     text_box_reset(app->text_box);
-    rpc_system_app_set_data_exchange_callback(app->rpc, NULL, NULL);
 }

applications/debug/text_box_test/application.fam

@@ -3,7 +3,6 @@ App(
     name="Text Box Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="text_box_test_app",
-    cdefines=["APP_TEXT_BOX_TEST"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=140,

applications/debug/uart_echo/application.fam

@@ -3,7 +3,6 @@ App(
     name="UART Echo",
     apptype=FlipperAppType.DEBUG,
     entry_point="uart_echo_app",
-    cdefines=["APP_UART_ECHO"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=70,

applications/debug/uart_echo/uart_echo.c

@@ -1,13 +1,14 @@
 #include <furi.h>
+#include <furi_hal.h>
+
 #include <gui/gui.h>
-#include <notification/notification.h>
-#include <notification/notification_messages.h>
 #include <gui/elements.h>
-#include <furi_hal_uart.h>
-#include <furi_hal_console.h>
 #include <gui/view_dispatcher.h>
 #include <gui/modules/dialog_ex.h>
 
+#include <notification/notification.h>
+#include <notification/notification_messages.h>
+
 #define LINES_ON_SCREEN 6
 #define COLUMNS_ON_SCREEN 21
 #define TAG "UartEcho"
@@ -22,6 +23,7 @@ typedef struct {
     View* view;
     FuriThread* worker_thread;
     FuriStreamBuffer* rx_stream;
+    FuriHalSerialHandle* serial_handle;
 } UartEchoApp;
 
 typedef struct {
@@ -39,10 +41,16 @@ struct UartDumpModel {
 typedef enum {
     WorkerEventReserved = (1 << 0), // Reserved for StreamBuffer internal event
     WorkerEventStop = (1 << 1),
-    WorkerEventRx = (1 << 2),
+    WorkerEventRxData = (1 << 2),
+    WorkerEventRxIdle = (1 << 3),
+    WorkerEventRxOverrunError = (1 << 4),
+    WorkerEventRxFramingError = (1 << 5),
+    WorkerEventRxNoiseError = (1 << 6),
 } WorkerEventFlags;
 
-#define WORKER_EVENTS_MASK (WorkerEventStop | WorkerEventRx)
+#define WORKER_EVENTS_MASK                                                                 \
+    (WorkerEventStop | WorkerEventRxData | WorkerEventRxIdle | WorkerEventRxOverrunError | \
+     WorkerEventRxFramingError | WorkerEventRxNoiseError)
 
 const NotificationSequence sequence_notification = {
     &message_display_backlight_on,
@@ -91,14 +99,39 @@ static uint32_t uart_echo_exit(void* context) {
     return VIEW_NONE;
 }
 
-static void uart_echo_on_irq_cb(UartIrqEvent ev, uint8_t data, void* context) {
+static void
+    uart_echo_on_irq_cb(FuriHalSerialHandle* handle, FuriHalSerialRxEvent event, void* context) {
     furi_assert(context);
+    UNUSED(handle);
     UartEchoApp* app = context;
+    volatile FuriHalSerialRxEvent event_copy = event;
+    UNUSED(event_copy);
 
-    if(ev == UartIrqEventRXNE) {
+    WorkerEventFlags flag = 0;
+
+    if(event & FuriHalSerialRxEventData) {
+        uint8_t data = furi_hal_serial_async_rx(handle);
         furi_stream_buffer_send(app->rx_stream, &data, 1, 0);
-        furi_thread_flags_set(furi_thread_get_id(app->worker_thread), WorkerEventRx);
+        flag |= WorkerEventRxData;
     }
+
+    if(event & FuriHalSerialRxEventIdle) {
+        //idle line detected, packet transmission may have ended
+        flag |= WorkerEventRxIdle;
+    }
+
+    //error detected
+    if(event & FuriHalSerialRxEventFrameError) {
+        flag |= WorkerEventRxFramingError;
+    }
+    if(event & FuriHalSerialRxEventNoiseError) {
+        flag |= WorkerEventRxNoiseError;
+    }
+    if(event & FuriHalSerialRxEventOverrunError) {
+        flag |= WorkerEventRxOverrunError;
+    }
+
+    furi_thread_flags_set(furi_thread_get_id(app->worker_thread), flag);
 }
 
 static void uart_echo_push_to_list(UartDumpModel* model, const char data) {
@@ -153,13 +186,13 @@ static int32_t uart_echo_worker(void* context) {
         furi_check((events & FuriFlagError) == 0);
 
         if(events & WorkerEventStop) break;
-        if(events & WorkerEventRx) {
+        if(events & WorkerEventRxData) {
             size_t length = 0;
             do {
                 uint8_t data[64];
                 length = furi_stream_buffer_receive(app->rx_stream, data, 64, 0);
                 if(length > 0) {
-                    furi_hal_uart_tx(FuriHalUartIdUSART1, data, length);
+                    furi_hal_serial_tx(app->serial_handle, data, length);
                     with_view_model(
                         app->view,
                         UartDumpModel * model,
@@ -176,6 +209,23 @@ static int32_t uart_echo_worker(void* context) {
             with_view_model(
                 app->view, UartDumpModel * model, { UNUSED(model); }, true);
         }
+
+        if(events & WorkerEventRxIdle) {
+            furi_hal_serial_tx(app->serial_handle, (uint8_t*)"\r\nDetect IDLE\r\n", 15);
+        }
+
+        if(events &
+           (WorkerEventRxOverrunError | WorkerEventRxFramingError | WorkerEventRxNoiseError)) {
+            if(events & WorkerEventRxOverrunError) {
+                furi_hal_serial_tx(app->serial_handle, (uint8_t*)"\r\nDetect ORE\r\n", 14);
+            }
+            if(events & WorkerEventRxFramingError) {
+                furi_hal_serial_tx(app->serial_handle, (uint8_t*)"\r\nDetect FE\r\n", 13);
+            }
+            if(events & WorkerEventRxNoiseError) {
+                furi_hal_serial_tx(app->serial_handle, (uint8_t*)"\r\nDetect NE\r\n", 13);
+            }
+        }
     }
 
     return 0;
@@ -221,9 +271,11 @@ static UartEchoApp* uart_echo_app_alloc(uint32_t baudrate) {
     furi_thread_start(app->worker_thread);
 
     // Enable uart listener
-    furi_hal_console_disable();
-    furi_hal_uart_set_br(FuriHalUartIdUSART1, baudrate);
-    furi_hal_uart_set_irq_cb(FuriHalUartIdUSART1, uart_echo_on_irq_cb, app);
+    app->serial_handle = furi_hal_serial_control_acquire(FuriHalSerialIdUsart);
+    furi_check(app->serial_handle);
+    furi_hal_serial_init(app->serial_handle, baudrate);
+
+    furi_hal_serial_async_rx_start(app->serial_handle, uart_echo_on_irq_cb, app, true);
 
     return app;
 }
@@ -231,12 +283,13 @@ static UartEchoApp* uart_echo_app_alloc(uint32_t baudrate) {
 static void uart_echo_app_free(UartEchoApp* app) {
     furi_assert(app);
 
-    furi_hal_console_enable(); // this will also clear IRQ callback so thread is no longer referenced
-
     furi_thread_flags_set(furi_thread_get_id(app->worker_thread), WorkerEventStop);
     furi_thread_join(app->worker_thread);
     furi_thread_free(app->worker_thread);
 
+    furi_hal_serial_deinit(app->serial_handle);
+    furi_hal_serial_control_release(app->serial_handle);
+
     // Free views
     view_dispatcher_remove_view(app->view_dispatcher, 0);
 

applications/debug/unit_tests/application.fam

@@ -5,6 +5,7 @@ App(
     cdefines=["APP_UNIT_TESTS"],
     requires=["system_settings"],
     provides=["delay_test"],
+    resources="resources",
     order=100,
 )
 

applications/debug/unit_tests/bit_lib/bit_lib_test.c

@@ -1,6 +1,6 @@
 #include <furi.h>
 #include "../minunit.h"
-#include <lfrfid/tools/bit_lib.h>
+#include <bit_lib/bit_lib.h>
 
 MU_TEST(test_bit_lib_increment_index) {
     uint32_t index = 0;
@@ -218,6 +218,178 @@ MU_TEST(test_bit_lib_get_bits_32) {
     mu_assert_int_eq(0b00001001101100011000110001100010, bit_lib_get_bits_32(value, 0, 32));
 }
 
+MU_TEST(test_bit_lib_get_bits_64) {
+    uint8_t value[8] = {
+        0b00001001,
+        0b10110001,
+        0b10001100,
+        0b01100010,
+        0b00001001,
+        0b10110001,
+        0b10001100,
+        0b01100010};
+    mu_assert_int_eq(0b0, bit_lib_get_bits_64(value, 0, 1));
+    mu_assert_int_eq(0b00, bit_lib_get_bits_64(value, 0, 2));
+    mu_assert_int_eq(0b000, bit_lib_get_bits_64(value, 0, 3));
+    mu_assert_int_eq(0b0000, bit_lib_get_bits_64(value, 0, 4));
+    mu_assert_int_eq(0b00001, bit_lib_get_bits_64(value, 0, 5));
+    mu_assert_int_eq(0b000010, bit_lib_get_bits_64(value, 0, 6));
+    mu_assert_int_eq(0b0000100, bit_lib_get_bits_64(value, 0, 7));
+    mu_assert_int_eq(0b00001001, bit_lib_get_bits_64(value, 0, 8));
+    mu_assert_int_eq(0b000010011, bit_lib_get_bits_64(value, 0, 9));
+    mu_assert_int_eq(0b0000100110, bit_lib_get_bits_64(value, 0, 10));
+    mu_assert_int_eq(0b00001001101, bit_lib_get_bits_64(value, 0, 11));
+    mu_assert_int_eq(0b000010011011, bit_lib_get_bits_64(value, 0, 12));
+    mu_assert_int_eq(0b0000100110110, bit_lib_get_bits_64(value, 0, 13));
+    mu_assert_int_eq(0b00001001101100, bit_lib_get_bits_64(value, 0, 14));
+    mu_assert_int_eq(0b000010011011000, bit_lib_get_bits_64(value, 0, 15));
+    mu_assert_int_eq(0b0000100110110001, bit_lib_get_bits_64(value, 0, 16));
+    mu_assert_int_eq(0b00001001101100011, bit_lib_get_bits_64(value, 0, 17));
+    mu_assert_int_eq(0b000010011011000110, bit_lib_get_bits_64(value, 0, 18));
+    mu_assert_int_eq(0b0000100110110001100, bit_lib_get_bits_64(value, 0, 19));
+    mu_assert_int_eq(0b00001001101100011000, bit_lib_get_bits_64(value, 0, 20));
+    mu_assert_int_eq(0b000010011011000110001, bit_lib_get_bits_64(value, 0, 21));
+    mu_assert_int_eq(0b0000100110110001100011, bit_lib_get_bits_64(value, 0, 22));
+    mu_assert_int_eq(0b00001001101100011000110, bit_lib_get_bits_64(value, 0, 23));
+    mu_assert_int_eq(0b000010011011000110001100, bit_lib_get_bits_64(value, 0, 24));
+    mu_assert_int_eq(0b0000100110110001100011000, bit_lib_get_bits_64(value, 0, 25));
+    mu_assert_int_eq(0b00001001101100011000110001, bit_lib_get_bits_64(value, 0, 26));
+    mu_assert_int_eq(0b000010011011000110001100011, bit_lib_get_bits_64(value, 0, 27));
+    mu_assert_int_eq(0b0000100110110001100011000110, bit_lib_get_bits_64(value, 0, 28));
+    mu_assert_int_eq(0b00001001101100011000110001100, bit_lib_get_bits_64(value, 0, 29));
+    mu_assert_int_eq(0b000010011011000110001100011000, bit_lib_get_bits_64(value, 0, 30));
+    mu_assert_int_eq(0b0000100110110001100011000110001, bit_lib_get_bits_64(value, 0, 31));
+    mu_assert_int_eq(0b00001001101100011000110001100010, bit_lib_get_bits_64(value, 0, 32));
+
+    uint64_t res = bit_lib_get_bits_64(value, 0, 33);
+    uint64_t expected = 0b000010011011000110001100011000100;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 34);
+    expected = 0b0000100110110001100011000110001000;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 35);
+    expected = 0b00001001101100011000110001100010000;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 36);
+    expected = 0b000010011011000110001100011000100000;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 37);
+    expected = 0b0000100110110001100011000110001000001;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 38);
+    expected = 0b00001001101100011000110001100010000010;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 39);
+    expected = 0b000010011011000110001100011000100000100;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 40);
+    expected = 0b0000100110110001100011000110001000001001;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 41);
+    expected = 0b00001001101100011000110001100010000010011;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 42);
+    expected = 0b000010011011000110001100011000100000100110;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 43);
+    expected = 0b0000100110110001100011000110001000001001101;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 44);
+    expected = 0b00001001101100011000110001100010000010011011;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 45);
+    expected = 0b000010011011000110001100011000100000100110110;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 46);
+    expected = 0b0000100110110001100011000110001000001001101100;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 47);
+    expected = 0b00001001101100011000110001100010000010011011000;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 48);
+    expected = 0b000010011011000110001100011000100000100110110001;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 49);
+    expected = 0b0000100110110001100011000110001000001001101100011;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 50);
+    expected = 0b00001001101100011000110001100010000010011011000110;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 51);
+    expected = 0b000010011011000110001100011000100000100110110001100;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 52);
+    expected = 0b0000100110110001100011000110001000001001101100011000;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 53);
+    expected = 0b00001001101100011000110001100010000010011011000110001;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 54);
+    expected = 0b000010011011000110001100011000100000100110110001100011;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 55);
+    expected = 0b0000100110110001100011000110001000001001101100011000110;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 56);
+    expected = 0b00001001101100011000110001100010000010011011000110001100;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 57);
+    expected = 0b000010011011000110001100011000100000100110110001100011000;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 58);
+    expected = 0b0000100110110001100011000110001000001001101100011000110001;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 59);
+    expected = 0b00001001101100011000110001100010000010011011000110001100011;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 60);
+    expected = 0b000010011011000110001100011000100000100110110001100011000110;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 61);
+    expected = 0b0000100110110001100011000110001000001001101100011000110001100;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 62);
+    expected = 0b00001001101100011000110001100010000010011011000110001100011000;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 63);
+    expected = 0b000010011011000110001100011000100000100110110001100011000110001;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+
+    res = bit_lib_get_bits_64(value, 0, 64);
+    expected = 0b0000100110110001100011000110001000001001101100011000110001100010;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+}
+
 MU_TEST(test_bit_lib_test_parity_u32) {
     // test even parity
     mu_assert_int_eq(bit_lib_test_parity_32(0b00000000, BitLibParityEven), 0);
@@ -447,6 +619,95 @@ MU_TEST(test_bit_lib_crc16) {
     mu_assert_int_eq(0x31C3, bit_lib_crc16(data, data_size, 0x1021, 0x0000, false, false, 0x0000));
 }
 
+MU_TEST(test_bit_lib_num_to_bytes_be) {
+    uint8_t src[8] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF};
+    uint8_t dest[8];
+
+    bit_lib_num_to_bytes_be(0x01, 1, dest);
+    mu_assert_mem_eq(src, dest, sizeof(src[0]));
+
+    bit_lib_num_to_bytes_be(0x0123456789ABCDEF, 4, dest);
+    mu_assert_mem_eq(src + 4, dest, 4 * sizeof(src[0]));
+
+    bit_lib_num_to_bytes_be(0x0123456789ABCDEF, 8, dest);
+    mu_assert_mem_eq(src, dest, 8 * sizeof(src[0]));
+
+    bit_lib_num_to_bytes_be(bit_lib_bytes_to_num_be(src, 8), 8, dest);
+    mu_assert_mem_eq(src, dest, 8 * sizeof(src[0]));
+}
+
+MU_TEST(test_bit_lib_num_to_bytes_le) {
+    uint8_t dest[8];
+
+    uint8_t n2b_le_expected_1[] = {0x01};
+    bit_lib_num_to_bytes_le(0x01, 1, dest);
+    mu_assert_mem_eq(n2b_le_expected_1, dest, sizeof(n2b_le_expected_1[0]));
+
+    uint8_t n2b_le_expected_2[] = {0xEF, 0xCD, 0xAB, 0x89};
+    bit_lib_num_to_bytes_le(0x0123456789ABCDEF, 4, dest);
+    mu_assert_mem_eq(n2b_le_expected_2, dest, 4 * sizeof(n2b_le_expected_2[0]));
+
+    uint8_t n2b_le_expected_3[] = {0xEF, 0xCD, 0xAB, 0x89, 0x67, 0x45, 0x23, 0x01};
+    bit_lib_num_to_bytes_le(0x0123456789ABCDEF, 8, dest);
+    mu_assert_mem_eq(n2b_le_expected_3, dest, 8 * sizeof(n2b_le_expected_3[0]));
+
+    bit_lib_num_to_bytes_le(bit_lib_bytes_to_num_le(n2b_le_expected_3, 8), 8, dest);
+    mu_assert_mem_eq(n2b_le_expected_3, dest, 8 * sizeof(n2b_le_expected_3[0]));
+}
+
+MU_TEST(test_bit_lib_bytes_to_num_be) {
+    uint8_t src[8] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF};
+    uint64_t res;
+
+    res = bit_lib_bytes_to_num_be(src, 1);
+    mu_assert_int_eq(0x01, res);
+
+    res = bit_lib_bytes_to_num_be(src, 4);
+    mu_assert_int_eq(0x01234567, res);
+
+    res = bit_lib_bytes_to_num_be(src, 8);
+    uint64_t expected = 0x0123456789ABCDEF;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+}
+
+MU_TEST(test_bit_lib_bytes_to_num_le) {
+    uint8_t src[8] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF};
+    uint64_t res;
+
+    res = bit_lib_bytes_to_num_le(src, 1);
+    mu_assert_int_eq(0x01, res);
+
+    res = bit_lib_bytes_to_num_le(src, 4);
+    mu_assert_int_eq(0x67452301, res);
+
+    res = bit_lib_bytes_to_num_le(src, 8);
+    uint64_t expected = 0xEFCDAB8967452301;
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+}
+
+MU_TEST(test_bit_lib_bytes_to_num_bcd) {
+    uint8_t src[8] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF};
+    uint64_t res;
+    bool is_bcd_res;
+
+    res = bit_lib_bytes_to_num_bcd(src, 1, &is_bcd_res);
+    mu_assert_int_eq(01, res);
+    mu_assert_int_eq(true, is_bcd_res);
+
+    res = bit_lib_bytes_to_num_bcd(src, 4, &is_bcd_res);
+    mu_assert_int_eq(1234567, res);
+    mu_assert_int_eq(true, is_bcd_res);
+
+    uint8_t digits[5] = {0x98, 0x76, 0x54, 0x32, 0x10};
+    uint64_t expected = 9876543210;
+    res = bit_lib_bytes_to_num_bcd(digits, 5, &is_bcd_res);
+    mu_assert_mem_eq(&expected, &res, sizeof(expected));
+    mu_assert_int_eq(true, is_bcd_res);
+
+    res = bit_lib_bytes_to_num_bcd(src, 8, &is_bcd_res);
+    mu_assert_int_eq(false, is_bcd_res);
+}
+
 MU_TEST_SUITE(test_bit_lib) {
     MU_RUN_TEST(test_bit_lib_increment_index);
     MU_RUN_TEST(test_bit_lib_is_set);
@@ -457,6 +718,7 @@ MU_TEST_SUITE(test_bit_lib) {
     MU_RUN_TEST(test_bit_lib_get_bits);
     MU_RUN_TEST(test_bit_lib_get_bits_16);
     MU_RUN_TEST(test_bit_lib_get_bits_32);
+    MU_RUN_TEST(test_bit_lib_get_bits_64);
     MU_RUN_TEST(test_bit_lib_test_parity_u32);
     MU_RUN_TEST(test_bit_lib_test_parity);
     MU_RUN_TEST(test_bit_lib_remove_bit_every_nth);
@@ -465,6 +727,11 @@ MU_TEST_SUITE(test_bit_lib) {
     MU_RUN_TEST(test_bit_lib_get_bit_count);
     MU_RUN_TEST(test_bit_lib_reverse_16_fast);
     MU_RUN_TEST(test_bit_lib_crc16);
+    MU_RUN_TEST(test_bit_lib_num_to_bytes_be);
+    MU_RUN_TEST(test_bit_lib_num_to_bytes_le);
+    MU_RUN_TEST(test_bit_lib_bytes_to_num_be);
+    MU_RUN_TEST(test_bit_lib_bytes_to_num_le);
+    MU_RUN_TEST(test_bit_lib_bytes_to_num_bcd);
 }
 
 int run_minunit_test_bit_lib() {

applications/debug/unit_tests/bt/bt_test.c

@@ -28,7 +28,7 @@ void bt_test_alloc() {
 }
 
 void bt_test_free() {
-    furi_assert(bt_test);
+    furi_check(bt_test);
     free(bt_test->nvm_ram_buff_ref);
     free(bt_test->nvm_ram_buff_dut);
     bt_keys_storage_free(bt_test->bt_keys_storage);
@@ -89,7 +89,7 @@ static void bt_test_keys_remove_test_file() {
 }
 
 MU_TEST(bt_test_keys_storage_serial_profile) {
-    furi_assert(bt_test);
+    furi_check(bt_test);
 
     bt_test_keys_remove_test_file();
     bt_test_keys_storage_profile();

applications/debug/unit_tests/datetimelib/datetimelib_test.c

@@ -0,0 +1,175 @@
+#include <furi.h>
+#include "../minunit.h"
+
+#include <datetime/datetime.h>
+
+MU_TEST(test_datetime_validate_datetime_correct_min) {
+    DateTime correct_min = {0, 0, 0, 1, 1, 2000, 1};
+    bool result = datetime_validate_datetime(&correct_min);
+
+    mu_assert_int_eq(true, result);
+}
+
+MU_TEST(test_datetime_validate_datetime_correct_max) {
+    DateTime correct_max = {23, 59, 59, 31, 12, 2099, 7};
+    bool result = datetime_validate_datetime(&correct_max);
+
+    mu_assert_int_eq(true, result);
+}
+
+MU_TEST(test_datetime_validate_datetime_incorrect_second) {
+    DateTime incorrect_sec = {0, 0, 60, 1, 1, 2000, 1};
+    bool result = datetime_validate_datetime(&incorrect_sec);
+
+    mu_assert_int_eq(false, result);
+}
+
+MU_TEST(test_datetime_validate_datetime_incorrect_minute) {
+    DateTime incorrect_min = {0, 60, 0, 1, 1, 2000, 1};
+    bool result = datetime_validate_datetime(&incorrect_min);
+
+    mu_assert_int_eq(false, result);
+}
+
+MU_TEST(test_datetime_validate_datetime_incorrect_hour) {
+    DateTime incorrect_hour = {24, 0, 0, 1, 1, 2000, 1};
+    bool result = datetime_validate_datetime(&incorrect_hour);
+
+    mu_assert_int_eq(false, result);
+}
+
+MU_TEST(test_datetime_validate_datetime_incorrect_day_min) {
+    DateTime incorrect_day_min = {0, 0, 0, 0, 1, 2000, 1};
+    bool result = datetime_validate_datetime(&incorrect_day_min);
+
+    mu_assert_int_eq(false, result);
+}
+
+MU_TEST(test_datetime_validate_datetime_incorrect_day_max) {
+    DateTime incorrect_day_max = {0, 0, 0, 32, 1, 2000, 1};
+    bool result = datetime_validate_datetime(&incorrect_day_max);
+
+    mu_assert_int_eq(false, result);
+}
+
+MU_TEST(test_datetime_validate_datetime_incorrect_month_min) {
+    DateTime incorrect_month_min = {0, 0, 0, 1, 0, 2000, 1};
+    bool result = datetime_validate_datetime(&incorrect_month_min);
+
+    mu_assert_int_eq(false, result);
+}
+
+MU_TEST(test_datetime_validate_datetime_incorrect_month_max) {
+    DateTime incorrect_month_max = {0, 0, 0, 1, 13, 2000, 1};
+    bool result = datetime_validate_datetime(&incorrect_month_max);
+
+    mu_assert_int_eq(false, result);
+}
+
+MU_TEST(test_datetime_validate_datetime_incorrect_year_min) {
+    DateTime incorrect_year_min = {0, 0, 0, 1, 1, 1999, 1};
+    bool result = datetime_validate_datetime(&incorrect_year_min);
+
+    mu_assert_int_eq(false, result);
+}
+
+MU_TEST(test_datetime_validate_datetime_incorrect_year_max) {
+    DateTime incorrect_year_max = {0, 0, 0, 1, 1, 2100, 1};
+    bool result = datetime_validate_datetime(&incorrect_year_max);
+
+    mu_assert_int_eq(false, result);
+}
+
+MU_TEST(test_datetime_validate_datetime_incorrect_weekday_min) {
+    DateTime incorrect_weekday_min = {0, 0, 0, 1, 1, 2000, 0};
+    bool result = datetime_validate_datetime(&incorrect_weekday_min);
+
+    mu_assert_int_eq(false, result);
+}
+
+MU_TEST(test_datetime_validate_datetime_incorrect_weekday_max) {
+    DateTime incorrect_weekday_max = {0, 0, 0, 1, 1, 2000, 8};
+    bool result = datetime_validate_datetime(&incorrect_weekday_max);
+
+    mu_assert_int_eq(false, result);
+}
+
+MU_TEST_SUITE(test_datetime_validate_datetime) {
+    MU_RUN_TEST(test_datetime_validate_datetime_correct_min);
+    MU_RUN_TEST(test_datetime_validate_datetime_correct_max);
+    MU_RUN_TEST(test_datetime_validate_datetime_incorrect_second);
+    MU_RUN_TEST(test_datetime_validate_datetime_incorrect_minute);
+    MU_RUN_TEST(test_datetime_validate_datetime_incorrect_hour);
+    MU_RUN_TEST(test_datetime_validate_datetime_incorrect_day_min);
+    MU_RUN_TEST(test_datetime_validate_datetime_incorrect_day_max);
+    MU_RUN_TEST(test_datetime_validate_datetime_incorrect_month_min);
+    MU_RUN_TEST(test_datetime_validate_datetime_incorrect_month_max);
+    MU_RUN_TEST(test_datetime_validate_datetime_incorrect_year_min);
+    MU_RUN_TEST(test_datetime_validate_datetime_incorrect_year_max);
+    MU_RUN_TEST(test_datetime_validate_datetime_incorrect_weekday_min);
+    MU_RUN_TEST(test_datetime_validate_datetime_incorrect_weekday_max);
+}
+
+MU_TEST(test_datetime_timestamp_to_datetime_min) {
+    uint32_t test_value = 0;
+    DateTime min_datetime_expected = {0, 0, 0, 1, 1, 1970, 0};
+
+    DateTime result = {0};
+    datetime_timestamp_to_datetime(test_value, &result);
+
+    mu_assert_mem_eq(&min_datetime_expected, &result, sizeof(result));
+}
+
+MU_TEST(test_datetime_timestamp_to_datetime_max) {
+    uint32_t test_value = UINT32_MAX;
+    DateTime max_datetime_expected = {6, 28, 15, 7, 2, 2106, 0};
+
+    DateTime result = {0};
+    datetime_timestamp_to_datetime(test_value, &result);
+
+    mu_assert_mem_eq(&max_datetime_expected, &result, sizeof(result));
+}
+
+MU_TEST(test_datetime_timestamp_to_datetime_to_timestamp) {
+    uint32_t test_value = random();
+
+    DateTime datetime = {0};
+    datetime_timestamp_to_datetime(test_value, &datetime);
+
+    uint32_t result = datetime_datetime_to_timestamp(&datetime);
+
+    mu_assert_int_eq(test_value, result);
+}
+
+MU_TEST_SUITE(test_datetime_timestamp_to_datetime_suite) {
+    MU_RUN_TEST(test_datetime_timestamp_to_datetime_min);
+    MU_RUN_TEST(test_datetime_timestamp_to_datetime_max);
+    MU_RUN_TEST(test_datetime_timestamp_to_datetime_to_timestamp);
+}
+
+MU_TEST(test_datetime_datetime_to_timestamp_min) {
+    DateTime min_datetime = {0, 0, 0, 1, 1, 1970, 0};
+
+    uint32_t result = datetime_datetime_to_timestamp(&min_datetime);
+    mu_assert_int_eq(0, result);
+}
+
+MU_TEST(test_datetime_datetime_to_timestamp_max) {
+    DateTime max_datetime = {6, 28, 15, 7, 2, 2106, 0};
+
+    uint32_t result = datetime_datetime_to_timestamp(&max_datetime);
+    mu_assert_int_eq(UINT32_MAX, result);
+}
+
+MU_TEST_SUITE(test_datetime_datetime_to_timestamp_suite) {
+    MU_RUN_TEST(test_datetime_datetime_to_timestamp_min);
+    MU_RUN_TEST(test_datetime_datetime_to_timestamp_max);
+}
+
+int run_minunit_test_datetime() {
+    MU_RUN_SUITE(test_datetime_timestamp_to_datetime_suite);
+    MU_RUN_SUITE(test_datetime_datetime_to_timestamp_suite);
+    MU_RUN_SUITE(test_datetime_validate_datetime);
+
+    return MU_EXIT_CODE;
+}

applications/debug/unit_tests/expansion/expansion_test.c

@@ -0,0 +1,200 @@
+#include "../minunit.h"
+
+#include <furi.h>
+#include <furi_hal_random.h>
+
+#include <expansion/expansion_protocol.h>
+
+#define EXPANSION_TEST_GARBAGE_MAGIC (0xB19AF)
+#define EXPANSION_TEST_GARBAGE_BUF_SIZE (0x100U)
+#define EXPANSION_TEST_GARBAGE_ITERATIONS (100U)
+
+MU_TEST(test_expansion_encoded_size) {
+    ExpansionFrame frame = {};
+
+    frame.header.type = ExpansionFrameTypeHeartbeat;
+    mu_assert_int_eq(1, expansion_frame_get_encoded_size(&frame));
+
+    frame.header.type = ExpansionFrameTypeStatus;
+    mu_assert_int_eq(2, expansion_frame_get_encoded_size(&frame));
+
+    frame.header.type = ExpansionFrameTypeBaudRate;
+    mu_assert_int_eq(5, expansion_frame_get_encoded_size(&frame));
+
+    frame.header.type = ExpansionFrameTypeControl;
+    mu_assert_int_eq(2, expansion_frame_get_encoded_size(&frame));
+
+    frame.header.type = ExpansionFrameTypeData;
+    for(size_t i = 0; i <= EXPANSION_PROTOCOL_MAX_DATA_SIZE; ++i) {
+        frame.content.data.size = i;
+        mu_assert_int_eq(i + 2, expansion_frame_get_encoded_size(&frame));
+    }
+}
+
+MU_TEST(test_expansion_remaining_size) {
+    ExpansionFrame frame = {};
+
+    size_t remaining_size;
+    mu_check(expansion_frame_get_remaining_size(&frame, 0, &remaining_size));
+    mu_assert_int_eq(1, remaining_size);
+
+    frame.header.type = ExpansionFrameTypeHeartbeat;
+    mu_check(expansion_frame_get_remaining_size(&frame, 0, &remaining_size));
+    mu_assert_int_eq(1, remaining_size);
+    mu_check(expansion_frame_get_remaining_size(&frame, 1, &remaining_size));
+    mu_assert_int_eq(0, remaining_size);
+    mu_check(expansion_frame_get_remaining_size(&frame, 100, &remaining_size));
+    mu_assert_int_eq(0, remaining_size);
+
+    frame.header.type = ExpansionFrameTypeStatus;
+    mu_check(expansion_frame_get_remaining_size(&frame, 0, &remaining_size));
+    mu_assert_int_eq(1, remaining_size);
+    mu_check(expansion_frame_get_remaining_size(&frame, 1, &remaining_size));
+    mu_assert_int_eq(1, remaining_size);
+    mu_check(expansion_frame_get_remaining_size(&frame, 2, &remaining_size));
+    mu_assert_int_eq(0, remaining_size);
+    mu_check(expansion_frame_get_remaining_size(&frame, 100, &remaining_size));
+    mu_assert_int_eq(0, remaining_size);
+
+    frame.header.type = ExpansionFrameTypeBaudRate;
+    mu_check(expansion_frame_get_remaining_size(&frame, 0, &remaining_size));
+    mu_assert_int_eq(1, remaining_size);
+    mu_check(expansion_frame_get_remaining_size(&frame, 1, &remaining_size));
+    mu_assert_int_eq(4, remaining_size);
+    mu_check(expansion_frame_get_remaining_size(&frame, 5, &remaining_size));
+    mu_assert_int_eq(0, remaining_size);
+    mu_check(expansion_frame_get_remaining_size(&frame, 100, &remaining_size));
+    mu_assert_int_eq(0, remaining_size);
+
+    frame.header.type = ExpansionFrameTypeControl;
+    mu_check(expansion_frame_get_remaining_size(&frame, 0, &remaining_size));
+    mu_assert_int_eq(1, remaining_size);
+    mu_check(expansion_frame_get_remaining_size(&frame, 1, &remaining_size));
+    mu_assert_int_eq(1, remaining_size);
+    mu_check(expansion_frame_get_remaining_size(&frame, 2, &remaining_size));
+    mu_assert_int_eq(0, remaining_size);
+    mu_check(expansion_frame_get_remaining_size(&frame, 100, &remaining_size));
+    mu_assert_int_eq(0, remaining_size);
+
+    frame.header.type = ExpansionFrameTypeData;
+    frame.content.data.size = EXPANSION_PROTOCOL_MAX_DATA_SIZE;
+    mu_check(expansion_frame_get_remaining_size(&frame, 0, &remaining_size));
+    mu_assert_int_eq(1, remaining_size);
+    mu_check(expansion_frame_get_remaining_size(&frame, 1, &remaining_size));
+    mu_assert_int_eq(1, remaining_size);
+    mu_check(expansion_frame_get_remaining_size(&frame, 2, &remaining_size));
+    mu_assert_int_eq(EXPANSION_PROTOCOL_MAX_DATA_SIZE, remaining_size);
+    for(size_t i = 0; i <= EXPANSION_PROTOCOL_MAX_DATA_SIZE; ++i) {
+        mu_check(expansion_frame_get_remaining_size(&frame, i + 2, &remaining_size));
+        mu_assert_int_eq(EXPANSION_PROTOCOL_MAX_DATA_SIZE - i, remaining_size);
+    }
+    mu_check(expansion_frame_get_remaining_size(&frame, 100, &remaining_size));
+    mu_assert_int_eq(0, remaining_size);
+}
+
+typedef struct {
+    void* data_out;
+    size_t size_available;
+    size_t size_sent;
+} TestExpansionSendStream;
+
+static size_t test_expansion_send_callback(const uint8_t* data, size_t data_size, void* context) {
+    TestExpansionSendStream* stream = context;
+    const size_t size_sent = MIN(data_size, stream->size_available);
+
+    memcpy(stream->data_out + stream->size_sent, data, size_sent);
+
+    stream->size_available -= size_sent;
+    stream->size_sent += size_sent;
+
+    return size_sent;
+}
+
+typedef struct {
+    const void* data_in;
+    size_t size_available;
+    size_t size_received;
+} TestExpansionReceiveStream;
+
+static size_t test_expansion_receive_callback(uint8_t* data, size_t data_size, void* context) {
+    TestExpansionReceiveStream* stream = context;
+    const size_t size_received = MIN(data_size, stream->size_available);
+
+    memcpy(data, stream->data_in + stream->size_received, size_received);
+
+    stream->size_available -= size_received;
+    stream->size_received += size_received;
+
+    return size_received;
+}
+
+MU_TEST(test_expansion_encode_decode_frame) {
+    const ExpansionFrame frame_in = {
+        .header.type = ExpansionFrameTypeData,
+        .content.data.size = 8,
+        .content.data.bytes = {0xde, 0xad, 0xbe, 0xef, 0xfe, 0xed, 0xca, 0xfe},
+    };
+
+    uint8_t encoded_data[sizeof(ExpansionFrame) + sizeof(ExpansionFrameChecksum)];
+    memset(encoded_data, 0, sizeof(encoded_data));
+
+    TestExpansionSendStream send_stream = {
+        .data_out = &encoded_data,
+        .size_available = sizeof(encoded_data),
+        .size_sent = 0,
+    };
+
+    const size_t encoded_size = expansion_frame_get_encoded_size(&frame_in);
+
+    mu_assert_int_eq(
+        expansion_protocol_encode(&frame_in, test_expansion_send_callback, &send_stream),
+        ExpansionProtocolStatusOk);
+    mu_assert_int_eq(encoded_size + sizeof(ExpansionFrameChecksum), send_stream.size_sent);
+    mu_assert_int_eq(
+        expansion_protocol_get_checksum((const uint8_t*)&frame_in, encoded_size),
+        encoded_data[encoded_size]);
+    mu_assert_mem_eq(&frame_in, &encoded_data, encoded_size);
+
+    TestExpansionReceiveStream stream = {
+        .data_in = encoded_data,
+        .size_available = send_stream.size_sent,
+        .size_received = 0,
+    };
+
+    ExpansionFrame frame_out;
+
+    mu_assert_int_eq(
+        expansion_protocol_decode(&frame_out, test_expansion_receive_callback, &stream),
+        ExpansionProtocolStatusOk);
+    mu_assert_int_eq(encoded_size + sizeof(ExpansionFrameChecksum), stream.size_received);
+    mu_assert_mem_eq(&frame_in, &frame_out, encoded_size);
+}
+
+MU_TEST(test_expansion_garbage_input) {
+    uint8_t garbage_data[EXPANSION_TEST_GARBAGE_BUF_SIZE];
+    for(uint32_t i = 0; i < EXPANSION_TEST_GARBAGE_ITERATIONS; ++i) {
+        furi_hal_random_fill_buf(garbage_data, sizeof(garbage_data));
+        size_t remaining_size = EXPANSION_TEST_GARBAGE_MAGIC;
+        if(expansion_frame_get_remaining_size(
+               (ExpansionFrame*)garbage_data, sizeof(garbage_data), &remaining_size)) {
+            // If by chance the garbage data is a valid frame, then the result
+            // must be 0 because the amount of data provided is more than enough
+            mu_assert_int_eq(0, remaining_size);
+        } else {
+            // If the frame is invalid, the remaining_size parameter should be untouched
+            mu_assert_int_eq(EXPANSION_TEST_GARBAGE_MAGIC, remaining_size);
+        }
+    }
+}
+
+MU_TEST_SUITE(test_expansion_suite) {
+    MU_RUN_TEST(test_expansion_encoded_size);
+    MU_RUN_TEST(test_expansion_remaining_size);
+    MU_RUN_TEST(test_expansion_encode_decode_frame);
+    MU_RUN_TEST(test_expansion_garbage_input);
+}
+
+int run_minunit_test_expansion() {
+    MU_RUN_SUITE(test_expansion_suite);
+    return MU_EXIT_CODE;
+}

applications/debug/unit_tests/furi/furi_memmgr_test.c

@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
+#include <stdint.h>
 
 void test_furi_memmgr() {
     void* ptr;

applications/debug/unit_tests/furi/furi_record_test.c

@@ -3,18 +3,29 @@
 #include <furi.h>
 #include "../minunit.h"
 
-void test_furi_create_open() {
-    // 1. Create record
-    uint8_t test_data = 0;
-    furi_record_create("test/holding", (void*)&test_data);
+#define TEST_RECORD_NAME "test/holding"
 
-    // 2. Open it
-    void* record = furi_record_open("test/holding");
+void test_furi_create_open() {
+    // Test that record does not exist
+    mu_check(furi_record_exists(TEST_RECORD_NAME) == false);
+
+    // Create record
+    uint8_t test_data = 0;
+    furi_record_create(TEST_RECORD_NAME, (void*)&test_data);
+
+    // Test that record exists
+    mu_check(furi_record_exists(TEST_RECORD_NAME) == true);
+
+    // Open it
+    void* record = furi_record_open(TEST_RECORD_NAME);
     mu_assert_pointers_eq(record, &test_data);
 
-    // 3. Close it
-    furi_record_close("test/holding");
+    // Close it
+    furi_record_close(TEST_RECORD_NAME);
 
-    // 4. Clean up
-    furi_record_destroy("test/holding");
+    // Clean up
+    furi_record_destroy(TEST_RECORD_NAME);
+
+    // Test that record does not exist
+    mu_check(furi_record_exists(TEST_RECORD_NAME) == false);
 }

applications/debug/unit_tests/furi_hal/furi_hal_tests.c

@@ -1,10 +1,18 @@
+#include "furi_hal_rtc.h"
+#include <stdint.h>
 #include <stdio.h>
 #include <furi.h>
 #include <furi_hal.h>
 #include <lp5562_reg.h>
 #include "../minunit.h"
+#include <stdlib.h>
 
 #define DATA_SIZE 4
+#define EEPROM_ADDRESS 0b10101000
+#define EEPROM_ADDRESS_HIGH (EEPROM_ADDRESS | 0b10)
+#define EEPROM_SIZE 512
+#define EEPROM_PAGE_SIZE 16
+#define EEPROM_WRITE_DELAY_MS 6
 
 static void furi_hal_i2c_int_setup() {
     furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
@@ -14,6 +22,14 @@ static void furi_hal_i2c_int_teardown() {
     furi_hal_i2c_release(&furi_hal_i2c_handle_power);
 }
 
+static void furi_hal_i2c_ext_setup() {
+    furi_hal_i2c_acquire(&furi_hal_i2c_handle_external);
+}
+
+static void furi_hal_i2c_ext_teardown() {
+    furi_hal_i2c_release(&furi_hal_i2c_handle_external);
+}
+
 MU_TEST(furi_hal_i2c_int_1b) {
     bool ret = false;
     uint8_t data_one = 0;
@@ -103,14 +119,116 @@ MU_TEST(furi_hal_i2c_int_1b_fail) {
     mu_assert(data_one != 0, "9 invalid data");
 }
 
+MU_TEST(furi_hal_i2c_int_ext_3b) {
+    bool ret = false;
+    uint8_t data_many[DATA_SIZE] = {0};
+
+    // 3 byte: read
+    data_many[0] = LP5562_CHANNEL_BLUE_CURRENT_REGISTER;
+    ret = furi_hal_i2c_tx_ext(
+        &furi_hal_i2c_handle_power,
+        LP5562_ADDRESS,
+        false,
+        data_many,
+        1,
+        FuriHalI2cBeginStart,
+        FuriHalI2cEndAwaitRestart,
+        LP5562_I2C_TIMEOUT);
+    mu_assert(ret, "3 tx failed");
+
+    // Send a RESTART condition, then read the 3 bytes one after the other
+    ret = furi_hal_i2c_rx_ext(
+        &furi_hal_i2c_handle_power,
+        LP5562_ADDRESS,
+        false,
+        data_many + 1,
+        1,
+        FuriHalI2cBeginRestart,
+        FuriHalI2cEndPause,
+        LP5562_I2C_TIMEOUT);
+    mu_assert(ret, "4 rx failed");
+    mu_assert(data_many[1] != 0, "4 invalid data");
+    ret = furi_hal_i2c_rx_ext(
+        &furi_hal_i2c_handle_power,
+        LP5562_ADDRESS,
+        false,
+        data_many + 2,
+        1,
+        FuriHalI2cBeginResume,
+        FuriHalI2cEndPause,
+        LP5562_I2C_TIMEOUT);
+    mu_assert(ret, "5 rx failed");
+    mu_assert(data_many[2] != 0, "5 invalid data");
+    ret = furi_hal_i2c_rx_ext(
+        &furi_hal_i2c_handle_power,
+        LP5562_ADDRESS,
+        false,
+        data_many + 3,
+        1,
+        FuriHalI2cBeginResume,
+        FuriHalI2cEndStop,
+        LP5562_I2C_TIMEOUT);
+    mu_assert(ret, "6 rx failed");
+    mu_assert(data_many[3] != 0, "6 invalid data");
+}
+
+MU_TEST(furi_hal_i2c_ext_eeprom) {
+    if(!furi_hal_i2c_is_device_ready(&furi_hal_i2c_handle_external, EEPROM_ADDRESS, 100)) {
+        printf("no device connected, skipping\r\n");
+        return;
+    }
+
+    bool ret = false;
+    uint8_t buffer[EEPROM_SIZE] = {0};
+
+    for(size_t page = 0; page < (EEPROM_SIZE / EEPROM_PAGE_SIZE); ++page) {
+        // Fill page buffer
+        for(size_t page_byte = 0; page_byte < EEPROM_PAGE_SIZE; ++page_byte) {
+            // Each byte is its position in the EEPROM modulo 256
+            uint8_t byte = ((page * EEPROM_PAGE_SIZE) + page_byte) % 256;
+
+            buffer[page_byte] = byte;
+        }
+
+        uint8_t address = (page < 16) ? EEPROM_ADDRESS : EEPROM_ADDRESS_HIGH;
+
+        ret = furi_hal_i2c_write_mem(
+            &furi_hal_i2c_handle_external,
+            address,
+            page * EEPROM_PAGE_SIZE,
+            buffer,
+            EEPROM_PAGE_SIZE,
+            20);
+
+        mu_assert(ret, "EEPROM write failed");
+        furi_delay_ms(EEPROM_WRITE_DELAY_MS);
+    }
+
+    ret = furi_hal_i2c_read_mem(
+        &furi_hal_i2c_handle_external, EEPROM_ADDRESS, 0, buffer, EEPROM_SIZE, 100);
+
+    mu_assert(ret, "EEPROM read failed");
+
+    for(size_t pos = 0; pos < EEPROM_SIZE; ++pos) {
+        mu_assert_int_eq(pos % 256, buffer[pos]);
+    }
+}
+
 MU_TEST_SUITE(furi_hal_i2c_int_suite) {
     MU_SUITE_CONFIGURE(&furi_hal_i2c_int_setup, &furi_hal_i2c_int_teardown);
     MU_RUN_TEST(furi_hal_i2c_int_1b);
     MU_RUN_TEST(furi_hal_i2c_int_3b);
+    MU_RUN_TEST(furi_hal_i2c_int_ext_3b);
     MU_RUN_TEST(furi_hal_i2c_int_1b_fail);
 }
 
+MU_TEST_SUITE(furi_hal_i2c_ext_suite) {
+    MU_SUITE_CONFIGURE(&furi_hal_i2c_ext_setup, &furi_hal_i2c_ext_teardown);
+    MU_RUN_TEST(furi_hal_i2c_ext_eeprom);
+}
+
 int run_minunit_test_furi_hal() {
     MU_RUN_SUITE(furi_hal_i2c_int_suite);
+    MU_RUN_SUITE(furi_hal_i2c_ext_suite);
     return MU_EXIT_CODE;
 }

applications/debug/unit_tests/infrared/infrared_test.c

@@ -27,7 +27,7 @@ static void infrared_test_alloc() {
 }
 
 static void infrared_test_free() {
-    furi_assert(test);
+    furi_check(test);
     infrared_free_decoder(test->decoder_handler);
     infrared_free_encoder(test->encoder_handler);
     flipper_format_free(test->ff);

applications/debug/unit_tests/lfrfid/lfrfid_protocols.c

@@ -209,6 +209,25 @@ const int8_t indala26_test_timings[INDALA26_EMULATION_TIMINGS_COUNT] = {
     -1, 1,  -1, 1,  -1, 1,  -1, 1,
 };
 
+#define FDXB_TEST_DATA \
+    { 0x44, 0x88, 0x23, 0xF2, 0x5A, 0x6F, 0x00, 0x01, 0x00, 0x00, 0x00 }
+#define FDXB_TEST_DATA_SIZE 11
+#define FDXB_TEST_EMULATION_TIMINGS_COUNT (206)
+
+const int8_t fdxb_test_timings[FDXB_TEST_EMULATION_TIMINGS_COUNT] = {
+    32,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,
+    -16, 16,  -32, 16,  -16, 32,  -16, 16,  -16, 16,  -16, 16,  -32, 16,  -16, 16,  -16, 32,  -32,
+    16,  -16, 16,  -16, 16,  -16, 32,  -16, 16,  -16, 16,  -16, 16,  -32, 16,  -16, 16,  -16, 32,
+    -16, 16,  -16, 16,  -16, 16,  -32, 32,  -32, 32,  -32, 32,  -32, 16,  -16, 16,  -16, 32,  -16,
+    16,  -32, 16,  -16, 32,  -16, 16,  -32, 32,  -16, 16,  -32, 16,  -16, 32,  -16, 16,  -32, 32,
+    -16, 16,  -32, 32,  -32, 32,  -32, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16,
+    16,  -16, 16,  -16, 32,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,
+    -32, 32,  -32, 32,  -32, 32,  -32, 16,  -16, 32,  -32, 32,  -16, 16,  -16, 16,  -32, 32,  -32,
+    32,  -32, 32,  -32, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,
+    -16, 32,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -32,
+    16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16, 16,  -16,
+};
+
 MU_TEST(test_lfrfid_protocol_em_read_simple) {
     ProtocolDict* dict = protocol_dict_alloc(lfrfid_protocols, LFRFIDProtocolMax);
     mu_assert_int_eq(EM_TEST_DATA_SIZE, protocol_dict_get_data_size(dict, LFRFIDProtocolEM4100));
@@ -445,6 +464,73 @@ MU_TEST(test_lfrfid_protocol_inadala26_emulate_simple) {
     protocol_dict_free(dict);
 }
 
+MU_TEST(test_lfrfid_protocol_fdxb_emulate_simple) {
+    ProtocolDict* dict = protocol_dict_alloc(lfrfid_protocols, LFRFIDProtocolMax);
+    mu_assert_int_eq(FDXB_TEST_DATA_SIZE, protocol_dict_get_data_size(dict, LFRFIDProtocolFDXB));
+    mu_assert_string_eq("FDX-B", protocol_dict_get_name(dict, LFRFIDProtocolFDXB));
+    mu_assert_string_eq("ISO", protocol_dict_get_manufacturer(dict, LFRFIDProtocolFDXB));
+
+    const uint8_t data[FDXB_TEST_DATA_SIZE] = FDXB_TEST_DATA;
+
+    protocol_dict_set_data(dict, LFRFIDProtocolFDXB, data, FDXB_TEST_DATA_SIZE);
+    mu_check(protocol_dict_encoder_start(dict, LFRFIDProtocolFDXB));
+
+    for(size_t i = 0; i < FDXB_TEST_EMULATION_TIMINGS_COUNT; i++) {
+        LevelDuration level_duration = protocol_dict_encoder_yield(dict, LFRFIDProtocolFDXB);
+
+        if(level_duration_get_level(level_duration)) {
+            mu_assert_int_eq(fdxb_test_timings[i], level_duration_get_duration(level_duration));
+        } else {
+            mu_assert_int_eq(fdxb_test_timings[i], -level_duration_get_duration(level_duration));
+        }
+    }
+
+    protocol_dict_free(dict);
+}
+
+MU_TEST(test_lfrfid_protocol_fdxb_read_simple) {
+    ProtocolDict* dict = protocol_dict_alloc(lfrfid_protocols, LFRFIDProtocolMax);
+    mu_assert_int_eq(FDXB_TEST_DATA_SIZE, protocol_dict_get_data_size(dict, LFRFIDProtocolFDXB));
+    mu_assert_string_eq("FDX-B", protocol_dict_get_name(dict, LFRFIDProtocolFDXB));
+    mu_assert_string_eq("ISO", protocol_dict_get_manufacturer(dict, LFRFIDProtocolFDXB));
+
+    const uint8_t data[FDXB_TEST_DATA_SIZE] = FDXB_TEST_DATA;
+
+    protocol_dict_decoders_start(dict);
+
+    ProtocolId protocol = PROTOCOL_NO;
+    PulseGlue* pulse_glue = pulse_glue_alloc();
+
+    for(size_t i = 0; i < FDXB_TEST_EMULATION_TIMINGS_COUNT * 10; i++) {
+        bool pulse_pop = pulse_glue_push(
+            pulse_glue,
+            fdxb_test_timings[i % FDXB_TEST_EMULATION_TIMINGS_COUNT] >= 0,
+            abs(fdxb_test_timings[i % FDXB_TEST_EMULATION_TIMINGS_COUNT]) *
+                LF_RFID_READ_TIMING_MULTIPLIER);
+
+        if(pulse_pop) {
+            uint32_t length, period;
+            pulse_glue_pop(pulse_glue, &length, &period);
+
+            protocol = protocol_dict_decoders_feed(dict, true, period);
+            if(protocol != PROTOCOL_NO) break;
+
+            protocol = protocol_dict_decoders_feed(dict, false, length - period);
+            if(protocol != PROTOCOL_NO) break;
+        }
+    }
+
+    pulse_glue_free(pulse_glue);
+
+    mu_assert_int_eq(LFRFIDProtocolFDXB, protocol);
+    uint8_t received_data[FDXB_TEST_DATA_SIZE] = {0};
+    protocol_dict_get_data(dict, protocol, received_data, FDXB_TEST_DATA_SIZE);
+
+    mu_assert_mem_eq(data, received_data, FDXB_TEST_DATA_SIZE);
+
+    protocol_dict_free(dict);
+}
+
 MU_TEST_SUITE(test_lfrfid_protocols_suite) {
     MU_RUN_TEST(test_lfrfid_protocol_em_read_simple);
     MU_RUN_TEST(test_lfrfid_protocol_em_emulate_simple);
@@ -456,6 +542,9 @@ MU_TEST_SUITE(test_lfrfid_protocols_suite) {
     MU_RUN_TEST(test_lfrfid_protocol_ioprox_xsf_emulate_simple);
 
     MU_RUN_TEST(test_lfrfid_protocol_inadala26_emulate_simple);
+
+    MU_RUN_TEST(test_lfrfid_protocol_fdxb_read_simple);
+    MU_RUN_TEST(test_lfrfid_protocol_fdxb_emulate_simple);
 }
 
 int run_minunit_test_lfrfid_protocols() {

applications/debug/unit_tests/manifest/manifest.c

@@ -22,7 +22,7 @@ MU_TEST(manifest_iteration_test) {
     ResourceManifestReader* manifest_reader = resource_manifest_reader_alloc(storage);
     do {
         // Open manifest file
-        if(!resource_manifest_reader_open(manifest_reader, EXT_PATH("unit_tests/Manifest"))) {
+        if(!resource_manifest_reader_open(manifest_reader, EXT_PATH("unit_tests/Manifest_test"))) {
             result = false;
             break;
         }

applications/debug/unit_tests/minunit.h

@@ -81,6 +81,7 @@ __attribute__((unused)) static void (*minunit_teardown)(void) = NULL;
 
 void minunit_print_progress(void);
 void minunit_print_fail(const char* error);
+void minunit_printf_warning(const char* format, ...);
 
 /*  Definitions */
 #define MU_TEST(method_name) static void method_name(void)
@@ -150,6 +151,10 @@ void minunit_print_fail(const char* error);
                        minunit_end_proc_timer - minunit_proc_timer);)
 #define MU_EXIT_CODE minunit_fail
 
+/* Warnings */
+#define mu_warn(message) \
+    MU__SAFE_BLOCK(minunit_printf_warning("%s:%d: %s", __FILE__, __LINE__, message);)
+
 /*  Assertions */
 #define mu_check(test)                       \
     MU__SAFE_BLOCK(                          \

applications/debug/unit_tests/nfc/nfc_transport.c

@@ -0,0 +1,473 @@
+#ifdef FW_CFG_unit_tests
+
+#include <lib/nfc/nfc.h>
+#include <lib/nfc/helpers/iso14443_crc.h>
+#include <lib/nfc/protocols/iso14443_3a/iso14443_3a.h>
+
+#include <furi/furi.h>
+
+#define NFC_MAX_BUFFER_SIZE (256)
+
+typedef enum {
+    NfcTransportLogLevelWarning,
+    NfcTransportLogLevelInfo,
+} NfcTransportLogLevel;
+
+FuriMessageQueue* poller_queue = NULL;
+FuriMessageQueue* listener_queue = NULL;
+
+typedef enum {
+    NfcMessageTypeTx,
+    NfcMessageTypeTimeout,
+    NfcMessageTypeAbort,
+} NfcMessageType;
+
+typedef struct {
+    uint16_t data_bits;
+    uint8_t data[NFC_MAX_BUFFER_SIZE];
+} NfcMessageData;
+
+typedef struct {
+    NfcMessageType type;
+    NfcMessageData data;
+} NfcMessage;
+
+typedef enum {
+    NfcStateIdle,
+    NfcStateReady,
+    NfcStateReset,
+} NfcState;
+
+typedef enum {
+    Iso14443_3aColResStatusIdle,
+    Iso14443_3aColResStatusInProgress,
+    Iso14443_3aColResStatusDone,
+} Iso14443_3aColResStatus;
+
+typedef struct {
+    Iso14443_3aSensResp sens_resp;
+    Iso14443_3aSddResp sdd_resp[2];
+    Iso14443_3aSelResp sel_resp[2];
+} Iso14443_3aColResData;
+
+struct Nfc {
+    NfcState state;
+
+    Iso14443_3aColResStatus col_res_status;
+    Iso14443_3aColResData col_res_data;
+
+    NfcEventCallback callback;
+    void* context;
+
+    NfcMode mode;
+
+    FuriThread* worker_thread;
+};
+
+static void nfc_test_print(
+    NfcTransportLogLevel log_level,
+    const char* message,
+    uint8_t* buffer,
+    uint16_t bits) {
+    FuriString* str = furi_string_alloc();
+    size_t bytes = (bits + 7) / 8;
+
+    for(size_t i = 0; i < bytes; i++) {
+        furi_string_cat_printf(str, " %02X", buffer[i]);
+    }
+    if(log_level == NfcTransportLogLevelWarning) {
+        FURI_LOG_W(message, "%s", furi_string_get_cstr(str));
+    } else {
+        FURI_LOG_I(message, "%s", furi_string_get_cstr(str));
+    }
+
+    furi_string_free(str);
+}
+
+static void nfc_prepare_col_res_data(
+    Nfc* instance,
+    uint8_t* uid,
+    uint8_t uid_len,
+    uint8_t* atqa,
+    uint8_t sak) {
+    memcpy(instance->col_res_data.sens_resp.sens_resp, atqa, 2);
+
+    if(uid_len == 7) {
+        instance->col_res_data.sdd_resp[0].nfcid[0] = 0x88;
+        memcpy(&instance->col_res_data.sdd_resp[0].nfcid[1], uid, 3);
+        uint8_t bss = 0;
+        for(size_t i = 0; i < 4; i++) {
+            bss ^= instance->col_res_data.sdd_resp[0].nfcid[i];
+        }
+        instance->col_res_data.sdd_resp[0].bss = bss;
+        instance->col_res_data.sel_resp[0].sak = 0x04;
+
+        memcpy(instance->col_res_data.sdd_resp[1].nfcid, &uid[3], 4);
+        bss = 0;
+        for(size_t i = 0; i < 4; i++) {
+            bss ^= instance->col_res_data.sdd_resp[1].nfcid[i];
+        }
+        instance->col_res_data.sdd_resp[1].bss = bss;
+        instance->col_res_data.sel_resp[1].sak = sak;
+
+    } else {
+        furi_crash("Not supporting not 7 bytes");
+    }
+}
+
+Nfc* nfc_alloc() {
+    Nfc* instance = malloc(sizeof(Nfc));
+
+    return instance;
+}
+
+void nfc_free(Nfc* instance) {
+    furi_check(instance);
+
+    free(instance);
+}
+
+void nfc_config(Nfc* instance, NfcMode mode, NfcTech tech) {
+    UNUSED(instance);
+    UNUSED(tech);
+
+    instance->mode = mode;
+}
+
+void nfc_set_fdt_poll_fc(Nfc* instance, uint32_t fdt_poll_fc) {
+    UNUSED(instance);
+    UNUSED(fdt_poll_fc);
+}
+
+void nfc_set_fdt_listen_fc(Nfc* instance, uint32_t fdt_listen_fc) {
+    UNUSED(instance);
+    UNUSED(fdt_listen_fc);
+}
+
+void nfc_set_mask_receive_time_fc(Nfc* instance, uint32_t mask_rx_time_fc) {
+    UNUSED(instance);
+    UNUSED(mask_rx_time_fc);
+}
+
+void nfc_set_fdt_poll_poll_us(Nfc* instance, uint32_t fdt_poll_poll_us) {
+    UNUSED(instance);
+    UNUSED(fdt_poll_poll_us);
+}
+
+void nfc_set_guard_time_us(Nfc* instance, uint32_t guard_time_us) {
+    UNUSED(instance);
+    UNUSED(guard_time_us);
+}
+
+NfcError nfc_iso14443a_listener_set_col_res_data(
+    Nfc* instance,
+    uint8_t* uid,
+    uint8_t uid_len,
+    uint8_t* atqa,
+    uint8_t sak) {
+    furi_check(instance);
+    furi_check(uid);
+    furi_check(atqa);
+
+    nfc_prepare_col_res_data(instance, uid, uid_len, atqa, sak);
+
+    return NfcErrorNone;
+}
+
+static int32_t nfc_worker_poller(void* context) {
+    Nfc* instance = context;
+    furi_check(instance->callback);
+
+    instance->state = NfcStateReady;
+    NfcCommand command = NfcCommandContinue;
+    NfcEvent event = {};
+
+    while(true) {
+        event.type = NfcEventTypePollerReady;
+        command = instance->callback(event, instance->context);
+        if(command == NfcCommandStop) {
+            break;
+        }
+    }
+
+    instance->state = NfcStateIdle;
+
+    return 0;
+}
+
+static void nfc_worker_listener_pass_col_res(Nfc* instance, uint8_t* rx_data, uint16_t rx_bits) {
+    furi_check(instance->col_res_status != Iso14443_3aColResStatusDone);
+    BitBuffer* tx_buffer = bit_buffer_alloc(NFC_MAX_BUFFER_SIZE);
+
+    bool processed = false;
+
+    if((rx_bits == 7) && (rx_data[0] == 0x52)) {
+        instance->col_res_status = Iso14443_3aColResStatusInProgress;
+        bit_buffer_copy_bytes(
+            tx_buffer,
+            instance->col_res_data.sens_resp.sens_resp,
+            sizeof(instance->col_res_data.sens_resp.sens_resp));
+        nfc_listener_tx(instance, tx_buffer);
+        processed = true;
+    } else if(rx_bits == 2 * 8) {
+        if((rx_data[0] == 0x93) && (rx_data[1] == 0x20)) {
+            bit_buffer_copy_bytes(
+                tx_buffer,
+                (const uint8_t*)&instance->col_res_data.sdd_resp[0],
+                sizeof(Iso14443_3aSddResp));
+            nfc_listener_tx(instance, tx_buffer);
+            processed = true;
+        } else if((rx_data[0] == 0x95) && (rx_data[1] == 0x20)) {
+            bit_buffer_copy_bytes(
+                tx_buffer,
+                (const uint8_t*)&instance->col_res_data.sdd_resp[1],
+                sizeof(Iso14443_3aSddResp));
+            nfc_listener_tx(instance, tx_buffer);
+            processed = true;
+        }
+    } else if(rx_bits == 9 * 8) {
+        if((rx_data[0] == 0x93) && (rx_data[1] == 0x70)) {
+            bit_buffer_set_size_bytes(tx_buffer, 1);
+            bit_buffer_set_byte(tx_buffer, 0, instance->col_res_data.sel_resp[0].sak);
+            iso14443_crc_append(Iso14443CrcTypeA, tx_buffer);
+            nfc_listener_tx(instance, tx_buffer);
+            processed = true;
+        } else if((rx_data[0] == 0x95) && (rx_data[1] == 0x70)) {
+            bit_buffer_set_size_bytes(tx_buffer, 1);
+            bit_buffer_set_byte(tx_buffer, 0, instance->col_res_data.sel_resp[1].sak);
+            iso14443_crc_append(Iso14443CrcTypeA, tx_buffer);
+            nfc_listener_tx(instance, tx_buffer);
+            instance->col_res_status = Iso14443_3aColResStatusDone;
+            NfcEvent event = {.type = NfcEventTypeListenerActivated};
+            instance->callback(event, instance->context);
+
+            processed = true;
+        }
+    }
+
+    if(!processed) {
+        NfcMessage message = {.type = NfcMessageTypeTimeout};
+        furi_message_queue_put(poller_queue, &message, FuriWaitForever);
+    }
+
+    bit_buffer_free(tx_buffer);
+}
+
+static int32_t nfc_worker_listener(void* context) {
+    Nfc* instance = context;
+    furi_check(instance->callback);
+
+    NfcMessage message = {};
+
+    NfcEventData event_data = {};
+    event_data.buffer = bit_buffer_alloc(NFC_MAX_BUFFER_SIZE);
+    NfcEvent nfc_event = {.data = event_data};
+
+    while(true) {
+        furi_message_queue_get(listener_queue, &message, FuriWaitForever);
+        bit_buffer_copy_bits(event_data.buffer, message.data.data, message.data.data_bits);
+        if((message.data.data[0] == 0x52) && (message.data.data_bits == 7)) {
+            instance->col_res_status = Iso14443_3aColResStatusIdle;
+        }
+
+        if(message.type == NfcMessageTypeAbort) {
+            break;
+        } else if(message.type == NfcMessageTypeTx) {
+            nfc_test_print(
+                NfcTransportLogLevelInfo, "RDR", message.data.data, message.data.data_bits);
+            if(instance->col_res_status != Iso14443_3aColResStatusDone) {
+                nfc_worker_listener_pass_col_res(
+                    instance, message.data.data, message.data.data_bits);
+            } else {
+                instance->state = NfcStateReady;
+                nfc_event.type = NfcEventTypeRxEnd;
+                instance->callback(nfc_event, instance->context);
+            }
+        }
+    }
+
+    instance->state = NfcStateIdle;
+    instance->col_res_status = Iso14443_3aColResStatusIdle;
+    memset(&instance->col_res_data, 0, sizeof(instance->col_res_data));
+    bit_buffer_free(nfc_event.data.buffer);
+
+    return 0;
+}
+
+void nfc_start(Nfc* instance, NfcEventCallback callback, void* context) {
+    furi_check(instance);
+    furi_check(instance->worker_thread == NULL);
+
+    if(instance->mode == NfcModeListener) {
+        furi_check(listener_queue == NULL);
+        // Check that poller didn't start
+        furi_check(poller_queue == NULL);
+    } else {
+        furi_check(poller_queue == NULL);
+        // Check that poller is started after listener
+        furi_check(listener_queue);
+    }
+
+    instance->callback = callback;
+    instance->context = context;
+
+    if(instance->mode == NfcModeListener) {
+        listener_queue = furi_message_queue_alloc(4, sizeof(NfcMessage));
+    } else {
+        poller_queue = furi_message_queue_alloc(4, sizeof(NfcMessage));
+    }
+
+    instance->worker_thread = furi_thread_alloc();
+    furi_thread_set_context(instance->worker_thread, instance);
+    furi_thread_set_priority(instance->worker_thread, FuriThreadPriorityHigh);
+    furi_thread_set_stack_size(instance->worker_thread, 8 * 1024);
+
+    if(instance->mode == NfcModeListener) {
+        furi_thread_set_name(instance->worker_thread, "NfcWorkerListener");
+        furi_thread_set_callback(instance->worker_thread, nfc_worker_listener);
+    } else {
+        furi_thread_set_name(instance->worker_thread, "NfcWorkerPoller");
+        furi_thread_set_callback(instance->worker_thread, nfc_worker_poller);
+    }
+
+    furi_thread_start(instance->worker_thread);
+}
+
+void nfc_stop(Nfc* instance) {
+    furi_check(instance);
+    furi_check(instance->worker_thread);
+
+    if(instance->mode == NfcModeListener) {
+        NfcMessage message = {.type = NfcMessageTypeAbort};
+        furi_message_queue_put(listener_queue, &message, FuriWaitForever);
+        furi_thread_join(instance->worker_thread);
+
+        furi_message_queue_free(listener_queue);
+        listener_queue = NULL;
+
+        furi_thread_free(instance->worker_thread);
+        instance->worker_thread = NULL;
+    } else {
+        furi_thread_join(instance->worker_thread);
+
+        furi_message_queue_free(poller_queue);
+        poller_queue = NULL;
+
+        furi_thread_free(instance->worker_thread);
+        instance->worker_thread = NULL;
+    }
+}
+
+// Called from worker thread
+
+NfcError nfc_listener_tx(Nfc* instance, const BitBuffer* tx_buffer) {
+    furi_check(instance);
+    furi_check(poller_queue);
+    furi_check(listener_queue);
+    furi_check(tx_buffer);
+
+    NfcMessage message = {};
+    message.type = NfcMessageTypeTx;
+    message.data.data_bits = bit_buffer_get_size(tx_buffer);
+    bit_buffer_write_bytes(tx_buffer, message.data.data, bit_buffer_get_size_bytes(tx_buffer));
+
+    furi_message_queue_put(poller_queue, &message, FuriWaitForever);
+
+    return NfcErrorNone;
+}
+
+NfcError nfc_iso14443a_listener_tx_custom_parity(Nfc* instance, const BitBuffer* tx_buffer) {
+    return nfc_listener_tx(instance, tx_buffer);
+}
+
+NfcError
+    nfc_poller_trx(Nfc* instance, const BitBuffer* tx_buffer, BitBuffer* rx_buffer, uint32_t fwt) {
+    furi_check(instance);
+    furi_check(tx_buffer);
+    furi_check(rx_buffer);
+    furi_check(poller_queue);
+    furi_check(listener_queue);
+    UNUSED(fwt);
+
+    NfcError error = NfcErrorNone;
+
+    NfcMessage message = {};
+    message.type = NfcMessageTypeTx;
+    message.data.data_bits = bit_buffer_get_size(tx_buffer);
+    bit_buffer_write_bytes(tx_buffer, message.data.data, bit_buffer_get_size_bytes(tx_buffer));
+    // Tx
+    furi_check(furi_message_queue_put(listener_queue, &message, FuriWaitForever) == FuriStatusOk);
+    // Rx
+    FuriStatus status = furi_message_queue_get(poller_queue, &message, 50);
+
+    if(status == FuriStatusErrorTimeout) {
+        error = NfcErrorTimeout;
+    } else if(message.type == NfcMessageTypeTx) {
+        bit_buffer_copy_bits(rx_buffer, message.data.data, message.data.data_bits);
+        nfc_test_print(
+            NfcTransportLogLevelWarning, "TAG", message.data.data, message.data.data_bits);
+    } else if(message.type == NfcMessageTypeTimeout) {
+        error = NfcErrorTimeout;
+    }
+
+    return error;
+}
+
+NfcError nfc_iso14443a_poller_trx_custom_parity(
+    Nfc* instance,
+    const BitBuffer* tx_buffer,
+    BitBuffer* rx_buffer,
+    uint32_t fwt) {
+    return nfc_poller_trx(instance, tx_buffer, rx_buffer, fwt);
+}
+
+// Technology specific API
+
+NfcError nfc_iso14443a_poller_trx_short_frame(
+    Nfc* instance,
+    NfcIso14443aShortFrame frame,
+    BitBuffer* rx_buffer,
+    uint32_t fwt) {
+    UNUSED(frame);
+
+    BitBuffer* tx_buffer = bit_buffer_alloc(32);
+    bit_buffer_set_size(tx_buffer, 7);
+    bit_buffer_set_byte(tx_buffer, 0, 0x52);
+
+    NfcError error = nfc_poller_trx(instance, tx_buffer, rx_buffer, fwt);
+
+    bit_buffer_free(tx_buffer);
+
+    return error;
+}
+
+NfcError nfc_iso14443a_poller_trx_sdd_frame(
+    Nfc* instance,
+    const BitBuffer* tx_buffer,
+    BitBuffer* rx_buffer,
+    uint32_t fwt) {
+    return nfc_poller_trx(instance, tx_buffer, rx_buffer, fwt);
+}
+
+NfcError nfc_iso15693_listener_tx_sof(Nfc* instance) {
+    UNUSED(instance);
+
+    return NfcErrorNone;
+}
+
+NfcError nfc_felica_listener_set_sensf_res_data(
+    Nfc* instance,
+    const uint8_t* idm,
+    const uint8_t idm_len,
+    const uint8_t* pmm,
+    const uint8_t pmm_len) {
+    furi_assert(instance);
+    furi_assert(idm);
+    furi_assert(pmm);
+    furi_assert(idm_len == 8);
+    furi_assert(pmm_len == 8);
+
+    return NfcErrorNone;
+}
+
+#endif

applications/debug/unit_tests/resources/unit_tests/nfc/Ntag213_locked.nfc

@@ -0,0 +1,66 @@
+Filetype: Flipper NFC device
+Version: 3
+# Nfc device type can be UID, Mifare Ultralight, Mifare Classic
+Device type: NTAG213
+# UID, ATQA and SAK are common for all formats
+UID: 04 AC 6B 72 BA 6C 80
+ATQA: 00 44
+SAK: 00
+# Mifare Ultralight specific data
+Data format version: 1
+Signature: 2D AE BC AF 84 B8 85 87 C2 FB FE 76 13 58 86 72 8E 1D 3C B5 DA 24 23 44 E5 63 4D 4C 82 FB D7 18
+Mifare version: 00 04 04 02 01 00 0F 03
+Counter 0: 0
+Tearing 0: 00
+Counter 1: 0
+Tearing 1: 00
+Counter 2: 0
+Tearing 2: 00
+Pages total: 45
+Pages read: 45
+Page 0: 04 AC 6B 4B
+Page 1: 72 BA 6C 80
+Page 2: 24 48 00 00
+Page 3: E1 10 12 00
+Page 4: 00 00 41 50
+Page 5: 00 00 31 31
+Page 6: 00 20 09 28
+Page 7: 00 03 31 59
+Page 8: 91 DF D3 00
+Page 9: 00 00 00 00
+Page 10: 00 00 00 00
+Page 11: 00 00 00 00
+Page 12: 00 00 00 00
+Page 13: 00 00 00 00
+Page 14: 00 00 00 00
+Page 15: 00 00 00 00
+Page 16: 00 00 00 00
+Page 17: 00 00 00 00
+Page 18: 00 00 00 00
+Page 19: 00 00 00 00
+Page 20: 00 00 00 00
+Page 21: 00 00 00 00
+Page 22: 00 00 00 00
+Page 23: 00 00 00 00
+Page 24: 00 00 00 00
+Page 25: 00 00 00 00
+Page 26: 00 00 00 00
+Page 27: 00 00 00 00
+Page 28: 00 00 00 00
+Page 29: 00 00 00 00
+Page 30: 00 00 00 00
+Page 31: 00 00 00 00
+Page 32: 00 00 00 00
+Page 33: 00 00 00 00
+Page 34: 00 00 00 00
+Page 35: 00 00 00 00
+Page 36: 00 00 00 00
+Page 37: 00 00 00 00
+Page 38: 00 00 00 00
+Page 39: 00 00 00 00
+Page 40: 00 00 00 BD
+Page 41: 04 00 00 04
+Page 42: C0 05 00 00
+Page 43: 95 3F 52 FF
+Page 44: 00 00 00 00
+Failed authentication attempts: 0

applications/debug/unit_tests/resources/unit_tests/nfc/Ntag215.nfc

@@ -0,0 +1,156 @@
+Filetype: Flipper NFC device
+Version: 3
+# Nfc device type can be UID, Mifare Ultralight, Mifare Classic
+Device type: NTAG215
+# UID, ATQA and SAK are common for all formats
+UID: 04 51 5C FA 6F 73 81
+ATQA: 00 44
+SAK: 00
+# Mifare Ultralight specific data
+Data format version: 1
+Signature: 42 21 E4 6C 79 6A 81 5E EA 0D 93 6D 85 EE 4B 0C 2A 00 D5 77 F1 C5 67 F3 63 75 F8 EB 86 48 5E 6B
+Mifare version: 00 04 04 02 01 00 11 03
+Counter 0: 0
+Tearing 0: 00
+Counter 1: 0
+Tearing 1: 00
+Counter 2: 00
+Tearing 2: 00
+Pages total: 135
+Pages read: 135
+Page 0: 04 51 5C 81
+Page 1: FA 6F 73 81
+Page 2: 67 48 0F E0
+Page 3: F1 10 FF EE
+Page 4: A5 00 00 00
+Page 5: 90 42 74 71
+Page 6: FD 8F 50 61
+Page 7: C5 65 1B 54
+Page 8: EF 68 D0 8E
+Page 9: 3D 35 DB 83
+Page 10: D3 00 29 F6
+Page 11: 42 2A A5 5C
+Page 12: F1 69 0A FC
+Page 13: B6 44 E9 6B
+Page 14: 77 41 88 81
+Page 15: 86 31 CB AD
+Page 16: B1 DE F1 AB
+Page 17: DF 96 C2 C5
+Page 18: C1 26 99 96
+Page 19: 85 AF 9F 0E
+Page 20: 58 FE ED DC
+Page 21: 0A 0A 00 01
+Page 22: 03 C1 05 02
+Page 23: 38 39 34 33
+Page 24: 49 2D 4E 5C
+Page 25: 5B 21 0F 44
+Page 26: 3F 3F 76 69
+Page 27: B4 72 D8 38
+Page 28: A0 35 53 51
+Page 29: 53 EB A6 7C
+Page 30: 3E 8B 97 C0
+Page 31: 00 7A 45 13
+Page 32: 3A 8B D4 0F
+Page 33: 31 C2 32 CC
+Page 34: B4 24 A6 1B
+Page 35: D3 F5 4A 1F
+Page 36: CD 8F 1D 64
+Page 37: 01 F4 DF C2
+Page 38: 11 16 C2 C5
+Page 39: 30 6D 49 AF
+Page 40: 10 D4 7C 3C
+Page 41: 6E 36 4E 08
+Page 42: 95 76 BC 84
+Page 43: 35 50 DD F0
+Page 44: 21 0F EE D9
+Page 45: 85 19 54 5F
+Page 46: 3E A9 04 20
+Page 47: 1B 97 E4 39
+Page 48: FF 0A 45 F6
+Page 49: 13 D4 3E DD
+Page 50: 97 42 FC 67
+Page 51: 6A AC 78 96
+Page 52: D1 DA 25 23
+Page 53: BF 4D B3 76
+Page 54: F1 21 ED 15
+Page 55: BD 55 11 C4
+Page 56: 4E 8C E9 23
+Page 57: C0 C4 6D 5A
+Page 58: 58 25 FF 95
+Page 59: 3C 2B 7A 57
+Page 60: 66 BE A0 61
+Page 61: BC FC 4A 31
+Page 62: 4D AC EE 81
+Page 63: BE 1A 86 04
+Page 64: F6 D7 5E B3
+Page 65: E7 A8 A2 86
+Page 66: E9 40 AB 47
+Page 67: C8 36 E4 3E
+Page 68: A7 4D D3 EA
+Page 69: 83 9A 64 F7
+Page 70: 96 6B 5D BF
+Page 71: 4E A2 A6 0F
+Page 72: BD 3D BE 7C
+Page 73: 22 0C 68 51
+Page 74: 0F 9A B8 AE
+Page 75: 38 2C C4 CD
+Page 76: 53 D8 DD 18
+Page 77: A6 5D 35 87
+Page 78: C9 6D 99 59
+Page 79: 61 9F B6 DC
+Page 80: E6 22 0F 99
+Page 81: 39 82 79 60
+Page 82: 58 2E BE F7
+Page 83: EF F7 95 62
+Page 84: D5 06 1B 58
+Page 85: 65 05 A9 08
+Page 86: 75 ED 5D 90
+Page 87: 5A E1 7E C9
+Page 88: 35 D6 29 BB
+Page 89: D0 67 6C F9
+Page 90: A0 FF 0B 93
+Page 91: 22 EA A3 3F
+Page 92: E2 BD BD 58
+Page 93: BE 93 D9 94
+Page 94: 41 CC 7E 40
+Page 95: E6 8C 5A 43
+Page 96: 65 C1 24 94
+Page 97: B9 97 61 13
+Page 98: AD 74 FF 21
+Page 99: 0F EC F6 03
+Page 100: 89 5D 89 E5
+Page 101: 8D 11 F8 D7
+Page 102: 33 43 79 2E
+Page 103: 23 E5 29 B5
+Page 104: 53 98 13 FF
+Page 105: E8 79 8B 33
+Page 106: 45 6C 34 38
+Page 107: 3B 69 28 D7
+Page 108: D2 80 B0 2F
+Page 109: D0 18 D5 DD
+Page 110: 6C 2D D9 97
+Page 111: CA 78 B4 A2
+Page 112: B7 3E B8 79
+Page 113: A2 BE 54 E4
+Page 114: C8 28 0C 4A
+Page 115: 81 E7 EC 1C
+Page 116: 39 93 6F 70
+Page 117: 75 77 5C FC
+Page 118: 66 58 0C 1C
+Page 119: 9F 70 2E C8
+Page 120: 52 4A 52 BD
+Page 121: 56 D5 6A 15
+Page 122: 54 1B 33 90
+Page 123: 44 11 C1 07
+Page 124: 11 5C BA 80
+Page 125: 10 14 20 9A
+Page 126: 4A D8 E6 36
+Page 127: DA B8 59 E5
+Page 128: 5E 48 95 DA
+Page 129: 96 6A 26 85
+Page 130: 01 00 0F BD
+Page 131: 00 00 00 04
+Page 132: 5F 00 00 00
+Page 133: 00 00 00 00
+Page 134: 00 00 00 00
+Failed authentication attempts: 0

applications/debug/unit_tests/resources/unit_tests/nfc/Ntag216.nfc

@@ -0,0 +1,252 @@
+Filetype: Flipper NFC device
+Version: 2
+# Nfc device type can be UID, Mifare Ultralight, Mifare Classic, Bank card
+Device type: NTAG216
+# UID, ATQA and SAK are common for all formats
+UID: 04 D9 65 0A 32 5E 80
+ATQA: 44 00
+SAK: 00
+# Mifare Ultralight specific data
+Data format version: 1
+Signature: 48 2A F2 01 0F F2 F5 A7 9A D5 79 6E CB 14 54 48 98 D1 57 5D 8A 23 A9 B0 E8 20 02 3E CD C8 16 DB
+Mifare version: 00 04 04 02 01 00 13 03
+Counter 0: 0
+Tearing 0: 00
+Counter 1: 0
+Tearing 1: 00
+Counter 2: 0
+Tearing 2: 00
+Pages total: 231
+Pages read: 231
+Page 0: 04 D9 65 30
+Page 1: 0A 32 5E 80
+Page 2: E6 48 00 00
+Page 3: E1 10 6D 00
+Page 4: 03 37 D1 01
+Page 5: 33 55 04 6D
+Page 6: 2E 79 6F 75
+Page 7: 74 75 62 65
+Page 8: 2E 63 6F 6D
+Page 9: 2F 77 61 74
+Page 10: 63 68 3F 76
+Page 11: 3D 62 78 71
+Page 12: 4C 73 72 6C
+Page 13: 61 6B 4B 38
+Page 14: 26 66 65 61
+Page 15: 74 75 72 65
+Page 16: 3D 79 6F 75
+Page 17: 74 75 2E 62
+Page 18: 65 FE 00 00
+Page 19: 00 00 00 00
+Page 20: 00 00 00 00
+Page 21: 00 00 00 00
+Page 22: 00 00 00 00
+Page 23: 00 00 00 00
+Page 24: 00 00 00 00
+Page 25: 00 00 00 00
+Page 26: 00 00 00 00
+Page 27: 00 00 00 00
+Page 28: 00 00 00 00
+Page 29: 00 00 00 00
+Page 30: 00 00 00 00
+Page 31: 00 00 00 00
+Page 32: 00 00 00 00
+Page 33: 00 00 00 00
+Page 34: 00 00 00 00
+Page 35: 00 00 00 00
+Page 36: 00 00 00 00
+Page 37: 00 00 00 00
+Page 38: 00 00 00 00
+Page 39: 00 00 00 00
+Page 40: 00 00 00 00
+Page 41: 00 00 00 00
+Page 42: 00 00 00 00
+Page 43: 00 00 00 00
+Page 44: 00 00 00 00
+Page 45: 00 00 00 00
+Page 46: 00 00 00 00
+Page 47: 00 00 00 00
+Page 48: 00 00 00 00
+Page 49: 00 00 00 00
+Page 50: 00 00 00 00
+Page 51: 00 00 00 00
+Page 52: 00 00 00 00
+Page 53: 00 00 00 00
+Page 54: 00 00 00 00
+Page 55: 00 00 00 00
+Page 56: 00 00 00 00
+Page 57: 00 00 00 00
+Page 58: 00 00 00 00
+Page 59: 00 00 00 00
+Page 60: 00 00 00 00
+Page 61: 00 00 00 00
+Page 62: 00 00 00 00
+Page 63: 00 00 00 00
+Page 64: 00 00 00 00
+Page 65: 00 00 00 00
+Page 66: 00 00 00 00
+Page 67: 00 00 00 00
+Page 68: 00 00 00 00
+Page 69: 00 00 00 00
+Page 70: 00 00 00 00
+Page 71: 00 00 00 00
+Page 72: 00 00 00 00
+Page 73: 00 00 00 00
+Page 74: 00 00 00 00
+Page 75: 00 00 00 00
+Page 76: 00 00 00 00
+Page 77: 00 00 00 00
+Page 78: 00 00 00 00
+Page 79: 00 00 00 00
+Page 80: 00 00 00 00
+Page 81: 00 00 00 00
+Page 82: 00 00 00 00
+Page 83: 00 00 00 00
+Page 84: 00 00 00 00
+Page 85: 00 00 00 00
+Page 86: 00 00 00 00
+Page 87: 00 00 00 00
+Page 88: 00 00 00 00
+Page 89: 00 00 00 00
+Page 90: 00 00 00 00
+Page 91: 00 00 00 00
+Page 92: 00 00 00 00
+Page 93: 00 00 00 00
+Page 94: 00 00 00 00
+Page 95: 00 00 00 00
+Page 96: 00 00 00 00
+Page 97: 00 00 00 00
+Page 98: 00 00 00 00
+Page 99: 00 00 00 00
+Page 100: 00 00 00 00
+Page 101: 00 00 00 00
+Page 102: 00 00 00 00
+Page 103: 00 00 00 00
+Page 104: 00 00 00 00
+Page 105: 00 00 00 00
+Page 106: 00 00 00 00
+Page 107: 00 00 00 00
+Page 108: 00 00 00 00
+Page 109: 00 00 00 00
+Page 110: 00 00 00 00
+Page 111: 00 00 00 00
+Page 112: 00 00 00 00
+Page 113: 00 00 00 00
+Page 114: 00 00 00 00
+Page 115: 00 00 00 00
+Page 116: 00 00 00 00
+Page 117: 00 00 00 00
+Page 118: 00 00 00 00
+Page 119: 00 00 00 00
+Page 120: 00 00 00 00
+Page 121: 00 00 00 00
+Page 122: 00 00 00 00
+Page 123: 00 00 00 00
+Page 124: 00 00 00 00
+Page 125: 00 00 00 00
+Page 126: 00 00 00 00
+Page 127: 00 00 00 00
+Page 128: 00 00 00 00
+Page 129: 00 00 00 00
+Page 130: 00 00 00 00
+Page 131: 00 00 00 00
+Page 132: 00 00 00 00
+Page 133: 00 00 00 00
+Page 134: 00 00 00 00
+Page 135: 00 00 00 00
+Page 136: 00 00 00 00
+Page 137: 00 00 00 00
+Page 138: 00 00 00 00
+Page 139: 00 00 00 00
+Page 140: 00 00 00 00
+Page 141: 00 00 00 00
+Page 142: 00 00 00 00
+Page 143: 00 00 00 00
+Page 144: 00 00 00 00
+Page 145: 00 00 00 00
+Page 146: 00 00 00 00
+Page 147: 00 00 00 00
+Page 148: 00 00 00 00
+Page 149: 00 00 00 00
+Page 150: 00 00 00 00
+Page 151: 00 00 00 00
+Page 152: 00 00 00 00
+Page 153: 00 00 00 00
+Page 154: 00 00 00 00
+Page 155: 00 00 00 00
+Page 156: 00 00 00 00
+Page 157: 00 00 00 00
+Page 158: 00 00 00 00
+Page 159: 00 00 00 00
+Page 160: 00 00 00 00
+Page 161: 00 00 00 00
+Page 162: 00 00 00 00
+Page 163: 00 00 00 00
+Page 164: 00 00 00 00
+Page 165: 00 00 00 00
+Page 166: 00 00 00 00
+Page 167: 00 00 00 00
+Page 168: 00 00 00 00
+Page 169: 00 00 00 00
+Page 170: 00 00 00 00
+Page 171: 00 00 00 00
+Page 172: 00 00 00 00
+Page 173: 00 00 00 00
+Page 174: 00 00 00 00
+Page 175: 00 00 00 00
+Page 176: 00 00 00 00
+Page 177: 00 00 00 00
+Page 178: 00 00 00 00
+Page 179: 00 00 00 00
+Page 180: 00 00 00 00
+Page 181: 00 00 00 00
+Page 182: 00 00 00 00
+Page 183: 00 00 00 00
+Page 184: 00 00 00 00
+Page 185: 00 00 00 00
+Page 186: 00 00 00 00
+Page 187: 00 00 00 00
+Page 188: 00 00 00 00
+Page 189: 00 00 00 00
+Page 190: 00 00 00 00
+Page 191: 00 00 00 00
+Page 192: 00 00 00 00
+Page 193: 00 00 00 00
+Page 194: 00 00 00 00
+Page 195: 00 00 00 00
+Page 196: 00 00 00 00
+Page 197: 00 00 00 00
+Page 198: 00 00 00 00
+Page 199: 00 00 00 00
+Page 200: 00 00 00 00
+Page 201: 00 00 00 00
+Page 202: 00 00 00 00
+Page 203: 00 00 00 00
+Page 204: 00 00 00 00
+Page 205: 00 00 00 00
+Page 206: 00 00 00 00
+Page 207: 00 00 00 00
+Page 208: 00 00 00 00
+Page 209: 00 00 00 00
+Page 210: 00 00 00 00
+Page 211: 00 00 00 00
+Page 212: 00 00 00 00
+Page 213: 00 00 00 00
+Page 214: 00 00 00 00
+Page 215: 00 00 00 00
+Page 216: 00 00 00 00
+Page 217: 00 00 00 00
+Page 218: 00 00 00 00
+Page 219: 00 00 00 00
+Page 220: 00 00 00 00
+Page 221: 00 00 00 00
+Page 222: 00 00 00 00
+Page 223: 00 00 00 00
+Page 224: 00 00 00 00
+Page 225: 00 00 00 00
+Page 226: 00 00 00 BD
+Page 227: 04 00 00 FF
+Page 228: 00 05 00 00
+Page 229: 00 00 00 00
+Page 230: 00 00 00 00
+Failed authentication attempts: 0

applications/debug/unit_tests/resources/unit_tests/nfc/Ultralight_11.nfc

@@ -0,0 +1,41 @@
+Filetype: Flipper NFC device
+Version: 3
+# Nfc device type can be UID, Mifare Ultralight, Mifare Classic
+Device type: Mifare Ultralight 11
+# UID, ATQA and SAK are common for all formats
+UID: 04 15 74 F2 B0 5E 81
+ATQA: 00 44
+SAK: 00
+# Mifare Ultralight specific data
+Data format version: 1
+Signature: A4 37 7D E5 8C 2F 88 D8 04 60 41 6E 3A C8 CD DB 19 94 26 12 C5 D0 12 B0 EB 88 05 72 89 F2 A5 61
+Mifare version: 00 04 03 01 01 00 0B 03
+Counter 0: 0
+Tearing 0: BD
+Counter 1: 0
+Tearing 1: BD
+Counter 2: 0
+Tearing 2: BD
+Pages total: 20
+Pages read: 20
+Page 0: 04 15 74 ED
+Page 1: F2 B0 5E 81
+Page 2: 9D 48 F8 FF
+Page 3: C1 31 3E 3F
+Page 4: B0 00 F0 02
+Page 5: 2F B3 45 A0
+Page 6: D4 9C 02 F2
+Page 7: 4A B1 ED FF
+Page 8: C8 01 00 02
+Page 9: 4F B3 46 70
+Page 10: EE F6 60 B0
+Page 11: B6 C6 12 1B
+Page 12: B9 1E 49 C3
+Page 13: 49 DF 7A 57
+Page 14: 08 52 2A 11
+Page 15: 28 0A 28 59
+Page 16: 00 00 00 FF
+Page 17: 00 05 00 00
+Page 18: FF FF FF FF
+Page 19: 00 00 00 00
+Failed authentication attempts: 0

applications/debug/unit_tests/resources/unit_tests/nfc/Ultralight_21.nfc

@@ -0,0 +1,62 @@
+Filetype: Flipper NFC device
+Version: 3
+# Nfc device type can be UID, Mifare Ultralight, Mifare Classic
+Device type: Mifare Ultralight 21
+# UID, ATQA and SAK are common for all formats
+UID: 34 BF AB B1 AE 73 D6
+ATQA: 00 44
+SAK: 00
+# Mifare Ultralight specific data
+Data format version: 1
+Signature: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+Mifare version: 00 34 21 01 01 00 0E 03
+Counter 0: 0
+Tearing 0: 00
+Counter 1: 0
+Tearing 1: 00
+Counter 2: 0
+Tearing 2: 00
+Pages total: 41
+Pages read: 41
+Page 0: 34 BF AB A8
+Page 1: B1 AE 73 D6
+Page 2: BA 00 70 08
+Page 3: FF FF FF FC
+Page 4: 45 D9 BB A0
+Page 5: 5D 9D FA 00
+Page 6: 80 70 38 40
+Page 7: 12 30 02 00
+Page 8: 00 00 00 00
+Page 9: 00 00 00 00
+Page 10: AC A1 0D E4
+Page 11: 80 70 38 40
+Page 12: 00 57 A0 01
+Page 13: 00 08 C1 40
+Page 14: 00 00 00 00
+Page 15: AC A1 0D E4
+Page 16: 00 00 00 00
+Page 17: 00 00 00 00
+Page 18: 00 00 00 00
+Page 19: 00 00 00 00
+Page 20: 00 00 00 00
+Page 21: 00 00 00 00
+Page 22: 00 00 00 00
+Page 23: 00 00 00 00
+Page 24: 00 00 00 00
+Page 25: 00 00 00 00
+Page 26: 00 00 00 00
+Page 27: 00 00 00 00
+Page 28: 00 00 00 00
+Page 29: 00 00 00 00
+Page 30: 00 00 00 00
+Page 31: 00 00 00 00
+Page 32: 00 00 00 00
+Page 33: 00 00 00 00
+Page 34: 00 00 00 00
+Page 35: 00 00 00 00
+Page 36: 00 00 00 BD
+Page 37: 00 00 00 FF
+Page 38: 00 05 00 00
+Page 39: FF FF FF FF
+Page 40: 00 00 00 00
+Failed authentication attempts: 0