Merge branch 'dev' into release

.ci_files/anims_ofw.txt

@@ -36,6 +36,13 @@ Min level: 1
 Max level: 1
 Weight: 3
 
+Name: L1_Happy_holidays_128x64
+Min butthurt: 0
+Max butthurt: 14
+Min level: 1
+Max level: 3
+Weight: 4
+
 Name: L1_Read_books_128x64
 Min butthurt: 0
 Max butthurt: 8
@@ -85,20 +92,6 @@ Min level: 1
 Max level: 3
 Weight: 3
 
-Name: L1_Kaiju_128x64
-Min butthurt: 0
-Max butthurt: 10
-Min level: 1
-Max level: 3
-Weight: 4
-
-Name: L1_My_dude_128x64
-Min butthurt: 0
-Max butthurt: 8
-Min level: 1
-Max level: 3
-Weight: 4
-
 Name: L2_Wake_up_128x64
 Min butthurt: 0
 Max butthurt: 12
@@ -127,13 +120,6 @@ Min level: 2
 Max level: 2
 Weight: 3
 
-Name: L2_Dj_128x64
-Min butthurt: 0
-Max butthurt: 8
-Min level: 2
-Max level: 3
-Weight: 4
-
 Name: L3_Furippa3_128x64
 Min butthurt: 0
 Max butthurt: 6
@@ -154,24 +140,3 @@ Max butthurt: 10
 Min level: 3
 Max level: 3
 Weight: 3
-
-Name: L1_Senpai_128x64
-Min butthurt: 0
-Max butthurt: 5
-Min level: 1
-Max level: 3
-Weight: 4
-
-Name: L1_Sad_song_128x64
-Min butthurt: 8
-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

.ci_files/rgb.patch

@@ -1,677 +0,0 @@
-diff --git a/applications/services/notification/notification_app.c b/applications/services/notification/notification_app.c
-index 5769ced..c5d3088 100644
---- a/applications/services/notification/notification_app.c
-+++ b/applications/services/notification/notification_app.c
-@@ -9,6 +9,7 @@
- #include "notification.h"
- #include "notification_messages.h"
- #include "notification_app.h"
-+#include "applications/settings/notification_settings/rgb_backlight.h"
- 
- #define TAG "NotificationSrv"
- 
-@@ -589,6 +590,7 @@ int32_t notification_srv(void* p) {
-             break;
-         case SaveSettingsMessage:
-             notification_save_settings(app);
-+            rgb_backlight_save_settings();
-             break;
-         }
- 
-diff --git a/applications/settings/notification_settings/notification_settings_app.c b/applications/settings/notification_settings/notification_settings_app.c
-index 1955012..19d953d 100644
---- a/applications/settings/notification_settings/notification_settings_app.c
-+++ b/applications/settings/notification_settings/notification_settings_app.c
-@@ -3,6 +3,7 @@
- #include <gui/modules/variable_item_list.h>
- #include <gui/view_dispatcher.h>
- #include <lib/toolbox/value_index.h>
-+#include <applications/settings/notification_settings/rgb_backlight.h>
- 
- #define MAX_NOTIFICATION_SETTINGS 4
- 
-@@ -20,6 +21,8 @@ static const NotificationSequence sequence_note_c = {
-     NULL,
- };
- 
-+static VariableItem* temp_item;
-+
- #define CONTRAST_COUNT 11
- const char* const contrast_text[CONTRAST_COUNT] = {
-     "-5",
-@@ -156,6 +159,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);
-+    rgb_backlight_set_color(index);
-+    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;
-@@ -180,8 +236,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]);
- 
-+    // 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..98f0d3a
---- /dev/null
-+++ b/applications/settings/notification_settings/rgb_backlight.c
-@@ -0,0 +1,217 @@
-+/*
-+    RGB backlight FlipperZero driver
-+    Copyright (C) 2022-2023 Victor Nikitchuk (https://github.com/quen0n)
-+
-+    This program is free software: you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation, either version 3 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-+*/
-+
-+#include "rgb_backlight.h"
-+#include <furi_hal.h>
-+#include <storage/storage.h>
-+
-+#define RGB_BACKLIGHT_SETTINGS_VERSION 6
-+#define RGB_BACKLIGHT_SETTINGS_FILE_NAME ".rgb_backlight.settings"
-+#define RGB_BACKLIGHT_SETTINGS_PATH INT_PATH(RGB_BACKLIGHT_SETTINGS_FILE_NAME)
-+
-+#define COLOR_COUNT (sizeof(colors) / sizeof(RGBBacklightColor))
-+
-+#define TAG "RGB Backlight"
-+
-+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, 144, 0},
-+    {"Spring", 167, 255, 0},
-+    {"Lime", 0, 255, 0},
-+    {"Aqua", 0, 255, 127},
-+    {"Cyan", 0, 210, 210},
-+    {"Azure", 0, 127, 255},
-+    {"Blue", 0, 0, 255},
-+    {"Purple", 127, 0, 255},
-+    {"Magenta", 210, 0, 210},
-+    {"Pink", 255, 0, 127},
-+    {"Red", 255, 0, 0},
-+    {"White", 254, 210, 200},
-+    {"Custom", 0, 0, 0},
-+};
-+
-+uint8_t rgb_backlight_get_color_count(void) {
-+    return COLOR_COUNT;
-+}
-+
-+const char* rgb_backlight_get_color_text(uint8_t index) {
-+    return colors[index].name;
-+}
-+
-+void rgb_backlight_load_settings(void) {
-+    // 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_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);
-+
-+    if(fs_result) {
-+        uint16_t bytes_count = storage_file_read(file, &settings, settings_size);
-+
-+        if(bytes_count != settings_size) {
-+            fs_result = false;
-+        }
-+    }
-+
-+    if(fs_result) {
-+        FURI_LOG_D(TAG, "load success");
-+        if(settings.version != RGB_BACKLIGHT_SETTINGS_VERSION) {
-+            FURI_LOG_E(
-+                TAG,
-+                "version(%d != %d) mismatch",
-+                settings.version,
-+                RGB_BACKLIGHT_SETTINGS_VERSION);
-+        } else {
-+            memcpy(&rgb_settings, &settings, settings_size);
-+        }
-+    } else {
-+        FURI_LOG_E(TAG, "load failed, %s", storage_file_get_error_desc(file));
-+    }
-+
-+    storage_file_close(file);
-+    storage_file_free(file);
-+    furi_record_close(RECORD_STORAGE);
-+    rgb_settings.settings_is_loaded = true;
-+};
-+
-+void rgb_backlight_save_settings(void) {
-+    RGBBacklightSettings settings;
-+    File* file = storage_file_alloc(furi_record_open(RECORD_STORAGE));
-+    const size_t settings_size = sizeof(RGBBacklightSettings);
-+
-+    FURI_LOG_D(TAG, "saving settings to \"%s\"", RGB_BACKLIGHT_SETTINGS_PATH);
-+
-+    memcpy(&settings, &rgb_settings, settings_size);
-+
-+    bool fs_result =
-+        storage_file_open(file, RGB_BACKLIGHT_SETTINGS_PATH, FSAM_WRITE, FSOM_CREATE_ALWAYS);
-+
-+    if(fs_result) {
-+        uint16_t bytes_count = storage_file_write(file, &settings, settings_size);
-+
-+        if(bytes_count != settings_size) {
-+            fs_result = false;
-+        }
-+    }
-+
-+    if(fs_result) {
-+        FURI_LOG_D(TAG, "save success");
-+    } else {
-+        FURI_LOG_E(TAG, "save failed, %s", storage_file_get_error_desc(file));
-+    }
-+
-+    storage_file_close(file);
-+    storage_file_free(file);
-+    furi_record_close(RECORD_STORAGE);
-+};
-+
-+RGBBacklightSettings* rgb_backlight_get_settings(void) {
-+    if(!rgb_settings.settings_is_loaded) {
-+        rgb_backlight_load_settings();
-+    }
-+    return &rgb_settings;
-+}
-+
-+void rgb_backlight_set_color(uint8_t color_index) {
-+    if(color_index > (rgb_backlight_get_color_count() - 1)) color_index = 0;
-+    rgb_settings.display_color_index = color_index;
-+}
-+
-+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();
-+    }
-+
-+    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;
-+        }
-+
-+        last_brightness = brightness;
-+        last_color_index = rgb_settings.display_color_index;
-+    }
-+
-+    for(uint8_t i = 0; i < SK6805_get_led_count(); i++) {
-+        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);
-+        } 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..68dacda
---- /dev/null
-+++ b/applications/settings/notification_settings/rgb_backlight.h
-@@ -0,0 +1,91 @@
-+/*
-+    RGB backlight FlipperZero driver
-+    Copyright (C) 2022-2023 Victor Nikitchuk (https://github.com/quen0n)
-+
-+    This program is free software: you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation, either version 3 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-+*/
-+
-+#include <furi.h>
-+#include "SK6805.h"
-+
-+typedef struct {
-+    char* name;
-+    uint8_t red;
-+    uint8_t green;
-+    uint8_t blue;
-+} RGBBacklightColor;
-+
-+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;
-+
-+/**
-+ * @brief Получить текущие настройки RGB-подсветки
-+ *
-+ * @return Указатель на структуру настроек
-+ */
-+RGBBacklightSettings* rgb_backlight_get_settings(void);
-+
-+/**
-+ * @brief Загрузить настройки подсветки с SD-карты
-+ */
-+void rgb_backlight_load_settings(void);
-+
-+/**
-+ * @brief Сохранить текущие настройки RGB-подсветки
-+ */
-+void rgb_backlight_save_settings(void);
-+
-+/**
-+ * @brief Применить текущие настройки RGB-подсветки
-+ *
-+ * @param brightness Яркость свечения (0-255)
-+ * @param bypass Применить настройки принудительно
-+ */
-+void rgb_backlight_update(uint8_t brightness, bool bypass);
-+
-+/**
-+ * @brief Установить цвет RGB-подсветки
-+ *
-+ * @param color_index Индекс цвета (0 - rgb_backlight_get_color_count())
-+ */
-+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 Число доступных вариантов цвета
-+ */
-+uint8_t rgb_backlight_get_color_count(void);
-+
-+/**
-+ * @brief Получить текстовое название цвета
-+ *
-+ * @param index Индекс из доступных вариантов цвета
-+ * @return Указатель на строку с названием цвета
-+ */
-+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..45798ca 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, 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) {
-diff --git a/lib/drivers/SK6805.c b/lib/drivers/SK6805.c
-new file mode 100644
-index 0000000..572e1df
---- /dev/null
-+++ b/lib/drivers/SK6805.c
-@@ -0,0 +1,101 @@
-+/*
-+    SK6805 FlipperZero driver
-+    Copyright (C) 2022-2023 Victor Nikitchuk (https://github.com/quen0n)
-+
-+    This program is free software: you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation, either version 3 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-+*/
-+
-+#include "SK6805.h"
-+#include <furi_hal.h>
-+
-+/* Настройки */
-+#define SK6805_LED_COUNT 3 //Количество светодиодов на плате подсветки
-+#define SK6805_LED_PIN &led_pin //Порт подключения светодиодов
-+
-+#ifdef FURI_DEBUG
-+#define DEBUG_PIN &gpio_ext_pa7
-+#define DEBUG_INIT() \
-+    furi_hal_gpio_init(DEBUG_PIN, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh)
-+#define DEBUG_SET_HIGH() furi_hal_gpio_write(DEBUG_PIN, true)
-+#define DEBUG_SET_LOW() furi_hal_gpio_write(DEBUG_PIN, false)
-+#else
-+#define DEBUG_INIT()
-+#define DEBUG_SET_HIGH()
-+#define DEBUG_SET_LOW()
-+#endif
-+
-+static const GpioPin led_pin = {.port = GPIOA, .pin = LL_GPIO_PIN_8};
-+static uint8_t led_buffer[SK6805_LED_COUNT][3];
-+
-+void SK6805_init(void) {
-+    DEBUG_INIT();
-+    furi_hal_gpio_write(SK6805_LED_PIN, false);
-+    furi_hal_gpio_init(SK6805_LED_PIN, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
-+}
-+
-+uint8_t SK6805_get_led_count(void) {
-+    return (const uint8_t)SK6805_LED_COUNT;
-+}
-+void SK6805_set_led_color(uint8_t led_index, uint8_t r, uint8_t g, uint8_t b) {
-+    furi_check(led_index < SK6805_LED_COUNT);
-+
-+    led_buffer[led_index][0] = g;
-+    led_buffer[led_index][1] = r;
-+    led_buffer[led_index][2] = b;
-+}
-+
-+void SK6805_update(void) {
-+    SK6805_init();
-+    furi_kernel_lock();
-+    uint32_t end;
-+    /* Последовательная отправка цветов светодиодов */
-+    for(uint8_t lednumber = 0; lednumber < SK6805_LED_COUNT; lednumber++) {
-+        //Последовательная отправка цветов светодиода
-+        for(uint8_t color = 0; color < 3; color++) {
-+            //Последовательная отправка битов цвета
-+            uint8_t i = 0b10000000;
-+            while(i != 0) {
-+                if(led_buffer[lednumber][color] & (i)) {
-+                    furi_hal_gpio_write(SK6805_LED_PIN, true);
-+                    DEBUG_SET_HIGH();
-+                    end = DWT->CYCCNT + 30;
-+                    //T1H 600 us (615 us)
-+                    while(DWT->CYCCNT < end) {
-+                    }
-+                    furi_hal_gpio_write(SK6805_LED_PIN, false);
-+                    DEBUG_SET_LOW();
-+                    end = DWT->CYCCNT + 26;
-+                    //T1L  600 us (587 us)
-+                    while(DWT->CYCCNT < end) {
-+                    }
-+                } else {
-+                    furi_hal_gpio_write(SK6805_LED_PIN, true);
-+                    DEBUG_SET_HIGH();
-+                    end = DWT->CYCCNT + 11;
-+                    //T0H 300 ns (312 ns)
-+                    while(DWT->CYCCNT < end) {
-+                    }
-+                    furi_hal_gpio_write(SK6805_LED_PIN, false);
-+                    DEBUG_SET_LOW();
-+                    end = DWT->CYCCNT + 43;
-+                    //T0L 900 ns (890 ns)
-+                    while(DWT->CYCCNT < end) {
-+                    }
-+                }
-+                i >>= 1;
-+            }
-+        }
-+    }
-+    furi_kernel_unlock();
-+}
-diff --git a/lib/drivers/SK6805.h b/lib/drivers/SK6805.h
-new file mode 100644
-index 0000000..7c58956
---- /dev/null
-+++ b/lib/drivers/SK6805.h
-@@ -0,0 +1,51 @@
-+/*
-+    SK6805 FlipperZero driver
-+    Copyright (C) 2022-2023 Victor Nikitchuk (https://github.com/quen0n)
-+
-+    This program is free software: you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation, either version 3 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-+*/
-+
-+#ifndef SK6805_H_
-+#define SK6805_H_
-+
-+#include <furi.h>
-+
-+/**
-+ * @brief Инициализация линии управления подсветкой
-+ */
-+void SK6805_init(void);
-+
-+/**
-+ * @brief Получить количество светодиодов в подсветке
-+ *
-+ * @return Количество светодиодов
-+ */
-+uint8_t SK6805_get_led_count(void);
-+
-+/**
-+ * @brief Установить цвет свечения светодиода
-+ *
-+ * @param led_index номер светодиода (от 0 до SK6805_get_led_count())
-+ * @param r значение красного (0-255)
-+ * @param g значение зелёного (0-255)
-+ * @param b значение синего (0-255)
-+ */
-+void SK6805_set_led_color(uint8_t led_index, uint8_t r, uint8_t g, uint8_t b);
-+
-+/**
-+ * @brief Обновление состояния подсветки дисплея
-+ */
-+void SK6805_update(void);
-+
-+#endif /* SK6805_H_ */
-\ No newline at end of file

.drone.yml

@@ -2,142 +2,47 @@ kind: pipeline
 type: docker
 name: "Release firmware"
 
-platform:
-  os: linux
-  arch: amd64
-
 steps:
   - name: "Update submodules"
     image: alpine/git
     commands:
       - git submodule sync
-      - git -c protocol.version=2 submodule update --init --force --recursive --jobs 4
+      - git -c protocol.version=2 submodule update --init --force --recursive
       - git submodule foreach git config --local gc.auto 0
       - git log -1 --format='%H'
 
-  - name: "Build clean"
-    image: hfdj/fztools
-    pull: never
-    commands:
-      - export DIST_SUFFIX=${DRONE_TAG}c
-      - export WORKFLOW_BRANCH_OR_TAG=release-cfw
-      - export FORCE_NO_DIRTY=yes
-      - export FBT_GIT_SUBMODULE_SHALLOW=1
-      - rm -rf applications/main/clock_app/resources/apps/
-      - rm -rf build/
-      - rm -rf dist/
-      - rm -rf .sconsign.dblite
-      - ./fbt COMPACT=1 DEBUG=0 updater_package
-      - mkdir artifacts-clean
-      - mv dist/f7-C/* artifacts-clean/
-      - ls -laS artifacts-clean
-      - ls -laS artifacts-clean/f7-update-${DRONE_TAG}c
-    environment:
-      FBT_TOOLS_CUSTOM_LINK:
-        from_secret: fbt_link
-
-  - name: "Build default"
+  - name: "Build firmware"
     image: hfdj/fztools
     pull: never
     commands:
       - 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/* 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.*
       - ./fbt COMPACT=1 DEBUG=0 updater_package
       - mkdir artifacts-default
       - mv dist/f7-C/* artifacts-default/
       - ls -laS artifacts-default
       - ls -laS artifacts-default/f7-update-${DRONE_TAG}
+      - sed -i 's/(version)/'${DRONE_TAG}'/g' CHANGELOG.md
+      - echo '# [Install 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}')' >> CHANGELOG.md
     environment:
       FBT_TOOLS_CUSTOM_LINK:
         from_secret: fbt_link
 
-  - name: "Build with extra apps"
+  - name: "Build no anims FW"
     image: hfdj/fztools
     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/* 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
-      - mv dist/f7-C/* artifacts-extra-apps/
-      - ls -laS artifacts-extra-apps
-      - ls -laS artifacts-extra-apps/f7-update-${DRONE_TAG}e
-    environment:
-      FBT_TOOLS_CUSTOM_LINK:
-        from_secret: fbt_link
-
-  - name: "Build with RGB patch"
-    image: hfdj/fztools
-    pull: never
-    commands:
-      - git apply .ci_files/rgb.patch
-      - 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
-      - mv dist/f7-C/* artifacts-rgb-patch/
-      - ls -laS artifacts-rgb-patch
-      - ls -laS artifacts-rgb-patch/f7-update-${DRONE_TAG}r
-    environment:
-      FBT_TOOLS_CUSTOM_LINK:
-        from_secret: fbt_link
-
-  - name: "Build with ofw anims"
-    image: hfdj/fztools
-    pull: never
-    commands:
-      - git clean -df
-      - git checkout -- .
       - rm -f assets/dolphin/external/manifest.txt
       - cp .ci_files/anims_ofw.txt assets/dolphin/external/manifest.txt
-      - 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/* 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.*
       - ./fbt COMPACT=1 DEBUG=0 updater_package
       - mkdir artifacts-ofw-anims
       - mv dist/f7-C/* artifacts-ofw-anims/
       - ls -laS artifacts-ofw-anims
       - ls -laS artifacts-ofw-anims/f7-update-${DRONE_TAG}n
-      - sed -i 's/(version)/'${DRONE_TAG}'/g' CHANGELOG.md
-      - echo '# [Install 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}')' >> CHANGELOG.md
-      - echo '' >> CHANGELOG.md
-      - echo '### [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_TAG}'c.tgz&channel=release-cfw&version='${DRONE_TAG}'c)' >> CHANGELOG.md
       - echo '' >> CHANGELOG.md
       - echo '### [Version without custom animations - Install 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)' >> CHANGELOG.md
-      - echo '' >> CHANGELOG.md
-      - echo '### [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_TAG}'r.tgz&channel=release-cfw&version='${DRONE_TAG}'r)' >> CHANGELOG.md
-      - echo '' >> CHANGELOG.md
-      - echo '## [Version with Extra apps - Install 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)' >> CHANGELOG.md
     environment:
       FBT_TOOLS_CUSTOM_LINK:
         from_secret: fbt_link
@@ -145,32 +50,20 @@ steps:
   - name: "Bundle self-update packages"
     image: kramos/alpine-zip
     commands:
-      - cp artifacts-extra-apps/flipper-z-f7-update-${DRONE_TAG}e.tgz .
-      - cp artifacts-rgb-patch/flipper-z-f7-update-${DRONE_TAG}r.tgz .
-      - cp artifacts-clean/flipper-z-f7-update-${DRONE_TAG}c.tgz .
       - cp artifacts-ofw-anims/flipper-z-f7-update-${DRONE_TAG}n.tgz .
       - cp artifacts-default/flipper-z-f7-update-${DRONE_TAG}.tgz .
-      - zip -r artifacts-extra-apps/flipper-z-f7-update-${DRONE_TAG}e.zip artifacts-extra-apps/f7-update-${DRONE_TAG}e
-      - zip -r artifacts-rgb-patch/flipper-z-f7-update-${DRONE_TAG}r.zip artifacts-rgb-patch/f7-update-${DRONE_TAG}r
-      - zip -r artifacts-clean/flipper-z-f7-update-${DRONE_TAG}c.zip artifacts-clean/f7-update-${DRONE_TAG}c
       - zip -r artifacts-ofw-anims/flipper-z-f7-update-${DRONE_TAG}n.zip artifacts-ofw-anims/f7-update-${DRONE_TAG}n
       - zip -r artifacts-default/flipper-z-f7-update-${DRONE_TAG}.zip artifacts-default/f7-update-${DRONE_TAG}
-      - tar czpf artifacts-default/flipper-z-any-scripts-${DRONE_TAG}.tgz scripts
-      - rm -rf artifacts-extra-apps/f7-update-${DRONE_TAG}
-      - rm -rf artifacts-rgb-patch/f7-update-${DRONE_TAG}
-      - rm -rf artifacts-clean/f7-update-${DRONE_TAG}
+      - tar czpf artifacts-default/flipper-z-any-scripts-${DRONE_TAG}.tgz scripts debug
       - rm -rf artifacts-ofw-anims/f7-update-${DRONE_TAG}
       - rm -rf artifacts-default/f7-update-${DRONE_TAG}
-      - ls -laS artifacts-extra-apps
-      - ls -laS artifacts-rgb-patch
-      - ls -laS artifacts-clean
       - ls -laS artifacts-ofw-anims
       - ls -laS artifacts-default
       - mv artifacts-default/ ${DRONE_TAG}
       - ls -laS ${DRONE_TAG}
 
   - name: "Upload default to updates srv"
-    image: appleboy/drone-scp:linux-amd64
+    image: appleboy/drone-scp
     settings:
       host:
         from_secret: dep_host
@@ -191,7 +84,7 @@ steps:
         - ${DRONE_TAG}/*.bin
 
   - name: "Upload no-anims to updates srv"
-    image: appleboy/drone-scp:linux-amd64
+    image: appleboy/drone-scp
     settings:
       host:
         from_secret: dep_host
@@ -205,51 +98,6 @@ steps:
         from_secret: dep_target_noanim
       source: flipper-z-f7-update-${DRONE_TAG}n.tgz
 
-  - name: "Upload extra apps version to updates srv"
-    image: appleboy/drone-scp:linux-amd64
-    settings:
-      host:
-        from_secret: dep_host
-      username:
-        from_secret: dep_user
-      password:
-        from_secret: dep_passwd
-      port:
-        from_secret: dep_port
-      target:
-        from_secret: dep_target_extra
-      source: flipper-z-f7-update-${DRONE_TAG}e.tgz
-
-  - name: "Upload rgb patch version to updates srv"
-    image: appleboy/drone-scp:linux-amd64
-    settings:
-      host:
-        from_secret: dep_host
-      username:
-        from_secret: dep_user
-      password:
-        from_secret: dep_passwd
-      port:
-        from_secret: dep_port
-      target:
-        from_secret: dep_target_extra
-      source: flipper-z-f7-update-${DRONE_TAG}r.tgz
-
-  - name: "Upload clean version to updates srv"
-    image: appleboy/drone-scp:linux-amd64
-    settings:
-      host:
-        from_secret: dep_host
-      username:
-        from_secret: dep_user
-      password:
-        from_secret: dep_passwd
-      port:
-        from_secret: dep_port
-      target:
-        from_secret: dep_target_extra
-      source: flipper-z-f7-update-${DRONE_TAG}c.tgz
-
   - name: "Do Github release"
     image: ddplugins/github-release
     pull: never
@@ -263,9 +111,6 @@ steps:
         - ${DRONE_TAG}/*.tgz
         - ${DRONE_TAG}/*.zip
         - artifacts-ofw-anims/*.tgz
-        - artifacts-extra-apps/*.tgz
-        - artifacts-rgb-patch/*.tgz
-        - artifacts-clean/*.tgz
       title: ${DRONE_TAG}
       note: CHANGELOG.md
       checksum:
@@ -298,71 +143,48 @@ steps:
         Version: {{build.tag}}
 
 
-        [-> Sponsor our project](https://boosty.to/mmxdev)
-
-
-        [-Github - Changelog-](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/${DRONE_TAG})
+        [-Github-](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/${DRONE_TAG})
 
 
         [-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)
 
 
-        [-Download latest extra apps pack-](https://github.com/xMasterX/all-the-plugins/releases/latest)
+        [-Download latest extra apps pack-](https://download-directory.github.io/?url=https://github.com/xMasterX/unleashed-extra-pack/tree/main/apps)
 
 
-        [-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})
+        [-Version without custom animations - Install 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)
 
 
-        [-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)
-
-
-        [-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)
-
-
-        [-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)
-
-
-        [-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_TAG}r.tgz)
-
-
-        [-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)"
+        [-Install 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})"
       document:
         - ${DRONE_TAG}/flipper-z-f7-update-${DRONE_TAG}.tgz
 
   - name: "Send discord notification"
-    image: hfdj/fztools
-    pull: never
-    environment:
-      DISCORD_WEBHOOK:
-        from_secret: dis_release_webhook
-    commands:
-      - wget "https://raw.githubusercontent.com/fieu/discord.sh/e1dc1a7595efad2cad8f072f0b3531c470f5b7c8/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)'
-
-  - name: "Send clean build to telegram"
-    image: appleboy/drone-telegram
+    image: appleboy/drone-discord
     settings:
-      token:
-        from_secret: tgtoken
-      to:
-        from_secret: tgid
-      format: markdown
-      message: "Build with only main apps:"
-      document:
-        - flipper-z-f7-update-${DRONE_TAG}c.tgz
+      webhook_id:
+        from_secret: ds_wh_id
+      webhook_token:
+        from_secret: ds_wh_token
+      message: "New Unleashed firmware released!
 
-  - name: "Send extra pack build to telegram"
-    image: appleboy/drone-telegram
-    settings:
-      token:
-        from_secret: tgtoken
-      to:
-        from_secret: tgid
-      format: markdown
-      message: "Build with extra apps pack:"
-      document:
-        - flipper-z-f7-update-${DRONE_TAG}e.tgz
+
+        Version: {{build.tag}}
+
+
+        [[Github]](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/${DRONE_TAG})
+
+
+        [-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)
+
+
+        [-Download latest extra apps pack-](https://download-directory.github.io/?url=https://github.com/xMasterX/unleashed-extra-pack/tree/main/apps)
+
+
+        [-Version without custom animations - Install 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)
+
+
+        [-Install 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})"
 
 trigger:
   event:
@@ -376,56 +198,21 @@ kind: pipeline
 type: docker
 name: "Dev build"
 
-platform:
-  os: linux
-  arch: amd64
-
 steps:
   - name: "Update submodules"
     image: alpine/git
     commands:
       - git submodule sync
-      - git -c protocol.version=2 submodule update --init --force --recursive --jobs 4
+      - git -c protocol.version=2 submodule update --init --force --recursive
       - git submodule foreach git config --local gc.auto 0
       - git log -1 --format='%H'
 
-  - name: "Build dev clean"
-    image: hfdj/fztools
-    pull: never
-    commands:
-      - export DIST_SUFFIX=${DRONE_BUILD_NUMBER}c
-      - export WORKFLOW_BRANCH_OR_TAG=dev-cfw
-      - export FORCE_NO_DIRTY=yes
-      - export FBT_GIT_SUBMODULE_SHALLOW=1
-      - rm -rf applications/main/clock_app/resources/apps/
-      - rm -rf build/
-      - rm -rf dist/
-      - rm -rf .sconsign.dblite
-      - ./fbt COMPACT=1 DEBUG=0 updater_package
-      - mkdir artifacts-clean
-      - mv dist/f7-C/* artifacts-clean/
-      - ls -laS artifacts-clean
-      - ls -laS artifacts-clean/f7-update-${DRONE_BUILD_NUMBER}c
-    environment:
-      FBT_TOOLS_CUSTOM_LINK:
-        from_secret: fbt_link
-
-
-  - name: "Build dev default"
+  - name: "Build dev FW"
     image: hfdj/fztools
     pull: never
     commands:
       - 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/* 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.*
       - ./fbt COMPACT=1 DEBUG=0 updater_package
       - mkdir artifacts-default
       - mv dist/f7-C/* artifacts-default/
@@ -435,53 +222,9 @@ steps:
       FBT_TOOLS_CUSTOM_LINK:
         from_secret: fbt_link
 
-  - name: "Build dev with extra apps"
-    image: hfdj/fztools
-    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/* 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
-      - mv dist/f7-C/* artifacts-extra-apps/
-      - ls -laS artifacts-extra-apps
-      - ls -laS artifacts-extra-apps/f7-update-${DRONE_BUILD_NUMBER}e
-    environment:
-      FBT_TOOLS_CUSTOM_LINK:
-        from_secret: fbt_link
-
-  - name: "Build dev with rgb patch"
-    image: hfdj/fztools
-    pull: never
-    commands:
-      - git apply .ci_files/rgb.patch
-      - 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
-      - mv dist/f7-C/* artifacts-rgb-patch/
-      - ls -laS artifacts-rgb-patch
-      - ls -laS artifacts-rgb-patch/f7-update-${DRONE_BUILD_NUMBER}r
-    environment:
-      FBT_TOOLS_CUSTOM_LINK:
-        from_secret: fbt_link
-
   - name: "Bundle self-update packages"
     image: kramos/alpine-zip
     commands:
-      - cp artifacts-extra-apps/flipper-z-f7-update-${DRONE_BUILD_NUMBER}e.tgz .
-      - cp artifacts-rgb-patch/flipper-z-f7-update-${DRONE_BUILD_NUMBER}r.tgz .
-      - cp artifacts-clean/flipper-z-f7-update-${DRONE_BUILD_NUMBER}c.tgz .
       - cp artifacts-default/flipper-z-f7-update-${DRONE_BUILD_NUMBER}.tgz .
       - rm -rf artifacts-default/f7-update-${DRONE_BUILD_NUMBER}
       - ls -laS artifacts-default
@@ -489,7 +232,7 @@ steps:
       - ls -laS dev
 
   - name: "Clean dev folder"
-    image: appleboy/drone-ssh:linux-amd64
+    image: appleboy/drone-ssh
     settings:
       host:
         from_secret: dep_host
@@ -501,10 +244,11 @@ steps:
         from_secret: dep_port
       command_timeout: 30s
       script:
-        - cd web/unleashedflip.com/public_html/fw/dev && rm -f ./*
+        - cd web/unleashedflip.com/public_html/fw/dev
+        - rm -f ./*
 
   - name: "Upload default to updates srv"
-    image: appleboy/drone-scp:linux-amd64
+    image: appleboy/drone-scp
     settings:
       host:
         from_secret: dep_host
@@ -524,51 +268,6 @@ steps:
         - dev/*.dfu
         - dev/*.bin
 
-  - name: "Upload extra apps version to updates srv"
-    image: appleboy/drone-scp:linux-amd64
-    settings:
-      host:
-        from_secret: dep_host
-      username:
-        from_secret: dep_user
-      password:
-        from_secret: dep_passwd
-      port:
-        from_secret: dep_port
-      target:
-        from_secret: dep_target_extra
-      source: flipper-z-f7-update-${DRONE_BUILD_NUMBER}e.tgz
-
-  - name: "Upload rgb patch version to updates srv"
-    image: appleboy/drone-scp:linux-amd64
-    settings:
-      host:
-        from_secret: dep_host
-      username:
-        from_secret: dep_user
-      password:
-        from_secret: dep_passwd
-      port:
-        from_secret: dep_port
-      target:
-        from_secret: dep_target_extra
-      source: flipper-z-f7-update-${DRONE_BUILD_NUMBER}r.tgz
-
-  - name: "Upload clean version to updates srv"
-    image: appleboy/drone-scp:linux-amd64
-    settings:
-      host:
-        from_secret: dep_host
-      username:
-        from_secret: dep_user
-      password:
-        from_secret: dep_passwd
-      port:
-        from_secret: dep_port
-      target:
-        from_secret: dep_target_extra
-      source: flipper-z-f7-update-${DRONE_BUILD_NUMBER}c.tgz
-
   - name: "Trigger update server reindex"
     image: hfdj/fztools
     pull: never
@@ -580,7 +279,7 @@ steps:
     commands:
       - curl -X POST -F 'key='$UPD_KEY'' $UPD_URL
 
-  - name: "Send message to telegram"
+  - name: "Send files to telegram"
     image: appleboy/drone-telegram
     settings:
       token:
@@ -593,74 +292,16 @@ steps:
 
         Build: {{build.number}}
 
-        Commit: https://github.com/DarkFlippers/unleashed-firmware/commit/{{commit.sha}}
+        SHA: {{commit.sha}}
 
 
-
-        [-> Sponsor our project](https://boosty.to/mmxdev)
+        Commit: {{commit.message}}
 
 
-        [-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})
-        
-
-        [-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)
-        
-
-        [-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)
-
-
-        [-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)
-
-
-        [-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)"
-
-  - name: "Send build to telegram"
-    image: appleboy/drone-telegram
-    settings:
-      token:
-        from_secret: tgtoken
-      to:
-        from_secret: tgid_dev
-      format: markdown
-      message: "Regular Build:"
+        [-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})"
       document:
         - dev/flipper-z-f7-update-${DRONE_BUILD_NUMBER}.tgz
 
-  - name: "Send clean build to telegram"
-    image: appleboy/drone-telegram
-    settings:
-      token:
-        from_secret: tgtoken
-      to:
-        from_secret: tgid_dev
-      format: markdown
-      message: "Clean (Main apps only) Build:"
-      document:
-        - flipper-z-f7-update-${DRONE_BUILD_NUMBER}c.tgz
-
-  - name: "Send extra pack build to telegram"
-    image: appleboy/drone-telegram
-    settings:
-      token:
-        from_secret: tgtoken
-      to:
-        from_secret: tgid_dev
-      format: markdown
-      message: "Build with extra apps pack:"
-      document:
-        - flipper-z-f7-update-${DRONE_BUILD_NUMBER}e.tgz
-
-  - name: "Send discord notification"
-    image: hfdj/fztools
-    pull: never
-    environment:
-      DISCORD_WEBHOOK:
-        from_secret: dis_dev_webhook
-    commands:
-      - wget "https://raw.githubusercontent.com/fieu/discord.sh/e1dc1a7595efad2cad8f072f0b3531c470f5b7c8/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}')'
-
 trigger:
   branch:
     - dev

.github/CODEOWNERS

@@ -1,5 +1 @@
-# Default
-* @xMasterX
-
-# Assets
-/assets/resources/infrared/assets/ @amec0e @Leptopt1los @xMasterX
+* @xMasterX

.github/FUNDING.yml

@@ -1,7 +1,2 @@
-patreon: mmxdev
-custom:
-  [
-    "https://boosty.to/mmxdev",
-    "https://pay.cloudtips.ru/p/7b3e9d65",
-    "https://yoomoney.ru/fundraise/XA49mgQLPA0.221209",
-  ]
+ko_fi: masterx
+custom: ['https://boosty.to/mmxdev', 'https://destream.net/live/MMX/donate', 'https://pay.cloudtips.ru/p/7b3e9d65', 'https://yoomoney.ru/fundraise/XA49mgQLPA0.221209']

.github/workflows/codeql.yml

@@ -1,114 +0,0 @@
-# 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

.gitignore

@@ -1,8 +1,5 @@
-*~
 *.swp
-*.swo
 *.gdb_history
-*.old
 
 
 # LSP
@@ -30,9 +27,15 @@ bindings/
 .mxproject
 Brewfile.lock.json
 
-# Kate
-.kateproject
-.kateconfig
+# Visual Studio Code
+.vscode/
+
+# legendary cmake's
+build
+CMakeLists.txt
+
+# bundle output
+dist
 
 # kde
 .directory
@@ -40,21 +43,8 @@ null.d
 
 # SCons
 .sconsign.dblite
-
-
-# Visual Studio Code
-/.vscode
-
-# bundle output
-/dist
-/artifacts-default
-/artifacts-ofw-anims
-/artifacts-rgb-patch
-/artifacts-extra-apps
-/artifacts-clean
-
 # SCons build dir
-/build
+build/
 
 # Toolchain
 /toolchain
@@ -65,8 +55,5 @@ openocd.log
 # PVS Studio temporary files
 .PVS-Studio/
 PVS-Studio.log
-*.PVS-Studio.*
 
 .gdbinit
-
-/fbt_options_local.py

.gitmodules

@@ -1,6 +1,9 @@
 [submodule "lib/mlib"]
 	path = lib/mlib
 	url = https://github.com/P-p-H-d/mlib.git
+[submodule "lib/STM32CubeWB"]
+	path = lib/STM32CubeWB
+	url = https://github.com/Flipper-Zero/STM32CubeWB.git
 [submodule "lib/littlefs"]
 	path = lib/littlefs
 	url = https://github.com/littlefs-project/littlefs.git
@@ -10,7 +13,6 @@
 [submodule "assets/protobuf"]
 	path = assets/protobuf
 	url = https://github.com/flipperdevices/flipperzero-protobuf.git
-	shallow = false
 [submodule "lib/libusb_stm32"]
 	path = lib/libusb_stm32
 	url = https://github.com/flipperdevices/libusb_stm32.git
@@ -26,19 +28,9 @@
 [submodule "lib/cxxheaderparser"]
 	path = lib/cxxheaderparser
 	url = https://github.com/robotpy/cxxheaderparser.git
-[submodule "lib/heatshrink"]
-	path = lib/heatshrink
-	url = https://github.com/flipperdevices/heatshrink.git
-[submodule "lib/st_cmsis_device_wb"]
-	path = lib/stm32wb_cmsis
-	url = https://github.com/STMicroelectronics/cmsis_device_wb
-[submodule "lib/stm32wbxx_hal_driver"]
-	path = lib/stm32wb_hal
-	url = https://github.com/STMicroelectronics/stm32wbxx_hal_driver
-[submodule "lib/stm32wb_copro"]
-	path = lib/stm32wb_copro
-	url = https://github.com/flipperdevices/stm32wb_copro.git
-[submodule "subghz_remote"]
-	path = applications/main/subghz_remote
-	url = https://github.com/DarkFlippers/SubGHz_Remote.git
-	branch = ufw_main_app
+[submodule "applications/plugins/subbrute"]
+	path = applications/plugins/subbrute
+	url = https://github.com/derskythe/flipperzero-subbrute.git
+[submodule "applications/plugins/dap_link/lib/free-dap"]
+	path = applications/plugins/dap_link/lib/free-dap
+	url = https://github.com/ataradov/free-dap.git

.pvsconfig

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

.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/stm32wb_cmsis -e lib/stm32wb_copro -e lib/stm32wb_hal -e lib/u8g2 -e lib/nanopb -e */arm-none-eabi/*
+--rules-config .pvsconfig -e lib/fatfs -e lib/fnv1a-hash -e lib/FreeRTOS-Kernel -e lib/heatshrink -e lib/libusb_stm32 -e lib/littlefs -e lib/mbedtls -e lib/micro-ecc -e lib/microtar -e lib/mlib -e lib/qrcode -e lib/ST25RFAL002 -e lib/STM32CubeWB -e lib/u8g2 -e */arm-none-eabi/*

.vscode/.gitignore

@@ -1,5 +1,4 @@
-/c_cpp_properties.json
-/extensions.json
-/launch.json
-/settings.json
-/tasks.json
+./c_cpp_properties.json
+./launch.json
+./settings.json
+./tasks.json

.vscode/example/clangd/extensions.json

@@ -1,19 +0,0 @@
-{
-	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-	// List of extensions which should be recommended for users of this workspace.
-	"recommendations": [
-		"ms-python.black-formatter",
-		"llvm-vs-code-extensions.vscode-clangd",
-		"amiralizadeh9480.cpp-helper",
-		"marus25.cortex-debug",
-		"zxh404.vscode-proto3",
-		"augustocdias.tasks-shell-input"
-	],
-	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
-	"unwantedRecommendations": [
-		"twxs.cmake",
-		"ms-vscode.cpptools",
-		"ms-vscode.cmake-tools"
-	]
-}

.vscode/example/cpptools/extensions.json

@@ -1,20 +0,0 @@
-{
-	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-	// List of extensions which should be recommended for users of this workspace.
-	"recommendations": [
-		"ms-python.black-formatter",
-		"ms-vscode.cpptools",
-		"amiralizadeh9480.cpp-helper",
-		"marus25.cortex-debug",
-		"zxh404.vscode-proto3",
-		"augustocdias.tasks-shell-input",
-		"rioj7.command-variable"
-	],
-	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
-	"unwantedRecommendations": [
-		"llvm-vs-code-extensions.vscode-clangd",
-		"twxs.cmake",
-		"ms-vscode.cmake-tools"
-	]
-}

.vscode/example/launch.json

@@ -11,10 +11,10 @@
             "args": {
                 "useSingleResult": true,
                 "env": {
-                    "PATH": "${workspaceFolder}${command:extension.commandvariable.envListSep}${env:PATH}"
+                    "PATH": "${workspaceFolder};${env:PATH}"
                 },
-                "command": "fbt -s get_blackmagic",
-                "description": "Get Blackmagic device"
+                "command": "./fbt get_blackmagic",
+                "description": "Get Blackmagic device",
             }
         }
     ],
@@ -27,21 +27,20 @@
             "type": "cortex-debug",
             "servertype": "openocd",
             "device": "stlink",
-            "svdFile": "./scripts/debug/STM32WB55_CM4.svd",
+            "svdFile": "./debug/STM32WB55_CM4.svd",
             // If you're debugging early in the boot process, before OS scheduler is running,
             // you have to comment out the following line.
             "rtos": "FreeRTOS",
             "configFiles": [
                 "interface/stlink.cfg",
-                "./scripts/debug/stm32wbx.cfg",
+                "./debug/stm32wbx.cfg",
             ],
             "postAttachCommands": [
-                "source scripts/debug/flipperversion.py",
-                "fw-version",
                 // "compare-sections",
-                "source scripts/debug/flipperapps.py",
+                "source debug/flipperapps.py",
                 "fap-set-debug-elf-root build/latest/.extapps",
-                // "source scripts/debug/FreeRTOS/FreeRTOS.py",
+                // "source debug/FreeRTOS/FreeRTOS.py",
+                // "svd_load debug/STM32WB55_CM4.svd"
             ]
             // "showDevDebugOutput": "raw",
         },
@@ -53,16 +52,14 @@
             "type": "cortex-debug",
             "servertype": "external",
             "gdbTarget": "${input:BLACKMAGIC}",
-            "svdFile": "./scripts/debug/STM32WB55_CM4.svd",
+            "svdFile": "./debug/STM32WB55_CM4.svd",
             "rtos": "FreeRTOS",
             "postAttachCommands": [
                 "monitor swdp_scan",
                 "attach 1",
                 "set confirm off",
                 "set mem inaccessible-by-default off",
-                "source scripts/debug/flipperversion.py",
-                "fw-version",
-                "source scripts/debug/flipperapps.py",
+                "source debug/flipperapps.py",
                 "fap-set-debug-elf-root build/latest/.extapps",
                 // "compare-sections",
             ]
@@ -77,12 +74,10 @@
             "servertype": "jlink",
             "interface": "swd",
             "device": "STM32WB55RG",
-            "svdFile": "./scripts/debug/STM32WB55_CM4.svd",
+            "svdFile": "./debug/STM32WB55_CM4.svd",
             "rtos": "FreeRTOS",
             "postAttachCommands": [
-                "source scripts/debug/flipperversion.py",
-                "fw-version",
-                "source scripts/debug/flipperapps.py",
+                "source debug/flipperapps.py",
                 "fap-set-debug-elf-root build/latest/.extapps",
             ]
             // "showDevDebugOutput": "raw",
@@ -95,20 +90,27 @@
             "type": "cortex-debug",
             "servertype": "openocd",
             "device": "cmsis-dap",
-            "svdFile": "./scripts/debug/STM32WB55_CM4.svd",
+            "svdFile": "./debug/STM32WB55_CM4.svd",
             "rtos": "FreeRTOS",
             "configFiles": [
                 "interface/cmsis-dap.cfg",
-                "./scripts/debug/stm32wbx.cfg",
+                "./debug/stm32wbx.cfg",
             ],
             "postAttachCommands": [
-                "source scripts/debug/flipperversion.py",
-                "fw-version",
-                "source scripts/debug/flipperapps.py",
+                "source debug/flipperapps.py",
                 "fap-set-debug-elf-root build/latest/.extapps",
             ],
             // "showDevDebugOutput": "raw",
         },
+        {
+            "name": "fbt debug",
+            "type": "python",
+            "request": "launch",
+            "program": "./lib/scons/scripts/scons.py",
+            "args": [
+                "plugin_dist"
+            ]
+        },
         {
             "name": "python debug",
             "type": "python",

.vscode/example/settings.json

@@ -21,10 +21,5 @@
         "SConscript": "python",
         "SConstruct": "python",
         "*.fam": "python",
-    },
-    "clangd.arguments": [
-        // We might be able to tighten this a bit more to only include the correct toolchain.
-        "--query-driver=**",
-        "--compile-commands-dir=${workspaceFolder}/build/latest"
-    ]
-}
+    }
+}

.vscode/example/tasks.json

@@ -4,41 +4,41 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "[Release] Build Firmware",
+            "label": "[Release] Build",
             "group": "build",
             "type": "shell",
             "command": "./fbt COMPACT=1 DEBUG=0"
         },
         {
-            "label": "[Debug] Build Firmware",
+            "label": "[Debug] Build",
             "group": "build",
             "type": "shell",
             "command": "./fbt"
         },
         {
-            "label": "[FBT] Format",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt format"
-        },
-        {
-            "label": "[FBT] Clear",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt -c"
-        },
-        {
-            "label": "[Release] Flash (SWD)",
+            "label": "[Release] Flash (ST-Link)",
             "group": "build",
             "type": "shell",
             "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash"
         },
         {
-            "label": "[Debug] Flash (SWD)",
+            "label": "[Debug] Flash (ST-Link)",
             "group": "build",
             "type": "shell",
             "command": "./fbt FORCE=1 flash"
         },
+        {
+            "label": "[Release] Flash (blackmagic)",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_blackmagic"
+        },
+        {
+            "label": "[Debug] Flash (blackmagic)",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt FORCE=1 flash_blackmagic"
+        },
         {
             "label": "[Release] Flash (JLink)",
             "group": "build",
@@ -105,12 +105,6 @@
             "type": "shell",
             "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb_full"
         },
-        {
-            "label": "[Debug] Create PVS-Studio report",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt firmware_pvs"
-        },
         {
             "label": "[Debug] Build FAPs",
             "group": "build",
@@ -123,29 +117,17 @@
             "type": "shell",
             "command": "./fbt COMPACT=1 DEBUG=0 fap_dist"
         },
-        {
-            "label": "[Debug] Build App",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt build APPSRC=${relativeFileDirname}"
-        },
-        {
-            "label": "[Release] Build App",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt COMPACT=1 DEBUG=0 build APPSRC=${relativeFileDirname}"
-        },
         {
             "label": "[Debug] Launch App on Flipper",
             "group": "build",
             "type": "shell",
-            "command": "./fbt launch APPSRC=${relativeFileDirname}"
+            "command": "./fbt launch_app APPSRC=${relativeFileDirname}"
         },
         {
             "label": "[Release] Launch App on Flipper",
             "group": "build",
             "type": "shell",
-            "command": "./fbt COMPACT=1 DEBUG=0 launch APPSRC=${relativeFileDirname}"
+            "command": "./fbt COMPACT=1 DEBUG=0 launch_app APPSRC=${relativeFileDirname}"
         },
         {
             "label": "[Debug] Launch App on Flipper with Serial Console",
@@ -156,18 +138,6 @@
                 "Serial Console"
             ]
         },
-        {
-            "label": "[Debug] Build and upload all FAPs to Flipper over USB",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt fap_deploy"
-        },
-        {
-            "label": "[Release] Build and upload all FAPs to Flipper over USB",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt COMPACT=1 DEBUG=0 fap_deploy"
-        },
         {
             // Press Ctrl+] to quit
             "label": "Serial Console",
@@ -175,7 +145,7 @@
             "command": "./fbt cli",
             "group": "none",
             "isBackground": true,
-            "options": {
+			"options": {
                 "env": {
                     "FBT_NO_SYNC": "0"
                 }
@@ -192,4 +162,4 @@
             }
         }
     ]
-}
+}

.vscode/extensions.json

@@ -0,0 +1,15 @@
+{
+	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+	// List of extensions which should be recommended for users of this workspace.
+	"recommendations": [
+		"ms-python.black-formatter",
+		"ms-vscode.cpptools",
+		"amiralizadeh9480.cpp-helper",
+		"marus25.cortex-debug",
+		"zxh404.vscode-proto3",
+		"augustocdias.tasks-shell-input"
+	],
+	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
+	"unwantedRecommendations": []
+}

CHANGELOG.md

@@ -1,62 +1,55 @@
-## New changes
-* SubGHz: Add 4 more systems to Add Manually (untested!)
-* SubGHz: Add Manually fixes
-* SubGHz: Added NiceFlor-S to ignore options, removed colons. (by @G2Dolphin | PR #620)
-* Misc code cleanup
-* RGB: Fix white color on reboot, move settings, add custom color option
-* **BLE Spam app** updated to latest version (Android, Windows support) (by @Willy-JL) -> (app can be found in builds ` `, `e`, `n`, `r`)
-* OFW: Fix double arrows and add proper indication
-* OFW: SubGHz: add manually fix 12-bits is 0xFFF (or 0xFF0) CAME/NICE 12-bit
-* OFW: Fix various crashes if debug libraries used 
+### New changes
+* **Fixed sound issues with WAV Player, Metronome, Morse code, DTMF Dolphin**
+* API: Version was changed due to breaking changes - from 10.x to 11.x - Extra pack was updated, download it by using link below ([- Download latest extra apps pack](https://download-directory.github.io/?url=https://github.com/xMasterX/unleashed-extra-pack/tree/main/apps))
+* Plugins: Add (UniTemp) Temp sensor reader (PR #216 | by @quen0n) [(plugin repo)](https://github.com/quen0n/unitemp-flipperzero) and Remove DHT Monitor and AM2320 plugins (unitemp has support for that sensors)
+* Plugins -> SubGHz Bruteforcer: Add support for PT2260, SMC5326, UNILARM, Honeywell(file only) protocols
+* Plugins: Add mouse jiggler to USB Keyboard&Mouse App
+* Clock: Use system locale settings
+* Infrared: Update universal remote assets (by @Amec0e) + (PR #215 | by @airs0urce)
+* SubGHz: Removing duplicate code in subghz FAAC scenes. (PR #208 | by @gid9798)
+* Plugins -> Weather Station: Fix display of temps lower than -9
+* Misc fixes
+* OFW: Notification: fix recursive speaker acquire
+* OFW: Locale settings
+* OFW: Audio support for SubGhz **(Breaking API change)**
+* OFW: Dolphin: add new animation (Happy holidays)
+* OFW: SubGhz: add SMC5326, UNILARM protocol
+* OFW: Added support for IDTECK cards
+* OFW: WS: fix protocol and add new (Oregon_v1, TX8300)
+* OFW: VSCode: add task 'Serial console' and group task with sequence calling
+* OFW: Dictionary stuff: iClass keys
 
-----
+#### [🎲 Download latest extra apps pack](https://download-directory.github.io/?url=https://github.com/xMasterX/unleashed-extra-pack/tree/main/apps)
 
 [-> How to install firmware](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)
 
 [-> Download qFlipper (official link)](https://flipperzero.one/update)
 
 ## Please support development of the project
-|Service|Remark|Link/Wallet|
-|-|-|-|
-|**Patreon**||https://patreon.com/mmxdev|
-|**Boosty**|patreon alternative|https://boosty.to/mmxdev|
-|cloudtips|only RU payments accepted|https://pay.cloudtips.ru/p/7b3e9d65|
-|YooMoney|only RU payments accepted|https://yoomoney.ru/fundraise/XA49mgQLPA0.221209|
-|USDT|(TRC20)|`TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`|
-|BCH||`qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`|
-|ETH|(BSC/ERC20-Tokens)|`darkflippers.eth` (or `0xFebF1bBc8229418FF2408C07AF6Afa49152fEc6a`)|
-|BTC||`bc1q0np836jk9jwr4dd7p6qv66d04vamtqkxrecck9`|
-|DOGE||`D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`|
-|LTC||`ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`|
-|XMR|(Monero)| `41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`|
-|TON||`EQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmpGf`|
+* Boosty: https://boosty.to/mmxdev
+* Ko-Fi: https://ko-fi.com/masterx
+* destream (100 EUR min): https://destream.net/live/MMX/donate
+* cloudtips (only RU payments accepted): https://pay.cloudtips.ru/p/7b3e9d65
+* YooMoney (only RU payments accepted): https://yoomoney.ru/fundraise/XA49mgQLPA0.221209
+* USDT(TRC20): `TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`
+* BCH: `qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`
+* ETH/BSC/ERC20-Tokens: `darkflippers.eth` (or `0xFebF1bBc8229418FF2408C07AF6Afa49152fEc6a`)
+* BTC: `bc1q0np836jk9jwr4dd7p6qv66d04vamtqkxrecck9`
+* DOGE: `D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`
+* LTC: `ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`
+* XMR (Monero): `41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`
+* TON: `EQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmpGf`
 
-#### Thanks to our sponsors:
+### Thanks to our sponsors:
 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!
 
+**Note: To avoid issues with .dfu, prefer installing using .tgz with qFlipper, web updater or by self update package, all needed assets will be installed**
 
-## **Recommended update option - Web Updater**
+**Recommended option - Web Updater**
 
-### What `n`, `r`, `e`, ` `, `c` means? What I need to download if I don't want to use Web updater?
-What build I should download and what this name means - `flipper-z-f7-update-(version)(n / r / e / c).tgz` ? <br>
-`flipper-z` = for Flipper Zero device<br>
-`f7` = Hardware version - same for all flipper zero devices<br>
-`update` = Update package, contains updater, all assets (plugins, IR libs, etc.), and firmware itself<br>
-`(version)` = Firmware version<br>
-| Designation | 3 Custom Animation | [Base Apps](https://github.com/xMasterX/all-the-plugins#default-pack) | [Extra Apps](https://github.com/xMasterX/all-the-plugins#extra-pack) | ⚠️RGB mode* |
-|-----|:---:|:---:|:---:|:---:|
-| ` ` | ✅ | ✅ |  |  |
-| `c` | ✅ |  |  |  |
-| `n` |  | ✅ |  |  |
-| `e` | ✅ | ✅ | ✅ |  |
-| `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!
-
-Firmware Self-update package (update from microSD) - `flipper-z-f7-update-(version).tgz` for mobile app / qFlipper / web<br>
-Archive of `scripts` folder (contains scripts for FW/plugins development) - `flipper-z-any-scripts-(version).tgz`<br>
-SDK files for plugins development and uFBT - `flipper-z-f7-sdk-(version).zip`
+What means `n` in - `flipper-z-f7-update-(version)n.tgz` ? - that means this build comes without our custom animations, only official flipper animations
 
+Self-update package (update from microSD) - `flipper-z-f7-update-(version).zip` or download `.tgz` for mobile app / qFlipper
 
 

CODING_STYLE.md

@@ -3,15 +3,15 @@
 Nice to see you reading this document, we really appreciate it.
 
 As all documents of this kind it's unable to cover everything.
-But it will cover general rules that we are enforcing on PR review.
+But it will cover general rules that we enforcing on PR review.
 
-Also, we already have automatic rules checking and formatting,
-but it got its limitations and this guide is still mandatory.
+Also we already have automatic rules checking and formatting,
+but it got it's limitations and this guide is still mandatory.
 
-Some part of this project do have its own naming and coding guides.
+Some part of this project do have it's own naming and coding guides.
 For example: assets. Take a look into `ReadMe.md` in assets folder for more details.
 
-Also, 3rd party libraries are none of our concern.
+Also 3rd party libraries are none of our concern.
 
 And yes, this set is not final and we are open to discussion.
 If you want to add/remove/change something here please feel free to open new ticket.
@@ -30,7 +30,7 @@ Our guide is inspired by, but not claiming to be compatible with:
 
 Code we write is intended to be public.
 Avoid one-liners from hell and keep code complexity under control.
-Try to make code self-explanatory and add comments if needed.
+Try to make code self explanatory and add comments if needed.
 Leave references to standards that you are implementing.
 Use project wiki to document new/reverse engineered standards.
 
@@ -48,11 +48,11 @@ Almost everything in flipper firmware is built around this concept.
 # C coding style
 
 - Tab is 4 spaces
-- Use `./fbt format` to reformat source code and check style guide before commit
+- Use `fbt format` to reformat source code and check style guide before commit
 
 ## Naming
 
-### Type names are PascalCase
+### Type names are CamelCase
 
 Examples:
 
@@ -89,7 +89,7 @@ Enforced by linter.
 Suffixes:
 
 - `alloc` - allocate and init instance. C style constructor. Returns pointer to instance.
-- `free` - de-init and release instance. C style destructor. Takes pointer to instance.
+- `free` - deinit and release instance. C style destructor. Takes pointer to instance.
 
 # C++ coding style
 

Makefile

@@ -0,0 +1,21 @@
+$(info +-------------------------------------------------+)
+$(info |                                                 |)
+$(info |      Hello, this is Flipper team speaking!      |)
+$(info |                                                 |)
+$(info |       We've migrated to new build system        |)
+$(info |          It's nice and based on scons           |)
+$(info |                                                 |)
+$(info |      Crash course:                              |)
+$(info |                                                 |)
+$(info |        `./fbt`                                  |)
+$(info |        `./fbt flash`                            |)
+$(info |        `./fbt debug`                            |)
+$(info |                                                 |)
+$(info |      More details in documentation/fbt.md       |)
+$(info |                                                 |)
+$(info |      Also Please leave your feedback here:      |)
+$(info |           https://flipp.dev/4RDu                |)
+$(info |                      or                         |)
+$(info |           https://flipp.dev/2XM8                |)
+$(info |                                                 |)
+$(info +-------------------------------------------------+)

ReadMe.md

@@ -3,108 +3,59 @@
 <img src="https://user-images.githubusercontent.com/10697207/186202043-26947e28-b1cc-459a-8f20-ffcc7fc0c71c.png" align="center" alt="fzCUSTOM" border="0">
 </a>
 </h3>
-<div align="center" id="badges">
-	<a href="https://discord.unleashedflip.com">
-		<img src="https://img.shields.io/discord/937479784148115456?style=flat-square&logo=discord&label=Discord&color=%237289DA&link=https%3A%2F%2Fdiscord.unleashedflip.com%2F" alt="Discord server"/>
-	</a>
-	<a href="https://t.me/flipperzero_unofficial">
-		<img src="https://img.shields.io/endpoint?label=EN%20Channel&style=flat-square&url=https%3A%2F%2Fmogyo.ro%2Fquart-apis%2Ftgmembercount%3Fchat_id%3Dflipperzero_unofficial" alt="EN TG channel"/>
-	</a>
-	<a href="https://t.me/flipperzero_unofficial_ru">
-		<img src="https://img.shields.io/endpoint?label=RU%20Channel&style=flat-square&url=https%3A%2F%2Fmogyo.ro%2Fquart-apis%2Ftgmembercount%3Fchat_id%3Dflipperzero_unofficial_ru" alt="RU TG channel"/>	
-	</a>
-	<a href="https://t.me/flipperzero_unofficial_ua">
-		<img src="https://img.shields.io/endpoint?label=UA%20Channel&style=flat-square&url=https%3A%2F%2Fmogyo.ro%2Fquart-apis%2Ftgmembercount%3Fchat_id%3Dflipperzero_unofficial_ua" alt="UA TG channel"/>
-	</a>
-</div>
 
-### Welcome to the Flipper Zero Unleashed Firmware repo! 
+### Welcome to Flipper Zero Unleashed Firmware repo! 
 
-#### **This firmware is a fork from** [flipperdevices/flipperzero-firmware](https://github.com/flipperdevices/flipperzero-firmware)
+**This firmware is a fork from** [flipperdevices/flipperzero-firmware](https://github.com/flipperdevices/flipperzero-firmware)
 
 <br>
 
-### Most stable custom firmware focused on new features and improvements of original firmware components, with almost no UI changes
+Our goal is to make any features possible in this device without any limitations! 
+
+Please help us implement emulation for all subghz dynamic (rolling code) protocols!
 
 <br>
 
-##### This software is for experimental purposes only and is not meant for any illegal activity/purposes. <br> We do not condone illegal activity and strongly encourage keeping transmissions to legal/valid uses allowed by law. <br> Also, this software is made without any support from Flipper Devices and is in no way related to the official devs. 
-
+### This software is for experimental purposes only and is not meant for any illegal activity/purposes. <br> We do not condone illegal activity and strongly encourage keeping transmissions to legal/valid uses allowed by law. <br> Also this software is made without any support from Flipper Devices and in no way related to official devs. 
 
 <br>
+Our Discord Community:
+<br>
+<a href="https://discord.unleashedflip.com"><img src="https://discordapp.com/api/guilds/937479784148115456/widget.png?style=banner4" alt="Unofficial Discord Community" target="_blank"></a>
 
-## 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)
+<br>
+<br>
+<br>
 
-## Dev builds (unstable)
+## Dev builds
 - https://dev.unleashedflip.com/
 - https://t.me/kotnehleb
 ## Releases in Telegram
 - https://t.me/unleashed_fw
 
 # What's changed
-- **Sub-GHz** *lib & hal*
-	- Regional TX restrictions removed
-	- Extra Sub-GHz frequencies
-	- Frequency range can be extended in settings file (Warning: It can damage Flipper's hardware)
-	- Many rolling code [protocols](https://github.com/DarkFlippers/unleashed-firmware#current-modified-and-new-sub-ghz-protocols-list) now have the ability to save & send captured signals
-	- FAAC SLH (Spa) & BFT Mitto (keeloq secure with seed) manual creation
-	- External CC1101 module support [(by quen0n)](https://github.com/DarkFlippers/unleashed-firmware/pull/307)
-- **Sub-GHz** *Main App*
-	- Save last used frequency [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
-	- 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`
-	- 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)
-	- Debug mode counter increase settings (+1 -> +5, +10, default: +1)
-	- Debug PIN output settings for protocol development
-	
-- **Sub-GHz apps** *by unleashed team*
-	- Sub-GHz Bruteforce - static code brute-force plugin | 
-		- Time delay (between signals) setting (hold Up in main screen(says Up to Save)) + configure repeats in protocols list by pressing right button on selected protocol
-        - Load your own file and select bytes you want to bruteforce or use preconfigured options in protocols list
-	- Sub-GHz Remote - remote control for 5 sub-ghz files | bind one file for each button
-		- use the built-in constructor or make config file by following this [instruction](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemotePlugin.md)
-- **Infrared**
-	- Recompiled IR TV Universal Remote for ALL buttons
-	- Universal remotes for Projectors, Fans, A/Cs and Audio(soundbars, etc.) -> Also always updated and verified by our team
-	- Infrared -> `RCA` Protocol
-	- Infrared -> Debug TX PIN output settings
-- **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
-- **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`
-	- 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)
-	- **BadBT** plugin (BT version of BadKB) [(by Willy-JL, ClaraCrazy, XFW contributors)](https://github.com/ClaraCrazy/Flipper-Xtreme/tree/dev/applications/main/bad_kb) - (See in Applications->Tools) - (aka BadUSB via Bluetooth)
-	- BadUSB -> Keyboard layouts [(by rien > dummy-decoy)](https://github.com/dummy-decoy/flipperzero-firmware/tree/dummy_decoy/bad_usb_keyboard_layout)
-	- Custom community plugins and games added + all known working apps can be downloaded in extra pack in every release
-	- Other small fixes and changes throughout
-	- See other changes in readme below
+* SubGHz regional TX restrictions removed
+* SubGHz frequency range can be extended in settings file (Warning: It can damage flipper's hardware)
+* Many rolling code protocols now have the ability to save & send captured signals
+* FAAC SLH (Spa) & BFT Mitto (secure with seed) manual creation
+* Sub-GHz static code brute-force plugin
+* LFRFID Fuzzer plugin
+* Custom community plugins and games added
+* Extra SubGHz frequencies + extra Mifare Classic keys
+* Picopass/iClass plugin included in releases
+* Recompiled IR TV Universal Remote for ALL buttons
+* Universal remote for Projectors, Fans, A/Cs and Audio(soundbars, etc.)
+* BadUSB keyboard layouts
+* Customizable Flipper name
+* SubGHz -> Press OK in frequency analyzer to use detected frequency in Read modes
+* SubGHz -> Long press OK button in SubGHz Frequency analyzer to switch to Read menu 
+* Other small fixes and changes throughout
+* See other changes in changelog and in readme below
 
-Also check the [changelog in releases](https://github.com/DarkFlippers/unleashed-firmware/releases) for latest updates!
+Also check changelog in releases for latest updates!
 
-### 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)
-
-Encoders or sending made by @xMasterX:
-- Nero Radio 57bit (+ 56bit encoder improvements)
-- CAME 12bit/24bit encoder fixes (Fixes now merged in OFW)
+### Current modified and new SubGHz protocols list:
+- Keeloq [Not ALL systems supported for decode or emulation yet!] - [Supported manufacturers list](https://0bin.net/paste/VwR2lNJY#WH9vnPgvcp7w6zVKucFCuNREKAcOij8KsJ6vqLfMn3b)
 - Keeloq: HCS101
 - Keeloq: AN-Motors
 - Keeloq: JCM Tech
@@ -114,155 +65,166 @@ Encoders or sending made by @xMasterX:
 - 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 !)
-
-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)
-- Nice Flor S -> How to create new remote - [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
-- FAAC SLH (Spa) -> Update!!! Check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
-- Keeloq: BFT Mitto -> Update! Check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
+- CAME Atomo
+- Nice Flor S
+- FAAC SLH (Spa) [External seed calculation required (For info contact me in Discord: Nano#8998)] 
+- BFT Mitto [External seed calculation required (For info contact me in Discord: Nano#8998)] 
+- Security+ v1 & v2
 - Star Line
-- Security+ v1 & v2 (encoders was made in OFW)
-
-Encoders made by @assasinfil & @xMasterX:
-- Somfy Telis -> How to create new remote - [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
-- Somfy Keytis
-- KingGates Stylo 4k
-- Alutech AT-4N -> How to create new remote - [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
-- Nice ON2E (Nice One) -> How to create new remote - [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
 
 ## Please support development of the project
-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.
-- @gid9798 - SubGHz, Plugins, many other things
-- @assasinfil - SubGHz protocols
-- @Svaarich - UI design and animations
-- @amec0e & @Leptopt1los - 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.
+* Boosty: https://boosty.to/mmxdev
+* Ko-Fi: https://ko-fi.com/masterx
+* destream (100 EUR min): https://destream.net/live/MMX/donate
+* cloudtips (only RU payments accepted): https://pay.cloudtips.ru/p/7b3e9d65
+* YooMoney (only RU payments accepted): https://yoomoney.ru/fundraise/XA49mgQLPA0.221209
+* USDT(TRC20): `TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`
+* BCH: `qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`
+* ETH/BSC/ERC20-Tokens: `darkflippers.eth` (or `0xFebF1bBc8229418FF2408C07AF6Afa49152fEc6a`)
+* BTC: `bc1q0np836jk9jwr4dd7p6qv66d04vamtqkxrecck9`
+* DOGE: `D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`
+* LTC: `ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`
+* XMR (Monero): `41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`
+* TON: `EQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmpGf`
 
-The amount of work done on this project is huge and we need your support, no matter how large or small. Even if you just say, "Thank you Unleashed firmware developers!" somewhere. Doing so will help us continue our work and will help drive us to make the firmware better every time.
-Also, regarding our releases, every build has and always will be free and open-source. There will be no paywall releases or closed-source apps within the firmware. As long as I am working on this project it will never happen.
-You can support us by using links or addresses below:
-|Service|Remark|Link/Wallet|
-|-|-|-|
-|**Patreon**||https://patreon.com/mmxdev|
-|**Boosty**|patreon alternative|https://boosty.to/mmxdev|
-|cloudtips|only RU payments accepted|https://pay.cloudtips.ru/p/7b3e9d65|
-|YooMoney|only RU payments accepted|https://yoomoney.ru/fundraise/XA49mgQLPA0.221209|
-|USDT|(TRC20)|`TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`|
-|BCH||`qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`|
-|ETH|(BSC/ERC20-Tokens)|`darkflippers.eth` (or `0xFebF1bBc8229418FF2408C07AF6Afa49152fEc6a`)|
-|BTC||`bc1q0np836jk9jwr4dd7p6qv66d04vamtqkxrecck9`|
-|DOGE||`D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`|
-|LTC||`ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`|
-|XMR|(Monero)| `41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`|
-|TON||`EQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmpGf`|
+### Community apps included:
 
-## Community apps included
+- RFID Fuzzer plugin [(by Ganapati & @xMasterX)](https://github.com/DarkFlippers/unleashed-firmware/pull/54) & New protocols by @mvanzanten
+- Sub-GHz bruteforce plugin [(by @derskythe & xMasterX)](https://github.com/derskythe/flipperzero-subbrute) [(original by Ganapati & xMasterX)](https://github.com/DarkFlippers/unleashed-firmware/pull/57)
+- Sub-GHz playlist plugin [(by darmiel)](https://github.com/DarkFlippers/unleashed-firmware/pull/62)
+- ESP8266 Deauther plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module)
+- WiFi Scanner plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-WiFi-Scanner_Module)
+- MultiConverter plugin [(by theisolinearchip)](https://github.com/theisolinearchip/flipperzero_stuff)
+- USB Keyboard plugin [(by huuck)](https://github.com/huuck/FlipperZeroUSBKeyboard)
+- WAV player plugin (fixed) [(OFW: DrZlo13)](https://github.com/flipperdevices/flipperzero-firmware/tree/zlo/wav-player)
+- Barcode generator plugin [(original by McAzzaMan)](https://github.com/McAzzaMan/flipperzero-firmware/tree/UPC-A_Barcode_Generator/applications/barcode_generator) - [EAN-8 and refactoring](https://github.com/DarkFlippers/unleashed-firmware/pull/154) by @msvsergey
+- GPIO: Sentry Safe plugin [(by H4ckd4ddy)](https://github.com/H4ckd4ddy/flipperzero-sentry-safe-plugin)
+- ESP32: WiFi Marauder companion plugin [(by 0xchocolate)](https://github.com/0xchocolate/flipperzero-firmware-with-wifi-marauder-companion)
+- NRF24: Sniffer & MouseJacker (with changes) [(by mothball187)](https://github.com/mothball187/flipperzero-nrf24/tree/main/mousejacker)
+- Simple Clock (timer by GMMan / settings by kowalski7cc) [(original by CompaqDisc)](https://gist.github.com/CompaqDisc/4e329c501bd03c1e801849b81f48ea61)
+- UniversalRF Remix / Sub-GHz Remote [(by @darmiel & @xMasterX)](https://github.com/darmiel/flipper-playlist/tree/feat/unirf-protocols) (original by @ESurge)
+- Spectrum Analyzer (with changes) [(by jolcese)](https://github.com/jolcese/flipperzero-firmware/tree/spectrum/applications/spectrum_analyzer) - [Ultra Narrow mode & scan channels non-consecutively](https://github.com/theY4Kman/flipperzero-firmware/commits?author=theY4Kman)
+- Metronome [(by panki27)](https://github.com/panki27/Metronome)
+- DTMF Dolphin [(by litui)](https://github.com/litui/dtmf_dolphin)
+- **TOTP (Authenticator)** [(by akopachov)](https://github.com/akopachov/flipper-zero_authenticator)
+- GPS [(by ezod)](https://github.com/ezod/flipperzero-gps) works with module `NMEA 0183` via UART (13TX, 14RX, GND pins on Flipper)
+- i2c Tools [(by NaejEL)](https://github.com/NaejEL/flipperzero-i2ctools) - C0 -> SCL / C1 -> SDA / GND -> GND | 3v3 logic levels only!
+- Temperature Sensor Plugin - HTU2xD, SHT2x, SI702x, SI700x, SI701x, AM2320 [(by Mywk)](https://github.com/Mywk/FlipperTemperatureSensor) - [How to Connect](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/applications/plugins/htu21d_temp_sensor/Readme.md)
+- HC-SR04 Distance sensor - Ported and modified by @xMasterX [(original by Sanqui)](https://github.com/Sanqui/flipperzero-firmware/tree/hc_sr04) - How to connect -> (5V -> VCC) / (GND -> GND) / (13|TX -> Trig) / (14|RX -> Echo)
+- Morse Code [(by wh00hw)](https://github.com/wh00hw/MorseCodeFAP)
+- (UniTemp) Temp sensor reader [(by quen0n)](https://github.com/quen0n/unitemp-flipperzero)
+- BH1750 - Lightmeter [(by oleksiikutuzov)](https://github.com/oleksiikutuzov/flipperzero-lightmeter)
+- iButton Fuzzer [(by xMasterX)](https://github.com/xMasterX/ibutton-fuzzer)
+- HEX Viewer [(by QtRoS)](https://github.com/QtRoS/flipper-zero-hex-viewer)
+- POCSAG Pager [(by xMasterX & Shmuma)](https://github.com/xMasterX/flipper-pager)
 
-### [🎲 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)
+Games:
+- DOOM (fixed) [(by p4nic4ttack)](https://github.com/p4nic4ttack/doom-flipper-zero/)
+- Zombiez [(Reworked By DevMilanIan)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/240) [(Original By Dooskington)](https://github.com/Dooskington/flipperzero-zombiez)
+- Flappy Bird [(by DroomOne)](https://github.com/DroomOne/flipperzero-firmware/tree/dev/applications/flappy_bird)
+- Arkanoid (refactored by xMasterX) [(by gotnull)](https://github.com/gotnull/flipperzero-firmware-wPlugins)
+- Tic Tac Toe (refactored by xMasterX) [(by gotnull)](https://github.com/gotnull/flipperzero-firmware-wPlugins)
+- Tetris (with fixes) [(by jeffplang)](https://github.com/jeffplang/flipperzero-firmware/tree/tetris_game/applications/tetris_game)
+- Minesweeper [(by panki27)](https://github.com/panki27/minesweeper)
+- Heap Defence (aka Stack Attack) - Ported to latest firmware by @xMasterX - [(original by wquinoa & Vedmein)](https://github.com/Vedmein/flipperzero-firmware/tree/hd/svisto-perdelki)
+- Game15 [(by x27)](https://github.com/x27/flipperzero-game15)
+- Solitaire [(by teeebor)](https://github.com/teeebor/flipper_games)
+- BlackJack [(by teeebor)](https://github.com/teeebor/flipper_games)
 
-See full list and sources here: [xMasterX/all-the-plugins](https://github.com/xMasterX/all-the-plugins/tree/dev)
+### Other changes
 
-### Official Flipper Zero Apps Catalog [web version](https://lab.flipper.net/apps) or mobile app
+- BadUSB -> Keyboard layouts [(by rien > dummy-decoy)](https://github.com/dummy-decoy/flipperzero-firmware/tree/dummy_decoy/bad_usb_keyboard_layout)
+- SubGHz -> New frequency analyzer - [(by ClusterM)](https://github.com/DarkFlippers/unleashed-firmware/pull/43)
+- SubGHz -> Detect RAW feature - [(by perspecdev)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/152)
+- SubGHz -> Save last used frequency [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
+- SubGHz -> Press OK in frequency analyzer to use detected frequency in Read modes [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
+- SubGHz -> Long press OK button in SubGHz Frequency analyzer to switch to Read menu [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/79)
+- 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)
 
 # Instructions
-## First lock 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 install firmware](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)
 
-### - **[How to build](/documentation/HowToBuild.md#how-to-build-by-yourself) | [Project-structure](#project-structure)**
+## [- How to build firmware](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToBuild.md)
 
-### - **CLion IDE** - How to setup workspace for flipper firmware development [by Savely Krasovsky](https://krasovs.ky/2022/11/01/flipper-zero-clion.html)
+## [- BadUSB: how to add new keyboard layouts](https://github.com/dummy-decoy/flipperzero_badusb_kl)
 
-### - **"Hello world!"** - plugin tutorial [English<sub> by DroomOne</sub> ](https://github.com/DroomOne/Flipper-Plugin-Tutorial) | [Russian<sub> by Pavel Yakovlev</sub>](https://yakovlev.me/hello-flipper-zero/)
+## [- How to change Flipper name](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/CustomFlipperName.md)
 
-### - [How to write your own app](https://flipper.atmanos.com/docs/overview/intro). Docs by atmanos **⚠️outdated API**
+### **Plugins**
 
-## Firmware & main Apps feature
+## [- 🎲 Download Extra plugins for Unleashed](https://github.com/xMasterX/unleashed-extra-pack)
 
-### - System: [How to change Flipper name](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/CustomFlipperName.md)
+## [- Configure Sub-GHz Remote App](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemotePlugin.md)
 
-### - BadUSB: [How to add new keyboard layouts](https://github.com/dummy-decoy/flipperzero_badusb_kl)
+## [- TOTP (Authenticator) config description](https://github.com/akopachov/flipper-zero_authenticator/blob/master/docs/conf-file_description.md)
 
-### - Infrared: [How to make captures to add them into Universal IR remotes](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/InfraredCaptures.md)
+## [- Barcode Generator](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/BarcodeGenerator.md)
 
-## **Sub-GHz**
+## [- Multi Converter](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/MultiConverter.md)
 
-### - External Radio: [How to connect CC1101 module](https://github.com/quen0n/flipperzero-ext-cc1101)
+## [- WAV Player sample files & how to convert](https://github.com/UberGuidoZ/Flipper/tree/main/Wav_Player#readme)
 
-### - Transmission is blocked? [How to extend Sub-GHz frequency range](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/DangerousSettings.md)
+## [- SubGHz playlist generator script](https://github.com/darmiel/flipper-scripts/blob/main/playlist/playlist_creator_by_chunk.py)
 
-### - [How to add extra Sub-GHz frequencies](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzSettings.md)
+### **Plugins that works with external hardware**
 
-### - [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)
+## [- How to use: Temperature Sensor Plugin - HTU21D / SI7021](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/applications/plugins/htu21d_temp_sensor/Readme.md)
 
-### - [~~Configure Sub-GHz Remote App~~](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemotePlugin.md) Not recomeded, please use embedded configurator
+## [- How to use: DHT11/22 Temp. Sensor Monitor](https://github.com/quen0n/FipperZero-DHT-Monitor#readme)
 
-## **Plugins**
+## [- How to use: AM2320/AM2321 Temp. Sensor plugin](https://github.com/xMasterX/AM2320_Flipper_Plugin)
 
-### - TOTP (Authenticator): [config description](https://github.com/akopachov/flipper-zero_authenticator/blob/master/docs/conf-file_description.md)
+## [- How to use: [NMEA] GPS](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/applications/plugins/gps_nmea_uart/README.md)
 
-### - Mifare Nested plugin: [How to recover keys](https://github.com/AloneLiberty/FlipperNested#how-to-use-it)
+## [- How to use: i2c Tools](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/applications/plugins/flipper_i2ctools/README.md)
 
-### - Barcode Generator: [How to use](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/BarcodeGenerator.md)
+## [- How to use: [NRF24] plugins](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/NRF24.md)
 
-### - Multi Converter: [How to use](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/MultiConverter.md)
+## [- How to use: [WiFi] Scanner](https://github.com/SequoiaSan/FlipperZero-WiFi-Scanner_Module#readme)
 
-### - WAV Player: [sample files & how to convert](https://github.com/UberGuidoZ/Flipper/tree/main/Wav_Player#readme)
+## [- How to use: [ESP8266] Deauther](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module#readme)
 
-### - Sub-GHz playlist: [generator script](https://github.com/darmiel/flipper-scripts/blob/main/playlist/playlist_creator_by_chunk.py)
+## [- How to use: [ESP32] WiFi Marauder](https://github.com/UberGuidoZ/Flipper/tree/main/Wifi_DevBoard)
 
-## **Plugins that works with external hardware** [GPIO]
+## [- [WiFi] Scanner - Web Flasher for module firmware](https://sequoiasan.github.io/FlipperZero-WiFi-Scanner_Module/)
 
-### - Unitemp - Temperature sensors reader: [How to use & supported sensors](https://github.com/quen0n/unitemp-flipperzero#readme)
+## [- [ESP8266] Deauther - Web Flasher for module firmware](https://sequoiasan.github.io/FlipperZero-Wifi-ESP8266-Deauther-Module/)
 
-### - [NMEA] GPS: [How to use](https://github.com/xMasterX/all-the-plugins/blob/dev/base_pack/gps_nmea_uart/README.md)
+## [- Windows: How to Upload .bin to ESP32/ESP8266](https://github.com/SequoiaSan/Guide-How-To-Upload-bin-to-ESP8266-ESP32)
 
-### - i2c Tools [How to use](https://github.com/xMasterX/all-the-plugins/blob/dev/base_pack/flipper_i2ctools/README.md)
+## [- How to use: [GPIO] SentrySafe plugin](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SentrySafe.md)
 
-### - [NRF24] plugins: [How to use](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/NRF24.md)
+### **SubGHz**
 
+## [- Transmission is blocked? - How to extend SubGHz frequency range](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/DangerousSettings.md)
 
-### - [WiFi] Scanner: [How to use](https://github.com/SequoiaSan/FlipperZero-WiFi-Scanner_Module#readme) | [Web Flasher](https://sequoiasan.github.io/FlipperZero-WiFi-Scanner_Module/)
-
-### - [ESP8266] Deauther: [How to use](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module#readme) | [Web Flasher](https://sequoiasan.github.io/FlipperZero-Wifi-ESP8266-Deauther-Module/)
-
-### - [ESP32] WiFi Marauder: [How to use](https://github.com/UberGuidoZ/Flipper/tree/main/Wifi_DevBoard)<sub> docs by UberGuidoZ</sub> | [Marauder repo](https://github.com/justcallmekoko/ESP32Marauder)
-
-### - [ESP32-CAM] Camera Suite: [How to use](https://github.com/CodyTolene/Flipper-Zero-Camera-Suite)
-
-### - How to Upload `.bin` to ESP32/ESP8266: [Windows](https://github.com/SequoiaSan/Guide-How-To-Upload-bin-to-ESP8266-ESP32) | [FAP "ESP flasher"](https://github.com/0xchocolate/flipperzero-esp-flasher)
-
-### - [GPIO] SentrySafe plugin: [How to use](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SentrySafe.md)
+## [- How to add extra SubGHz frequencies](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzSettings.md)
 
 <br>
 <br>
 
-# Where I can find IR, Sub-GHz, ... files, DBs, and other stuff?
+# Where I can find IR, SubGhz, ... files, DBs, and other stuff?
 ## [UberGuidoZ Playground - Large collection of files - Github](https://github.com/UberGuidoZ/Flipper)
 ## [Awesome Flipper Zero - Github](https://github.com/djsime1/awesome-flipperzero)
+## [CAME-12bit, NICE-12bit, Linear-10bit, PT-2240 - SubGHz fixed code bruteforce](https://github.com/tobiabocchi/flipperzero-bruteforce)
+## [SMC5326, UNILARM - SubGHz fixed code bruteforce](https://github.com/Hong5489/flipperzero-gate-bruteforce)
 
 <br>
 <br>
 
 # Links
 
-* Official Docs: [docs.flipper.net](https://docs.flipper.net/)
+* Unofficial Discord: [discord.unleashedflip.com](https://discord.unleashedflip.com)
+* Docs by atmanos / How to write your own app (outdated API): [https://flipper.atmanos.com/docs/overview/intro](https://flipper.atmanos.com/docs/overview/intro)
+
+* Official Docs: [http://docs.flipperzero.one](http://docs.flipperzero.one)
 * Official Forum: [forum.flipperzero.one](https://forum.flipperzero.one/)
 
 # Project structure
 
 - `applications`    - Applications and services used in firmware
 - `assets`          - Assets used by applications and services
-- `furi`            - Furi Core: OS-level primitives and helpers
+- `furi`            - Furi Core: os level primitives and helpers
 - `debug`           - Debug tool: GDB-plugins, SVD-file and etc
 - `documentation`   - Documentation generation system configs and input files
 - `firmware`        - Firmware source code
@@ -270,4 +232,4 @@ See full list and sources here: [xMasterX/all-the-plugins](https://github.com/xM
 - `site_scons`      - Build helpers
 - `scripts`         - Supplementary scripts and python libraries home
 
-Also, pay attention to the `ReadMe.md` files inside those directories.
+Also pay attention to `ReadMe.md` files inside those directories.

SConstruct

@@ -45,7 +45,6 @@ distenv = coreenv.Clone(
     ],
     ENV=os.environ,
     UPDATE_BUNDLE_DIR="dist/${DIST_DIR}/f${TARGET_HW}-update-${DIST_SUFFIX}",
-    VSCODE_LANG_SERVER=ARGUMENTS.get("LANG_SERVER", "cpptools"),
 )
 
 firmware_env = distenv.AddFwProject(
@@ -67,22 +66,20 @@ if GetOption("fullenv") or any(
     # Target for self-update package
     dist_basic_arguments = [
         "--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}",
-        "--stackversion",
-        "${COPRO_CUBE_VERSION}",
+        '"${ROOT_DIR.abspath}/${COPRO_OB_DATA}"',
     ]
     dist_resource_arguments = [
         "-r",
-        firmware_env.subst("${RESOURCES_ROOT}"),
+        '"${ROOT_DIR.abspath}/assets/resources"',
     ]
     dist_splash_arguments = (
         [
@@ -95,7 +92,7 @@ if GetOption("fullenv") or any(
 
     selfupdate_dist = distenv.DistCommand(
         "updater_package",
-        (distenv["DIST_DEPENDS"], firmware_env["FW_RESOURCES_MANIFEST"]),
+        (distenv["DIST_DEPENDS"], firmware_env["FW_RESOURCES"]),
         DIST_EXTRA=[
             *dist_basic_arguments,
             *dist_radio_arguments,
@@ -128,8 +125,7 @@ if GetOption("fullenv") or any(
 
     # Installation over USB & CLI
     usb_update_package = distenv.AddUsbFlashTarget(
-        "#build/usbinstall.flag",
-        (firmware_env["FW_RESOURCES_MANIFEST"], selfupdate_dist),
+        "#build/usbinstall.flag", (firmware_env["FW_RESOURCES"], selfupdate_dist)
     )
     distenv.Alias("flash_usb_full", usb_update_package)
 
@@ -143,49 +139,31 @@ if GetOption("fullenv") or any(
 basic_dist = distenv.DistCommand("fw_dist", distenv["DIST_DEPENDS"])
 distenv.Default(basic_dist)
 
-dist_dir_name = distenv.GetProjectDirName()
-dist_dir = distenv.Dir(f"#/dist/{dist_dir_name}")
-external_apps_artifacts = firmware_env["FW_EXTAPPS"]
-external_app_list = external_apps_artifacts.application_map.values()
-
+dist_dir = distenv.GetProjetDirName()
 fap_dist = [
     distenv.Install(
-        dist_dir.Dir("debug_elf"),
-        list(app_artifact.debug for app_artifact in external_app_list),
+        distenv.Dir(f"#/dist/{dist_dir}/apps/debug_elf"),
+        list(
+            app_artifact.debug
+            for app_artifact in firmware_env["FW_EXTAPPS"].applications.values()
+        ),
     ),
-    *(
-        distenv.Install(
-            dist_dir.File(dist_entry[1]).dir,
-            app_artifact.compact,
-        )
-        for app_artifact in external_app_list
-        for dist_entry in app_artifact.dist_entries
+    distenv.Install(
+        f"#/dist/{dist_dir}/apps",
+        "#/assets/resources/apps",
     ),
 ]
 Depends(
     fap_dist,
-    list(app_artifact.validator for app_artifact in external_app_list),
+    list(
+        app_artifact.validator
+        for app_artifact in firmware_env["FW_EXTAPPS"].applications.values()
+    ),
 )
 Alias("fap_dist", fap_dist)
+# distenv.Default(fap_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=firmware_env.Dir(("${RESOURCES_ROOT}/apps")),
-)
-Depends(fap_deploy, firmware_env["FW_RESOURCES_MANIFEST"])
+distenv.Depends(firmware_env["FW_RESOURCES"], firmware_env["FW_EXTAPPS"].resources_dist)
 
 
 # Target for bundling core2 package for qFlipper
@@ -196,23 +174,21 @@ copro_dist = distenv.CoproBuilder(
 distenv.AlwaysBuild(copro_dist)
 distenv.Alias("copro_dist", copro_dist)
 
-
-firmware_flash = distenv.AddFwFlashTarget(firmware_env)
+firmware_flash = distenv.AddOpenOCDFlashTarget(firmware_env)
 distenv.Alias("flash", firmware_flash)
 
-# To be implemented in fwflash.py
 firmware_jflash = distenv.AddJFlashTarget(firmware_env)
 distenv.Alias("jflash", firmware_jflash)
 
-distenv.PhonyTarget(
-    "gdb_trace_all",
+firmware_bm_flash = distenv.PhonyTarget(
+    "flash_blackmagic",
     "$GDB $GDBOPTS $SOURCES $GDBFLASH",
     source=firmware_env["FW_ELF"],
-    GDBOPTS="${GDBOPTS_BASE}",
-    GDBREMOTE="${OPENOCD_GDB_PIPE}",
+    GDBOPTS="${GDBOPTS_BASE} ${GDBOPTS_BLACKMAGIC}",
+    GDBREMOTE="${BLACKMAGIC_ADDR}",
     GDBFLASH=[
         "-ex",
-        "thread apply all bt",
+        "load",
         "-ex",
         "quit",
     ],
@@ -239,31 +215,19 @@ distenv.PhonyTarget(
 )
 
 # Debug alien elf
-debug_other_opts = [
-    "-ex",
-    "source ${FBT_DEBUG_DIR}/PyCortexMDebug/PyCortexMDebug.py",
-    # "-ex",
-    # "source ${FBT_DEBUG_DIR}/FreeRTOS/FreeRTOS.py",
-    "-ex",
-    "source ${FBT_DEBUG_DIR}/flipperversion.py",
-    "-ex",
-    "fw-version",
-]
-
 distenv.PhonyTarget(
     "debug_other",
     "${GDBPYCOM}",
     GDBOPTS="${GDBOPTS_BASE}",
     GDBREMOTE="${OPENOCD_GDB_PIPE}",
-    GDBPYOPTS=debug_other_opts,
+    GDBPYOPTS='-ex "source ${FBT_DEBUG_DIR}/PyCortexMDebug/PyCortexMDebug.py" ',
 )
 
 distenv.PhonyTarget(
     "debug_other_blackmagic",
     "${GDBPYCOM}",
     GDBOPTS="${GDBOPTS_BASE}  ${GDBOPTS_BLACKMAGIC}",
-    GDBREMOTE="${BLACKMAGIC_ADDR}",
-    GDBPYOPTS=debug_other_opts,
+    GDBREMOTE="$${BLACKMAGIC_ADDR}",
 )
 
 
@@ -323,10 +287,7 @@ distenv.PhonyTarget(
 )
 
 # Start Flipper CLI via PySerial's miniterm
-distenv.PhonyTarget("cli", "${PYTHON3} ${FBT_SCRIPT_DIR}/serial_cli.py -p ${FLIP_PORT}")
-
-# Update WiFi devboard firmware
-distenv.PhonyTarget("devboard_flash", "${PYTHON3} ${FBT_SCRIPT_DIR}/wifi_board.py")
+distenv.PhonyTarget("cli", "${PYTHON3} ${FBT_SCRIPT_DIR}/serial_cli.py")
 
 
 # Find blackmagic probe
@@ -346,20 +307,7 @@ distenv.PhonyTarget(
 )
 
 # Prepare vscode environment
-VSCODE_LANG_SERVER = cmd_environment["LANG_SERVER"]
-vscode_dist = distenv.Install(
-    "#.vscode",
-    [
-        distenv.Glob("#.vscode/example/*.json"),
-        distenv.Glob(f"#.vscode/example/{VSCODE_LANG_SERVER}/*.json"),
-    ],
-)
+vscode_dist = distenv.Install("#.vscode", distenv.Glob("#.vscode/example/*"))
 distenv.Precious(vscode_dist)
 distenv.NoClean(vscode_dist)
 distenv.Alias("vscode_dist", vscode_dist)
-
-# Configure shell with build tools
-distenv.PhonyTarget(
-    "env",
-    "@echo $( ${FBT_SCRIPT_DIR}/toolchain/fbtenv.sh $)",
-)

applications/ReadMe.md

@@ -26,6 +26,7 @@ Applications for main Flipper menu.
 
 - `archive`             - Archive and file manager 
 - `bad_usb`             - Bad USB application
+- `fap_loader`          - External applications loader
 - `gpio`                - GPIO application: includes USART bridge and GPIO control
 - `ibutton`             - iButton application, onewire keys and more
 - `infrared`            - Infrared application, controls your IR devices
@@ -35,6 +36,16 @@ Applications for main Flipper menu.
 - `u2f`                 - U2F Application
 
 
+## plugins
+
+Extra apps for Plugins & App Loader menus.
+
+- `bt_hid_app`          - BT Remote controller
+- `music_player`        - Music player app (demo)
+- `picopass`            - Picopass tool
+- `snake_game`          - Snake game application
+
+
 ## services
 
 Background services providing system APIs to applications.

applications/debug/accessor/accessor_app.cpp

@@ -31,10 +31,9 @@ void AccessorApp::run(void) {
     onewire_host_stop(onewire_host);
 }
 
-AccessorApp::AccessorApp()
-    : text_store{0} {
+AccessorApp::AccessorApp() {
     notification = static_cast<NotificationApp*>(furi_record_open(RECORD_NOTIFICATION));
-    onewire_host = onewire_host_alloc(&gpio_ibutton);
+    onewire_host = onewire_host_alloc();
     furi_hal_power_enable_otg();
 }
 

applications/debug/accessor/application.fam

@@ -2,7 +2,6 @@ App(
     appid="accessor",
     name="Accessor",
     apptype=FlipperAppType.DEBUG,
-    targets=["f7"],
     entry_point="accessor_app",
     cdefines=["APP_ACCESSOR"],
     requires=["gui"],

applications/debug/accessor/helpers/wiegand.cpp

@@ -171,10 +171,13 @@ bool WIEGAND::DoWiegandConversion() {
                     return true;
                 } else {
                     _lastWiegand = sysTick;
+                    _bitCount = 0;
+                    _cardTemp = 0;
+                    _cardTempHigh = 0;
                     return false;
                 }
 
-                // TODO FL-3490: Handle validation failure case!
+                // TODO: Handle validation failure case!
             } else if(4 == _bitCount) {
                 // 4-bit Wiegand codes have no data integrity check so we just
                 // read the LOW nibble.

applications/debug/application.fam

@@ -7,11 +7,10 @@ App(
         "vibro_test",
         "keypad_test",
         "usb_test",
-        "usb_mouse",
-        "uart_echo",
+        "USB_Mouse",
+        "UART_Echo",
         "display_test",
         "text_box_test",
         "file_browser_test",
-        "speaker_debug",
     ],
 )

applications/debug/battery_test_app/application.fam

@@ -11,5 +11,4 @@ App(
     stack_size=1 * 1024,
     order=130,
     fap_category="Debug",
-    fap_libs=["assets"],
 )

applications/debug/battery_test_app/views/battery_info.c

@@ -1,148 +0,0 @@
-#include "battery_info.h"
-#include <furi.h>
-#include <gui/elements.h>
-#include <assets_icons.h>
-
-#define LOW_CHARGE_THRESHOLD 10
-#define HIGH_DRAIN_CURRENT_THRESHOLD 100
-
-struct BatteryInfo {
-    View* view;
-};
-
-static void draw_stat(Canvas* canvas, int x, int y, const Icon* icon, char* val) {
-    canvas_draw_frame(canvas, x - 7, y + 7, 30, 13);
-    canvas_draw_icon(canvas, x, y, icon);
-    canvas_set_color(canvas, ColorWhite);
-    canvas_draw_box(canvas, x - 4, y + 16, 24, 6);
-    canvas_set_color(canvas, ColorBlack);
-    canvas_draw_str_aligned(canvas, x + 8, y + 22, AlignCenter, AlignBottom, val);
-};
-
-static void draw_battery(Canvas* canvas, BatteryInfoModel* data, int x, int y) {
-    char emote[20] = {};
-    char header[20] = {};
-    char value[20] = {};
-
-    int32_t drain_current = data->gauge_current * (-1000);
-    uint32_t charge_current = data->gauge_current * 1000;
-
-    // Draw battery
-    canvas_draw_icon(canvas, x, y, &I_BatteryBody_52x28);
-    if(charge_current > 0) {
-        canvas_draw_icon(canvas, x + 16, y + 7, &I_FaceCharging_29x14);
-    } else if(drain_current > HIGH_DRAIN_CURRENT_THRESHOLD) {
-        canvas_draw_icon(canvas, x + 16, y + 7, &I_FaceConfused_29x14);
-    } else if(data->charge < LOW_CHARGE_THRESHOLD) {
-        canvas_draw_icon(canvas, x + 16, y + 7, &I_FaceNopower_29x14);
-    } else {
-        canvas_draw_icon(canvas, x + 16, y + 7, &I_FaceNormal_29x14);
-    }
-
-    // Draw bubble
-    elements_bubble(canvas, 53, 0, 71, 39);
-
-    // Set text
-    if(charge_current > 0) {
-        snprintf(emote, sizeof(emote), "%s", "Yummy!");
-        snprintf(header, sizeof(header), "%s", "Charging at");
-        snprintf(
-            value,
-            sizeof(value),
-            "%lu.%luV   %lumA",
-            (uint32_t)(data->vbus_voltage),
-            (uint32_t)(data->vbus_voltage * 10) % 10,
-            charge_current);
-    } else if(drain_current > 0) {
-        snprintf(
-            emote,
-            sizeof(emote),
-            "%s",
-            drain_current > HIGH_DRAIN_CURRENT_THRESHOLD ? "Oh no!" : "Om-nom-nom!");
-        snprintf(header, sizeof(header), "%s", "Consumption is");
-        snprintf(
-            value,
-            sizeof(value),
-            "%ld %s",
-            drain_current,
-            drain_current > HIGH_DRAIN_CURRENT_THRESHOLD ? "mA!" : "mA");
-    } else if(drain_current != 0) {
-        snprintf(header, 20, "...");
-    } else if(data->charging_voltage < 4.2) {
-        // Non-default battery charging limit, mention it
-        snprintf(emote, sizeof(emote), "Charged!");
-        snprintf(header, sizeof(header), "Limited to");
-        snprintf(
-            value,
-            sizeof(value),
-            "%lu.%luV",
-            (uint32_t)(data->charging_voltage),
-            (uint32_t)(data->charging_voltage * 10) % 10);
-    } else {
-        snprintf(header, sizeof(header), "Charged!");
-    }
-
-    canvas_draw_str_aligned(canvas, 92, y + 3, AlignCenter, AlignCenter, emote);
-    canvas_draw_str_aligned(canvas, 92, y + 15, AlignCenter, AlignCenter, header);
-    canvas_draw_str_aligned(canvas, 92, y + 27, AlignCenter, AlignCenter, value);
-};
-
-static void battery_info_draw_callback(Canvas* canvas, void* context) {
-    furi_assert(context);
-    BatteryInfoModel* model = context;
-
-    canvas_clear(canvas);
-    canvas_set_color(canvas, ColorBlack);
-    draw_battery(canvas, model, 0, 5);
-
-    char batt_level[10];
-    char temperature[10];
-    char voltage[10];
-    char health[10];
-
-    snprintf(batt_level, sizeof(batt_level), "%lu%%", (uint32_t)model->charge);
-    snprintf(temperature, sizeof(temperature), "%lu C", (uint32_t)model->gauge_temperature);
-    snprintf(
-        voltage,
-        sizeof(voltage),
-        "%lu.%01lu V",
-        (uint32_t)model->gauge_voltage,
-        (uint32_t)(model->gauge_voltage * 10) % 10UL);
-    snprintf(health, sizeof(health), "%d%%", model->health);
-
-    draw_stat(canvas, 8, 42, &I_Battery_16x16, batt_level);
-    draw_stat(canvas, 40, 42, &I_Temperature_16x16, temperature);
-    draw_stat(canvas, 72, 42, &I_Voltage_16x16, voltage);
-    draw_stat(canvas, 104, 42, &I_Health_16x16, health);
-}
-
-BatteryInfo* battery_info_alloc() {
-    BatteryInfo* battery_info = malloc(sizeof(BatteryInfo));
-    battery_info->view = view_alloc();
-    view_set_context(battery_info->view, battery_info);
-    view_allocate_model(battery_info->view, ViewModelTypeLocking, sizeof(BatteryInfoModel));
-    view_set_draw_callback(battery_info->view, battery_info_draw_callback);
-
-    return battery_info;
-}
-
-void battery_info_free(BatteryInfo* battery_info) {
-    furi_assert(battery_info);
-    view_free(battery_info->view);
-    free(battery_info);
-}
-
-View* battery_info_get_view(BatteryInfo* battery_info) {
-    furi_assert(battery_info);
-    return battery_info->view;
-}
-
-void battery_info_set_data(BatteryInfo* battery_info, BatteryInfoModel* data) {
-    furi_assert(battery_info);
-    furi_assert(data);
-    with_view_model(
-        battery_info->view,
-        BatteryInfoModel * model,
-        { memcpy(model, data, sizeof(BatteryInfoModel)); },
-        true);
-}

applications/debug/battery_test_app/views/battery_info.h

@@ -1,23 +0,0 @@
-#pragma once
-
-#include <gui/view.h>
-
-typedef struct BatteryInfo BatteryInfo;
-
-typedef struct {
-    float vbus_voltage;
-    float gauge_voltage;
-    float gauge_current;
-    float gauge_temperature;
-    float charging_voltage;
-    uint8_t charge;
-    uint8_t health;
-} BatteryInfoModel;
-
-BatteryInfo* battery_info_alloc();
-
-void battery_info_free(BatteryInfo* battery_info);
-
-View* battery_info_get_view(BatteryInfo* battery_info);
-
-void battery_info_set_data(BatteryInfo* battery_info, BatteryInfoModel* data);

applications/debug/bt_debug_app/bt_debug_app.c

@@ -31,6 +31,9 @@ uint32_t bt_debug_start_view(void* context) {
 BtDebugApp* bt_debug_app_alloc() {
     BtDebugApp* app = malloc(sizeof(BtDebugApp));
 
+    // Load settings
+    bt_settings_load(&app->settings);
+
     // Gui
     app->gui = furi_record_open(RECORD_GUI);
 
@@ -102,15 +105,13 @@ int32_t bt_debug_app(void* p) {
     }
 
     BtDebugApp* app = bt_debug_app_alloc();
-    // Was bt active?
-    const bool was_active = furi_hal_bt_is_active();
     // Stop advertising
     furi_hal_bt_stop_advertising();
 
     view_dispatcher_run(app->view_dispatcher);
 
     // Restart advertising
-    if(was_active) {
+    if(app->settings.enabled) {
         furi_hal_bt_start_advertising();
     }
     bt_debug_app_free(app);

applications/debug/bt_debug_app/bt_debug_app.h

@@ -4,14 +4,15 @@
 #include <gui/gui.h>
 #include <gui/view.h>
 #include <gui/view_dispatcher.h>
-#include <gui/modules/submenu.h>
-
 #include <dialogs/dialogs.h>
 
+#include <gui/modules/submenu.h>
 #include "views/bt_carrier_test.h"
 #include "views/bt_packet_test.h"
+#include <bt/bt_settings.h>
 
 typedef struct {
+    BtSettings settings;
     Gui* gui;
     ViewDispatcher* view_dispatcher;
     Submenu* submenu;

applications/debug/bt_debug_app/views/bt_carrier_test.c

@@ -1,7 +1,7 @@
 #include "bt_carrier_test.h"
 #include "bt_test.h"
 #include "bt_test_types.h"
-#include <furi_hal_bt.h>
+#include "furi_hal_bt.h"
 
 struct BtCarrierTest {
     BtTest* bt_test;

applications/debug/bt_debug_app/views/bt_packet_test.c

@@ -1,7 +1,7 @@
 #include "bt_packet_test.h"
 #include "bt_test.h"
 #include "bt_test_types.h"
-#include <furi_hal_bt.h>
+#include "furi_hal_bt.h"
 
 struct BtPacketTest {
     BtTest* bt_test;

applications/debug/bt_debug_app/views/bt_test.c

@@ -2,11 +2,8 @@
 
 #include <gui/canvas.h>
 #include <gui/elements.h>
-
-#include <lib/toolbox/float_tools.h>
 #include <m-array.h>
 #include <furi.h>
-#include <inttypes.h>
 #include <stdint.h>
 
 struct BtTestParam {
@@ -101,16 +98,16 @@ static void bt_test_draw_callback(Canvas* canvas, void* _model) {
     elements_scrollbar(canvas, model->position, BtTestParamArray_size(model->params));
     canvas_draw_str(canvas, 6, 60, model->message);
     if(model->state == BtTestStateStarted) {
-        if(!float_is_equal(model->rssi, 0.0f)) {
+        if(model->rssi != 0.0f) {
             snprintf(info_str, sizeof(info_str), "RSSI:%3.1f dB", (double)model->rssi);
             canvas_draw_str_aligned(canvas, 124, 60, AlignRight, AlignBottom, info_str);
         }
     } else if(model->state == BtTestStateStopped) {
         if(model->packets_num_rx) {
-            snprintf(info_str, sizeof(info_str), "%" PRIu32 " pack rcv", model->packets_num_rx);
+            snprintf(info_str, sizeof(info_str), "%ld pack rcv", model->packets_num_rx);
             canvas_draw_str_aligned(canvas, 124, 60, AlignRight, AlignBottom, info_str);
         } else if(model->packets_num_tx) {
-            snprintf(info_str, sizeof(info_str), "%" PRIu32 " pack sent", model->packets_num_tx);
+            snprintf(info_str, sizeof(info_str), "%ld pack sent", model->packets_num_tx);
             canvas_draw_str_aligned(canvas, 124, 60, AlignRight, AlignBottom, info_str);
         }
     }
@@ -156,7 +153,7 @@ static bool bt_test_input_callback(InputEvent* event, void* context) {
 }
 
 void bt_test_process_up(BtTest* bt_test) {
-    with_view_model( // -V658
+    with_view_model(
         bt_test->view,
         BtTestModel * model,
         {

applications/debug/ccid_test/application.fam

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

applications/debug/ccid_test/ccid_test_app.c

@@ -1,169 +0,0 @@
-#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

@@ -1,37 +0,0 @@
-/* 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

@@ -1,32 +0,0 @@
-#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;
-} __attribute__((packed));
-
-struct ISO7816_Response_APDU {
-    uint8_t SW1;
-    uint8_t SW2;
-} __attribute__((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

@@ -1,10 +0,0 @@
-App(
-    appid="crash_test",
-    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/crash_test/crash_test.c

@@ -1,128 +0,0 @@
-#include <furi_hal.h>
-#include <furi.h>
-
-#include <gui/gui.h>
-#include <gui/view_dispatcher.h>
-#include <gui/modules/submenu.h>
-
-#define TAG "CrashTest"
-
-typedef struct {
-    Gui* gui;
-    ViewDispatcher* view_dispatcher;
-    Submenu* submenu;
-} CrashTest;
-
-typedef enum {
-    CrashTestViewSubmenu,
-} CrashTestView;
-
-typedef enum {
-    CrashTestSubmenuCheck,
-    CrashTestSubmenuCheckMessage,
-    CrashTestSubmenuAssert,
-    CrashTestSubmenuAssertMessage,
-    CrashTestSubmenuCrash,
-    CrashTestSubmenuHalt,
-} CrashTestSubmenu;
-
-static void crash_test_submenu_callback(void* context, uint32_t index) {
-    CrashTest* instance = (CrashTest*)context;
-    UNUSED(instance);
-
-    switch(index) {
-    case CrashTestSubmenuCheck:
-        furi_check(false);
-        break;
-    case CrashTestSubmenuCheckMessage:
-        furi_check(false, "Crash test: furi_check with message");
-        break;
-    case CrashTestSubmenuAssert:
-        furi_assert(false);
-        break;
-    case CrashTestSubmenuAssertMessage:
-        furi_assert(false, "Crash test: furi_assert with message");
-        break;
-    case CrashTestSubmenuCrash:
-        furi_crash("Crash test: furi_crash");
-        break;
-    case CrashTestSubmenuHalt:
-        furi_halt("Crash test: furi_halt");
-        break;
-    default:
-        furi_crash("Programming error");
-    }
-}
-
-static uint32_t crash_test_exit_callback(void* context) {
-    UNUSED(context);
-    return VIEW_NONE;
-}
-
-CrashTest* crash_test_alloc() {
-    CrashTest* instance = malloc(sizeof(CrashTest));
-
-    View* view = NULL;
-
-    instance->gui = furi_record_open(RECORD_GUI);
-    instance->view_dispatcher = view_dispatcher_alloc();
-    view_dispatcher_enable_queue(instance->view_dispatcher);
-    view_dispatcher_attach_to_gui(
-        instance->view_dispatcher, instance->gui, ViewDispatcherTypeFullscreen);
-
-    // Menu
-    instance->submenu = submenu_alloc();
-    view = submenu_get_view(instance->submenu);
-    view_set_previous_callback(view, crash_test_exit_callback);
-    view_dispatcher_add_view(instance->view_dispatcher, CrashTestViewSubmenu, view);
-    submenu_add_item(
-        instance->submenu, "Check", CrashTestSubmenuCheck, crash_test_submenu_callback, instance);
-    submenu_add_item(
-        instance->submenu,
-        "Check with message",
-        CrashTestSubmenuCheckMessage,
-        crash_test_submenu_callback,
-        instance);
-    submenu_add_item(
-        instance->submenu, "Assert", CrashTestSubmenuAssert, crash_test_submenu_callback, instance);
-    submenu_add_item(
-        instance->submenu,
-        "Assert with message",
-        CrashTestSubmenuAssertMessage,
-        crash_test_submenu_callback,
-        instance);
-    submenu_add_item(
-        instance->submenu, "Crash", CrashTestSubmenuCrash, crash_test_submenu_callback, instance);
-    submenu_add_item(
-        instance->submenu, "Halt", CrashTestSubmenuHalt, crash_test_submenu_callback, instance);
-
-    return instance;
-}
-
-void crash_test_free(CrashTest* instance) {
-    view_dispatcher_remove_view(instance->view_dispatcher, CrashTestViewSubmenu);
-    submenu_free(instance->submenu);
-
-    view_dispatcher_free(instance->view_dispatcher);
-    furi_record_close(RECORD_GUI);
-
-    free(instance);
-}
-
-int32_t crash_test_run(CrashTest* instance) {
-    view_dispatcher_switch_to_view(instance->view_dispatcher, CrashTestViewSubmenu);
-    view_dispatcher_run(instance->view_dispatcher);
-    return 0;
-}
-
-int32_t crash_test_app(void* p) {
-    UNUSED(p);
-
-    CrashTest* instance = crash_test_alloc();
-
-    int32_t ret = crash_test_run(instance);
-
-    crash_test_free(instance);
-
-    return ret;
-}

applications/debug/direct_draw/application.fam

@@ -1,10 +0,0 @@
-App(
-    appid="direct_draw",
-    name="Direct Draw",
-    apptype=FlipperAppType.DEBUG,
-    entry_point="direct_draw_app",
-    requires=["gui", "input"],
-    stack_size=2 * 1024,
-    order=70,
-    fap_category="Debug",
-)

applications/debug/direct_draw/direct_draw.c

@@ -1,112 +0,0 @@
-#include <furi.h>
-#include <gui/gui.h>
-#include <gui/canvas_i.h>
-#include <input/input.h>
-
-#define BUFFER_SIZE (32U)
-
-typedef struct {
-    FuriPubSub* input;
-    FuriPubSubSubscription* input_subscription;
-    Gui* gui;
-    Canvas* canvas;
-    bool stop;
-    uint32_t counter;
-} DirectDraw;
-
-static void gui_input_events_callback(const void* value, void* ctx) {
-    furi_assert(value);
-    furi_assert(ctx);
-
-    DirectDraw* instance = ctx;
-    const InputEvent* event = value;
-
-    if(event->key == InputKeyBack && event->type == InputTypeShort) {
-        instance->stop = true;
-    }
-}
-
-static DirectDraw* direct_draw_alloc() {
-    DirectDraw* instance = malloc(sizeof(DirectDraw));
-
-    instance->input = furi_record_open(RECORD_INPUT_EVENTS);
-    instance->gui = furi_record_open(RECORD_GUI);
-    instance->canvas = gui_direct_draw_acquire(instance->gui);
-
-    instance->input_subscription =
-        furi_pubsub_subscribe(instance->input, gui_input_events_callback, instance);
-
-    return instance;
-}
-
-static void direct_draw_free(DirectDraw* instance) {
-    furi_pubsub_unsubscribe(instance->input, instance->input_subscription);
-
-    instance->canvas = NULL;
-    gui_direct_draw_release(instance->gui);
-    furi_record_close(RECORD_GUI);
-    furi_record_close(RECORD_INPUT_EVENTS);
-}
-
-static void direct_draw_block(Canvas* canvas, uint32_t size, uint32_t counter) {
-    size += 16;
-    uint8_t width = canvas_width(canvas) - size;
-    uint8_t height = canvas_height(canvas) - size;
-
-    uint8_t x = counter % width;
-    if((counter / width) % 2) {
-        x = width - x;
-    }
-
-    uint8_t y = counter % height;
-    if((counter / height) % 2) {
-        y = height - y;
-    }
-
-    canvas_draw_box(canvas, x, y, size, size);
-}
-
-static void direct_draw_run(DirectDraw* instance) {
-    size_t start = DWT->CYCCNT;
-    size_t counter = 0;
-    float fps = 0;
-
-    furi_thread_set_current_priority(FuriThreadPriorityIdle);
-
-    do {
-        size_t elapsed = DWT->CYCCNT - start;
-        char buffer[BUFFER_SIZE] = {0};
-
-        if(elapsed >= 64000000) {
-            fps = (float)counter / ((float)elapsed / 64000000.0f);
-
-            start = DWT->CYCCNT;
-            counter = 0;
-        }
-        snprintf(buffer, BUFFER_SIZE, "FPS: %.1f", (double)fps);
-
-        canvas_reset(instance->canvas);
-        canvas_set_color(instance->canvas, ColorXOR);
-        direct_draw_block(instance->canvas, instance->counter % 16, instance->counter);
-        direct_draw_block(instance->canvas, instance->counter * 2 % 16, instance->counter * 2);
-        direct_draw_block(instance->canvas, instance->counter * 3 % 16, instance->counter * 3);
-        direct_draw_block(instance->canvas, instance->counter * 4 % 16, instance->counter * 4);
-        direct_draw_block(instance->canvas, instance->counter * 5 % 16, instance->counter * 5);
-        canvas_draw_str(instance->canvas, 10, 10, buffer);
-        canvas_commit(instance->canvas);
-
-        counter++;
-        instance->counter++;
-        furi_thread_yield();
-    } while(!instance->stop);
-}
-
-int32_t direct_draw_app(void* p) {
-    UNUSED(p);
-
-    DirectDraw* instance = direct_draw_alloc();
-    direct_draw_run(instance);
-    direct_draw_free(instance);
-
-    return 0;
-}

applications/debug/display_test/application.fam

@@ -5,7 +5,6 @@ App(
     entry_point="display_test_app",
     cdefines=["APP_DISPLAY_TEST"],
     requires=["gui"],
-    fap_libs=["misc"],
     stack_size=1 * 1024,
     order=120,
     fap_category="Debug",

applications/debug/display_test/display_test.c

@@ -91,6 +91,7 @@ static void display_test_reload_config(DisplayTest* instance) {
         instance->config_contrast,
         instance->config_regulation_ratio,
         instance->config_bias);
+    gui_update(instance->gui);
 }
 
 static void display_config_set_bias(VariableItem* item) {

applications/debug/example_custom_font/application.fam

@@ -1,9 +0,0 @@
-App(
-    appid="example_custom_font",
-    name="Example: custom font",
-    apptype=FlipperAppType.DEBUG,
-    entry_point="example_custom_font_main",
-    requires=["gui"],
-    stack_size=1 * 1024,
-    fap_category="Debug",
-)

applications/debug/example_custom_font/example_custom_font.c

@@ -1,98 +0,0 @@
-#include <furi.h>
-#include <furi_hal.h>
-
-#include <gui/gui.h>
-#include <input/input.h>
-
-//This arrays contains the font itself. You can use any u8g2 font you want
-
-/*
-Fontname: -Raccoon-Fixed4x6-Medium-R-Normal--6-60-75-75-P-40-ISO10646-1
-Copyright: 
-Glyphs: 95/203
-BBX Build Mode: 0
-*/
-const uint8_t u8g2_font_tom_thumb_4x6_tr[725] =
-    "_\0\2\2\2\3\3\4\4\3\6\0\377\5\377\5\0\0\352\1\330\2\270 \5\340\315\0!\6\265\310"
-    "\254\0\42\6\213\313$\25#\10\227\310\244\241\206\12$\10\227\310\215\70b\2%\10\227\310d\324F\1"
-    "&\10\227\310(\65R\22'\5\251\313\10(\6\266\310\251\62)\10\226\310\304\224\24\0*\6\217\312\244"
-    "\16+\7\217\311\245\225\0,\6\212\310)\0-\5\207\312\14.\5\245\310\4/\7\227\310Ve\4\60"
-    "\7\227\310-k\1\61\6\226\310\255\6\62\10\227\310h\220\312\1\63\11\227\310h\220\62X\0\64\10\227"
-    "\310$\65b\1\65\10\227\310\214\250\301\2\66\10\227\310\315\221F\0\67\10\227\310\314TF\0\70\10\227"
-    "\310\214\64\324\10\71\10\227\310\214\64\342\2:\6\255\311\244\0;\7\222\310e\240\0<\10\227\310\246\32"
-    "d\20=\6\217\311l\60>\11\227\310d\220A*\1\77\10\227\310\314\224a\2@\10\227\310UC\3"
-    "\1A\10\227\310UC\251\0B\10\227\310\250\264\322\2C\7\227\310\315\32\10D\10\227\310\250d-\0"
-    "E\10\227\310\214\70\342\0F\10\227\310\214\70b\4G\10\227\310\315\221\222\0H\10\227\310$\65\224\12"
-    "I\7\227\310\254X\15J\7\227\310\226\252\2K\10\227\310$\265\222\12L\7\227\310\304\346\0M\10\227"
-    "\310\244\61\224\12N\10\227\310\244q\250\0O\7\227\310UV\5P\10\227\310\250\264b\4Q\10\227\310"
-    "Uj$\1R\10\227\310\250\64V\1S\10\227\310m\220\301\2T\7\227\310\254\330\2U\7\227\310$"
-    "W\22V\10\227\310$\253L\0W\10\227\310$\65\206\12X\10\227\310$\325R\1Y\10\227\310$U"
-    "V\0Z\7\227\310\314T\16[\7\227\310\214X\16\134\10\217\311d\220A\0]\7\227\310\314r\4^"
-    "\5\213\313\65_\5\207\310\14`\6\212\313\304\0a\7\223\310\310\65\2b\10\227\310D\225\324\2c\7"
-    "\223\310\315\14\4d\10\227\310\246\245\222\0e\6\223\310\235\2f\10\227\310\246\264b\2g\10\227\307\35"
-    "\61%\0h\10\227\310D\225\254\0i\6\265\310\244\1j\10\233\307f\30U\5k\10\227\310\304\264T"
-    "\1l\7\227\310\310\326\0m\7\223\310<R\0n\7\223\310\250d\5o\7\223\310U\252\2p\10\227"
-    "\307\250\244V\4q\10\227\307-\225d\0r\6\223\310\315\22s\10\223\310\215\70\22\0t\10\227\310\245"
-    "\25\243\0u\7\223\310$+\11v\10\223\310$\65R\2w\7\223\310\244q\4x\7\223\310\244\62\25"
-    "y\11\227\307$\225dJ\0z\7\223\310\254\221\6{\10\227\310\251\32D\1|\6\265\310(\1}\11"
-    "\227\310\310\14RR\0~\6\213\313\215\4\0\0\0\4\377\377\0";
-
-// Screen is 128x64 px
-static void app_draw_callback(Canvas* canvas, void* ctx) {
-    UNUSED(ctx);
-
-    canvas_clear(canvas);
-
-    canvas_set_custom_u8g2_font(canvas, u8g2_font_tom_thumb_4x6_tr);
-
-    canvas_draw_str(canvas, 0, 6, "This is a tiny custom font");
-    canvas_draw_str(canvas, 0, 12, "012345.?! ,:;\"\'@#$%");
-}
-
-static void app_input_callback(InputEvent* input_event, void* ctx) {
-    furi_assert(ctx);
-
-    FuriMessageQueue* event_queue = ctx;
-    furi_message_queue_put(event_queue, input_event, FuriWaitForever);
-}
-
-int32_t example_custom_font_main(void* p) {
-    UNUSED(p);
-    FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(InputEvent));
-
-    // Configure view port
-    ViewPort* view_port = view_port_alloc();
-    view_port_draw_callback_set(view_port, app_draw_callback, view_port);
-    view_port_input_callback_set(view_port, app_input_callback, event_queue);
-
-    // Register view port in GUI
-    Gui* gui = furi_record_open(RECORD_GUI);
-    gui_add_view_port(gui, view_port, GuiLayerFullscreen);
-
-    InputEvent event;
-
-    bool running = true;
-
-    while(running) {
-        if(furi_message_queue_get(event_queue, &event, 100) == FuriStatusOk) {
-            if((event.type == InputTypePress) || (event.type == InputTypeRepeat)) {
-                switch(event.key) {
-                case InputKeyBack:
-                    running = false;
-                    break;
-                default:
-                    break;
-                }
-            }
-        }
-    }
-
-    view_port_enabled_set(view_port, false);
-    gui_remove_view_port(gui, view_port);
-    view_port_free(view_port);
-    furi_message_queue_free(event_queue);
-
-    furi_record_close(RECORD_GUI);
-
-    return 0;
-}

applications/debug/file_browser_test/file_browser_app.c

@@ -1,11 +1,10 @@
-#include "file_browser_app_i.h"
 #include <file_browser_test_icons.h>
-
-#include <gui/modules/file_browser.h>
-#include <storage/storage.h>
-#include <lib/toolbox/path.h>
+#include "file_browser_app_i.h"
+#include "gui/modules/file_browser.h"
 #include <furi.h>
 #include <furi_hal.h>
+#include <storage/storage.h>
+#include <lib/toolbox/path.h>
 
 static bool file_browser_app_custom_event_callback(void* context, uint32_t event) {
     furi_assert(context);
@@ -49,7 +48,7 @@ FileBrowserApp* file_browser_app_alloc(char* arg) {
 
     app->file_path = furi_string_alloc();
     app->file_browser = file_browser_alloc(app->file_path);
-    file_browser_configure(app->file_browser, "*", NULL, true, false, &I_badusb_10px, true);
+    file_browser_configure(app->file_browser, "*", NULL, true, &I_badusb_10px, true);
 
     view_dispatcher_add_view(
         app->view_dispatcher, FileBrowserAppViewStart, widget_get_view(app->widget));

applications/debug/keypad_test/keypad_test.c

@@ -11,7 +11,6 @@ typedef struct {
     uint16_t left;
     uint16_t right;
     uint16_t ok;
-    FuriMutex* mutex;
 } KeypadTestState;
 
 static void keypad_test_reset_state(KeypadTestState* state) {
@@ -23,8 +22,7 @@ static void keypad_test_reset_state(KeypadTestState* state) {
 }
 
 static void keypad_test_render_callback(Canvas* canvas, void* ctx) {
-    KeypadTestState* state = ctx;
-    furi_mutex_acquire(state->mutex, FuriWaitForever);
+    KeypadTestState* state = (KeypadTestState*)acquire_mutex((ValueMutex*)ctx, 25);
     canvas_clear(canvas);
     char strings[5][20];
 
@@ -53,7 +51,7 @@ static void keypad_test_render_callback(Canvas* canvas, void* ctx) {
 
     canvas_draw_str(canvas, 10, 63, "[back] - reset, hold to exit");
 
-    furi_mutex_release(state->mutex);
+    release_mutex((ValueMutex*)ctx, state);
 }
 
 static void keypad_test_input_callback(InputEvent* input_event, void* ctx) {
@@ -66,17 +64,17 @@ int32_t keypad_test_app(void* p) {
     FuriMessageQueue* event_queue = furi_message_queue_alloc(32, sizeof(InputEvent));
     furi_check(event_queue);
 
-    KeypadTestState state = {{false, false, false, false, false}, 0, 0, 0, 0, 0, NULL};
-    state.mutex = furi_mutex_alloc(FuriMutexTypeNormal);
+    KeypadTestState _state = {{false, false, false, false, false}, 0, 0, 0, 0, 0};
 
-    if(!state.mutex) {
+    ValueMutex state_mutex;
+    if(!init_mutex(&state_mutex, &_state, sizeof(KeypadTestState))) {
         FURI_LOG_E(TAG, "cannot create mutex");
         return 0;
     }
 
     ViewPort* view_port = view_port_alloc();
 
-    view_port_draw_callback_set(view_port, keypad_test_render_callback, &state);
+    view_port_draw_callback_set(view_port, keypad_test_render_callback, &state_mutex);
     view_port_input_callback_set(view_port, keypad_test_input_callback, event_queue);
 
     // Open GUI and register view_port
@@ -85,7 +83,7 @@ int32_t keypad_test_app(void* p) {
 
     InputEvent event;
     while(furi_message_queue_get(event_queue, &event, FuriWaitForever) == FuriStatusOk) {
-        furi_mutex_acquire(state.mutex, FuriWaitForever);
+        KeypadTestState* state = (KeypadTestState*)acquire_mutex_block(&state_mutex);
         FURI_LOG_I(
             TAG,
             "key: %s type: %s",
@@ -94,54 +92,54 @@ int32_t keypad_test_app(void* p) {
 
         if(event.key == InputKeyRight) {
             if(event.type == InputTypePress) {
-                state.press[0] = true;
+                state->press[0] = true;
             } else if(event.type == InputTypeRelease) {
-                state.press[0] = false;
+                state->press[0] = false;
             } else if(event.type == InputTypeShort) {
-                ++state.right;
+                ++state->right;
             }
         } else if(event.key == InputKeyLeft) {
             if(event.type == InputTypePress) {
-                state.press[1] = true;
+                state->press[1] = true;
             } else if(event.type == InputTypeRelease) {
-                state.press[1] = false;
+                state->press[1] = false;
             } else if(event.type == InputTypeShort) {
-                ++state.left;
+                ++state->left;
             }
         } else if(event.key == InputKeyUp) {
             if(event.type == InputTypePress) {
-                state.press[2] = true;
+                state->press[2] = true;
             } else if(event.type == InputTypeRelease) {
-                state.press[2] = false;
+                state->press[2] = false;
             } else if(event.type == InputTypeShort) {
-                ++state.up;
+                ++state->up;
             }
         } else if(event.key == InputKeyDown) {
             if(event.type == InputTypePress) {
-                state.press[3] = true;
+                state->press[3] = true;
             } else if(event.type == InputTypeRelease) {
-                state.press[3] = false;
+                state->press[3] = false;
             } else if(event.type == InputTypeShort) {
-                ++state.down;
+                ++state->down;
             }
         } else if(event.key == InputKeyOk) {
             if(event.type == InputTypePress) {
-                state.press[4] = true;
+                state->press[4] = true;
             } else if(event.type == InputTypeRelease) {
-                state.press[4] = false;
+                state->press[4] = false;
             } else if(event.type == InputTypeShort) {
-                ++state.ok;
+                ++state->ok;
             }
         } else if(event.key == InputKeyBack) {
             if(event.type == InputTypeLong) {
-                furi_mutex_release(state.mutex);
+                release_mutex(&state_mutex, state);
                 break;
             } else if(event.type == InputTypeShort) {
-                keypad_test_reset_state(&state);
+                keypad_test_reset_state(state);
             }
         }
 
-        furi_mutex_release(state.mutex);
+        release_mutex(&state_mutex, state);
         view_port_update(view_port);
     }
 
@@ -149,7 +147,7 @@ int32_t keypad_test_app(void* p) {
     gui_remove_view_port(gui, view_port);
     view_port_free(view_port);
     furi_message_queue_free(event_queue);
-    furi_mutex_free(state.mutex);
+    delete_mutex(&state_mutex);
 
     furi_record_close(RECORD_GUI);
 

applications/debug/lfrfid_debug/application.fam

@@ -2,7 +2,6 @@ App(
     appid="lfrfid_debug",
     name="LF-RFID Debug",
     apptype=FlipperAppType.DEBUG,
-    targets=["f7"],
     entry_point="lfrfid_debug_app",
     requires=[
         "gui",

applications/debug/lfrfid_debug/scenes/lfrfid_debug_app_scene_tune.c

@@ -6,11 +6,6 @@ static void comparator_trigger_callback(bool level, void* comp_ctx) {
     furi_hal_gpio_write(&gpio_ext_pa7, !level);
 }
 
-void lfrfid_debug_view_tune_callback(void* context) {
-    LfRfidDebug* app = context;
-    view_dispatcher_send_custom_event(app->view_dispatcher, 0xBA);
-}
-
 void lfrfid_debug_scene_tune_on_enter(void* context) {
     LfRfidDebug* app = context;
 
@@ -19,9 +14,9 @@ void lfrfid_debug_scene_tune_on_enter(void* context) {
     furi_hal_rfid_comp_set_callback(comparator_trigger_callback, app);
     furi_hal_rfid_comp_start();
 
-    furi_hal_rfid_tim_read_start(125000, 0.5);
-
-    lfrfid_debug_view_tune_set_callback(app->tune_view, lfrfid_debug_view_tune_callback, app);
+    furi_hal_rfid_pins_read();
+    furi_hal_rfid_tim_read(125000, 0.5);
+    furi_hal_rfid_tim_read_start();
 
     view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidDebugViewTune);
 }
@@ -48,5 +43,6 @@ void lfrfid_debug_scene_tune_on_exit(void* context) {
 
     furi_hal_gpio_init_simple(&gpio_ext_pa7, GpioModeAnalog);
     furi_hal_rfid_tim_read_stop();
+    furi_hal_rfid_tim_reset();
     furi_hal_rfid_pins_reset();
 }

applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.c

@@ -13,8 +13,6 @@ typedef struct {
     uint32_t ARR;
     uint32_t CCR;
     int pos;
-    void (*update_callback)(void* context);
-    void* update_context;
 } LfRfidTuneViewModel;
 
 static void lfrfid_debug_view_tune_draw_callback(Canvas* canvas, void* _model) {
@@ -153,18 +151,6 @@ static bool lfrfid_debug_view_tune_input_callback(InputEvent* event, void* conte
             consumed = false;
             break;
         }
-
-        if(event->key == InputKeyLeft || event->key == InputKeyRight) {
-            with_view_model(
-                tune_view->view,
-                LfRfidTuneViewModel * model,
-                {
-                    if(model->update_callback) {
-                        model->update_callback(model->update_context);
-                    }
-                },
-                false);
-        }
     }
 
     return consumed;
@@ -175,7 +161,19 @@ LfRfidTuneView* lfrfid_debug_view_tune_alloc() {
     tune_view->view = view_alloc();
     view_set_context(tune_view->view, tune_view);
     view_allocate_model(tune_view->view, ViewModelTypeLocking, sizeof(LfRfidTuneViewModel));
-    lfrfid_debug_view_tune_clean(tune_view);
+
+    with_view_model(
+        tune_view->view,
+        LfRfidTuneViewModel * model,
+        {
+            model->dirty = true;
+            model->fine = false;
+            model->ARR = 511;
+            model->CCR = 255;
+            model->pos = 0;
+        },
+        true);
+
     view_set_draw_callback(tune_view->view, lfrfid_debug_view_tune_draw_callback);
     view_set_input_callback(tune_view->view, lfrfid_debug_view_tune_input_callback);
 
@@ -201,8 +199,6 @@ void lfrfid_debug_view_tune_clean(LfRfidTuneView* tune_view) {
             model->ARR = 511;
             model->CCR = 255;
             model->pos = 0;
-            model->update_callback = NULL;
-            model->update_context = NULL;
         },
         true);
 }
@@ -236,17 +232,3 @@ uint32_t lfrfid_debug_view_tune_get_ccr(LfRfidTuneView* tune_view) {
 
     return result;
 }
-
-void lfrfid_debug_view_tune_set_callback(
-    LfRfidTuneView* tune_view,
-    void (*callback)(void* context),
-    void* context) {
-    with_view_model(
-        tune_view->view,
-        LfRfidTuneViewModel * model,
-        {
-            model->update_callback = callback;
-            model->update_context = context;
-        },
-        false);
-}

applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.h

@@ -16,8 +16,3 @@ bool lfrfid_debug_view_tune_is_dirty(LfRfidTuneView* tune_view);
 uint32_t lfrfid_debug_view_tune_get_arr(LfRfidTuneView* tune_view);
 
 uint32_t lfrfid_debug_view_tune_get_ccr(LfRfidTuneView* tune_view);
-
-void lfrfid_debug_view_tune_set_callback(
-    LfRfidTuneView* tune_view,
-    void (*callback)(void* context),
-    void* context);

applications/debug/rpc_debug_app/rpc_debug_app.c

@@ -21,51 +21,22 @@ static void rpc_debug_app_tick_event_callback(void* context) {
     scene_manager_handle_tick_event(app->scene_manager);
 }
 
-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) {
+static void rpc_debug_app_rpc_command_callback(RpcAppSystemEvent event, void* context) {
     furi_assert(context);
     RpcDebugApp* app = context;
     furi_assert(app->rpc);
 
-    if(event->type == RpcAppEventTypeSessionClose) {
+    if(event == RpcAppEventSessionClose) {
         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->type == RpcAppEventTypeAppExit) {
+    } else if(event == RpcAppEventAppExit) {
         scene_manager_stop(app->scene_manager);
         view_dispatcher_stop(app->view_dispatcher);
-        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);
+        rpc_system_app_confirm(app->rpc, RpcAppEventAppExit, true);
     } else {
-        rpc_system_app_confirm(app->rpc, false);
+        rpc_system_app_confirm(app->rpc, event, false);
     }
 }
 

applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_input_error_code.c

@@ -44,11 +44,7 @@ bool rpc_debug_app_scene_input_error_code_on_event(void* context, SceneManagerEv
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == RpcDebugAppCustomEventInputErrorCode) {
-            char* end;
-            int error_code = strtol(app->text_store, &end, 10);
-            if(!*end) {
-                rpc_system_app_set_error_code(app->rpc, error_code);
-            }
+            rpc_system_app_set_error_code(app->rpc, (uint32_t)atol(app->text_store));
             scene_manager_previous_scene(app->scene_manager);
             consumed = true;
         }

applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_receive_data_exchange.c

@@ -1,5 +1,40 @@
 #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);
@@ -7,6 +42,8 @@ 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);
 }
 
@@ -16,7 +53,6 @@ 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);
@@ -30,4 +66,5 @@ 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/speaker_debug/application.fam

@@ -1,11 +0,0 @@
-App(
-    appid="speaker_debug",
-    name="Speaker Debug",
-    apptype=FlipperAppType.DEBUG,
-    entry_point="speaker_debug_app",
-    requires=["gui", "notification"],
-    stack_size=2 * 1024,
-    order=10,
-    fap_category="Debug",
-    fap_libs=["music_worker"],
-)

applications/debug/speaker_debug/speaker_debug.c

@@ -1,120 +0,0 @@
-#include <furi.h>
-#include <notification/notification.h>
-#include <music_worker/music_worker.h>
-#include <cli/cli.h>
-#include <toolbox/args.h>
-
-#define TAG "SpeakerDebug"
-#define CLI_COMMAND "speaker_debug"
-
-typedef enum {
-    SpeakerDebugAppMessageTypeStop,
-} SpeakerDebugAppMessageType;
-
-typedef struct {
-    SpeakerDebugAppMessageType type;
-} SpeakerDebugAppMessage;
-
-typedef struct {
-    MusicWorker* music_worker;
-    FuriMessageQueue* message_queue;
-    Cli* cli;
-} SpeakerDebugApp;
-
-static SpeakerDebugApp* speaker_app_alloc() {
-    SpeakerDebugApp* app = (SpeakerDebugApp*)malloc(sizeof(SpeakerDebugApp));
-    app->music_worker = music_worker_alloc();
-    app->message_queue = furi_message_queue_alloc(8, sizeof(SpeakerDebugAppMessage));
-    app->cli = furi_record_open(RECORD_CLI);
-    return app;
-}
-
-static void speaker_app_free(SpeakerDebugApp* app) {
-    music_worker_free(app->music_worker);
-    furi_message_queue_free(app->message_queue);
-    furi_record_close(RECORD_CLI);
-    free(app);
-}
-
-static void speaker_app_cli(Cli* cli, FuriString* args, void* context) {
-    UNUSED(cli);
-
-    SpeakerDebugApp* app = (SpeakerDebugApp*)context;
-    SpeakerDebugAppMessage message;
-    FuriString* cmd = furi_string_alloc();
-
-    if(!args_read_string_and_trim(args, cmd)) {
-        furi_string_free(cmd);
-        printf("Usage:\r\n");
-        printf("\t" CLI_COMMAND " stop\r\n");
-        return;
-    }
-
-    if(furi_string_cmp(cmd, "stop") == 0) {
-        message.type = SpeakerDebugAppMessageTypeStop;
-        FuriStatus status = furi_message_queue_put(app->message_queue, &message, 100);
-        if(status != FuriStatusOk) {
-            printf("Failed to send message\r\n");
-        } else {
-            printf("Stopping\r\n");
-        }
-    } else {
-        printf("Usage:\r\n");
-        printf("\t" CLI_COMMAND " stop\r\n");
-    }
-
-    furi_string_free(cmd);
-}
-
-static bool speaker_app_music_play(SpeakerDebugApp* app, const char* rtttl) {
-    if(music_worker_is_playing(app->music_worker)) {
-        music_worker_stop(app->music_worker);
-    }
-
-    if(!music_worker_load_rtttl_from_string(app->music_worker, rtttl)) {
-        FURI_LOG_E(TAG, "Failed to load RTTTL");
-        return false;
-    }
-
-    music_worker_set_volume(app->music_worker, 1.0f);
-    music_worker_start(app->music_worker);
-
-    return true;
-}
-
-static void speaker_app_music_stop(SpeakerDebugApp* app) {
-    if(music_worker_is_playing(app->music_worker)) {
-        music_worker_stop(app->music_worker);
-    }
-}
-
-static void speaker_app_run(SpeakerDebugApp* app, const char* arg) {
-    if(!arg || !speaker_app_music_play(app, arg)) {
-        FURI_LOG_E(TAG, "Provided RTTTL is invalid");
-        return;
-    }
-
-    cli_add_command(app->cli, CLI_COMMAND, CliCommandFlagParallelSafe, speaker_app_cli, app);
-
-    SpeakerDebugAppMessage message;
-    FuriStatus status;
-    while(true) {
-        status = furi_message_queue_get(app->message_queue, &message, FuriWaitForever);
-
-        if(status == FuriStatusOk) {
-            if(message.type == SpeakerDebugAppMessageTypeStop) {
-                speaker_app_music_stop(app);
-                break;
-            }
-        }
-    }
-
-    cli_delete_command(app->cli, CLI_COMMAND);
-}
-
-int32_t speaker_debug_app(void* arg) {
-    SpeakerDebugApp* app = speaker_app_alloc();
-    speaker_app_run(app, arg);
-    speaker_app_free(app);
-    return 0;
-}

applications/debug/subghz_test/application.fam

@@ -1,14 +0,0 @@
-App(
-    appid="subghz_test",
-    name="Sub-Ghz test",
-    apptype=FlipperAppType.DEBUG,
-    targets=["f7"],
-    entry_point="subghz_test_app",
-    requires=["gui"],
-    stack_size=4 * 1024,
-    order=50,
-    fap_icon="subghz_test_10px.png",
-    fap_category="Debug",
-    fap_icon_assets="images",
-    fap_version="0.1",
-)

applications/debug/subghz_test/helpers/subghz_test_event.h

@@ -1,7 +0,0 @@
-#pragma once
-
-typedef enum {
-    //SubGhzTestCustomEvent
-    SubGhzTestCustomEventStartId = 100,
-    SubGhzTestCustomEventSceneShowOnlyRX,
-} SubGhzTestCustomEvent;

applications/debug/subghz_test/helpers/subghz_test_frequency.c

@@ -1,38 +0,0 @@
-#include "subghz_test_frequency.h"
-
-const uint32_t subghz_frequencies_testing[] = {
-    /* 300 - 348 */
-    300000000,
-    304500000,
-    310000000,
-    312025000,
-    313250000,
-    313625000,
-    315000000,
-    315225000,
-    321950000,
-    348000000,
-    /* 387 - 464 */
-    387000000,
-    433075000, /* LPD433 first */
-    433825000,
-    433920000, /* LPD433 mid */
-    434420000,
-    434775000, /* LPD433 last channels */
-    438900000,
-    464000000,
-    /* 779 - 928 */
-    779000000,
-    868150000,
-    868350000,
-    868550000,
-    915000000,
-    925000000,
-    926500000,
-    927950000,
-    928000000,
-};
-
-const uint32_t subghz_frequencies_count_testing =
-    sizeof(subghz_frequencies_testing) / sizeof(uint32_t);
-const uint32_t subghz_frequencies_433_92_testing = 13;

applications/debug/subghz_test/helpers/subghz_test_frequency.h

@@ -1,6 +0,0 @@
-#pragma once
-#include "../subghz_test_app_i.h"
-
-extern const uint32_t subghz_frequencies_testing[];
-extern const uint32_t subghz_frequencies_count_testing;
-extern const uint32_t subghz_frequencies_433_92_testing;

applications/debug/subghz_test/helpers/subghz_test_types.h

@@ -1,18 +0,0 @@
-#pragma once
-
-#include <furi.h>
-#include <furi_hal.h>
-
-#define SUBGHZ_TEST_VERSION_APP "0.1"
-#define SUBGHZ_TEST_DEVELOPED "SkorP"
-#define SUBGHZ_TEST_GITHUB "https://github.com/flipperdevices/flipperzero-firmware"
-
-typedef enum {
-    SubGhzTestViewVariableItemList,
-    SubGhzTestViewSubmenu,
-    SubGhzTestViewStatic,
-    SubGhzTestViewCarrier,
-    SubGhzTestViewPacket,
-    SubGhzTestViewWidget,
-    SubGhzTestViewPopup,
-} SubGhzTestView;

applications/debug/subghz_test/protocol/math.c

@@ -1,244 +0,0 @@
-#include "math.h"
-
-uint64_t subghz_protocol_blocks_reverse_key(uint64_t key, uint8_t bit_count) {
-    uint64_t reverse_key = 0;
-    for(uint8_t i = 0; i < bit_count; i++) {
-        reverse_key = reverse_key << 1 | bit_read(key, i);
-    }
-    return reverse_key;
-}
-
-uint8_t subghz_protocol_blocks_get_parity(uint64_t key, uint8_t bit_count) {
-    uint8_t parity = 0;
-    for(uint8_t i = 0; i < bit_count; i++) {
-        parity += bit_read(key, i);
-    }
-    return parity & 0x01;
-}
-
-uint8_t subghz_protocol_blocks_crc4(
-    uint8_t const message[],
-    size_t size,
-    uint8_t polynomial,
-    uint8_t init) {
-    uint8_t remainder = init << 4; // LSBs are unused
-    uint8_t poly = polynomial << 4;
-    uint8_t bit;
-
-    while(size--) {
-        remainder ^= *message++;
-        for(bit = 0; bit < 8; bit++) {
-            if(remainder & 0x80) {
-                remainder = (remainder << 1) ^ poly;
-            } else {
-                remainder = (remainder << 1);
-            }
-        }
-    }
-    return remainder >> 4 & 0x0f; // discard the LSBs
-}
-
-uint8_t subghz_protocol_blocks_crc7(
-    uint8_t const message[],
-    size_t size,
-    uint8_t polynomial,
-    uint8_t init) {
-    uint8_t remainder = init << 1; // LSB is unused
-    uint8_t poly = polynomial << 1;
-
-    for(size_t byte = 0; byte < size; ++byte) {
-        remainder ^= message[byte];
-        for(uint8_t bit = 0; bit < 8; ++bit) {
-            if(remainder & 0x80) {
-                remainder = (remainder << 1) ^ poly;
-            } else {
-                remainder = (remainder << 1);
-            }
-        }
-    }
-    return remainder >> 1 & 0x7f; // discard the LSB
-}
-
-uint8_t subghz_protocol_blocks_crc8(
-    uint8_t const message[],
-    size_t size,
-    uint8_t polynomial,
-    uint8_t init) {
-    uint8_t remainder = init;
-
-    for(size_t byte = 0; byte < size; ++byte) {
-        remainder ^= message[byte];
-        for(uint8_t bit = 0; bit < 8; ++bit) {
-            if(remainder & 0x80) {
-                remainder = (remainder << 1) ^ polynomial;
-            } else {
-                remainder = (remainder << 1);
-            }
-        }
-    }
-    return remainder;
-}
-
-uint8_t subghz_protocol_blocks_crc8le(
-    uint8_t const message[],
-    size_t size,
-    uint8_t polynomial,
-    uint8_t init) {
-    uint8_t remainder = subghz_protocol_blocks_reverse_key(init, 8);
-    polynomial = subghz_protocol_blocks_reverse_key(polynomial, 8);
-
-    for(size_t byte = 0; byte < size; ++byte) {
-        remainder ^= message[byte];
-        for(uint8_t bit = 0; bit < 8; ++bit) {
-            if(remainder & 1) {
-                remainder = (remainder >> 1) ^ polynomial;
-            } else {
-                remainder = (remainder >> 1);
-            }
-        }
-    }
-    return remainder;
-}
-
-uint16_t subghz_protocol_blocks_crc16lsb(
-    uint8_t const message[],
-    size_t size,
-    uint16_t polynomial,
-    uint16_t init) {
-    uint16_t remainder = init;
-
-    for(size_t byte = 0; byte < size; ++byte) {
-        remainder ^= message[byte];
-        for(uint8_t bit = 0; bit < 8; ++bit) {
-            if(remainder & 1) {
-                remainder = (remainder >> 1) ^ polynomial;
-            } else {
-                remainder = (remainder >> 1);
-            }
-        }
-    }
-    return remainder;
-}
-
-uint16_t subghz_protocol_blocks_crc16(
-    uint8_t const message[],
-    size_t size,
-    uint16_t polynomial,
-    uint16_t init) {
-    uint16_t remainder = init;
-
-    for(size_t byte = 0; byte < size; ++byte) {
-        remainder ^= message[byte] << 8;
-        for(uint8_t bit = 0; bit < 8; ++bit) {
-            if(remainder & 0x8000) {
-                remainder = (remainder << 1) ^ polynomial;
-            } else {
-                remainder = (remainder << 1);
-            }
-        }
-    }
-    return remainder;
-}
-
-uint8_t subghz_protocol_blocks_lfsr_digest8(
-    uint8_t const message[],
-    size_t size,
-    uint8_t gen,
-    uint8_t key) {
-    uint8_t sum = 0;
-    for(size_t byte = 0; byte < size; ++byte) {
-        uint8_t data = message[byte];
-        for(int i = 7; i >= 0; --i) {
-            // XOR key into sum if data bit is set
-            if((data >> i) & 1) sum ^= key;
-
-            // roll the key right (actually the LSB is dropped here)
-            // and apply the gen (needs to include the dropped LSB as MSB)
-            if(key & 1)
-                key = (key >> 1) ^ gen;
-            else
-                key = (key >> 1);
-        }
-    }
-    return sum;
-}
-
-uint8_t subghz_protocol_blocks_lfsr_digest8_reflect(
-    uint8_t const message[],
-    size_t size,
-    uint8_t gen,
-    uint8_t key) {
-    uint8_t sum = 0;
-    // Process message from last byte to first byte (reflected)
-    for(int byte = size - 1; byte >= 0; --byte) {
-        uint8_t data = message[byte];
-        // Process individual bits of each byte (reflected)
-        for(uint8_t i = 0; i < 8; ++i) {
-            // XOR key into sum if data bit is set
-            if((data >> i) & 1) {
-                sum ^= key;
-            }
-
-            // roll the key left (actually the LSB is dropped here)
-            // and apply the gen (needs to include the dropped lsb as MSB)
-            if(key & 0x80)
-                key = (key << 1) ^ gen;
-            else
-                key = (key << 1);
-        }
-    }
-    return sum;
-}
-
-uint16_t subghz_protocol_blocks_lfsr_digest16(
-    uint8_t const message[],
-    size_t size,
-    uint16_t gen,
-    uint16_t key) {
-    uint16_t sum = 0;
-    for(size_t byte = 0; byte < size; ++byte) {
-        uint8_t data = message[byte];
-        for(int8_t i = 7; i >= 0; --i) {
-            // if data bit is set then xor with key
-            if((data >> i) & 1) sum ^= key;
-
-            // roll the key right (actually the LSB is dropped here)
-            // and apply the gen (needs to include the dropped LSB as MSB)
-            if(key & 1)
-                key = (key >> 1) ^ gen;
-            else
-                key = (key >> 1);
-        }
-    }
-    return sum;
-}
-
-uint8_t subghz_protocol_blocks_add_bytes(uint8_t const message[], size_t size) {
-    uint32_t result = 0;
-    for(size_t i = 0; i < size; ++i) {
-        result += message[i];
-    }
-    return (uint8_t)result;
-}
-
-uint8_t subghz_protocol_blocks_parity8(uint8_t byte) {
-    byte ^= byte >> 4;
-    byte &= 0xf;
-    return (0x6996 >> byte) & 1;
-}
-
-uint8_t subghz_protocol_blocks_parity_bytes(uint8_t const message[], size_t size) {
-    uint8_t result = 0;
-    for(size_t i = 0; i < size; ++i) {
-        result ^= subghz_protocol_blocks_parity8(message[i]);
-    }
-    return result;
-}
-
-uint8_t subghz_protocol_blocks_xor_bytes(uint8_t const message[], size_t size) {
-    uint8_t result = 0;
-    for(size_t i = 0; i < size; ++i) {
-        result ^= message[i];
-    }
-    return result;
-}

applications/debug/subghz_test/protocol/math.h

@@ -1,222 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stddef.h>
-
-#define bit_read(value, bit) (((value) >> (bit)) & 0x01)
-#define bit_set(value, bit)           \
-    ({                                \
-        __typeof__(value) _one = (1); \
-        (value) |= (_one << (bit));   \
-    })
-#define bit_clear(value, bit)         \
-    ({                                \
-        __typeof__(value) _one = (1); \
-        (value) &= ~(_one << (bit));  \
-    })
-#define bit_write(value, bit, bitvalue) (bitvalue ? bit_set(value, bit) : bit_clear(value, bit))
-#define DURATION_DIFF(x, y) (((x) < (y)) ? ((y) - (x)) : ((x) - (y)))
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Flip the data bitwise
- *
- * @param      key        In data
- * @param      bit_count  number of data bits
- *
- * @return     Reverse data
- */
-uint64_t subghz_protocol_blocks_reverse_key(uint64_t key, uint8_t bit_count);
-
-/** Get parity the data bitwise
- *
- * @param      key        In data
- * @param      bit_count  number of data bits
- *
- * @return     parity
- */
-uint8_t subghz_protocol_blocks_get_parity(uint64_t key, uint8_t bit_count);
-
-/** CRC-4
- *
- * @param      message     array of bytes to check
- * @param      size        number of bytes in message
- * @param      polynomial  CRC polynomial
- * @param      init        starting crc value
- *
- * @return     CRC value
- */
-uint8_t subghz_protocol_blocks_crc4(
-    uint8_t const message[],
-    size_t size,
-    uint8_t polynomial,
-    uint8_t init);
-
-/** CRC-7
- *
- * @param      message     array of bytes to check
- * @param      size        number of bytes in message
- * @param      polynomial  CRC polynomial
- * @param      init        starting crc value
- *
- * @return     CRC value
- */
-uint8_t subghz_protocol_blocks_crc7(
-    uint8_t const message[],
-    size_t size,
-    uint8_t polynomial,
-    uint8_t init);
-
-/** Generic Cyclic Redundancy Check CRC-8. Example polynomial: 0x31 = x8 + x5 +
- * x4 + 1 (x8 is implicit) Example polynomial: 0x80 = x8 + x7 (a normal
- * bit-by-bit parity XOR)
- *
- * @param      message     array of bytes to check
- * @param      size        number of bytes in message
- * @param      polynomial  byte is from x^7 to x^0 (x^8 is implicitly one)
- * @param      init        starting crc value
- *
- * @return     CRC value
- */
-uint8_t subghz_protocol_blocks_crc8(
-    uint8_t const message[],
-    size_t size,
-    uint8_t polynomial,
-    uint8_t init);
-
-/** "Little-endian" Cyclic Redundancy Check CRC-8 LE Input and output are
- * reflected, i.e. least significant bit is shifted in first
- *
- * @param      message     array of bytes to check
- * @param      size        number of bytes in message
- * @param      polynomial  CRC polynomial
- * @param      init        starting crc value
- *
- * @return     CRC value
- */
-uint8_t subghz_protocol_blocks_crc8le(
-    uint8_t const message[],
-    size_t size,
-    uint8_t polynomial,
-    uint8_t init);
-
-/** CRC-16 LSB. Input and output are reflected, i.e. least significant bit is
- * shifted in first. Note that poly and init already need to be reflected
- *
- * @param      message     array of bytes to check
- * @param      size        number of bytes in message
- * @param      polynomial  CRC polynomial
- * @param      init        starting crc value
- *
- * @return     CRC value
- */
-uint16_t subghz_protocol_blocks_crc16lsb(
-    uint8_t const message[],
-    size_t size,
-    uint16_t polynomial,
-    uint16_t init);
-
-/** CRC-16
- *
- * @param      message     array of bytes to check
- * @param      size        number of bytes in message
- * @param      polynomial  CRC polynomial
- * @param      init        starting crc value
- *
- * @return     CRC value
- */
-uint16_t subghz_protocol_blocks_crc16(
-    uint8_t const message[],
-    size_t size,
-    uint16_t polynomial,
-    uint16_t init);
-
-/** Digest-8 by "LFSR-based Toeplitz hash"
- *
- * @param      message  bytes of message data
- * @param      size     number of bytes to digest
- * @param      gen      key stream generator, needs to includes the MSB if the
- *                      LFSR is rolling
- * @param      key      initial key
- *
- * @return     digest value
- */
-uint8_t subghz_protocol_blocks_lfsr_digest8(
-    uint8_t const message[],
-    size_t size,
-    uint8_t gen,
-    uint8_t key);
-
-/** Digest-8 by "LFSR-based Toeplitz hash", byte reflect, bit reflect
- *
- * @param      message  bytes of message data
- * @param      size     number of bytes to digest
- * @param      gen      key stream generator, needs to includes the MSB if the
- *                      LFSR is rolling
- * @param      key      initial key
- *
- * @return     digest value
- */
-uint8_t subghz_protocol_blocks_lfsr_digest8_reflect(
-    uint8_t const message[],
-    size_t size,
-    uint8_t gen,
-    uint8_t key);
-
-/** Digest-16 by "LFSR-based Toeplitz hash"
- *
- * @param      message  bytes of message data
- * @param      size     number of bytes to digest
- * @param      gen      key stream generator, needs to includes the MSB if the
- *                      LFSR is rolling
- * @param      key      initial key
- *
- * @return     digest value
- */
-uint16_t subghz_protocol_blocks_lfsr_digest16(
-    uint8_t const message[],
-    size_t size,
-    uint16_t gen,
-    uint16_t key);
-
-/** Compute Addition of a number of bytes
- *
- * @param      message  bytes of message data
- * @param      size     number of bytes to sum
- *
- * @return     summation value
- */
-uint8_t subghz_protocol_blocks_add_bytes(uint8_t const message[], size_t size);
-
-/** Compute bit parity of a single byte (8 bits)
- *
- * @param      byte  single byte to check
- *
- * @return     1 odd parity, 0 even parity
- */
-uint8_t subghz_protocol_blocks_parity8(uint8_t byte);
-
-/** Compute bit parity of a number of bytes
- *
- * @param      message  bytes of message data
- * @param      size     number of bytes to sum
- *
- * @return     1 odd parity, 0 even parity
- */
-uint8_t subghz_protocol_blocks_parity_bytes(uint8_t const message[], size_t size);
-
-/** Compute XOR (byte-wide parity) of a number of bytes
- *
- * @param      message  bytes of message data
- * @param      size     number of bytes to sum
- *
- * @return     summation value, per bit-position 1 odd parity, 0 even parity
- */
-uint8_t subghz_protocol_blocks_xor_bytes(uint8_t const message[], size_t size);
-
-#ifdef __cplusplus
-}
-#endif

applications/debug/subghz_test/scenes/subghz_test_scene.c

@@ -1,30 +0,0 @@
-#include "../subghz_test_app_i.h"
-
-// Generate scene on_enter handlers array
-#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter,
-void (*const subghz_test_scene_on_enter_handlers[])(void*) = {
-#include "subghz_test_scene_config.h"
-};
-#undef ADD_SCENE
-
-// Generate scene on_event handlers array
-#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_event,
-bool (*const subghz_test_scene_on_event_handlers[])(void* context, SceneManagerEvent event) = {
-#include "subghz_test_scene_config.h"
-};
-#undef ADD_SCENE
-
-// Generate scene on_exit handlers array
-#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_exit,
-void (*const subghz_test_scene_on_exit_handlers[])(void* context) = {
-#include "subghz_test_scene_config.h"
-};
-#undef ADD_SCENE
-
-// Initialize scene handlers configuration structure
-const SceneManagerHandlers subghz_test_scene_handlers = {
-    .on_enter_handlers = subghz_test_scene_on_enter_handlers,
-    .on_event_handlers = subghz_test_scene_on_event_handlers,
-    .on_exit_handlers = subghz_test_scene_on_exit_handlers,
-    .scene_num = SubGhzTestSceneNum,
-};

applications/debug/subghz_test/scenes/subghz_test_scene.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#include <gui/scene_manager.h>
-
-// Generate scene id and total number
-#define ADD_SCENE(prefix, name, id) SubGhzTestScene##id,
-typedef enum {
-#include "subghz_test_scene_config.h"
-    SubGhzTestSceneNum,
-} SubGhzTestScene;
-#undef ADD_SCENE
-
-extern const SceneManagerHandlers subghz_test_scene_handlers;
-
-// Generate scene on_enter handlers declaration
-#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_enter(void*);
-#include "subghz_test_scene_config.h"
-#undef ADD_SCENE
-
-// Generate scene on_event handlers declaration
-#define ADD_SCENE(prefix, name, id) \
-    bool prefix##_scene_##name##_on_event(void* context, SceneManagerEvent event);
-#include "subghz_test_scene_config.h"
-#undef ADD_SCENE
-
-// Generate scene on_exit handlers declaration
-#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_exit(void* context);
-#include "subghz_test_scene_config.h"
-#undef ADD_SCENE

applications/debug/subghz_test/scenes/subghz_test_scene_about.c

@@ -1,66 +0,0 @@
-#include "../subghz_test_app_i.h"
-
-void subghz_test_scene_about_widget_callback(GuiButtonType result, InputType type, void* context) {
-    SubGhzTestApp* app = context;
-    if(type == InputTypeShort) {
-        view_dispatcher_send_custom_event(app->view_dispatcher, result);
-    }
-}
-
-void subghz_test_scene_about_on_enter(void* context) {
-    SubGhzTestApp* app = context;
-
-    FuriString* temp_str;
-    temp_str = furi_string_alloc();
-    furi_string_printf(temp_str, "\e#%s\n", "Information");
-
-    furi_string_cat_printf(temp_str, "Version: %s\n", SUBGHZ_TEST_VERSION_APP);
-    furi_string_cat_printf(temp_str, "Developed by: %s\n", SUBGHZ_TEST_DEVELOPED);
-    furi_string_cat_printf(temp_str, "Github: %s\n\n", SUBGHZ_TEST_GITHUB);
-
-    furi_string_cat_printf(temp_str, "\e#%s\n", "Description");
-    furi_string_cat_printf(
-        temp_str,
-        "This application is designed\nto test the functionality of the\nbuilt-in CC1101 module.\n\n");
-
-    widget_add_text_box_element(
-        app->widget,
-        0,
-        0,
-        128,
-        14,
-        AlignCenter,
-        AlignBottom,
-        "\e#\e!                                                      \e!\n",
-        false);
-    widget_add_text_box_element(
-        app->widget,
-        0,
-        2,
-        128,
-        14,
-        AlignCenter,
-        AlignBottom,
-        "\e#\e!         Sub-Ghz Test          \e!\n",
-        false);
-    widget_add_text_scroll_element(app->widget, 0, 16, 128, 50, furi_string_get_cstr(temp_str));
-    furi_string_free(temp_str);
-
-    view_dispatcher_switch_to_view(app->view_dispatcher, SubGhzTestViewWidget);
-}
-
-bool subghz_test_scene_about_on_event(void* context, SceneManagerEvent event) {
-    SubGhzTestApp* app = context;
-    bool consumed = false;
-    UNUSED(app);
-    UNUSED(event);
-
-    return consumed;
-}
-
-void subghz_test_scene_about_on_exit(void* context) {
-    SubGhzTestApp* app = context;
-
-    // Clear views
-    widget_reset(app->widget);
-}

applications/debug/subghz_test/scenes/subghz_test_scene_carrier.c

@@ -1,29 +0,0 @@
-#include "../subghz_test_app_i.h"
-
-void subghz_test_scene_carrier_callback(SubGhzTestCarrierEvent event, void* context) {
-    furi_assert(context);
-    SubGhzTestApp* app = context;
-    view_dispatcher_send_custom_event(app->view_dispatcher, event);
-}
-
-void subghz_test_scene_carrier_on_enter(void* context) {
-    SubGhzTestApp* app = context;
-    subghz_test_carrier_set_callback(
-        app->subghz_test_carrier, subghz_test_scene_carrier_callback, app);
-    view_dispatcher_switch_to_view(app->view_dispatcher, SubGhzTestViewCarrier);
-}
-
-bool subghz_test_scene_carrier_on_event(void* context, SceneManagerEvent event) {
-    SubGhzTestApp* app = context;
-    if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == SubGhzTestCarrierEventOnlyRx) {
-            scene_manager_next_scene(app->scene_manager, SubGhzTestSceneShowOnlyRx);
-            return true;
-        }
-    }
-    return false;
-}
-
-void subghz_test_scene_carrier_on_exit(void* context) {
-    UNUSED(context);
-}

applications/debug/subghz_test/scenes/subghz_test_scene_config.h

@@ -1,6 +0,0 @@
-ADD_SCENE(subghz_test, start, Start)
-ADD_SCENE(subghz_test, about, About)
-ADD_SCENE(subghz_test, carrier, Carrier)
-ADD_SCENE(subghz_test, packet, Packet)
-ADD_SCENE(subghz_test, static, Static)
-ADD_SCENE(subghz_test, show_only_rx, ShowOnlyRx)

applications/debug/subghz_test/scenes/subghz_test_scene_packet.c

@@ -1,29 +0,0 @@
-#include "../subghz_test_app_i.h"
-
-void subghz_test_scene_packet_callback(SubGhzTestPacketEvent event, void* context) {
-    furi_assert(context);
-    SubGhzTestApp* app = context;
-    view_dispatcher_send_custom_event(app->view_dispatcher, event);
-}
-
-void subghz_test_scene_packet_on_enter(void* context) {
-    SubGhzTestApp* app = context;
-    subghz_test_packet_set_callback(
-        app->subghz_test_packet, subghz_test_scene_packet_callback, app);
-    view_dispatcher_switch_to_view(app->view_dispatcher, SubGhzTestViewPacket);
-}
-
-bool subghz_test_scene_packet_on_event(void* context, SceneManagerEvent event) {
-    SubGhzTestApp* app = context;
-    if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == SubGhzTestPacketEventOnlyRx) {
-            scene_manager_next_scene(app->scene_manager, SubGhzTestSceneShowOnlyRx);
-            return true;
-        }
-    }
-    return false;
-}
-
-void subghz_test_scene_packet_on_exit(void* context) {
-    UNUSED(context);
-}

applications/debug/subghz_test/scenes/subghz_test_scene_show_only_rx.c

@@ -1,49 +0,0 @@
-#include "../subghz_test_app_i.h"
-#include <subghz_test_icons.h>
-
-void subghz_test_scene_show_only_rx_popup_callback(void* context) {
-    SubGhzTestApp* app = context;
-    view_dispatcher_send_custom_event(app->view_dispatcher, SubGhzTestCustomEventSceneShowOnlyRX);
-}
-
-void subghz_test_scene_show_only_rx_on_enter(void* context) {
-    SubGhzTestApp* app = context;
-
-    // Setup view
-    Popup* popup = app->popup;
-
-    const char* header_text = "Transmission is blocked";
-    const char* message_text = "Transmission on\nthis frequency is\nrestricted in\nyour region";
-    if(!furi_hal_region_is_provisioned()) {
-        header_text = "Firmware update needed";
-        message_text = "Please update\nfirmware before\nusing this feature\nflipp.dev/upd";
-    }
-
-    popup_set_header(popup, header_text, 63, 3, AlignCenter, AlignTop);
-    popup_set_text(popup, message_text, 0, 17, AlignLeft, AlignTop);
-    popup_set_icon(popup, 72, 17, &I_DolphinCommon_56x48);
-
-    popup_set_timeout(popup, 1500);
-    popup_set_context(popup, app);
-    popup_set_callback(popup, subghz_test_scene_show_only_rx_popup_callback);
-    popup_enable_timeout(popup);
-    view_dispatcher_switch_to_view(app->view_dispatcher, SubGhzTestViewPopup);
-}
-
-bool subghz_test_scene_show_only_rx_on_event(void* context, SceneManagerEvent event) {
-    SubGhzTestApp* app = context;
-    if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == SubGhzTestCustomEventSceneShowOnlyRX) {
-            scene_manager_previous_scene(app->scene_manager);
-            return true;
-        }
-    }
-    return false;
-}
-
-void subghz_test_scene_show_only_rx_on_exit(void* context) {
-    SubGhzTestApp* app = context;
-    Popup* popup = app->popup;
-
-    popup_reset(popup);
-}

applications/debug/subghz_test/scenes/subghz_test_scene_start.c

@@ -1,77 +0,0 @@
-#include "../subghz_test_app_i.h"
-
-typedef enum {
-    SubmenuIndexSubGhzTestCarrier,
-    SubmenuIndexSubGhzTestPacket,
-    SubmenuIndexSubGhzTestStatic,
-    SubmenuIndexSubGhzTestAbout,
-} SubmenuIndex;
-
-void subghz_test_scene_start_submenu_callback(void* context, uint32_t index) {
-    SubGhzTestApp* app = context;
-    view_dispatcher_send_custom_event(app->view_dispatcher, index);
-}
-
-void subghz_test_scene_start_on_enter(void* context) {
-    SubGhzTestApp* app = context;
-    Submenu* submenu = app->submenu;
-
-    submenu_add_item(
-        submenu,
-        "Carrier",
-        SubmenuIndexSubGhzTestCarrier,
-        subghz_test_scene_start_submenu_callback,
-        app);
-    submenu_add_item(
-        submenu,
-        "Packet",
-        SubmenuIndexSubGhzTestPacket,
-        subghz_test_scene_start_submenu_callback,
-        app);
-    submenu_add_item(
-        submenu,
-        "Static",
-        SubmenuIndexSubGhzTestStatic,
-        subghz_test_scene_start_submenu_callback,
-        app);
-    submenu_add_item(
-        submenu,
-        "About",
-        SubmenuIndexSubGhzTestAbout,
-        subghz_test_scene_start_submenu_callback,
-        app);
-
-    submenu_set_selected_item(
-        submenu, scene_manager_get_scene_state(app->scene_manager, SubGhzTestSceneStart));
-
-    view_dispatcher_switch_to_view(app->view_dispatcher, SubGhzTestViewSubmenu);
-}
-
-bool subghz_test_scene_start_on_event(void* context, SceneManagerEvent event) {
-    SubGhzTestApp* app = context;
-    bool consumed = false;
-
-    if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == SubmenuIndexSubGhzTestAbout) {
-            scene_manager_next_scene(app->scene_manager, SubGhzTestSceneAbout);
-            consumed = true;
-        } else if(event.event == SubmenuIndexSubGhzTestCarrier) {
-            scene_manager_next_scene(app->scene_manager, SubGhzTestSceneCarrier);
-            consumed = true;
-        } else if(event.event == SubmenuIndexSubGhzTestPacket) {
-            scene_manager_next_scene(app->scene_manager, SubGhzTestScenePacket);
-            consumed = true;
-        } else if(event.event == SubmenuIndexSubGhzTestStatic) {
-            scene_manager_next_scene(app->scene_manager, SubGhzTestSceneStatic);
-            consumed = true;
-        }
-        scene_manager_set_scene_state(app->scene_manager, SubGhzTestSceneStart, event.event);
-    }
-
-    return consumed;
-}
-
-void subghz_test_scene_start_on_exit(void* context) {
-    SubGhzTestApp* app = context;
-    submenu_reset(app->submenu);
-}

applications/debug/subghz_test/scenes/subghz_test_scene_static.c

@@ -1,29 +0,0 @@
-#include "../subghz_test_app_i.h"
-
-void subghz_test_scene_static_callback(SubGhzTestStaticEvent event, void* context) {
-    furi_assert(context);
-    SubGhzTestApp* app = context;
-    view_dispatcher_send_custom_event(app->view_dispatcher, event);
-}
-
-void subghz_test_scene_static_on_enter(void* context) {
-    SubGhzTestApp* app = context;
-    subghz_test_static_set_callback(
-        app->subghz_test_static, subghz_test_scene_static_callback, app);
-    view_dispatcher_switch_to_view(app->view_dispatcher, SubGhzTestViewStatic);
-}
-
-bool subghz_test_scene_static_on_event(void* context, SceneManagerEvent event) {
-    SubGhzTestApp* app = context;
-    if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == SubGhzTestStaticEventOnlyRx) {
-            scene_manager_next_scene(app->scene_manager, SubGhzTestSceneShowOnlyRx);
-            return true;
-        }
-    }
-    return false;
-}
-
-void subghz_test_scene_static_on_exit(void* context) {
-    UNUSED(context);
-}

applications/debug/subghz_test/subghz_test_app.c

@@ -1,139 +0,0 @@
-#include "subghz_test_app_i.h"
-
-#include <furi.h>
-#include <furi_hal.h>
-
-static bool subghz_test_app_custom_event_callback(void* context, uint32_t event) {
-    furi_assert(context);
-    SubGhzTestApp* app = context;
-    return scene_manager_handle_custom_event(app->scene_manager, event);
-}
-
-static bool subghz_test_app_back_event_callback(void* context) {
-    furi_assert(context);
-    SubGhzTestApp* app = context;
-    return scene_manager_handle_back_event(app->scene_manager);
-}
-
-static void subghz_test_app_tick_event_callback(void* context) {
-    furi_assert(context);
-    SubGhzTestApp* app = context;
-    scene_manager_handle_tick_event(app->scene_manager);
-}
-
-SubGhzTestApp* subghz_test_app_alloc() {
-    SubGhzTestApp* app = malloc(sizeof(SubGhzTestApp));
-
-    // GUI
-    app->gui = furi_record_open(RECORD_GUI);
-
-    // View Dispatcher
-    app->view_dispatcher = view_dispatcher_alloc();
-    app->scene_manager = scene_manager_alloc(&subghz_test_scene_handlers, app);
-    view_dispatcher_enable_queue(app->view_dispatcher);
-
-    view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
-    view_dispatcher_set_custom_event_callback(
-        app->view_dispatcher, subghz_test_app_custom_event_callback);
-    view_dispatcher_set_navigation_event_callback(
-        app->view_dispatcher, subghz_test_app_back_event_callback);
-    view_dispatcher_set_tick_event_callback(
-        app->view_dispatcher, subghz_test_app_tick_event_callback, 100);
-
-    view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
-
-    // Open Notification record
-    app->notifications = furi_record_open(RECORD_NOTIFICATION);
-
-    // SubMenu
-    app->submenu = submenu_alloc();
-    view_dispatcher_add_view(
-        app->view_dispatcher, SubGhzTestViewSubmenu, submenu_get_view(app->submenu));
-
-    // Widget
-    app->widget = widget_alloc();
-    view_dispatcher_add_view(
-        app->view_dispatcher, SubGhzTestViewWidget, widget_get_view(app->widget));
-
-    // Popup
-    app->popup = popup_alloc();
-    view_dispatcher_add_view(
-        app->view_dispatcher, SubGhzTestViewPopup, popup_get_view(app->popup));
-
-    // Carrier Test Module
-    app->subghz_test_carrier = subghz_test_carrier_alloc();
-    view_dispatcher_add_view(
-        app->view_dispatcher,
-        SubGhzTestViewCarrier,
-        subghz_test_carrier_get_view(app->subghz_test_carrier));
-
-    // Packet Test
-    app->subghz_test_packet = subghz_test_packet_alloc();
-    view_dispatcher_add_view(
-        app->view_dispatcher,
-        SubGhzTestViewPacket,
-        subghz_test_packet_get_view(app->subghz_test_packet));
-
-    // Static send
-    app->subghz_test_static = subghz_test_static_alloc();
-    view_dispatcher_add_view(
-        app->view_dispatcher,
-        SubGhzTestViewStatic,
-        subghz_test_static_get_view(app->subghz_test_static));
-
-    scene_manager_next_scene(app->scene_manager, SubGhzTestSceneStart);
-
-    return app;
-}
-
-void subghz_test_app_free(SubGhzTestApp* app) {
-    furi_assert(app);
-
-    // Submenu
-    view_dispatcher_remove_view(app->view_dispatcher, SubGhzTestViewSubmenu);
-    submenu_free(app->submenu);
-
-    //  Widget
-    view_dispatcher_remove_view(app->view_dispatcher, SubGhzTestViewWidget);
-    widget_free(app->widget);
-
-    // Popup
-    view_dispatcher_remove_view(app->view_dispatcher, SubGhzTestViewPopup);
-    popup_free(app->popup);
-
-    // Carrier Test
-    view_dispatcher_remove_view(app->view_dispatcher, SubGhzTestViewCarrier);
-    subghz_test_carrier_free(app->subghz_test_carrier);
-
-    // Packet Test
-    view_dispatcher_remove_view(app->view_dispatcher, SubGhzTestViewPacket);
-    subghz_test_packet_free(app->subghz_test_packet);
-
-    // Static
-    view_dispatcher_remove_view(app->view_dispatcher, SubGhzTestViewStatic);
-    subghz_test_static_free(app->subghz_test_static);
-
-    // View dispatcher
-    view_dispatcher_free(app->view_dispatcher);
-    scene_manager_free(app->scene_manager);
-
-    // Notifications
-    furi_record_close(RECORD_NOTIFICATION);
-    app->notifications = NULL;
-
-    // Close records
-    furi_record_close(RECORD_GUI);
-
-    free(app);
-}
-
-int32_t subghz_test_app(void* p) {
-    UNUSED(p);
-    SubGhzTestApp* subghz_test_app = subghz_test_app_alloc();
-
-    view_dispatcher_run(subghz_test_app->view_dispatcher);
-
-    subghz_test_app_free(subghz_test_app);
-
-    return 0;
-}

applications/debug/subghz_test/subghz_test_app_i.c

@@ -1,5 +0,0 @@
-#include "subghz_test_app_i.h"
-
-#include <furi.h>
-
-#define TAG "SubGhzTest"

applications/debug/subghz_test/subghz_test_app_i.h

@@ -1,32 +0,0 @@
-#pragma once
-
-#include "helpers/subghz_test_types.h"
-#include "helpers/subghz_test_event.h"
-
-#include "scenes/subghz_test_scene.h"
-#include <gui/gui.h>
-#include <gui/view_dispatcher.h>
-#include <gui/scene_manager.h>
-#include <gui/modules/submenu.h>
-#include <gui/modules/widget.h>
-#include <gui/modules/popup.h>
-#include <notification/notification_messages.h>
-
-#include "views/subghz_test_static.h"
-#include "views/subghz_test_carrier.h"
-#include "views/subghz_test_packet.h"
-
-typedef struct SubGhzTestApp SubGhzTestApp;
-
-struct SubGhzTestApp {
-    Gui* gui;
-    ViewDispatcher* view_dispatcher;
-    SceneManager* scene_manager;
-    NotificationApp* notifications;
-    Submenu* submenu;
-    Widget* widget;
-    Popup* popup;
-    SubGhzTestStatic* subghz_test_static;
-    SubGhzTestCarrier* subghz_test_carrier;
-    SubGhzTestPacket* subghz_test_packet;
-};

applications/debug/text_box_test/text_box_test.c

@@ -53,17 +53,15 @@ static void (*text_box_test_render[])(Canvas* canvas) = {
 
 typedef struct {
     uint32_t idx;
-    FuriMutex* mutex;
 } TextBoxTestState;
 
 static void text_box_test_render_callback(Canvas* canvas, void* ctx) {
-    TextBoxTestState* state = ctx;
-    furi_mutex_acquire(state->mutex, FuriWaitForever);
+    TextBoxTestState* state = acquire_mutex((ValueMutex*)ctx, 25);
     canvas_clear(canvas);
 
     text_box_test_render[state->idx](canvas);
 
-    furi_mutex_release(state->mutex);
+    release_mutex((ValueMutex*)ctx, state);
 }
 
 static void text_box_test_input_callback(InputEvent* input_event, void* ctx) {
@@ -76,17 +74,17 @@ int32_t text_box_test_app(void* p) {
     FuriMessageQueue* event_queue = furi_message_queue_alloc(32, sizeof(InputEvent));
     furi_check(event_queue);
 
-    TextBoxTestState state = {.idx = 0, .mutex = NULL};
-    state.mutex = furi_mutex_alloc(FuriMutexTypeNormal);
+    TextBoxTestState _state = {.idx = 0};
 
-    if(!state.mutex) {
+    ValueMutex state_mutex;
+    if(!init_mutex(&state_mutex, &_state, sizeof(TextBoxTestState))) {
         FURI_LOG_E(TAG, "Cannot create mutex");
         return 0;
     }
 
     ViewPort* view_port = view_port_alloc();
 
-    view_port_draw_callback_set(view_port, text_box_test_render_callback, &state);
+    view_port_draw_callback_set(view_port, text_box_test_render_callback, &state_mutex);
     view_port_input_callback_set(view_port, text_box_test_input_callback, event_queue);
 
     // Open GUI and register view_port
@@ -96,24 +94,24 @@ int32_t text_box_test_app(void* p) {
     uint32_t test_renders_num = COUNT_OF(text_box_test_render);
     InputEvent event;
     while(furi_message_queue_get(event_queue, &event, FuriWaitForever) == FuriStatusOk) {
-        furi_mutex_acquire(state.mutex, FuriWaitForever);
+        TextBoxTestState* state = acquire_mutex_block(&state_mutex);
 
         if(event.type == InputTypeShort) {
             if(event.key == InputKeyRight) {
-                if(state.idx < test_renders_num - 1) {
-                    state.idx++;
+                if(state->idx < test_renders_num - 1) {
+                    state->idx++;
                 }
             } else if(event.key == InputKeyLeft) {
-                if(state.idx > 0) {
-                    state.idx--;
+                if(state->idx > 0) {
+                    state->idx--;
                 }
             } else if(event.key == InputKeyBack) {
-                furi_mutex_release(state.mutex);
+                release_mutex(&state_mutex, state);
                 break;
             }
         }
 
-        furi_mutex_release(state.mutex);
+        release_mutex(&state_mutex, state);
         view_port_update(view_port);
     }
 
@@ -121,7 +119,7 @@ int32_t text_box_test_app(void* p) {
     gui_remove_view_port(gui, view_port);
     view_port_free(view_port);
     furi_message_queue_free(event_queue);
-    furi_mutex_free(state.mutex);
+    delete_mutex(&state_mutex);
 
     furi_record_close(RECORD_GUI);
 

applications/debug/uart_echo/application.fam

@@ -1,12 +1,12 @@
 App(
-    appid="uart_echo",
+    appid="UART_Echo",
     name="UART Echo",
-    apptype=FlipperAppType.DEBUG,
+    apptype=FlipperAppType.PLUGIN,
     entry_point="uart_echo_app",
     cdefines=["APP_UART_ECHO"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=70,
     fap_icon="uart_10px.png",
-    fap_category="Debug",
+    fap_category="Misc",
 )

applications/debug/uart_echo/uart_echo.c

@@ -10,8 +10,6 @@
 
 #define LINES_ON_SCREEN 6
 #define COLUMNS_ON_SCREEN 21
-#define TAG "UartEcho"
-#define DEFAULT_BAUD_RATE 230400
 
 typedef struct UartDumpModel UartDumpModel;
 
@@ -181,7 +179,7 @@ static int32_t uart_echo_worker(void* context) {
     return 0;
 }
 
-static UartEchoApp* uart_echo_app_alloc(uint32_t baudrate) {
+static UartEchoApp* uart_echo_app_alloc() {
     UartEchoApp* app = malloc(sizeof(UartEchoApp));
 
     app->rx_stream = furi_stream_buffer_alloc(2048, 1);
@@ -222,7 +220,7 @@ static UartEchoApp* uart_echo_app_alloc(uint32_t baudrate) {
 
     // Enable uart listener
     furi_hal_console_disable();
-    furi_hal_uart_set_br(FuriHalUartIdUSART1, baudrate);
+    furi_hal_uart_set_br(FuriHalUartIdUSART1, 115200);
     furi_hal_uart_set_irq_cb(FuriHalUartIdUSART1, uart_echo_on_irq_cb, app);
 
     return app;
@@ -265,18 +263,8 @@ static void uart_echo_app_free(UartEchoApp* app) {
 }
 
 int32_t uart_echo_app(void* p) {
-    uint32_t baudrate = DEFAULT_BAUD_RATE;
-    if(p) {
-        const char* baudrate_str = p;
-        if(sscanf(baudrate_str, "%lu", &baudrate) != 1) {
-            FURI_LOG_E(TAG, "Invalid baudrate: %s", baudrate_str);
-            baudrate = DEFAULT_BAUD_RATE;
-        }
-    }
-
-    FURI_LOG_I(TAG, "Using baudrate: %lu", baudrate);
-
-    UartEchoApp* app = uart_echo_app_alloc(baudrate);
+    UNUSED(p);
+    UartEchoApp* app = uart_echo_app_alloc();
     view_dispatcher_run(app->view_dispatcher);
     uart_echo_app_free(app);
     return 0;

applications/debug/unit_tests/application.fam

@@ -3,9 +3,7 @@ App(
     apptype=FlipperAppType.STARTUP,
     entry_point="unit_tests_on_system_start",
     cdefines=["APP_UNIT_TESTS"],
-    requires=["system_settings"],
     provides=["delay_test"],
-    resources="resources",
     order=100,
 )
 

applications/debug/unit_tests/bt/bt_test.c

@@ -1,110 +0,0 @@
-#include <furi.h>
-#include <furi_hal.h>
-#include "../minunit.h"
-
-#include <bt/bt_service/bt_keys_storage.h>
-#include <storage/storage.h>
-
-#define BT_TEST_KEY_STORAGE_FILE_PATH EXT_PATH("unit_tests/bt_test.keys")
-#define BT_TEST_NVM_RAM_BUFF_SIZE (507 * 4) // The same as in ble NVM storage
-
-typedef struct {
-    Storage* storage;
-    BtKeysStorage* bt_keys_storage;
-    uint8_t* nvm_ram_buff_dut;
-    uint8_t* nvm_ram_buff_ref;
-} BtTest;
-
-BtTest* bt_test = NULL;
-
-void bt_test_alloc() {
-    bt_test = malloc(sizeof(BtTest));
-    bt_test->storage = furi_record_open(RECORD_STORAGE);
-    bt_test->nvm_ram_buff_dut = malloc(BT_TEST_NVM_RAM_BUFF_SIZE);
-    bt_test->nvm_ram_buff_ref = malloc(BT_TEST_NVM_RAM_BUFF_SIZE);
-    bt_test->bt_keys_storage = bt_keys_storage_alloc(BT_TEST_KEY_STORAGE_FILE_PATH);
-    bt_keys_storage_set_ram_params(
-        bt_test->bt_keys_storage, bt_test->nvm_ram_buff_dut, BT_TEST_NVM_RAM_BUFF_SIZE);
-}
-
-void bt_test_free() {
-    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);
-    furi_record_close(RECORD_STORAGE);
-    free(bt_test);
-    bt_test = NULL;
-}
-
-static void bt_test_keys_storage_profile() {
-    // Emulate nvm change on initial connection
-    const int nvm_change_size_on_connection = 88;
-    for(size_t i = 0; i < nvm_change_size_on_connection; i++) {
-        bt_test->nvm_ram_buff_dut[i] = rand();
-        bt_test->nvm_ram_buff_ref[i] = bt_test->nvm_ram_buff_dut[i];
-    }
-    // Emulate update storage on initial connect
-    mu_assert(
-        bt_keys_storage_update(
-            bt_test->bt_keys_storage, bt_test->nvm_ram_buff_dut, nvm_change_size_on_connection),
-        "Failed to update key storage on initial connect");
-    memset(bt_test->nvm_ram_buff_dut, 0, BT_TEST_NVM_RAM_BUFF_SIZE);
-    mu_assert(bt_keys_storage_load(bt_test->bt_keys_storage), "Failed to load NVM");
-    mu_assert(
-        memcmp(
-            bt_test->nvm_ram_buff_ref, bt_test->nvm_ram_buff_dut, nvm_change_size_on_connection) ==
-            0,
-        "Wrong buffer loaded");
-
-    const int nvm_disconnect_update_offset = 84;
-    const int nvm_disconnect_update_size = 324;
-    const int nvm_total_size = nvm_change_size_on_connection -
-                               (nvm_change_size_on_connection - nvm_disconnect_update_offset) +
-                               nvm_disconnect_update_size;
-    // Emulate update storage on initial disconnect
-    for(size_t i = nvm_disconnect_update_offset;
-        i < nvm_disconnect_update_offset + nvm_disconnect_update_size;
-        i++) {
-        bt_test->nvm_ram_buff_dut[i] = rand();
-        bt_test->nvm_ram_buff_ref[i] = bt_test->nvm_ram_buff_dut[i];
-    }
-    mu_assert(
-        bt_keys_storage_update(
-            bt_test->bt_keys_storage,
-            &bt_test->nvm_ram_buff_dut[nvm_disconnect_update_offset],
-            nvm_disconnect_update_size),
-        "Failed to update key storage on initial disconnect");
-    memset(bt_test->nvm_ram_buff_dut, 0, BT_TEST_NVM_RAM_BUFF_SIZE);
-    mu_assert(bt_keys_storage_load(bt_test->bt_keys_storage), "Failed to load NVM");
-    mu_assert(
-        memcmp(bt_test->nvm_ram_buff_ref, bt_test->nvm_ram_buff_dut, nvm_total_size) == 0,
-        "Wrong buffer loaded");
-}
-
-static void bt_test_keys_remove_test_file() {
-    mu_assert(
-        storage_simply_remove(bt_test->storage, BT_TEST_KEY_STORAGE_FILE_PATH),
-        "Can't remove test file");
-}
-
-MU_TEST(bt_test_keys_storage_serial_profile) {
-    furi_check(bt_test);
-
-    bt_test_keys_remove_test_file();
-    bt_test_keys_storage_profile();
-    bt_test_keys_remove_test_file();
-}
-
-MU_TEST_SUITE(test_bt) {
-    bt_test_alloc();
-
-    MU_RUN_TEST(bt_test_keys_storage_serial_profile);
-
-    bt_test_free();
-}
-
-int run_minunit_test_bt() {
-    MU_RUN_SUITE(test_bt);
-    return MU_EXIT_CODE;
-}

applications/debug/unit_tests/dialogs/dialogs_file_browser_options.c

@@ -1,32 +0,0 @@
-#include <dialogs/dialogs.h>
-
-#include "../minunit.h"
-
-MU_TEST(test_dialog_file_browser_set_basic_options_should_init_all_fields) {
-    mu_assert(
-        sizeof(DialogsFileBrowserOptions) == 28,
-        "Changes to `DialogsFileBrowserOptions` should also be reflected in `dialog_file_browser_set_basic_options`");
-
-    DialogsFileBrowserOptions options;
-    dialog_file_browser_set_basic_options(&options, ".fap", NULL);
-    // note: this assertions can safely be changed, their primary purpose is to remind the maintainer
-    // to update `dialog_file_browser_set_basic_options` by including all structure fields in it
-    mu_assert_string_eq(".fap", options.extension);
-    mu_assert_null(options.base_path);
-    mu_assert(options.skip_assets, "`skip_assets` should default to `true");
-    mu_assert(options.hide_dot_files, "`hide_dot_files` should default to `true");
-    mu_assert_null(options.icon);
-    mu_assert(options.hide_ext, "`hide_ext` should default to `true");
-    mu_assert_null(options.item_loader_callback);
-    mu_assert_null(options.item_loader_context);
-}
-
-MU_TEST_SUITE(dialogs_file_browser_options) {
-    MU_RUN_TEST(test_dialog_file_browser_set_basic_options_should_init_all_fields);
-}
-
-int run_minunit_test_dialogs_file_browser_options() {
-    MU_RUN_SUITE(dialogs_file_browser_options);
-
-    return MU_EXIT_CODE;
-}

applications/debug/unit_tests/float_tools/float_tools_test.c

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

applications/debug/unit_tests/furi/furi_memmgr_test.c

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

applications/debug/unit_tests/furi/furi_string_test.c

@@ -69,7 +69,7 @@ MU_TEST(mu_test_furi_string_mem) {
     mu_check(string != NULL);
     mu_check(!furi_string_empty(string));
 
-    // TODO FL-3493: how to test furi_string_reserve?
+    // TODO: how to test furi_string_reserve?
 
     // test furi_string_reset
     furi_string_reset(string);

applications/debug/unit_tests/furi/furi_test.c

@@ -5,6 +5,7 @@
 
 // v2 tests
 void test_furi_create_open();
+void test_furi_valuemutex();
 void test_furi_concurrent_access();
 void test_furi_pubsub();
 
@@ -29,6 +30,10 @@ MU_TEST(mu_test_furi_create_open) {
     test_furi_create_open();
 }
 
+MU_TEST(mu_test_furi_valuemutex) {
+    test_furi_valuemutex();
+}
+
 MU_TEST(mu_test_furi_pubsub) {
     test_furi_pubsub();
 }
@@ -46,6 +51,7 @@ MU_TEST_SUITE(test_suite) {
 
     // v2 tests
     MU_RUN_TEST(mu_test_furi_create_open);
+    MU_RUN_TEST(mu_test_furi_valuemutex);
     MU_RUN_TEST(mu_test_furi_pubsub);
     MU_RUN_TEST(mu_test_furi_memmgr);
 }

applications/debug/unit_tests/furi/furi_valuemutex_test.c

@@ -0,0 +1,41 @@
+#include <stdio.h>
+#include <string.h>
+#include <furi.h>
+
+#include "../minunit.h"
+
+void test_furi_valuemutex() {
+    const int init_value = 0xdeadbeef;
+    const int changed_value = 0x12345678;
+
+    int value = init_value;
+    bool result;
+    ValueMutex valuemutex;
+
+    // init mutex case
+    result = init_mutex(&valuemutex, &value, sizeof(value));
+    mu_assert(result, "init mutex failed");
+
+    // acquire mutex case
+    int* value_pointer = acquire_mutex(&valuemutex, 100);
+    mu_assert_pointers_eq(value_pointer, &value);
+
+    // second acquire mutex case
+    int* value_pointer_second = acquire_mutex(&valuemutex, 100);
+    mu_assert_pointers_eq(value_pointer_second, NULL);
+
+    // change value case
+    *value_pointer = changed_value;
+    mu_assert_int_eq(value, changed_value);
+
+    // release mutex case
+    result = release_mutex(&valuemutex, &value);
+    mu_assert(result, "release mutex failed");
+
+    // TODO
+    //acquire mutex blocking case
+    //write mutex blocking case
+    //read mutex blocking case
+
+    mu_check(delete_mutex(&valuemutex));
+}

applications/debug/unit_tests/furi_hal/furi_hal_crypto_tests.c

@@ -1,602 +0,0 @@
-#include <stdio.h>
-#include <furi.h>
-#include <furi_hal.h>
-#include "../minunit.h"
-
-static const uint8_t key_ctr_1[32] = {
-    0x77, 0x6B, 0xEF, 0xF2, 0x85, 0x1D, 0xB0, 0x6F, 0x4C, 0x8A, 0x05, 0x42, 0xC8, 0x69, 0x6F, 0x6C,
-    0x6A, 0x81, 0xAF, 0x1E, 0xEC, 0x96, 0xB4, 0xD3, 0x7F, 0xC1, 0xD6, 0x89, 0xE6, 0xC1, 0xC1, 0x04,
-};
-static const uint8_t iv_ctr_1[16] = {
-    0x00,
-    0x00,
-    0x00,
-    0x60,
-    0xDB,
-    0x56,
-    0x72,
-    0xC9,
-    0x7A,
-    0xA8,
-    0xF0,
-    0xB2,
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-};
-static const uint8_t pt_ctr_1[16] = {
-    0x53,
-    0x69,
-    0x6E,
-    0x67,
-    0x6C,
-    0x65,
-    0x20,
-    0x62,
-    0x6C,
-    0x6F,
-    0x63,
-    0x6B,
-    0x20,
-    0x6D,
-    0x73,
-    0x67,
-};
-static const uint8_t tv_ctr_ct_1[16] = {
-    0x14,
-    0x5A,
-    0xD0,
-    0x1D,
-    0xBF,
-    0x82,
-    0x4E,
-    0xC7,
-    0x56,
-    0x08,
-    0x63,
-    0xDC,
-    0x71,
-    0xE3,
-    0xE0,
-    0xC0,
-};
-
-static const uint8_t key_ctr_2[32] = {
-    0x77, 0x6B, 0xEF, 0xF2, 0x85, 0x1D, 0xB0, 0x6F, 0x4C, 0x8A, 0x05, 0x42, 0xC8, 0x69, 0x6F, 0x6C,
-    0x6A, 0x81, 0xAF, 0x1E, 0xEC, 0x96, 0xB4, 0xD3, 0x7F, 0xC1, 0xD6, 0x89, 0xE6, 0xC1, 0xC1, 0x04,
-};
-static const uint8_t iv_ctr_2[16] = {
-    0x00,
-    0x00,
-    0x00,
-    0x60,
-    0xDB,
-    0x56,
-    0x72,
-    0xC9,
-    0x7A,
-    0xA8,
-    0xF0,
-    0xB2,
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-};
-static const uint8_t pt_ctr_2[0] = {};
-//static const uint8_t tv_ctr_ct_2[0] = {};
-
-static const uint8_t key_ctr_3[32] = {
-    0xF6, 0xD6, 0x6D, 0x6B, 0xD5, 0x2D, 0x59, 0xBB, 0x07, 0x96, 0x36, 0x58, 0x79, 0xEF, 0xF8, 0x86,
-    0xC6, 0x6D, 0xD5, 0x1A, 0x5B, 0x6A, 0x99, 0x74, 0x4B, 0x50, 0x59, 0x0C, 0x87, 0xA2, 0x38, 0x84,
-};
-static const uint8_t iv_ctr_3[16] = {
-    0x00,
-    0xFA,
-    0xAC,
-    0x24,
-    0xC1,
-    0x58,
-    0x5E,
-    0xF1,
-    0x5A,
-    0x43,
-    0xD8,
-    0x75,
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-};
-static const uint8_t pt_ctr_3[32] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
-};
-static const uint8_t tv_ctr_ct_3[32] = {
-    0xF0, 0x5E, 0x23, 0x1B, 0x38, 0x94, 0x61, 0x2C, 0x49, 0xEE, 0x00, 0x0B, 0x80, 0x4E, 0xB2, 0xA9,
-    0xB8, 0x30, 0x6B, 0x50, 0x8F, 0x83, 0x9D, 0x6A, 0x55, 0x30, 0x83, 0x1D, 0x93, 0x44, 0xAF, 0x1C,
-};
-
-static const uint8_t key_ctr_4[32] = {
-    0xFF, 0x7A, 0x61, 0x7C, 0xE6, 0x91, 0x48, 0xE4, 0xF1, 0x72, 0x6E, 0x2F, 0x43, 0x58, 0x1D, 0xE2,
-    0xAA, 0x62, 0xD9, 0xF8, 0x05, 0x53, 0x2E, 0xDF, 0xF1, 0xEE, 0xD6, 0x87, 0xFB, 0x54, 0x15, 0x3D,
-};
-static const uint8_t iv_ctr_4[16] = {
-    0x00,
-    0x1C,
-    0xC5,
-    0xB7,
-    0x51,
-    0xA5,
-    0x1D,
-    0x70,
-    0xA1,
-    0xC1,
-    0x11,
-    0x48,
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-};
-static const uint8_t pt_ctr_4[36] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,
-    0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-    0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23,
-};
-static const uint8_t tv_ctr_ct_4[36] = {
-    0xEB, 0x6C, 0x52, 0x82, 0x1D, 0x0B, 0xBB, 0xF7, 0xCE, 0x75, 0x94, 0x46,
-    0x2A, 0xCA, 0x4F, 0xAA, 0xB4, 0x07, 0xDF, 0x86, 0x65, 0x69, 0xFD, 0x07,
-    0xF4, 0x8C, 0xC0, 0xB5, 0x83, 0xD6, 0x07, 0x1F, 0x1E, 0xC0, 0xE6, 0xB8,
-};
-
-static const uint8_t key_ctr_5[32] = {
-    0xFF, 0x7A, 0x61, 0x7C, 0xE6, 0x91, 0x48, 0xE4, 0xF1, 0x72, 0x6E, 0x2F, 0x43, 0x58, 0x1D, 0xE2,
-    0xAA, 0x62, 0xD9, 0xF8, 0x05, 0x53, 0x2E, 0xDF, 0xF1, 0xEE, 0xD6, 0x87, 0xFB, 0x54, 0x15, 0x3D,
-};
-static const uint8_t iv_ctr_5[16] = {
-    0x00,
-    0x1C,
-    0xC5,
-    0xB7,
-    0x51,
-    0xA5,
-    0x1D,
-    0x70,
-    0xA1,
-    0xC1,
-    0x11,
-    0x48,
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-};
-static const uint8_t pt_ctr_5[0] = {};
-//static const uint8_t tv_ctr_ct_5[0] = {};
-
-static const uint8_t key_gcm_1[32] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-static const uint8_t iv_gcm_1[16] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
-static const uint8_t pt_gcm_1[0] = {};
-//static const uint8_t tv_gcm_ct_1[0] = {};
-static const uint8_t aad_gcm_1[0] = {};
-static const uint8_t tv_gcm_tag_1[16] = {
-    0x53,
-    0x0F,
-    0x8A,
-    0xFB,
-    0xC7,
-    0x45,
-    0x36,
-    0xB9,
-    0xA9,
-    0x63,
-    0xB4,
-    0xF1,
-    0xC4,
-    0xCB,
-    0x73,
-    0x8B,
-};
-
-static const uint8_t key_gcm_2[32] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-static const uint8_t iv_gcm_2[16] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
-static const uint8_t pt_gcm_2[16] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
-static const uint8_t tv_gcm_ct_2[16] = {
-    0xCE,
-    0xA7,
-    0x40,
-    0x3D,
-    0x4D,
-    0x60,
-    0x6B,
-    0x6E,
-    0x07,
-    0x4E,
-    0xC5,
-    0xD3,
-    0xBA,
-    0xF3,
-    0x9D,
-    0x18,
-};
-static const uint8_t aad_gcm_2[0] = {};
-static const uint8_t tv_gcm_tag_2[16] = {
-    0xD0,
-    0xD1,
-    0xC8,
-    0xA7,
-    0x99,
-    0x99,
-    0x6B,
-    0xF0,
-    0x26,
-    0x5B,
-    0x98,
-    0xB5,
-    0xD4,
-    0x8A,
-    0xB9,
-    0x19,
-};
-
-static const uint8_t key_gcm_3[32] = {
-    0xFE, 0xFF, 0xE9, 0x92, 0x86, 0x65, 0x73, 0x1C, 0x6D, 0x6A, 0x8F, 0x94, 0x67, 0x30, 0x83, 0x08,
-    0xFE, 0xFF, 0xE9, 0x92, 0x86, 0x65, 0x73, 0x1C, 0x6D, 0x6A, 0x8F, 0x94, 0x67, 0x30, 0x83, 0x08,
-};
-static const uint8_t iv_gcm_3[16] = {
-    0xCA,
-    0xFE,
-    0xBA,
-    0xBE,
-    0xFA,
-    0xCE,
-    0xDB,
-    0xAD,
-    0xDE,
-    0xCA,
-    0xF8,
-    0x88,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
-static const uint8_t pt_gcm_3[64] = {
-    0xD9, 0x31, 0x32, 0x25, 0xF8, 0x84, 0x06, 0xE5, 0xA5, 0x59, 0x09, 0xC5, 0xAF, 0xF5, 0x26, 0x9A,
-    0x86, 0xA7, 0xA9, 0x53, 0x15, 0x34, 0xF7, 0xDA, 0x2E, 0x4C, 0x30, 0x3D, 0x8A, 0x31, 0x8A, 0x72,
-    0x1C, 0x3C, 0x0C, 0x95, 0x95, 0x68, 0x09, 0x53, 0x2F, 0xCF, 0x0E, 0x24, 0x49, 0xA6, 0xB5, 0x25,
-    0xB1, 0x6A, 0xED, 0xF5, 0xAA, 0x0D, 0xE6, 0x57, 0xBA, 0x63, 0x7B, 0x39, 0x1A, 0xAF, 0xD2, 0x55,
-};
-static const uint8_t tv_gcm_ct_3[64] = {
-    0x52, 0x2D, 0xC1, 0xF0, 0x99, 0x56, 0x7D, 0x07, 0xF4, 0x7F, 0x37, 0xA3, 0x2A, 0x84, 0x42, 0x7D,
-    0x64, 0x3A, 0x8C, 0xDC, 0xBF, 0xE5, 0xC0, 0xC9, 0x75, 0x98, 0xA2, 0xBD, 0x25, 0x55, 0xD1, 0xAA,
-    0x8C, 0xB0, 0x8E, 0x48, 0x59, 0x0D, 0xBB, 0x3D, 0xA7, 0xB0, 0x8B, 0x10, 0x56, 0x82, 0x88, 0x38,
-    0xC5, 0xF6, 0x1E, 0x63, 0x93, 0xBA, 0x7A, 0x0A, 0xBC, 0xC9, 0xF6, 0x62, 0x89, 0x80, 0x15, 0xAD,
-};
-static const uint8_t aad_gcm_3[0] = {};
-static const uint8_t tv_gcm_tag_3[16] = {
-    0xB0,
-    0x94,
-    0xDA,
-    0xC5,
-    0xD9,
-    0x34,
-    0x71,
-    0xBD,
-    0xEC,
-    0x1A,
-    0x50,
-    0x22,
-    0x70,
-    0xE3,
-    0xCC,
-    0x6C,
-};
-
-static const uint8_t key_gcm_4[32] = {
-    0xFE, 0xFF, 0xE9, 0x92, 0x86, 0x65, 0x73, 0x1C, 0x6D, 0x6A, 0x8F, 0x94, 0x67, 0x30, 0x83, 0x08,
-    0xFE, 0xFF, 0xE9, 0x92, 0x86, 0x65, 0x73, 0x1C, 0x6D, 0x6A, 0x8F, 0x94, 0x67, 0x30, 0x83, 0x08,
-};
-static const uint8_t iv_gcm_4[16] = {
-    0xCA,
-    0xFE,
-    0xBA,
-    0xBE,
-    0xFA,
-    0xCE,
-    0xDB,
-    0xAD,
-    0xDE,
-    0xCA,
-    0xF8,
-    0x88,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
-static const uint8_t pt_gcm_4[60] = {
-    0xD9, 0x31, 0x32, 0x25, 0xF8, 0x84, 0x06, 0xE5, 0xA5, 0x59, 0x09, 0xC5, 0xAF, 0xF5, 0x26,
-    0x9A, 0x86, 0xA7, 0xA9, 0x53, 0x15, 0x34, 0xF7, 0xDA, 0x2E, 0x4C, 0x30, 0x3D, 0x8A, 0x31,
-    0x8A, 0x72, 0x1C, 0x3C, 0x0C, 0x95, 0x95, 0x68, 0x09, 0x53, 0x2F, 0xCF, 0x0E, 0x24, 0x49,
-    0xA6, 0xB5, 0x25, 0xB1, 0x6A, 0xED, 0xF5, 0xAA, 0x0D, 0xE6, 0x57, 0xBA, 0x63, 0x7B, 0x39,
-};
-static const uint8_t tv_gcm_ct_4[60] = {
-    0x52, 0x2D, 0xC1, 0xF0, 0x99, 0x56, 0x7D, 0x07, 0xF4, 0x7F, 0x37, 0xA3, 0x2A, 0x84, 0x42,
-    0x7D, 0x64, 0x3A, 0x8C, 0xDC, 0xBF, 0xE5, 0xC0, 0xC9, 0x75, 0x98, 0xA2, 0xBD, 0x25, 0x55,
-    0xD1, 0xAA, 0x8C, 0xB0, 0x8E, 0x48, 0x59, 0x0D, 0xBB, 0x3D, 0xA7, 0xB0, 0x8B, 0x10, 0x56,
-    0x82, 0x88, 0x38, 0xC5, 0xF6, 0x1E, 0x63, 0x93, 0xBA, 0x7A, 0x0A, 0xBC, 0xC9, 0xF6, 0x62,
-};
-static const uint8_t aad_gcm_4[20] = {
-    0xFE, 0xED, 0xFA, 0xCE, 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED,
-    0xFA, 0xCE, 0xDE, 0xAD, 0xBE, 0xEF, 0xAB, 0xAD, 0xDA, 0xD2,
-};
-static const uint8_t tv_gcm_tag_4[16] = {
-    0x76,
-    0xFC,
-    0x6E,
-    0xCE,
-    0x0F,
-    0x4E,
-    0x17,
-    0x68,
-    0xCD,
-    0xDF,
-    0x88,
-    0x53,
-    0xBB,
-    0x2D,
-    0x55,
-    0x1B,
-};
-
-static void furi_hal_crypto_ctr_setup() {
-}
-
-static void furi_hal_crypto_ctr_teardown() {
-}
-
-static void furi_hal_crypto_gcm_setup() {
-}
-
-static void furi_hal_crypto_gcm_teardown() {
-}
-
-MU_TEST(furi_hal_crypto_ctr_1) {
-    bool ret = false;
-    uint8_t ct[sizeof(pt_ctr_1)];
-
-    ret = furi_hal_crypto_ctr(key_ctr_1, iv_ctr_1, pt_ctr_1, ct, sizeof(pt_ctr_1));
-    mu_assert(ret, "CTR 1 failed");
-    mu_assert_mem_eq(tv_ctr_ct_1, ct, sizeof(pt_ctr_1));
-}
-
-MU_TEST(furi_hal_crypto_ctr_2) {
-    bool ret = false;
-    uint8_t ct[sizeof(pt_ctr_2)];
-
-    ret = furi_hal_crypto_ctr(key_ctr_2, iv_ctr_2, pt_ctr_2, ct, sizeof(pt_ctr_2));
-    mu_assert(ret, "CTR 2 failed");
-    //mu_assert_mem_eq(tv_ctr_ct_2, ct, sizeof(pt_ctr_2));
-}
-
-MU_TEST(furi_hal_crypto_ctr_3) {
-    bool ret = false;
-    uint8_t ct[sizeof(pt_ctr_3)];
-
-    ret = furi_hal_crypto_ctr(key_ctr_3, iv_ctr_3, pt_ctr_3, ct, sizeof(pt_ctr_3));
-    mu_assert(ret, "CTR 3 failed");
-    mu_assert_mem_eq(tv_ctr_ct_3, ct, sizeof(pt_ctr_3));
-}
-
-MU_TEST(furi_hal_crypto_ctr_4) {
-    bool ret = false;
-    uint8_t ct[sizeof(pt_ctr_4)];
-
-    ret = furi_hal_crypto_ctr(key_ctr_4, iv_ctr_4, pt_ctr_4, ct, sizeof(pt_ctr_4));
-    mu_assert(ret, "CTR 4 failed");
-    mu_assert_mem_eq(tv_ctr_ct_4, ct, sizeof(pt_ctr_4));
-}
-
-MU_TEST(furi_hal_crypto_ctr_5) {
-    bool ret = false;
-    uint8_t ct[sizeof(pt_ctr_5)];
-
-    ret = furi_hal_crypto_ctr(key_ctr_5, iv_ctr_5, pt_ctr_5, ct, sizeof(pt_ctr_5));
-    mu_assert(ret, "CTR 5 failed");
-    //mu_assert_mem_eq(tv_ctr_ct_5, ct, sizeof(pt_ctr_5));
-}
-
-MU_TEST(furi_hal_crypto_gcm_1) {
-    bool ret = false;
-    uint8_t pt[sizeof(pt_gcm_1)];
-    uint8_t ct[sizeof(pt_gcm_1)];
-    uint8_t tag_enc[16];
-    uint8_t tag_dec[16];
-
-    ret = furi_hal_crypto_gcm(
-        key_gcm_1,
-        iv_gcm_1,
-        aad_gcm_1,
-        sizeof(aad_gcm_1),
-        pt_gcm_1,
-        ct,
-        sizeof(pt_gcm_1),
-        tag_enc,
-        false);
-    mu_assert(ret, "GCM 1 encryption failed");
-    //mu_assert_mem_eq(tv_gcm_ct_1, ct, sizeof(pt_gcm_1));
-    mu_assert_mem_eq(tv_gcm_tag_1, tag_enc, 16);
-
-    ret = furi_hal_crypto_gcm(
-        key_gcm_1, iv_gcm_1, aad_gcm_1, sizeof(aad_gcm_1), ct, pt, sizeof(pt_gcm_1), tag_dec, true);
-    mu_assert(ret, "GCM 1 decryption failed");
-    //mu_assert_mem_eq(pt_gcm_1, pt, sizeof(pt_gcm_1));
-    mu_assert_mem_eq(tv_gcm_tag_1, tag_dec, 16);
-}
-
-MU_TEST(furi_hal_crypto_gcm_2) {
-    bool ret = false;
-    uint8_t pt[sizeof(pt_gcm_2)];
-    uint8_t ct[sizeof(pt_gcm_2)];
-    uint8_t tag_enc[16];
-    uint8_t tag_dec[16];
-
-    ret = furi_hal_crypto_gcm(
-        key_gcm_2,
-        iv_gcm_2,
-        aad_gcm_2,
-        sizeof(aad_gcm_2),
-        pt_gcm_2,
-        ct,
-        sizeof(pt_gcm_2),
-        tag_enc,
-        false);
-    mu_assert(ret, "GCM 2 encryption failed");
-    mu_assert_mem_eq(tv_gcm_ct_2, ct, sizeof(pt_gcm_2));
-    mu_assert_mem_eq(tv_gcm_tag_2, tag_enc, 16);
-
-    ret = furi_hal_crypto_gcm(
-        key_gcm_2, iv_gcm_2, aad_gcm_2, sizeof(aad_gcm_2), ct, pt, sizeof(pt_gcm_2), tag_dec, true);
-    mu_assert(ret, "GCM 2 decryption failed");
-    mu_assert_mem_eq(pt_gcm_2, pt, sizeof(pt_gcm_2));
-    mu_assert_mem_eq(tv_gcm_tag_2, tag_dec, 16);
-}
-
-MU_TEST(furi_hal_crypto_gcm_3) {
-    bool ret = false;
-    uint8_t pt[sizeof(pt_gcm_3)];
-    uint8_t ct[sizeof(pt_gcm_3)];
-    uint8_t tag_enc[16];
-    uint8_t tag_dec[16];
-
-    ret = furi_hal_crypto_gcm(
-        key_gcm_3,
-        iv_gcm_3,
-        aad_gcm_3,
-        sizeof(aad_gcm_3),
-        pt_gcm_3,
-        ct,
-        sizeof(pt_gcm_3),
-        tag_enc,
-        false);
-    mu_assert(ret, "GCM 3 encryption failed");
-    mu_assert_mem_eq(tv_gcm_ct_3, ct, sizeof(pt_gcm_3));
-    mu_assert_mem_eq(tv_gcm_tag_3, tag_enc, 16);
-
-    ret = furi_hal_crypto_gcm(
-        key_gcm_3, iv_gcm_3, aad_gcm_3, sizeof(aad_gcm_3), ct, pt, sizeof(pt_gcm_3), tag_dec, true);
-    mu_assert(ret, "GCM 3 decryption failed");
-    mu_assert_mem_eq(pt_gcm_3, pt, sizeof(pt_gcm_3));
-    mu_assert_mem_eq(tv_gcm_tag_3, tag_dec, 16);
-}
-
-MU_TEST(furi_hal_crypto_gcm_4) {
-    bool ret = false;
-    uint8_t pt[sizeof(pt_gcm_4)];
-    uint8_t ct[sizeof(pt_gcm_4)];
-    uint8_t tag_enc[16];
-    uint8_t tag_dec[16];
-
-    ret = furi_hal_crypto_gcm(
-        key_gcm_4,
-        iv_gcm_4,
-        aad_gcm_4,
-        sizeof(aad_gcm_4),
-        pt_gcm_4,
-        ct,
-        sizeof(pt_gcm_4),
-        tag_enc,
-        false);
-    mu_assert(ret, "GCM 4 encryption failed");
-    mu_assert_mem_eq(tv_gcm_ct_4, ct, sizeof(pt_gcm_4));
-    mu_assert_mem_eq(tv_gcm_tag_4, tag_enc, 16);
-
-    ret = furi_hal_crypto_gcm(
-        key_gcm_4, iv_gcm_4, aad_gcm_4, sizeof(aad_gcm_4), ct, pt, sizeof(pt_gcm_4), tag_dec, true);
-    mu_assert(ret, "GCM 4 decryption failed");
-    mu_assert_mem_eq(pt_gcm_4, pt, sizeof(pt_gcm_4));
-    mu_assert_mem_eq(tv_gcm_tag_4, tag_dec, 16);
-}
-
-MU_TEST_SUITE(furi_hal_crypto_ctr_test) {
-    MU_SUITE_CONFIGURE(&furi_hal_crypto_ctr_setup, &furi_hal_crypto_ctr_teardown);
-    MU_RUN_TEST(furi_hal_crypto_ctr_1);
-    MU_RUN_TEST(furi_hal_crypto_ctr_2);
-    MU_RUN_TEST(furi_hal_crypto_ctr_3);
-    MU_RUN_TEST(furi_hal_crypto_ctr_4);
-    MU_RUN_TEST(furi_hal_crypto_ctr_5);
-}
-
-MU_TEST_SUITE(furi_hal_crypto_gcm_test) {
-    MU_SUITE_CONFIGURE(&furi_hal_crypto_gcm_setup, &furi_hal_crypto_gcm_teardown);
-    MU_RUN_TEST(furi_hal_crypto_gcm_1);
-    MU_RUN_TEST(furi_hal_crypto_gcm_2);
-    MU_RUN_TEST(furi_hal_crypto_gcm_3);
-    MU_RUN_TEST(furi_hal_crypto_gcm_4);
-}
-
-int run_minunit_test_furi_hal_crypto() {
-    MU_RUN_SUITE(furi_hal_crypto_ctr_test);
-    MU_RUN_SUITE(furi_hal_crypto_gcm_test);
-    return MU_EXIT_CODE;
-}

applications/debug/unit_tests/furi_hal/furi_hal_tests.c

@@ -5,11 +5,6 @@
 #include "../minunit.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);
@@ -19,14 +14,6 @@ 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;
@@ -116,116 +103,14 @@ 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_check(test);
+    furi_assert(test);
     infrared_free_decoder(test->decoder_handler);
     infrared_free_encoder(test->encoder_handler);
     flipper_format_free(test->ff);
@@ -425,7 +425,6 @@ MU_TEST(infrared_test_decoder_mixed) {
     infrared_test_run_decoder(InfraredProtocolSamsung32, 1);
     infrared_test_run_decoder(InfraredProtocolSIRC, 3);
     infrared_test_run_decoder(InfraredProtocolKaseikyo, 1);
-    infrared_test_run_decoder(InfraredProtocolRCA, 1);
 }
 
 MU_TEST(infrared_test_decoder_nec) {
@@ -500,15 +499,6 @@ MU_TEST(infrared_test_decoder_kaseikyo) {
     infrared_test_run_decoder(InfraredProtocolKaseikyo, 6);
 }
 
-MU_TEST(infrared_test_decoder_rca) {
-    infrared_test_run_decoder(InfraredProtocolRCA, 1);
-    infrared_test_run_decoder(InfraredProtocolRCA, 2);
-    infrared_test_run_decoder(InfraredProtocolRCA, 3);
-    infrared_test_run_decoder(InfraredProtocolRCA, 4);
-    infrared_test_run_decoder(InfraredProtocolRCA, 5);
-    infrared_test_run_decoder(InfraredProtocolRCA, 6);
-}
-
 MU_TEST(infrared_test_encoder_decoder_all) {
     infrared_test_run_encoder_decoder(InfraredProtocolNEC, 1);
     infrared_test_run_encoder_decoder(InfraredProtocolNECext, 1);
@@ -519,7 +509,6 @@ MU_TEST(infrared_test_encoder_decoder_all) {
     infrared_test_run_encoder_decoder(InfraredProtocolRC5, 1);
     infrared_test_run_encoder_decoder(InfraredProtocolSIRC, 1);
     infrared_test_run_encoder_decoder(InfraredProtocolKaseikyo, 1);
-    infrared_test_run_encoder_decoder(InfraredProtocolRCA, 1);
 }
 
 MU_TEST_SUITE(infrared_test) {
@@ -538,7 +527,6 @@ MU_TEST_SUITE(infrared_test) {
     MU_RUN_TEST(infrared_test_decoder_samsung32);
     MU_RUN_TEST(infrared_test_decoder_necext1);
     MU_RUN_TEST(infrared_test_decoder_kaseikyo);
-    MU_RUN_TEST(infrared_test_decoder_rca);
     MU_RUN_TEST(infrared_test_decoder_mixed);
     MU_RUN_TEST(infrared_test_encoder_decoder_all);
 }

applications/debug/unit_tests/lfrfid/bit_lib_test.c

@@ -311,7 +311,7 @@ MU_TEST(test_bit_lib_test_parity) {
 }
 
 MU_TEST(test_bit_lib_remove_bit_every_nth) {
-    // TODO FL-3494: more tests
+    // TODO: more tests
     uint8_t data_i[1] = {0b00001111};
     uint8_t data_o[1] = {0b00011111};
     size_t length;

applications/debug/unit_tests/manifest/manifest.c

@@ -1,75 +0,0 @@
-#include <furi.c>
-#include "../minunit.h"
-#include <update_util/resources/manifest.h>
-
-#define TAG "Manifest"
-
-MU_TEST(manifest_type_test) {
-    mu_assert(ResourceManifestEntryTypeUnknown == 0, "ResourceManifestEntryTypeUnknown != 0\r\n");
-    mu_assert(ResourceManifestEntryTypeVersion == 1, "ResourceManifestEntryTypeVersion != 1\r\n");
-    mu_assert(
-        ResourceManifestEntryTypeTimestamp == 2, "ResourceManifestEntryTypeTimestamp != 2\r\n");
-    mu_assert(
-        ResourceManifestEntryTypeDirectory == 3, "ResourceManifestEntryTypeDirectory != 3\r\n");
-    mu_assert(ResourceManifestEntryTypeFile == 4, "ResourceManifestEntryTypeFile != 4\r\n");
-}
-
-MU_TEST(manifest_iteration_test) {
-    bool result = true;
-    size_t counters[5] = {0};
-
-    Storage* storage = furi_record_open(RECORD_STORAGE);
-    ResourceManifestReader* manifest_reader = resource_manifest_reader_alloc(storage);
-    do {
-        // Open manifest file
-        if(!resource_manifest_reader_open(manifest_reader, EXT_PATH("unit_tests/Manifest_test"))) {
-            result = false;
-            break;
-        }
-
-        // Iterate forward
-        ResourceManifestEntry* entry_ptr = NULL;
-        while((entry_ptr = resource_manifest_reader_next(manifest_reader))) {
-            FURI_LOG_D(TAG, "F:%u:%s", entry_ptr->type, furi_string_get_cstr(entry_ptr->name));
-            if(entry_ptr->type > 4) {
-                mu_fail("entry_ptr->type > 4\r\n");
-                result = false;
-                break;
-            }
-            counters[entry_ptr->type]++;
-        }
-        if(!result) break;
-
-        // Iterate backward
-        while((entry_ptr = resource_manifest_reader_previous(manifest_reader))) {
-            FURI_LOG_D(TAG, "B:%u:%s", entry_ptr->type, furi_string_get_cstr(entry_ptr->name));
-            if(entry_ptr->type > 4) {
-                mu_fail("entry_ptr->type > 4\r\n");
-                result = false;
-                break;
-            }
-            counters[entry_ptr->type]--;
-        }
-    } while(false);
-
-    resource_manifest_reader_free(manifest_reader);
-    furi_record_close(RECORD_STORAGE);
-
-    mu_assert(counters[ResourceManifestEntryTypeUnknown] == 0, "Unknown counter != 0\r\n");
-    mu_assert(counters[ResourceManifestEntryTypeVersion] == 0, "Version counter != 0\r\n");
-    mu_assert(counters[ResourceManifestEntryTypeTimestamp] == 0, "Timestamp counter != 0\r\n");
-    mu_assert(counters[ResourceManifestEntryTypeDirectory] == 0, "Directory counter != 0\r\n");
-    mu_assert(counters[ResourceManifestEntryTypeFile] == 0, "File counter != 0\r\n");
-
-    mu_assert(result, "Manifest forward iterate failed\r\n");
-}
-
-MU_TEST_SUITE(manifest_suite) {
-    MU_RUN_TEST(manifest_type_test);
-    MU_RUN_TEST(manifest_iteration_test);
-}
-
-int run_minunit_test_manifest() {
-    MU_RUN_SUITE(manifest_suite);
-    return MU_EXIT_CODE;
-}

applications/debug/unit_tests/nfc/nfc_test.c

@@ -1,536 +1,498 @@
 #include <furi.h>
 #include <furi_hal.h>
 #include <storage/storage.h>
+#include <lib/flipper_format/flipper_format.h>
+#include <lib/nfc/protocols/nfca.h>
+#include <lib/nfc/helpers/mf_classic_dict.h>
+#include <lib/digital_signal/digital_signal.h>
+#include <lib/nfc/nfc_device.h>
+#include <lib/nfc/helpers/nfc_generators.h>
 
-#include <nfc/nfc_device.h>
-#include <nfc/helpers/nfc_data_generator.h>
-#include <nfc/nfc_poller.h>
-#include <nfc/nfc_listener.h>
-#include <nfc/protocols/iso14443_3a/iso14443_3a.h>
-#include <nfc/protocols/iso14443_3a/iso14443_3a_poller_sync_api.h>
-#include <nfc/protocols/mf_ultralight/mf_ultralight.h>
-#include <nfc/protocols/mf_ultralight/mf_ultralight_poller_sync_api.h>
-#include <nfc/protocols/mf_classic/mf_classic_poller_sync_api.h>
-
-#include <nfc/helpers/nfc_dict.h>
-#include <nfc/nfc.h>
+#include <lib/flipper_format/flipper_format_i.h>
+#include <lib/toolbox/stream/file_stream.h>
 
 #include "../minunit.h"
 
 #define TAG "NfcTest"
 
-#define NFC_TEST_NFC_DEV_PATH EXT_PATH("unit_tests/nfc/nfc_device_test.nfc")
-#define NFC_APP_MF_CLASSIC_DICT_UNIT_TEST_PATH EXT_PATH("unit_tests/mf_dict.nfc")
+#define NFC_TEST_RESOURCES_DIR EXT_PATH("unit_tests/nfc/")
+#define NFC_TEST_SIGNAL_SHORT_FILE "nfc_nfca_signal_short.nfc"
+#define NFC_TEST_SIGNAL_LONG_FILE "nfc_nfca_signal_long.nfc"
+#define NFC_TEST_DICT_PATH EXT_PATH("unit_tests/mf_classic_dict.nfc")
+#define NFC_TEST_NFC_DEV_PATH EXT_PATH("unit_tests/nfc/nfc_dev_test.nfc")
+
+static const char* nfc_test_file_type = "Flipper NFC test";
+static const uint32_t nfc_test_file_version = 1;
+
+#define NFC_TEST_DATA_MAX_LEN 18
+#define NFC_TETS_TIMINGS_MAX_LEN 1350
 
 typedef struct {
     Storage* storage;
+    NfcaSignal* signal;
+    uint32_t test_data_len;
+    uint8_t test_data[NFC_TEST_DATA_MAX_LEN];
+    uint32_t test_timings_len;
+    uint32_t test_timings[NFC_TETS_TIMINGS_MAX_LEN];
 } NfcTest;
 
 static NfcTest* nfc_test = NULL;
 
 static void nfc_test_alloc() {
     nfc_test = malloc(sizeof(NfcTest));
+    nfc_test->signal = nfca_signal_alloc();
     nfc_test->storage = furi_record_open(RECORD_STORAGE);
 }
 
 static void nfc_test_free() {
-    furi_check(nfc_test);
+    furi_assert(nfc_test);
 
     furi_record_close(RECORD_STORAGE);
+    nfca_signal_free(nfc_test->signal);
     free(nfc_test);
     nfc_test = NULL;
 }
 
-static void nfc_test_save_and_load(NfcDevice* nfc_device_ref) {
-    NfcDevice* nfc_device_dut = nfc_device_alloc();
+static bool nfc_test_read_signal_from_file(const char* file_name) {
+    bool success = false;
 
+    FlipperFormat* file = flipper_format_file_alloc(nfc_test->storage);
+    FuriString* file_type;
+    file_type = furi_string_alloc();
+    uint32_t file_version = 0;
+
+    do {
+        if(!flipper_format_file_open_existing(file, file_name)) break;
+        if(!flipper_format_read_header(file, file_type, &file_version)) break;
+        if(furi_string_cmp_str(file_type, nfc_test_file_type) ||
+           file_version != nfc_test_file_version)
+            break;
+        if(!flipper_format_read_uint32(file, "Data length", &nfc_test->test_data_len, 1)) break;
+        if(nfc_test->test_data_len > NFC_TEST_DATA_MAX_LEN) break;
+        if(!flipper_format_read_hex(
+               file, "Plain data", nfc_test->test_data, nfc_test->test_data_len))
+            break;
+        if(!flipper_format_read_uint32(file, "Timings length", &nfc_test->test_timings_len, 1))
+            break;
+        if(nfc_test->test_timings_len > NFC_TETS_TIMINGS_MAX_LEN) break;
+        if(!flipper_format_read_uint32(
+               file, "Timings", nfc_test->test_timings, nfc_test->test_timings_len))
+            break;
+        success = true;
+    } while(false);
+
+    furi_string_free(file_type);
+    flipper_format_free(file);
+
+    return success;
+}
+
+static bool nfc_test_digital_signal_test_encode(
+    const char* file_name,
+    uint32_t encode_max_time,
+    uint32_t timing_tolerance,
+    uint32_t timings_sum_tolerance) {
+    furi_assert(nfc_test);
+
+    bool success = false;
+    uint32_t time = 0;
+    uint32_t dut_timings_sum = 0;
+    uint32_t ref_timings_sum = 0;
+    uint8_t parity[10] = {};
+
+    do {
+        // Read test data
+        if(!nfc_test_read_signal_from_file(file_name)) {
+            FURI_LOG_E(TAG, "Failed to read signal from file");
+            break;
+        }
+
+        // Encode signal
+        FURI_CRITICAL_ENTER();
+        time = DWT->CYCCNT;
+        nfca_signal_encode(
+            nfc_test->signal, nfc_test->test_data, nfc_test->test_data_len * 8, parity);
+        digital_signal_prepare_arr(nfc_test->signal->tx_signal);
+        time = (DWT->CYCCNT - time) / furi_hal_cortex_instructions_per_microsecond();
+        FURI_CRITICAL_EXIT();
+
+        // Check timings
+        if(time > encode_max_time) {
+            FURI_LOG_E(
+                TAG, "Encoding time: %ld us while accepted value: %ld us", time, encode_max_time);
+            break;
+        }
+
+        // Check data
+        if(nfc_test->signal->tx_signal->edge_cnt != nfc_test->test_timings_len) {
+            FURI_LOG_E(TAG, "Not equal timings buffers length");
+            break;
+        }
+
+        uint32_t timings_diff = 0;
+        uint32_t* ref = nfc_test->test_timings;
+        uint32_t* dut = nfc_test->signal->tx_signal->reload_reg_buff;
+        bool timing_check_success = true;
+        for(size_t i = 0; i < nfc_test->test_timings_len; i++) {
+            timings_diff = dut[i] > ref[i] ? dut[i] - ref[i] : ref[i] - dut[i];
+            dut_timings_sum += dut[i];
+            ref_timings_sum += ref[i];
+            if(timings_diff > timing_tolerance) {
+                FURI_LOG_E(
+                    TAG, "Too big difference in %d timings. Ref: %ld, DUT: %ld", i, ref[i], dut[i]);
+                timing_check_success = false;
+                break;
+            }
+        }
+        if(!timing_check_success) break;
+        uint32_t sum_diff = dut_timings_sum > ref_timings_sum ? dut_timings_sum - ref_timings_sum :
+                                                                ref_timings_sum - dut_timings_sum;
+        if(sum_diff > timings_sum_tolerance) {
+            FURI_LOG_E(
+                TAG,
+                "Too big difference in timings sum. Ref: %ld, DUT: %ld",
+                ref_timings_sum,
+                dut_timings_sum);
+            break;
+        }
+
+        FURI_LOG_I(TAG, "Encoding time: %ld us. Acceptable time: %ld us", time, encode_max_time);
+        FURI_LOG_I(
+            TAG,
+            "Timings sum difference: %ld [1/64MHZ]. Acceptable difference: %ld [1/64MHz]",
+            sum_diff,
+            timings_sum_tolerance);
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+MU_TEST(nfc_digital_signal_test) {
     mu_assert(
-        nfc_device_save(nfc_device_ref, NFC_TEST_NFC_DEV_PATH), "nfc_device_save() failed\r\n");
-
+        nfc_test_digital_signal_test_encode(
+            NFC_TEST_RESOURCES_DIR NFC_TEST_SIGNAL_SHORT_FILE, 500, 1, 37),
+        "NFC short digital signal test failed\r\n");
     mu_assert(
-        nfc_device_load(nfc_device_dut, NFC_TEST_NFC_DEV_PATH), "nfc_device_load() failed\r\n");
-
-    mu_assert(
-        nfc_device_is_equal(nfc_device_ref, nfc_device_dut),
-        "nfc_device_data_dut != nfc_device_data_ref\r\n");
-
-    mu_assert(
-        storage_simply_remove(nfc_test->storage, NFC_TEST_NFC_DEV_PATH),
-        "storage_simply_remove() failed\r\n");
-
-    nfc_device_free(nfc_device_dut);
-}
-
-static void iso14443_3a_file_test(uint8_t uid_len) {
-    NfcDevice* nfc_device = nfc_device_alloc();
-
-    Iso14443_3aData* data = iso14443_3a_alloc();
-    data->uid_len = uid_len;
-    furi_hal_random_fill_buf(data->uid, uid_len);
-    furi_hal_random_fill_buf(data->atqa, sizeof(data->atqa));
-    furi_hal_random_fill_buf(&data->sak, 1);
-
-    nfc_device_set_data(nfc_device, NfcProtocolIso14443_3a, data);
-    nfc_test_save_and_load(nfc_device);
-
-    iso14443_3a_free(data);
-    nfc_device_free(nfc_device);
-}
-
-static void nfc_file_test_with_generator(NfcDataGeneratorType type) {
-    NfcDevice* nfc_device_ref = nfc_device_alloc();
-
-    nfc_data_generator_fill_data(type, nfc_device_ref);
-    nfc_test_save_and_load(nfc_device_ref);
-
-    nfc_device_free(nfc_device_ref);
-}
-
-MU_TEST(iso14443_3a_4b_file_test) {
-    iso14443_3a_file_test(4);
-}
-
-MU_TEST(iso14443_3a_7b_file_test) {
-    iso14443_3a_file_test(7);
-}
-
-MU_TEST(mf_ultralight_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeMfUltralight);
-}
-
-MU_TEST(mf_ultralight_ev1_11_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeMfUltralightEV1_11);
-}
-
-MU_TEST(mf_ultralight_ev1_h11_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeMfUltralightEV1_H11);
-}
-
-MU_TEST(mf_ultralight_ev1_21_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeMfUltralightEV1_21);
-}
-
-MU_TEST(mf_ultralight_ev1_h21_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeMfUltralightEV1_H21);
-}
-
-MU_TEST(mf_ultralight_ntag_203_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeNTAG203);
-}
-
-MU_TEST(mf_ultralight_ntag_213_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeNTAG213);
-}
-
-MU_TEST(mf_ultralight_ntag_215_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeNTAG215);
-}
-
-MU_TEST(mf_ultralight_ntag_216_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeNTAG216);
-}
-
-MU_TEST(mf_ultralight_ntag_i2c_1k_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeNTAGI2C1k);
-}
-
-MU_TEST(mf_ultralight_ntag_i2c_2k_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeNTAGI2C2k);
-}
-
-MU_TEST(mf_ultralight_ntag_i2c_plus_1k_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeNTAGI2CPlus1k);
-}
-
-MU_TEST(mf_ultralight_ntag_i2c_plus_2k_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeNTAGI2CPlus2k);
-}
-
-MU_TEST(mf_classic_mini_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeMfClassicMini);
-}
-
-MU_TEST(mf_classic_1k_4b_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeMfClassic1k_4b);
-}
-
-MU_TEST(mf_classic_1k_7b_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeMfClassic1k_7b);
-}
-
-MU_TEST(mf_classic_4k_4b_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeMfClassic4k_4b);
-}
-
-MU_TEST(mf_classic_4k_7b_file_test) {
-    nfc_file_test_with_generator(NfcDataGeneratorTypeMfClassic4k_7b);
-}
-
-MU_TEST(iso14443_3a_reader) {
-    Nfc* poller = nfc_alloc();
-    Nfc* listener = nfc_alloc();
-
-    Iso14443_3aData iso14443_3a_listener_data = {
-        .uid_len = 7,
-        .uid = {0x04, 0x51, 0x5C, 0xFA, 0x6F, 0x73, 0x81},
-        .atqa = {0x44, 0x00},
-        .sak = 0x00,
-    };
-    NfcListener* iso3_listener =
-        nfc_listener_alloc(listener, NfcProtocolIso14443_3a, &iso14443_3a_listener_data);
-    nfc_listener_start(iso3_listener, NULL, NULL);
-
-    Iso14443_3aData iso14443_3a_poller_data = {};
-    mu_assert(
-        iso14443_3a_poller_read(poller, &iso14443_3a_poller_data) == Iso14443_3aErrorNone,
-        "iso14443_3a_poller_read() failed");
-
-    nfc_listener_stop(iso3_listener);
-    mu_assert(
-        iso14443_3a_is_equal(&iso14443_3a_poller_data, &iso14443_3a_listener_data),
-        "Data not matches");
-
-    nfc_listener_free(iso3_listener);
-    nfc_free(listener);
-    nfc_free(poller);
-}
-
-static void mf_ultralight_reader_test(const char* path) {
-    FURI_LOG_I(TAG, "Testing file: %s", path);
-    Nfc* poller = nfc_alloc();
-    Nfc* listener = nfc_alloc();
-
-    NfcDevice* nfc_device = nfc_device_alloc();
-    mu_assert(nfc_device_load(nfc_device, path), "nfc_device_load() failed\r\n");
-
-    NfcListener* mfu_listener = nfc_listener_alloc(
-        listener,
-        NfcProtocolMfUltralight,
-        nfc_device_get_data(nfc_device, NfcProtocolMfUltralight));
-    nfc_listener_start(mfu_listener, NULL, NULL);
-
-    MfUltralightData* mfu_data = mf_ultralight_alloc();
-    MfUltralightError error = mf_ultralight_poller_read_card(poller, mfu_data);
-    mu_assert(error == MfUltralightErrorNone, "mf_ultralight_poller_read_card() failed");
-
-    nfc_listener_stop(mfu_listener);
-    nfc_listener_free(mfu_listener);
-
-    mu_assert(
-        mf_ultralight_is_equal(mfu_data, nfc_device_get_data(nfc_device, NfcProtocolMfUltralight)),
-        "Data not matches");
-
-    mf_ultralight_free(mfu_data);
-    nfc_device_free(nfc_device);
-    nfc_free(listener);
-    nfc_free(poller);
-}
-
-MU_TEST(mf_ultralight_11_reader) {
-    mf_ultralight_reader_test(EXT_PATH("unit_tests/nfc/Ultralight_11.nfc"));
-}
-
-MU_TEST(mf_ultralight_21_reader) {
-    mf_ultralight_reader_test(EXT_PATH("unit_tests/nfc/Ultralight_21.nfc"));
-}
-
-MU_TEST(ntag_215_reader) {
-    mf_ultralight_reader_test(EXT_PATH("unit_tests/nfc/Ntag215.nfc"));
-}
-
-MU_TEST(ntag_216_reader) {
-    mf_ultralight_reader_test(EXT_PATH("unit_tests/nfc/Ntag216.nfc"));
-}
-
-MU_TEST(ntag_213_locked_reader) {
-    FURI_LOG_I(TAG, "Testing Ntag215 locked file");
-    Nfc* poller = nfc_alloc();
-    Nfc* listener = nfc_alloc();
-
-    NfcDeviceData* nfc_device = nfc_device_alloc();
-    mu_assert(
-        nfc_device_load(nfc_device, EXT_PATH("unit_tests/nfc/Ntag213_locked.nfc")),
-        "nfc_device_load() failed\r\n");
-
-    NfcListener* mfu_listener = nfc_listener_alloc(
-        listener,
-        NfcProtocolMfUltralight,
-        nfc_device_get_data(nfc_device, NfcProtocolMfUltralight));
-    nfc_listener_start(mfu_listener, NULL, NULL);
-
-    MfUltralightData* mfu_data = mf_ultralight_alloc();
-    MfUltralightError error = mf_ultralight_poller_read_card(poller, mfu_data);
-    mu_assert(error == MfUltralightErrorNone, "mf_ultralight_poller_read_card() failed");
-
-    nfc_listener_stop(mfu_listener);
-    nfc_listener_free(mfu_listener);
-
-    MfUltralightConfigPages* config = NULL;
-    const MfUltralightData* mfu_ref_data =
-        nfc_device_get_data(nfc_device, NfcProtocolMfUltralight);
-    mu_assert(
-        mf_ultralight_get_config_page(mfu_ref_data, &config),
-        "mf_ultralight_get_config_page() failed");
-    uint16_t pages_locked = config->auth0;
-
-    mu_assert(mfu_data->pages_read == pages_locked, "Unexpected pages read");
-
-    mf_ultralight_free(mfu_data);
-    nfc_device_free(nfc_device);
-    nfc_free(listener);
-    nfc_free(poller);
-}
-
-static void mf_ultralight_write() {
-    Nfc* poller = nfc_alloc();
-    Nfc* listener = nfc_alloc();
-
-    NfcDevice* nfc_device = nfc_device_alloc();
-    nfc_data_generator_fill_data(NfcDataGeneratorTypeMfUltralightEV1_21, nfc_device);
-
-    NfcListener* mfu_listener = nfc_listener_alloc(
-        listener,
-        NfcProtocolMfUltralight,
-        nfc_device_get_data(nfc_device, NfcProtocolMfUltralight));
-    nfc_listener_start(mfu_listener, NULL, NULL);
-
-    MfUltralightData* mfu_data = mf_ultralight_alloc();
-
-    // Initial read
-    MfUltralightError error = mf_ultralight_poller_read_card(poller, mfu_data);
-    mu_assert(error == MfUltralightErrorNone, "mf_ultralight_poller_read_card() failed");
-
-    mu_assert(
-        mf_ultralight_is_equal(mfu_data, nfc_device_get_data(nfc_device, NfcProtocolMfUltralight)),
-        "Data not matches");
-
-    // Write random data
-    for(size_t i = 5; i < 15; i++) {
-        MfUltralightPage page = {};
-        FURI_LOG_D(TAG, "Writing page %d", i);
-        furi_hal_random_fill_buf(page.data, sizeof(MfUltralightPage));
-        mfu_data->page[i] = page;
-        error = mf_ultralight_poller_write_page(poller, i, &page);
-        mu_assert(error == MfUltralightErrorNone, "mf_ultralight_poller_write_page() failed");
-    }
-
-    // Verification read
-    error = mf_ultralight_poller_read_card(poller, mfu_data);
-    mu_assert(error == MfUltralightErrorNone, "mf_ultralight_poller_read_card() failed");
-
-    nfc_listener_stop(mfu_listener);
-    const MfUltralightData* mfu_listener_data =
-        nfc_listener_get_data(mfu_listener, NfcProtocolMfUltralight);
-
-    mu_assert(mf_ultralight_is_equal(mfu_data, mfu_listener_data), "Data not matches");
-
-    nfc_listener_free(mfu_listener);
-    mf_ultralight_free(mfu_data);
-    nfc_device_free(nfc_device);
-    nfc_free(listener);
-    nfc_free(poller);
-}
-
-static void mf_classic_reader() {
-    Nfc* poller = nfc_alloc();
-    Nfc* listener = nfc_alloc();
-
-    NfcDevice* nfc_device = nfc_device_alloc();
-    nfc_data_generator_fill_data(NfcDataGeneratorTypeMfClassic4k_7b, nfc_device);
-    NfcListener* mfc_listener = nfc_listener_alloc(
-        listener, NfcProtocolMfClassic, nfc_device_get_data(nfc_device, NfcProtocolMfClassic));
-    nfc_listener_start(mfc_listener, NULL, NULL);
-
-    MfClassicBlock block = {};
-    MfClassicKey key = {.data = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}};
-
-    mf_classic_poller_read_block(poller, 0, &key, MfClassicKeyTypeA, &block);
-
-    nfc_listener_stop(mfc_listener);
-    nfc_listener_free(mfc_listener);
-
-    const MfClassicData* mfc_data = nfc_device_get_data(nfc_device, NfcProtocolMfClassic);
-    mu_assert(memcmp(&mfc_data->block[0], &block, sizeof(MfClassicBlock)) == 0, "Data mismatch");
-
-    nfc_device_free(nfc_device);
-    nfc_free(listener);
-    nfc_free(poller);
-}
-
-static void mf_classic_write() {
-    Nfc* poller = nfc_alloc();
-    Nfc* listener = nfc_alloc();
-
-    NfcDevice* nfc_device = nfc_device_alloc();
-    nfc_data_generator_fill_data(NfcDataGeneratorTypeMfClassic4k_7b, nfc_device);
-    NfcListener* mfc_listener = nfc_listener_alloc(
-        listener, NfcProtocolMfClassic, nfc_device_get_data(nfc_device, NfcProtocolMfClassic));
-    nfc_listener_start(mfc_listener, NULL, NULL);
-
-    MfClassicBlock block_write = {};
-    MfClassicBlock block_read = {};
-    furi_hal_random_fill_buf(block_write.data, sizeof(MfClassicBlock));
-    MfClassicKey key = {.data = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}};
-
-    mf_classic_poller_write_block(poller, 1, &key, MfClassicKeyTypeA, &block_write);
-    mf_classic_poller_read_block(poller, 1, &key, MfClassicKeyTypeA, &block_read);
-
-    nfc_listener_stop(mfc_listener);
-    nfc_listener_free(mfc_listener);
-
-    mu_assert(memcmp(&block_read, &block_write, sizeof(MfClassicBlock)) == 0, "Data mismatch");
-
-    nfc_device_free(nfc_device);
-    nfc_free(listener);
-    nfc_free(poller);
-}
-
-static void mf_classic_value_block() {
-    Nfc* poller = nfc_alloc();
-    Nfc* listener = nfc_alloc();
-
-    NfcDevice* nfc_device = nfc_device_alloc();
-    nfc_data_generator_fill_data(NfcDataGeneratorTypeMfClassic4k_7b, nfc_device);
-    NfcListener* mfc_listener = nfc_listener_alloc(
-        listener, NfcProtocolMfClassic, nfc_device_get_data(nfc_device, NfcProtocolMfClassic));
-    nfc_listener_start(mfc_listener, NULL, NULL);
-
-    MfClassicKey key = {.data = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}};
-
-    int32_t value = 228;
-    MfClassicBlock block_write = {};
-    mf_classic_value_to_block(value, 1, &block_write);
-
-    MfClassicError error = MfClassicErrorNone;
-    error = mf_classic_poller_write_block(poller, 1, &key, MfClassicKeyTypeA, &block_write);
-    mu_assert(error == MfClassicErrorNone, "Write failed");
-
-    int32_t data = 200;
-    int32_t new_value = 0;
-    error = mf_classic_poller_change_value(poller, 1, &key, MfClassicKeyTypeA, data, &new_value);
-    mu_assert(error == MfClassicErrorNone, "Value increment failed");
-    mu_assert(new_value == value + data, "Value not match");
-
-    error = mf_classic_poller_change_value(poller, 1, &key, MfClassicKeyTypeA, -data, &new_value);
-    mu_assert(error == MfClassicErrorNone, "Value decrement failed");
-    mu_assert(new_value == value, "Value not match");
-
-    nfc_listener_stop(mfc_listener);
-    nfc_listener_free(mfc_listener);
-    nfc_device_free(nfc_device);
-    nfc_free(listener);
-    nfc_free(poller);
+        nfc_test_digital_signal_test_encode(
+            NFC_TEST_RESOURCES_DIR NFC_TEST_SIGNAL_LONG_FILE, 2000, 1, 37),
+        "NFC long digital signal test failed\r\n");
 }
 
 MU_TEST(mf_classic_dict_test) {
+    MfClassicDict* instance = NULL;
+    uint64_t key = 0;
+    FuriString* temp_str;
+    temp_str = furi_string_alloc();
+
+    instance = mf_classic_dict_alloc(MfClassicDictTypeUnitTest);
+    mu_assert(instance != NULL, "mf_classic_dict_alloc\r\n");
+
+    mu_assert(
+        mf_classic_dict_get_total_keys(instance) == 0,
+        "mf_classic_dict_get_total_keys == 0 assert failed\r\n");
+
+    furi_string_set(temp_str, "2196FAD8115B");
+    mu_assert(
+        mf_classic_dict_add_key_str(instance, temp_str),
+        "mf_classic_dict_add_key == true assert failed\r\n");
+
+    mu_assert(
+        mf_classic_dict_get_total_keys(instance) == 1,
+        "mf_classic_dict_get_total_keys == 1 assert failed\r\n");
+
+    mu_assert(mf_classic_dict_rewind(instance), "mf_classic_dict_rewind == 1 assert failed\r\n");
+
+    mu_assert(
+        mf_classic_dict_get_key_at_index_str(instance, temp_str, 0),
+        "mf_classic_dict_get_key_at_index_str == true assert failed\r\n");
+    mu_assert(
+        furi_string_cmp(temp_str, "2196FAD8115B") == 0,
+        "string_cmp(temp_str, \"2196FAD8115B\") == 0 assert failed\r\n");
+
+    mu_assert(mf_classic_dict_rewind(instance), "mf_classic_dict_rewind == 1 assert failed\r\n");
+
+    mu_assert(
+        mf_classic_dict_get_key_at_index(instance, &key, 0),
+        "mf_classic_dict_get_key_at_index == true assert failed\r\n");
+    mu_assert(key == 0x2196FAD8115B, "key == 0x2196FAD8115B assert failed\r\n");
+
+    mu_assert(mf_classic_dict_rewind(instance), "mf_classic_dict_rewind == 1 assert failed\r\n");
+
+    mu_assert(
+        mf_classic_dict_delete_index(instance, 0),
+        "mf_classic_dict_delete_index == true assert failed\r\n");
+
+    mf_classic_dict_free(instance);
+    furi_string_free(temp_str);
+}
+
+MU_TEST(mf_classic_dict_load_test) {
     Storage* storage = furi_record_open(RECORD_STORAGE);
-    if(storage_common_stat(storage, NFC_APP_MF_CLASSIC_DICT_UNIT_TEST_PATH, NULL) == FSE_OK) {
+    mu_assert(storage != NULL, "storage != NULL assert failed\r\n");
+
+    // Delete unit test dict file if exists
+    if(storage_file_exists(storage, NFC_TEST_DICT_PATH)) {
         mu_assert(
-            storage_simply_remove(storage, NFC_APP_MF_CLASSIC_DICT_UNIT_TEST_PATH),
-            "Remove test dict failed");
+            storage_simply_remove(storage, NFC_TEST_DICT_PATH),
+            "remove == true assert failed\r\n");
     }
 
-    NfcDict* dict = nfc_dict_alloc(
-        NFC_APP_MF_CLASSIC_DICT_UNIT_TEST_PATH, NfcDictModeOpenAlways, sizeof(MfClassicKey));
-    mu_assert(dict != NULL, "nfc_dict_alloc() failed");
-
-    size_t dict_keys_total = nfc_dict_get_total_keys(dict);
-    mu_assert(dict_keys_total == 0, "nfc_dict_keys_total() failed");
-
-    const uint32_t test_key_num = 30;
-    MfClassicKey* key_arr_ref = malloc(test_key_num * sizeof(MfClassicKey));
-    for(size_t i = 0; i < test_key_num; i++) {
-        furi_hal_random_fill_buf(key_arr_ref[i].data, sizeof(MfClassicKey));
-        mu_assert(
-            nfc_dict_add_key(dict, key_arr_ref[i].data, sizeof(MfClassicKey)), "add key failed");
-
-        size_t dict_keys_total = nfc_dict_get_total_keys(dict);
-        mu_assert(dict_keys_total == (i + 1), "nfc_dict_keys_total() failed");
-    }
-
-    nfc_dict_free(dict);
-
-    dict = nfc_dict_alloc(
-        NFC_APP_MF_CLASSIC_DICT_UNIT_TEST_PATH, NfcDictModeOpenAlways, sizeof(MfClassicKey));
-    mu_assert(dict != NULL, "nfc_dict_alloc() failed");
-
-    dict_keys_total = nfc_dict_get_total_keys(dict);
-    mu_assert(dict_keys_total == test_key_num, "nfc_dict_keys_total() failed");
-
-    MfClassicKey key_dut = {};
-    size_t key_idx = 0;
-    while(nfc_dict_get_next_key(dict, key_dut.data, sizeof(MfClassicKey))) {
-        mu_assert(
-            memcmp(key_arr_ref[key_idx].data, key_dut.data, sizeof(MfClassicKey)) == 0,
-            "Loaded key data mismatch");
-        key_idx++;
-    }
-
-    uint32_t delete_keys_idx[] = {1, 3, 9, 11, 19, 27};
-
-    for(size_t i = 0; i < COUNT_OF(delete_keys_idx); i++) {
-        MfClassicKey* key = &key_arr_ref[delete_keys_idx[i]];
-        mu_assert(
-            nfc_dict_is_key_present(dict, key->data, sizeof(MfClassicKey)),
-            "nfc_dict_is_key_present() failed");
-        mu_assert(
-            nfc_dict_delete_key(dict, key->data, sizeof(MfClassicKey)),
-            "nfc_dict_delete_key() failed");
-    }
-
-    dict_keys_total = nfc_dict_get_total_keys(dict);
+    // Create unit test dict file
+    Stream* file_stream = file_stream_alloc(storage);
+    mu_assert(file_stream != NULL, "file_stream != NULL assert failed\r\n");
     mu_assert(
-        dict_keys_total == test_key_num - COUNT_OF(delete_keys_idx),
-        "nfc_dict_keys_total() failed");
-
-    nfc_dict_free(dict);
-    free(key_arr_ref);
+        file_stream_open(file_stream, NFC_TEST_DICT_PATH, FSAM_WRITE, FSOM_OPEN_ALWAYS),
+        "file_stream_open == true assert failed\r\n");
 
+    // Write unit test dict file
+    char key_str[] = "a0a1a2a3a4a5";
     mu_assert(
-        storage_simply_remove(storage, NFC_APP_MF_CLASSIC_DICT_UNIT_TEST_PATH),
-        "Remove test dict failed");
+        stream_write_cstring(file_stream, key_str) == strlen(key_str),
+        "write == true assert failed\r\n");
+    // Close unit test dict file
+    mu_assert(file_stream_close(file_stream), "file_stream_close == true assert failed\r\n");
+
+    // Load unit test dict file
+    MfClassicDict* instance = NULL;
+    instance = mf_classic_dict_alloc(MfClassicDictTypeUnitTest);
+    mu_assert(instance != NULL, "mf_classic_dict_alloc\r\n");
+    uint32_t total_keys = mf_classic_dict_get_total_keys(instance);
+    mu_assert(total_keys == 1, "total_keys == 1 assert failed\r\n");
+
+    // Read key
+    uint64_t key_ref = 0xa0a1a2a3a4a5;
+    uint64_t key_dut = 0;
+    FuriString* temp_str = furi_string_alloc();
+    mu_assert(
+        mf_classic_dict_get_next_key_str(instance, temp_str),
+        "get_next_key_str == true assert failed\r\n");
+    mu_assert(furi_string_cmp_str(temp_str, key_str) == 0, "invalid key loaded\r\n");
+    mu_assert(mf_classic_dict_rewind(instance), "mf_classic_dict_rewind == 1 assert failed\r\n");
+    mu_assert(
+        mf_classic_dict_get_next_key(instance, &key_dut),
+        "get_next_key == true assert failed\r\n");
+    mu_assert(key_dut == key_ref, "invalid key loaded\r\n");
+    furi_string_free(temp_str);
+    mf_classic_dict_free(instance);
+
+    // Check that MfClassicDict added new line to the end of the file
+    mu_assert(
+        file_stream_open(file_stream, NFC_TEST_DICT_PATH, FSAM_READ, FSOM_OPEN_EXISTING),
+        "file_stream_open == true assert failed\r\n");
+    mu_assert(stream_seek(file_stream, -1, StreamOffsetFromEnd), "seek == true assert failed\r\n");
+    uint8_t last_char = 0;
+    mu_assert(stream_read(file_stream, &last_char, 1) == 1, "read == true assert failed\r\n");
+    mu_assert(last_char == '\n', "last_char == '\\n' assert failed\r\n");
+    mu_assert(file_stream_close(file_stream), "file_stream_close == true assert failed\r\n");
+
+    // Delete unit test dict file
+    mu_assert(
+        storage_simply_remove(storage, NFC_TEST_DICT_PATH), "remove == true assert failed\r\n");
+    stream_free(file_stream);
+    furi_record_close(RECORD_STORAGE);
+}
+
+MU_TEST(nfca_file_test) {
+    NfcDevice* nfc = nfc_device_alloc();
+    mu_assert(nfc != NULL, "nfc_device_data != NULL assert failed\r\n");
+    nfc->format = NfcDeviceSaveFormatUid;
+
+    // Fill the UID, sak, ATQA and type
+    uint8_t uid[7] = {0x04, 0x01, 0x23, 0x45, 0x67, 0x89, 0x00};
+    memcpy(nfc->dev_data.nfc_data.uid, uid, 7);
+    nfc->dev_data.nfc_data.uid_len = 7;
+
+    nfc->dev_data.nfc_data.sak = 0x08;
+    nfc->dev_data.nfc_data.atqa[0] = 0x00;
+    nfc->dev_data.nfc_data.atqa[1] = 0x04;
+    nfc->dev_data.nfc_data.type = FuriHalNfcTypeA;
+
+    // Save the NFC device data to the file
+    mu_assert(
+        nfc_device_save(nfc, NFC_TEST_NFC_DEV_PATH), "nfc_device_save == true assert failed\r\n");
+    nfc_device_free(nfc);
+
+    // Load the NFC device data from the file
+    NfcDevice* nfc_validate = nfc_device_alloc();
+    mu_assert(
+        nfc_device_load(nfc_validate, NFC_TEST_NFC_DEV_PATH, true),
+        "nfc_device_load == true assert failed\r\n");
+
+    // Check the UID, sak, ATQA and type
+    mu_assert(memcmp(nfc_validate->dev_data.nfc_data.uid, uid, 7) == 0, "uid assert failed\r\n");
+    mu_assert(nfc_validate->dev_data.nfc_data.sak == 0x08, "sak == 0x08 assert failed\r\n");
+    mu_assert(
+        nfc_validate->dev_data.nfc_data.atqa[0] == 0x00, "atqa[0] == 0x00 assert failed\r\n");
+    mu_assert(
+        nfc_validate->dev_data.nfc_data.atqa[1] == 0x04, "atqa[1] == 0x04 assert failed\r\n");
+    mu_assert(
+        nfc_validate->dev_data.nfc_data.type == FuriHalNfcTypeA,
+        "type == FuriHalNfcTypeA assert failed\r\n");
+    nfc_device_free(nfc_validate);
+}
+
+static void mf_classic_generator_test(uint8_t uid_len, MfClassicType type) {
+    NfcDevice* nfc_dev = nfc_device_alloc();
+    mu_assert(nfc_dev != NULL, "nfc_device_data != NULL assert failed\r\n");
+    nfc_dev->format = NfcDeviceSaveFormatMifareClassic;
+
+    // Create a test file
+    nfc_generate_mf_classic(&nfc_dev->dev_data, uid_len, type);
+
+    // Get the uid from generated MFC
+    uint8_t uid[7] = {0};
+    memcpy(uid, nfc_dev->dev_data.nfc_data.uid, uid_len);
+    uint8_t sak = nfc_dev->dev_data.nfc_data.sak;
+    uint8_t atqa[2] = {};
+    memcpy(atqa, nfc_dev->dev_data.nfc_data.atqa, 2);
+
+    MfClassicData* mf_data = &nfc_dev->dev_data.mf_classic_data;
+    // Check the manufacturer block (should be uid[uid_len] + 0xFF[rest])
+    uint8_t manufacturer_block[16] = {0};
+    memcpy(manufacturer_block, nfc_dev->dev_data.mf_classic_data.block[0].value, 16);
+    mu_assert(
+        memcmp(manufacturer_block, uid, uid_len) == 0,
+        "manufacturer_block uid doesn't match the file\r\n");
+    for(uint8_t i = uid_len; i < 16; i++) {
+        mu_assert(
+            manufacturer_block[i] == 0xFF, "manufacturer_block[i] == 0xFF assert failed\r\n");
+    }
+
+    // Reference sector trailers (should be 0xFF[6] + 0xFF + 0x07 + 0x80 + 0x69 + 0xFF[6])
+    uint8_t sector_trailer[16] = {
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0x07,
+        0x80,
+        0x69,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF};
+    // Reference block data
+    uint8_t block_data[16] = {};
+    memset(block_data, 0xff, sizeof(block_data));
+    uint16_t total_blocks = mf_classic_get_total_block_num(type);
+    for(size_t i = 1; i < total_blocks; i++) {
+        if(mf_classic_is_sector_trailer(i)) {
+            mu_assert(
+                memcmp(mf_data->block[i].value, sector_trailer, 16) == 0,
+                "Failed sector trailer compare");
+        } else {
+            mu_assert(memcmp(mf_data->block[i].value, block_data, 16) == 0, "Failed data compare");
+        }
+    }
+    // Save the NFC device data to the file
+    mu_assert(
+        nfc_device_save(nfc_dev, NFC_TEST_NFC_DEV_PATH),
+        "nfc_device_save == true assert failed\r\n");
+    // Verify that key cache is saved
+    FuriString* key_cache_name = furi_string_alloc();
+    furi_string_set_str(key_cache_name, "/ext/nfc/.cache/");
+    for(size_t i = 0; i < uid_len; i++) {
+        furi_string_cat_printf(key_cache_name, "%02X", uid[i]);
+    }
+    furi_string_cat_printf(key_cache_name, ".keys");
+    mu_assert(
+        storage_common_stat(nfc_dev->storage, furi_string_get_cstr(key_cache_name), NULL) ==
+            FSE_OK,
+        "Key cache file save failed");
+    nfc_device_free(nfc_dev);
+
+    // Load the NFC device data from the file
+    NfcDevice* nfc_validate = nfc_device_alloc();
+    mu_assert(nfc_validate, "Nfc device alloc assert");
+    mu_assert(
+        nfc_device_load(nfc_validate, NFC_TEST_NFC_DEV_PATH, false),
+        "nfc_device_load == true assert failed\r\n");
+
+    // Check the UID, sak, ATQA and type
+    mu_assert(
+        memcmp(nfc_validate->dev_data.nfc_data.uid, uid, uid_len) == 0,
+        "uid compare assert failed\r\n");
+    mu_assert(nfc_validate->dev_data.nfc_data.sak == sak, "sak compare assert failed\r\n");
+    mu_assert(
+        memcmp(nfc_validate->dev_data.nfc_data.atqa, atqa, 2) == 0,
+        "atqa compare assert failed\r\n");
+    mu_assert(
+        nfc_validate->dev_data.nfc_data.type == FuriHalNfcTypeA,
+        "type == FuriHalNfcTypeA assert failed\r\n");
+
+    // Check the manufacturer block
+    mu_assert(
+        memcmp(nfc_validate->dev_data.mf_classic_data.block[0].value, manufacturer_block, 16) == 0,
+        "manufacturer_block assert failed\r\n");
+    // Check other blocks
+    for(size_t i = 1; i < total_blocks; i++) {
+        if(mf_classic_is_sector_trailer(i)) {
+            mu_assert(
+                memcmp(mf_data->block[i].value, sector_trailer, 16) == 0,
+                "Failed sector trailer compare");
+        } else {
+            mu_assert(memcmp(mf_data->block[i].value, block_data, 16) == 0, "Failed data compare");
+        }
+    }
+    nfc_device_free(nfc_validate);
+
+    // Check saved key cache
+    NfcDevice* nfc_keys = nfc_device_alloc();
+    mu_assert(nfc_validate, "Nfc device alloc assert");
+    nfc_keys->dev_data.nfc_data.uid_len = uid_len;
+    memcpy(nfc_keys->dev_data.nfc_data.uid, uid, uid_len);
+    mu_assert(nfc_device_load_key_cache(nfc_keys), "Failed to load key cache");
+    uint8_t total_sec = mf_classic_get_total_sectors_num(type);
+    uint8_t default_key[6] = {};
+    memset(default_key, 0xff, 6);
+    for(size_t i = 0; i < total_sec; i++) {
+        MfClassicSectorTrailer* sec_tr =
+            mf_classic_get_sector_trailer_by_sector(&nfc_keys->dev_data.mf_classic_data, i);
+        mu_assert(memcmp(sec_tr->key_a, default_key, 6) == 0, "Failed key compare");
+        mu_assert(memcmp(sec_tr->key_b, default_key, 6) == 0, "Failed key compare");
+    }
+
+    // Delete key cache file
+    mu_assert(
+        storage_common_remove(nfc_keys->storage, furi_string_get_cstr(key_cache_name)) == FSE_OK,
+        "Failed to remove key cache file");
+    furi_string_free(key_cache_name);
+    nfc_device_free(nfc_keys);
+}
+
+MU_TEST(mf_classic_1k_4b_file_test) {
+    mf_classic_generator_test(4, MfClassicType1k);
+}
+
+MU_TEST(mf_classic_4k_4b_file_test) {
+    mf_classic_generator_test(4, MfClassicType4k);
+}
+
+MU_TEST(mf_classic_1k_7b_file_test) {
+    mf_classic_generator_test(7, MfClassicType1k);
+}
+
+MU_TEST(mf_classic_4k_7b_file_test) {
+    mf_classic_generator_test(7, MfClassicType4k);
 }
 
 MU_TEST_SUITE(nfc) {
     nfc_test_alloc();
 
-    MU_RUN_TEST(iso14443_3a_reader);
-    MU_RUN_TEST(mf_ultralight_11_reader);
-    MU_RUN_TEST(mf_ultralight_21_reader);
-    MU_RUN_TEST(ntag_215_reader);
-    MU_RUN_TEST(ntag_216_reader);
-    MU_RUN_TEST(ntag_213_locked_reader);
-
-    MU_RUN_TEST(mf_ultralight_write);
-
-    MU_RUN_TEST(iso14443_3a_4b_file_test);
-    MU_RUN_TEST(iso14443_3a_7b_file_test);
-
-    MU_RUN_TEST(mf_ultralight_file_test);
-    MU_RUN_TEST(mf_ultralight_ev1_11_file_test);
-    MU_RUN_TEST(mf_ultralight_ev1_h11_file_test);
-    MU_RUN_TEST(mf_ultralight_ev1_21_file_test);
-    MU_RUN_TEST(mf_ultralight_ev1_h21_file_test);
-    MU_RUN_TEST(mf_ultralight_ntag_203_file_test);
-    MU_RUN_TEST(mf_ultralight_ntag_213_file_test);
-    MU_RUN_TEST(mf_ultralight_ntag_215_file_test);
-    MU_RUN_TEST(mf_ultralight_ntag_216_file_test);
-    MU_RUN_TEST(mf_ultralight_ntag_i2c_1k_file_test);
-    MU_RUN_TEST(mf_ultralight_ntag_i2c_2k_file_test);
-    MU_RUN_TEST(mf_ultralight_ntag_i2c_plus_1k_file_test);
-    MU_RUN_TEST(mf_ultralight_ntag_i2c_plus_2k_file_test);
-
-    MU_RUN_TEST(mf_classic_mini_file_test);
+    MU_RUN_TEST(nfca_file_test);
     MU_RUN_TEST(mf_classic_1k_4b_file_test);
-    MU_RUN_TEST(mf_classic_1k_7b_file_test);
     MU_RUN_TEST(mf_classic_4k_4b_file_test);
+    MU_RUN_TEST(mf_classic_1k_7b_file_test);
     MU_RUN_TEST(mf_classic_4k_7b_file_test);
-    MU_RUN_TEST(mf_classic_reader);
-
-    MU_RUN_TEST(mf_classic_write);
-    MU_RUN_TEST(mf_classic_value_block);
-
+    MU_RUN_TEST(nfc_digital_signal_test);
     MU_RUN_TEST(mf_classic_dict_test);
+    MU_RUN_TEST(mf_classic_dict_load_test);
 
     nfc_test_free();
 }

applications/debug/unit_tests/nfc/nfc_transport.c

@@ -1,458 +0,0 @@
-#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;
-}
-
-#endif

applications/debug/unit_tests/power/power_test.c

@@ -3,63 +3,56 @@
 #include "../minunit.h"
 
 static void power_test_deinit(void) {
-    // Try to reset to default charge voltage limit
-    furi_hal_power_set_battery_charge_voltage_limit(4.208f);
+    // Try to reset to default charging voltage
+    furi_hal_power_set_battery_charging_voltage(4.208f);
 }
 
-MU_TEST(test_power_charge_voltage_limit_exact) {
-    // Power of 16mV charge voltage limits get applied exactly
+MU_TEST(test_power_charge_voltage_exact) {
+    // Power of 16mV charge voltages get applied exactly
     // (bq25896 charge controller works in 16mV increments)
     //
     // This test may need adapted if other charge controllers are used in the future.
     for(uint16_t charge_mv = 3840; charge_mv <= 4208; charge_mv += 16) {
         float charge_volt = (float)charge_mv / 1000.0f;
-        furi_hal_power_set_battery_charge_voltage_limit(charge_volt);
-        mu_assert_double_eq(charge_volt, furi_hal_power_get_battery_charge_voltage_limit());
+        furi_hal_power_set_battery_charging_voltage(charge_volt);
+        mu_assert_double_eq(charge_volt, furi_hal_power_get_battery_charging_voltage());
     }
 }
 
-MU_TEST(test_power_charge_voltage_limit_floating_imprecision) {
+MU_TEST(test_power_charge_voltage_floating_imprecision) {
     // 4.016f should act as 4.016 V, even with floating point imprecision
-    furi_hal_power_set_battery_charge_voltage_limit(4.016f);
-    mu_assert_double_eq(4.016f, furi_hal_power_get_battery_charge_voltage_limit());
+    furi_hal_power_set_battery_charging_voltage(4.016f);
+    mu_assert_double_eq(4.016f, furi_hal_power_get_battery_charging_voltage());
 }
 
-MU_TEST(test_power_charge_voltage_limit_inexact) {
-    // Charge voltage limits that are not power of 16mV get truncated down
-    furi_hal_power_set_battery_charge_voltage_limit(3.841f);
-    mu_assert_double_eq(3.840, furi_hal_power_get_battery_charge_voltage_limit());
+MU_TEST(test_power_charge_voltage_inexact) {
+    // Charge voltages that are not power of 16mV get truncated down
+    furi_hal_power_set_battery_charging_voltage(3.841f);
+    mu_assert_double_eq(3.840, furi_hal_power_get_battery_charging_voltage());
 
-    furi_hal_power_set_battery_charge_voltage_limit(3.900f);
-    mu_assert_double_eq(3.888, furi_hal_power_get_battery_charge_voltage_limit());
+    furi_hal_power_set_battery_charging_voltage(3.900f);
+    mu_assert_double_eq(3.888, furi_hal_power_get_battery_charging_voltage());
 
-    furi_hal_power_set_battery_charge_voltage_limit(4.200f);
-    mu_assert_double_eq(4.192, furi_hal_power_get_battery_charge_voltage_limit());
+    furi_hal_power_set_battery_charging_voltage(4.200f);
+    mu_assert_double_eq(4.192, furi_hal_power_get_battery_charging_voltage());
 }
 
-MU_TEST(test_power_charge_voltage_limit_invalid_clamped) {
-    // Out-of-range charge voltage limits get clamped to 3.840 V and 4.208 V
-    furi_hal_power_set_battery_charge_voltage_limit(3.808f);
-    mu_assert_double_eq(3.840, furi_hal_power_get_battery_charge_voltage_limit());
-    furi_hal_power_set_battery_charge_voltage_limit(1.0f);
-    mu_assert_double_eq(3.840, furi_hal_power_get_battery_charge_voltage_limit());
+MU_TEST(test_power_charge_voltage_invalid_clamped) {
+    // Out-of-range charge voltages get clamped to 3.840 V and 4.208 V
+    furi_hal_power_set_battery_charging_voltage(3.808f);
+    mu_assert_double_eq(3.840, furi_hal_power_get_battery_charging_voltage());
 
     // NOTE: Intentionally picking a small increment above 4.208 V to reduce the risk of an
     // unhappy battery if this fails.
-    furi_hal_power_set_battery_charge_voltage_limit(4.240f);
-    mu_assert_double_eq(4.208, furi_hal_power_get_battery_charge_voltage_limit());
-    // Likewise, picking a number that the uint8_t wraparound in the driver would result in a
-    // VREG value under 23 if this test fails.
-    // E.g. (uint8_t)((8105-3840)/16) -> 10
-    furi_hal_power_set_battery_charge_voltage_limit(8.105f);
-    mu_assert_double_eq(4.208, furi_hal_power_get_battery_charge_voltage_limit());
+    furi_hal_power_set_battery_charging_voltage(4.240f);
+    mu_assert_double_eq(4.208, furi_hal_power_get_battery_charging_voltage());
 }
 
 MU_TEST_SUITE(test_power_suite) {
-    MU_RUN_TEST(test_power_charge_voltage_limit_exact);
-    MU_RUN_TEST(test_power_charge_voltage_limit_floating_imprecision);
-    MU_RUN_TEST(test_power_charge_voltage_limit_inexact);
-    MU_RUN_TEST(test_power_charge_voltage_limit_invalid_clamped);
+    MU_RUN_TEST(test_power_charge_voltage_exact);
+    MU_RUN_TEST(test_power_charge_voltage_floating_imprecision);
+    MU_RUN_TEST(test_power_charge_voltage_inexact);
+    MU_RUN_TEST(test_power_charge_voltage_invalid_clamped);
     power_test_deinit();
 }
 

applications/debug/unit_tests/resources/unit_tests/Manifest_test

@@ -1,76 +0,0 @@
-V:0
-T:1672935435
-D:infrared
-D:nfc
-D:subghz
-F:4bff70f2a2ae771f81de5cfb090b3d74:3952:infrared/test_kaseikyo.irtest
-F:8556d32d7c54e66771d9da78d007d379:21463:infrared/test_nec.irtest
-F:860c0c475573878842180a6cb50c85c7:2012:infrared/test_nec42.irtest
-F:2b3cbf3fe7d3642190dfb8362dcc0ed6:3522:infrared/test_nec42ext.irtest
-F:c74bbd7f885ab8fbc3b3363598041bc1:18976:infrared/test_necext.irtest
-F:cab5e604abcb233bcb27903baec24462:7460:infrared/test_rc5.irtest
-F:3d22b3ec2531bb8f4842c9c0c6a8d97c:547:infrared/test_rc5x.irtest
-F:c9cb9fa4decbdd077741acb845f21343:8608:infrared/test_rc6.irtest
-F:97de943385bc6ad1c4a58fc4fedb5244:16975:infrared/test_samsung32.irtest
-F:4eb36c62d4f2e737a3e4a64b5ff0a8e7:41623:infrared/test_sirc.irtest
-F:e4ec3299cbe1f528fb1b9b45aac53556:4182:nfc/nfc_nfca_signal_long.nfc
-F:af4d10974834c2703ad29e859eea78c2:1020:nfc/nfc_nfca_signal_short.nfc
-F:224d12457a26774d8d2aa0d4b3a15652:160:subghz/ansonic.sub
-F:ce9fc98dc01230387a340332316774f1:13642:subghz/ansonic_raw.sub
-F:f958927b656d0804036c28b4a31ff856:157:subghz/bett.sub
-F:b4b17b2603fa3a144dbea4d9ede9f61d:5913:subghz/bett_raw.sub
-F:370a0c62be967b420da5e60ffcdc078b:157:subghz/came.sub
-F:0156915c656d8c038c6d555d34349a36:6877:subghz/came_atomo_raw.sub
-F:111a8b796661f3cbd6f49f756cf91107:8614:subghz/came_raw.sub
-F:2101b0a5a72c87f9dce77223b2885aa7:162:subghz/came_twee.sub
-F:c608b78b8e4646eeb94db37644623254:10924:subghz/came_twee_raw.sub
-F:c4a55acddb68fc3111d592c9292022a8:21703:subghz/cenmax_raw.sub
-F:51d6bd600345954b9c84a5bc6e999313:159:subghz/clemsa.sub
-F:14fa0d5931a32674bfb2ddf288f3842b:21499:subghz/clemsa_raw.sub
-F:f38b6dfa0920199200887b2cd5c0a385:161:subghz/doitrand.sub
-F:c7e53da8e3588a2c0721aa794699ccd4:24292:subghz/doitrand_raw.sub
-F:cc73b6f4d05bfe30c67a0d18b63e58d9:159:subghz/doorhan.sub
-F:22fec89c5cc43504ad4391e61e12c7e0:10457:subghz/doorhan_raw.sub
-F:3a97d8bd32ddaff42932b4c3033ee2d2:12732:subghz/faac_slh_raw.sub
-F:06d3226f5330665f48d41c49e34fed15:159:subghz/gate_tx.sub
-F:8b150a8d38ac7c4f7063ee0d42050399:13827:subghz/gate_tx_raw.sub
-F:a7904e17b0c18c083ae1acbefc330c7a:159:subghz/holtek.sub
-F:72bb528255ef1c135cb3f436414897d3:173:subghz/holtek_ht12x.sub
-F:54ceacb8c156f9534fc7ee0a0911f4da:11380:subghz/holtek_ht12x_raw.sub
-F:4a9567c1543cf3e7bb5350b635d9076f:31238:subghz/holtek_raw.sub
-F:ca86c0d78364d704ff62b0698093d396:162:subghz/honeywell_wdb.sub
-F:f606548c935adc8d8bc804326ef67543:38415:subghz/honeywell_wdb_raw.sub
-F:20bba4b0aec006ced7e82513f9459e31:15532:subghz/hormann_hsm_raw.sub
-F:3392f2db6aa7777e937db619b86203bb:10637:subghz/ido_117_111_raw.sub
-F:cc5c7968527cc233ef11a08986e31bf2:167:subghz/intertechno_v3.sub
-F:70bceb941739260ab9f6162cfdeb0347:18211:subghz/intertechno_v3_raw.sub
-F:bc9a4622f3e22fd7f82eb3f26e61f59b:44952:subghz/kia_seed_raw.sub
-F:6b6e95fc70ea481dc6184d291466d16a:159:subghz/linear.sub
-F:77aaa9005db54c0357451ced081857b2:14619:subghz/linear_raw.sub
-F:1a618e21e6ffa9984d465012e704c450:161:subghz/magellan.sub
-F:bf43cb85d79e20644323d6acad87e028:5808:subghz/magellan_raw.sub
-F:4ef17320f936ee88e92582a9308b2faa:161:subghz/marantec.sub
-F:507a8413a1603ad348eea945123fb7cc:21155:subghz/marantec_raw.sub
-F:22b69dc490d5425488342b5c5a838d55:161:subghz/megacode.sub
-F:4f8fe9bef8bdd9c52f3f77e829f8986f:6205:subghz/megacode_raw.sub
-F:b39f62cb108c2fa9916e0a466596ab87:18655:subghz/nero_radio_raw.sub
-F:d0d70f8183032096805a41e1808c093b:26436:subghz/nero_sketch_raw.sub
-F:c6999bd0eefd0fccf34820e17bcbc8ba:161:subghz/nice_flo.sub
-F:9b1200600b9ec2a73166797ff243fbfc:3375:subghz/nice_flo_raw.sub
-F:b52bafb098282676d1c7163bfb0d6e73:8773:subghz/nice_flor_s_raw.sub
-F:e4df94dfdee2efadf2ed9a1e9664f8b2:163:subghz/phoenix_v2.sub
-F:8ec066976df93fba6335b3f6dc47014c:8548:subghz/phoenix_v2_raw.sub
-F:2b1192e4898aaf274caebbb493b9f96e:164:subghz/power_smart.sub
-F:8b8195cab1d9022fe38e802383fb923a:3648:subghz/power_smart_raw.sub
-F:1ccf1289533e0486a1d010d934ad7b06:170:subghz/princeton.sub
-F:8bccc506a61705ec429aecb879e5d7ce:7344:subghz/princeton_raw.sub
-F:0bda91d783e464165190c3b3d16666a7:38724:subghz/scher_khan_magic_code.sub
-F:116d7e1a532a0c9e00ffeee105f7138b:166:subghz/security_pls_1_0.sub
-F:441fc7fc6fa11ce0068fde3f6145177b:69413:subghz/security_pls_1_0_raw.sub
-F:e5e33c24c5e55f592ca892b5aa8fa31f:208:subghz/security_pls_2_0.sub
-F:2614f0aef367042f8623719d765bf2c0:62287:subghz/security_pls_2_0_raw.sub
-F:8eb533544c4c02986800c90e935184ff:168:subghz/smc5326.sub
-F:fc67a4fe7e0b3bc81a1c8da8caca7658:4750:subghz/smc5326_raw.sub
-F:24196a4c4af1eb03404a2ee434c864bf:4096:subghz/somfy_keytis_raw.sub
-F:6a5ece145a5694e543d99bf1b970baf0:9741:subghz/somfy_telis_raw.sub
-F:0ad046bfa9ec872e92141a69bbf03d92:382605:subghz/test_random_raw.sub

applications/debug/unit_tests/resources/unit_tests/infrared/test_rca.irtest

@@ -1,105 +0,0 @@
-Filetype: IR tests file
-Version: 1
-#
-name: decoder_input1
-type: raw
-data: 1000000 3994 3969 552 1945 551 1945 552 1945 551 1945 552 946 551 947 550 1947 548 951 546 1953 542 979 518 1979 517 981 492 1006 491 1006 492 1006 492 1006 492 2005 492 2005 492 1006 492 2005 492 1006 492 2005 492 1006 492 2006 491 
-#
-name: decoder_expected1
-type: parsed_array
-count: 1
-#
-protocol: RCA
-address: 0F 00 00 00
-command: 54 00 00 00
-repeat: false
-#
-name: decoder_input2
-type: raw
-data: 1000000 4055 3941 605 1891 551 1947 550 1946 551 1946 551 947 551 947 550 1947 549 949 548 1951 545 1977 519 1978 519 1979 518 980 518 980 518 980 518 980 518 1979 518 1979 518 981 517 1979 518 980 518 980 518 980 518 980 518 
-#
-name: decoder_expected2
-type: parsed_array
-count: 1
-#
-protocol: RCA
-address: 0F 00 00 00
-command: F4 00 00 00
-repeat: false
-#
-name: decoder_input3
-type: raw
-data: 1000000 4027 3970 551 1946 550 1946 551 1946 551 1946 551 946 551 947 550 1947 549 949 547 1951 545 1978 518 1979 492 1006 492 1007 491 1006 492 1006 492 1006 492 2006 491 2006 491 1006 492 2006 491 1007 491 1007 491 1006 492 2006 491 
-#
-name: decoder_expected3
-type: parsed_array
-count: 1
-#
-protocol: RCA
-address: 0F 00 00 00
-command: 74 00 00 00
-repeat: false
-#
-name: decoder_input4
-type: raw
-data: 1000000 4021 3941 551 1946 550 1946 551 1946 551 1945 552 946 551 947 550 1947 549 950 547 1952 544 1977 519 979 519 1979 518 980 518 980 518 980 518 980 518 1979 518 1979 518 980 518 1979 518 980 518 980 518 1979 518 980 518 
-#
-name: decoder_expected4
-type: parsed_array
-count: 1
-#
-protocol: RCA
-address: 0F 00 00 00
-command: B4 00 00 00
-repeat: false
-#
-name: decoder_input5
-type: raw
-data: 1000000 4022 3941 551 1946 551 1946 577 1919 578 1919 578 920 552 946 551 1946 550 947 550 1949 547 1952 544 978 520 979 519 980 518 980 518 980 518 980 518 1979 518 1979 518 980 518 1979 518 980 518 980 518 1979 518 1980 517 
-#
-name: decoder_expected5
-type: parsed_array
-count: 1
-#
-protocol: RCA
-address: 0F 00 00 00
-command: 34 00 00 00
-repeat: false
-#
-name: decoder_input6
-type: raw
-data: 1000000 3995 3968 552 1944 552 1946 550 1946 550 1946 551 947 550 948 549 1947 549 1949 547 1952 544 1978 518 1979 492 2005 492 1006 492 1006 492 1006 492 1006 492 2005 492 2005 492 1006 492 1006 492 1006 492 1006 492 1006 492 1006 492 
-#
-name: decoder_expected6
-type: parsed_array
-count: 1
-#
-protocol: RCA
-address: 0F 00 00 00
-command: FC 00 00 00
-repeat: false
-#
-name: encoder_decoder_input1
-type: parsed_array
-count: 4
-#
-protocol: RCA
-address: 0F 00 00 00
-command: 74 00 00 00
-repeat: false
-#
-protocol: RCA
-address: 0F 00 00 00
-command: B4 00 00 00
-repeat: false
-#
-protocol: RCA
-address: 0F 00 00 00
-command: 34 00 00 00
-repeat: false
-#
-protocol: RCA
-address: 0F 00 00 00
-command: FC 00 00 00
-repeat: false
-#