Merge branch 'dev' into cc1101_ext

applications/external/bad_bt/application.fam

@@ -10,7 +10,7 @@ App(
     stack_size=2 * 1024,
     order=70,
     fap_libs=["assets"],
-    fap_category="Tools",
+    fap_category="Bluetooth",
     fap_icon="images/badbt_10px.png",
     fap_icon_assets="images",
 )

applications/external/mifare_nested/application.fam

@@ -21,5 +21,5 @@ App(
     fap_author="AloneLiberty",
     fap_description="Recover Mifare Classic keys",
     fap_weburl="https://github.com/AloneLiberty/FlipperNested",
-    fap_version="1.5.0"
+    fap_version="1.5.1"
 )

applications/external/mifare_nested/mifare_nested_i.h

@@ -21,7 +21,7 @@
 #include <gui/modules/variable_item_list.h>
 #include "mifare_nested_icons.h"
 
-#define NESTED_VERSION_APP "1.5.0"
+#define NESTED_VERSION_APP "1.5.1"
 #define NESTED_GITHUB_LINK "https://github.com/AloneLiberty/FlipperNested"
 #define NESTED_RECOVER_KEYS_GITHUB_LINK "https://github.com/AloneLiberty/FlipperNestedRecovery"
 #define NESTED_NONCE_FORMAT_VERSION "3"

applications/external/mifare_nested/mifare_nested_worker.c

@@ -478,9 +478,13 @@ SaveNoncesResult_t* mifare_nested_worker_write_nonces(
         for(uint8_t sector = 0; sector < sector_count; sector++) {
             for(uint8_t key_type = 0; key_type < 2; key_type++) {
                 if(nonces->nonces[sector][key_type][tries]->invalid) {
-                    result->invalid++;
+                    if(tries == 0) {
+                        result->invalid++;
+                    }
                 } else if(nonces->nonces[sector][key_type][tries]->skipped) {
-                    result->skipped++;
+                    if(tries == 0) {
+                        result->skipped++;
+                    }
                 } else if(nonces->nonces[sector][key_type][tries]->collected) {
                     if(nonces->nonces[sector][key_type][tries]->hardnested) {
                         FuriString* hardnested_path = furi_string_alloc();

applications/external/nfc_maker/nfc_maker.c

@@ -35,9 +35,11 @@ NfcMaker* nfc_maker_alloc() {
     view_dispatcher_add_view(
         app->view_dispatcher, NfcMakerViewSubmenu, submenu_get_view(app->submenu));
 
-    app->text_input = text_input_alloc();
+    app->text_input = nfc_maker_text_input_alloc();
     view_dispatcher_add_view(
-        app->view_dispatcher, NfcMakerViewTextInput, text_input_get_view(app->text_input));
+        app->view_dispatcher,
+        NfcMakerViewTextInput,
+        nfc_maker_text_input_get_view(app->text_input));
 
     app->byte_input = byte_input_alloc();
     view_dispatcher_add_view(
@@ -56,7 +58,7 @@ void nfc_maker_free(NfcMaker* app) {
     view_dispatcher_remove_view(app->view_dispatcher, NfcMakerViewSubmenu);
     submenu_free(app->submenu);
     view_dispatcher_remove_view(app->view_dispatcher, NfcMakerViewTextInput);
-    text_input_free(app->text_input);
+    nfc_maker_text_input_free(app->text_input);
     view_dispatcher_remove_view(app->view_dispatcher, NfcMakerViewByteInput);
     byte_input_free(app->byte_input);
     view_dispatcher_remove_view(app->view_dispatcher, NfcMakerViewPopup);

applications/external/nfc_maker/nfc_maker.h

@@ -8,7 +8,7 @@
 #include <gui/scene_manager.h>
 #include "nfc_maker_icons.h"
 #include <gui/modules/submenu.h>
-#include <gui/modules/text_input.h>
+#include "nfc_maker_text_input.h"
 #include <gui/modules/byte_input.h>
 #include <gui/modules/popup.h>
 #include "scenes/nfc_maker_scene.h"
@@ -42,7 +42,7 @@ typedef struct {
     SceneManager* scene_manager;
     ViewDispatcher* view_dispatcher;
     Submenu* submenu;
-    TextInput* text_input;
+    NFCMaker_TextInput* text_input;
     ByteInput* byte_input;
     Popup* popup;
 

applications/external/nfc_maker/nfc_maker_text_input.c

@@ -0,0 +1,762 @@
+#include "nfc_maker_text_input.h"
+#include <gui/elements.h>
+#include "nfc_maker.h"
+#include <furi.h>
+
+struct NFCMaker_TextInput {
+    View* view;
+    FuriTimer* timer;
+};
+
+typedef struct {
+    const char text;
+    const uint8_t x;
+    const uint8_t y;
+} NFCMaker_TextInputKey;
+
+typedef struct {
+    const NFCMaker_TextInputKey* rows[3];
+    const uint8_t keyboard_index;
+} Keyboard;
+
+typedef struct {
+    const char* header;
+    char* text_buffer;
+    size_t text_buffer_size;
+    size_t minimum_length;
+    bool clear_default_text;
+
+    bool cursor_select;
+    size_t cursor_pos;
+
+    NFCMaker_TextInputCallback callback;
+    void* callback_context;
+
+    uint8_t selected_row;
+    uint8_t selected_column;
+    uint8_t selected_keyboard;
+
+    NFCMaker_TextInputValidatorCallback validator_callback;
+    void* validator_callback_context;
+    FuriString* validator_text;
+    bool validator_message_visible;
+} NFCMaker_TextInputModel;
+
+static const uint8_t keyboard_origin_x = 1;
+static const uint8_t keyboard_origin_y = 29;
+static const uint8_t keyboard_row_count = 3;
+static const uint8_t keyboard_count = 2;
+
+#define ENTER_KEY '\r'
+#define BACKSPACE_KEY '\b'
+#define SWITCH_KEYBOARD_KEY 0xfe
+
+static const NFCMaker_TextInputKey keyboard_keys_row_1[] = {
+    {'q', 1, 8},
+    {'w', 10, 8},
+    {'e', 19, 8},
+    {'r', 28, 8},
+    {'t', 37, 8},
+    {'y', 46, 8},
+    {'u', 55, 8},
+    {'i', 64, 8},
+    {'o', 73, 8},
+    {'p', 82, 8},
+    {'0', 91, 8},
+    {'1', 100, 8},
+    {'2', 110, 8},
+    {'3', 120, 8},
+};
+
+static const NFCMaker_TextInputKey keyboard_keys_row_2[] = {
+    {'a', 1, 20},
+    {'s', 10, 20},
+    {'d', 19, 20},
+    {'f', 28, 20},
+    {'g', 37, 20},
+    {'h', 46, 20},
+    {'j', 55, 20},
+    {'k', 64, 20},
+    {'l', 73, 20},
+    {BACKSPACE_KEY, 82, 12},
+    {'4', 100, 20},
+    {'5', 110, 20},
+    {'6', 120, 20},
+};
+
+static const NFCMaker_TextInputKey keyboard_keys_row_3[] = {
+    {SWITCH_KEYBOARD_KEY, 1, 23},
+    {'z', 13, 32},
+    {'x', 21, 32},
+    {'c', 28, 32},
+    {'v', 36, 32},
+    {'b', 44, 32},
+    {'n', 52, 32},
+    {'m', 59, 32},
+    {'_', 67, 32},
+    {ENTER_KEY, 74, 23},
+    {'7', 100, 32},
+    {'8', 110, 32},
+    {'9', 120, 32},
+};
+
+static const NFCMaker_TextInputKey symbol_keyboard_keys_row_1[] = {
+    {'!', 2, 8},
+    {'@', 12, 8},
+    {'#', 22, 8},
+    {'$', 32, 8},
+    {'%', 42, 8},
+    {'^', 52, 8},
+    {'&', 62, 8},
+    {'(', 71, 8},
+    {')', 81, 8},
+    {'0', 91, 8},
+    {'1', 100, 8},
+    {'2', 110, 8},
+    {'3', 120, 8},
+};
+
+static const NFCMaker_TextInputKey symbol_keyboard_keys_row_2[] = {
+    {'~', 2, 20},
+    {'+', 12, 20},
+    {'-', 22, 20},
+    {'=', 32, 20},
+    {'[', 42, 20},
+    {']', 52, 20},
+    {'{', 62, 20},
+    {'}', 72, 20},
+    {BACKSPACE_KEY, 82, 12},
+    {'4', 100, 20},
+    {'5', 110, 20},
+    {'6', 120, 20},
+};
+
+static const NFCMaker_TextInputKey symbol_keyboard_keys_row_3[] = {
+    {SWITCH_KEYBOARD_KEY, 1, 23},
+    {'.', 15, 32},
+    {',', 29, 32},
+    {':', 41, 32},
+    {'/', 53, 32},
+    {'\\', 65, 32},
+    {ENTER_KEY, 74, 23},
+    {'7', 100, 32},
+    {'8', 110, 32},
+    {'9', 120, 32},
+};
+
+static const Keyboard keyboard = {
+    .rows =
+        {
+            keyboard_keys_row_1,
+            keyboard_keys_row_2,
+            keyboard_keys_row_3,
+        },
+    .keyboard_index = 0,
+};
+
+static const Keyboard symbol_keyboard = {
+    .rows =
+        {
+            symbol_keyboard_keys_row_1,
+            symbol_keyboard_keys_row_2,
+            symbol_keyboard_keys_row_3,
+        },
+    .keyboard_index = 1,
+};
+
+static const Keyboard* keyboards[] = {
+    &keyboard,
+    &symbol_keyboard,
+};
+
+static void switch_keyboard(NFCMaker_TextInputModel* model) {
+    model->selected_keyboard = (model->selected_keyboard + 1) % keyboard_count;
+}
+
+static uint8_t get_row_size(const Keyboard* keyboard, uint8_t row_index) {
+    uint8_t row_size = 0;
+    if(keyboard == &symbol_keyboard) {
+        switch(row_index + 1) {
+        case 1:
+            row_size = COUNT_OF(symbol_keyboard_keys_row_1);
+            break;
+        case 2:
+            row_size = COUNT_OF(symbol_keyboard_keys_row_2);
+            break;
+        case 3:
+            row_size = COUNT_OF(symbol_keyboard_keys_row_3);
+            break;
+        default:
+            furi_crash(NULL);
+        }
+    } else {
+        switch(row_index + 1) {
+        case 1:
+            row_size = COUNT_OF(keyboard_keys_row_1);
+            break;
+        case 2:
+            row_size = COUNT_OF(keyboard_keys_row_2);
+            break;
+        case 3:
+            row_size = COUNT_OF(keyboard_keys_row_3);
+            break;
+        default:
+            furi_crash(NULL);
+        }
+    }
+
+    return row_size;
+}
+
+static const NFCMaker_TextInputKey* get_row(const Keyboard* keyboard, uint8_t row_index) {
+    const NFCMaker_TextInputKey* row = NULL;
+    if(row_index < 3) {
+        row = keyboard->rows[row_index];
+    } else {
+        furi_crash(NULL);
+    }
+
+    return row;
+}
+
+static char get_selected_char(NFCMaker_TextInputModel* model) {
+    return get_row(
+               keyboards[model->selected_keyboard], model->selected_row)[model->selected_column]
+        .text;
+}
+
+static bool char_is_lowercase(char letter) {
+    return (letter >= 0x61 && letter <= 0x7A);
+}
+
+static char char_to_uppercase(const char letter) {
+    if(letter == '_') {
+        return 0x20;
+    } else if(char_is_lowercase(letter)) {
+        return (letter - 0x20);
+    } else {
+        return letter;
+    }
+}
+
+static void nfc_maker_text_input_backspace_cb(NFCMaker_TextInputModel* model) {
+    if(model->clear_default_text) {
+        model->text_buffer[0] = 0;
+        model->cursor_pos = 0;
+    } else if(model->cursor_pos > 0) {
+        char* move = model->text_buffer + model->cursor_pos;
+        memmove(move - 1, move, strlen(move) + 1);
+        model->cursor_pos--;
+    }
+}
+
+static void nfc_maker_text_input_view_draw_callback(Canvas* canvas, void* _model) {
+    NFCMaker_TextInputModel* model = _model;
+    uint8_t text_length = model->text_buffer ? strlen(model->text_buffer) : 0;
+    uint8_t needed_string_width = canvas_width(canvas) - 8;
+    uint8_t start_pos = 4;
+
+    model->cursor_pos = model->cursor_pos > text_length ? text_length : model->cursor_pos;
+    size_t cursor_pos = model->cursor_pos;
+
+    canvas_clear(canvas);
+    canvas_set_color(canvas, ColorBlack);
+
+    canvas_draw_str(canvas, 2, 8, model->header);
+    elements_slightly_rounded_frame(canvas, 1, 12, 126, 15);
+
+    char buf[model->text_buffer_size + 1];
+    if(model->text_buffer) {
+        strlcpy(buf, model->text_buffer, sizeof(buf));
+    }
+    char* str = buf;
+
+    if(model->clear_default_text) {
+        elements_slightly_rounded_box(
+            canvas, start_pos - 1, 14, canvas_string_width(canvas, str) + 2, 10);
+        canvas_set_color(canvas, ColorWhite);
+    } else {
+        char* move = str + cursor_pos;
+        memmove(move + 1, move, strlen(move) + 1);
+        str[cursor_pos] = '|';
+    }
+
+    if(cursor_pos > 0 && canvas_string_width(canvas, str) > needed_string_width) {
+        canvas_draw_str(canvas, start_pos, 22, "...");
+        start_pos += 6;
+        needed_string_width -= 8;
+        for(uint32_t off = 0;
+            strlen(str) && canvas_string_width(canvas, str) > needed_string_width &&
+            off < cursor_pos;
+            off++) {
+            str++;
+        }
+    }
+
+    if(canvas_string_width(canvas, str) > needed_string_width) {
+        needed_string_width -= 4;
+        size_t len = strlen(str);
+        while(len && canvas_string_width(canvas, str) > needed_string_width) {
+            str[len--] = '\0';
+        }
+        strcat(str, "...");
+    }
+
+    canvas_draw_str(canvas, start_pos, 22, str);
+
+    canvas_set_font(canvas, FontKeyboard);
+
+    for(uint8_t row = 0; row < keyboard_row_count; row++) {
+        const uint8_t column_count = get_row_size(keyboards[model->selected_keyboard], row);
+        const NFCMaker_TextInputKey* keys = get_row(keyboards[model->selected_keyboard], row);
+
+        for(size_t column = 0; column < column_count; column++) {
+            bool selected = !model->cursor_select && model->selected_row == row &&
+                            model->selected_column == column;
+            const Icon* icon = NULL;
+            if(keys[column].text == ENTER_KEY) {
+                icon = selected ? &I_KeySaveSelected_24x11 : &I_KeySave_24x11;
+            } else if(keys[column].text == SWITCH_KEYBOARD_KEY) {
+                icon = selected ? &I_KeyKeyboardSelected_10x11 : &I_KeyKeyboard_10x11;
+            } else if(keys[column].text == BACKSPACE_KEY) {
+                icon = selected ? &I_KeyBackspaceSelected_16x9 : &I_KeyBackspace_16x9;
+            }
+            canvas_set_color(canvas, ColorBlack);
+            if(icon != NULL) {
+                canvas_draw_icon(
+                    canvas,
+                    keyboard_origin_x + keys[column].x,
+                    keyboard_origin_y + keys[column].y,
+                    icon);
+            } else {
+                if(selected) {
+                    canvas_draw_box(
+                        canvas,
+                        keyboard_origin_x + keys[column].x - 1,
+                        keyboard_origin_y + keys[column].y - 8,
+                        7,
+                        10);
+                    canvas_set_color(canvas, ColorWhite);
+                }
+
+                if(model->clear_default_text || text_length == 0) {
+                    canvas_draw_glyph(
+                        canvas,
+                        keyboard_origin_x + keys[column].x,
+                        keyboard_origin_y + keys[column].y,
+                        char_to_uppercase(keys[column].text));
+                } else {
+                    canvas_draw_glyph(
+                        canvas,
+                        keyboard_origin_x + keys[column].x,
+                        keyboard_origin_y + keys[column].y,
+                        keys[column].text);
+                }
+            }
+        }
+    }
+    if(model->validator_message_visible) {
+        canvas_set_font(canvas, FontSecondary);
+        canvas_set_color(canvas, ColorWhite);
+        canvas_draw_box(canvas, 8, 10, 110, 48);
+        canvas_set_color(canvas, ColorBlack);
+        canvas_draw_icon(canvas, 10, 14, &I_WarningDolphin_45x42);
+        canvas_draw_rframe(canvas, 8, 8, 112, 50, 3);
+        canvas_draw_rframe(canvas, 9, 9, 110, 48, 2);
+        elements_multiline_text(canvas, 62, 20, furi_string_get_cstr(model->validator_text));
+        canvas_set_font(canvas, FontKeyboard);
+    }
+}
+
+static void nfc_maker_text_input_handle_up(
+    NFCMaker_TextInput* nfc_maker_text_input,
+    NFCMaker_TextInputModel* model) {
+    UNUSED(nfc_maker_text_input);
+    if(model->selected_row > 0) {
+        model->selected_row--;
+        if(model->selected_row == 0 &&
+           model->selected_column >
+               get_row_size(keyboards[model->selected_keyboard], model->selected_row) - 6) {
+            model->selected_column = model->selected_column + 1;
+        }
+        if(model->selected_row == 1 &&
+           model->selected_keyboard == symbol_keyboard.keyboard_index) {
+            if(model->selected_column > 5)
+                model->selected_column += 2;
+            else if(model->selected_column > 1)
+                model->selected_column += 1;
+        }
+    } else {
+        model->cursor_select = true;
+        model->clear_default_text = false;
+    }
+}
+
+static void nfc_maker_text_input_handle_down(
+    NFCMaker_TextInput* nfc_maker_text_input,
+    NFCMaker_TextInputModel* model) {
+    UNUSED(nfc_maker_text_input);
+    if(model->cursor_select) {
+        model->cursor_select = false;
+    } else if(model->selected_row < keyboard_row_count - 1) {
+        model->selected_row++;
+        if(model->selected_row == 1 &&
+           model->selected_column >
+               get_row_size(keyboards[model->selected_keyboard], model->selected_row) - 4) {
+            model->selected_column = model->selected_column - 1;
+        }
+        if(model->selected_row == 2 &&
+           model->selected_keyboard == symbol_keyboard.keyboard_index) {
+            if(model->selected_column > 7)
+                model->selected_column -= 2;
+            else if(model->selected_column > 1)
+                model->selected_column -= 1;
+        }
+    }
+}
+
+static void nfc_maker_text_input_handle_left(
+    NFCMaker_TextInput* nfc_maker_text_input,
+    NFCMaker_TextInputModel* model) {
+    UNUSED(nfc_maker_text_input);
+    if(model->cursor_select) {
+        if(model->cursor_pos > 0) {
+            model->cursor_pos = CLAMP(model->cursor_pos - 1, strlen(model->text_buffer), 0u);
+        }
+    } else if(model->selected_column > 0) {
+        model->selected_column--;
+    } else {
+        model->selected_column =
+            get_row_size(keyboards[model->selected_keyboard], model->selected_row) - 1;
+    }
+}
+
+static void nfc_maker_text_input_handle_right(
+    NFCMaker_TextInput* nfc_maker_text_input,
+    NFCMaker_TextInputModel* model) {
+    UNUSED(nfc_maker_text_input);
+    if(model->cursor_select) {
+        model->cursor_pos = CLAMP(model->cursor_pos + 1, strlen(model->text_buffer), 0u);
+    } else if(
+        model->selected_column <
+        get_row_size(keyboards[model->selected_keyboard], model->selected_row) - 1) {
+        model->selected_column++;
+    } else {
+        model->selected_column = 0;
+    }
+}
+
+static void nfc_maker_text_input_handle_ok(
+    NFCMaker_TextInput* nfc_maker_text_input,
+    NFCMaker_TextInputModel* model,
+    InputType type) {
+    if(model->cursor_select) return;
+    bool shift = type == InputTypeLong;
+    bool repeat = type == InputTypeRepeat;
+    char selected = get_selected_char(model);
+    size_t text_length = strlen(model->text_buffer);
+
+    if(selected == ENTER_KEY) {
+        if(model->validator_callback &&
+           (!model->validator_callback(
+               model->text_buffer, model->validator_text, model->validator_callback_context))) {
+            model->validator_message_visible = true;
+            furi_timer_start(nfc_maker_text_input->timer, furi_kernel_get_tick_frequency() * 4);
+        } else if(model->callback != 0 && text_length >= model->minimum_length) {
+            model->callback(model->callback_context);
+        }
+    } else if(selected == SWITCH_KEYBOARD_KEY) {
+        switch_keyboard(model);
+    } else {
+        if(selected == BACKSPACE_KEY) {
+            nfc_maker_text_input_backspace_cb(model);
+        } else if(!repeat) {
+            if(model->clear_default_text) {
+                text_length = 0;
+            }
+            if(text_length < (model->text_buffer_size - 1)) {
+                if(shift != (text_length == 0)) {
+                    selected = char_to_uppercase(selected);
+                }
+                if(model->clear_default_text) {
+                    model->text_buffer[0] = selected;
+                    model->text_buffer[1] = '\0';
+                    model->cursor_pos = 1;
+                } else {
+                    char* move = model->text_buffer + model->cursor_pos;
+                    memmove(move + 1, move, strlen(move) + 1);
+                    model->text_buffer[model->cursor_pos] = selected;
+                    model->cursor_pos++;
+                }
+            }
+        }
+        model->clear_default_text = false;
+    }
+}
+
+static bool nfc_maker_text_input_view_input_callback(InputEvent* event, void* context) {
+    NFCMaker_TextInput* nfc_maker_text_input = context;
+    furi_assert(nfc_maker_text_input);
+
+    bool consumed = false;
+
+    // Acquire model
+    NFCMaker_TextInputModel* model = view_get_model(nfc_maker_text_input->view);
+
+    if((!(event->type == InputTypePress) && !(event->type == InputTypeRelease)) &&
+       model->validator_message_visible) {
+        model->validator_message_visible = false;
+        consumed = true;
+    } else if(event->type == InputTypeShort) {
+        consumed = true;
+        switch(event->key) {
+        case InputKeyUp:
+            nfc_maker_text_input_handle_up(nfc_maker_text_input, model);
+            break;
+        case InputKeyDown:
+            nfc_maker_text_input_handle_down(nfc_maker_text_input, model);
+            break;
+        case InputKeyLeft:
+            nfc_maker_text_input_handle_left(nfc_maker_text_input, model);
+            break;
+        case InputKeyRight:
+            nfc_maker_text_input_handle_right(nfc_maker_text_input, model);
+            break;
+        case InputKeyOk:
+            nfc_maker_text_input_handle_ok(nfc_maker_text_input, model, event->type);
+            break;
+        default:
+            consumed = false;
+            break;
+        }
+    } else if(event->type == InputTypeLong) {
+        consumed = true;
+        switch(event->key) {
+        case InputKeyUp:
+            nfc_maker_text_input_handle_up(nfc_maker_text_input, model);
+            break;
+        case InputKeyDown:
+            nfc_maker_text_input_handle_down(nfc_maker_text_input, model);
+            break;
+        case InputKeyLeft:
+            nfc_maker_text_input_handle_left(nfc_maker_text_input, model);
+            break;
+        case InputKeyRight:
+            nfc_maker_text_input_handle_right(nfc_maker_text_input, model);
+            break;
+        case InputKeyOk:
+            nfc_maker_text_input_handle_ok(nfc_maker_text_input, model, event->type);
+            break;
+        case InputKeyBack:
+            nfc_maker_text_input_backspace_cb(model);
+            break;
+        default:
+            consumed = false;
+            break;
+        }
+    } else if(event->type == InputTypeRepeat) {
+        consumed = true;
+        switch(event->key) {
+        case InputKeyUp:
+            nfc_maker_text_input_handle_up(nfc_maker_text_input, model);
+            break;
+        case InputKeyDown:
+            nfc_maker_text_input_handle_down(nfc_maker_text_input, model);
+            break;
+        case InputKeyLeft:
+            nfc_maker_text_input_handle_left(nfc_maker_text_input, model);
+            break;
+        case InputKeyRight:
+            nfc_maker_text_input_handle_right(nfc_maker_text_input, model);
+            break;
+        case InputKeyOk:
+            nfc_maker_text_input_handle_ok(nfc_maker_text_input, model, event->type);
+            break;
+        case InputKeyBack:
+            nfc_maker_text_input_backspace_cb(model);
+            break;
+        default:
+            consumed = false;
+            break;
+        }
+    }
+
+    // Commit model
+    view_commit_model(nfc_maker_text_input->view, consumed);
+
+    return consumed;
+}
+
+void nfc_maker_text_input_timer_callback(void* context) {
+    furi_assert(context);
+    NFCMaker_TextInput* nfc_maker_text_input = context;
+
+    with_view_model(
+        nfc_maker_text_input->view,
+        NFCMaker_TextInputModel * model,
+        { model->validator_message_visible = false; },
+        true);
+}
+
+NFCMaker_TextInput* nfc_maker_text_input_alloc() {
+    NFCMaker_TextInput* nfc_maker_text_input = malloc(sizeof(NFCMaker_TextInput));
+    nfc_maker_text_input->view = view_alloc();
+    view_set_context(nfc_maker_text_input->view, nfc_maker_text_input);
+    view_allocate_model(
+        nfc_maker_text_input->view, ViewModelTypeLocking, sizeof(NFCMaker_TextInputModel));
+    view_set_draw_callback(nfc_maker_text_input->view, nfc_maker_text_input_view_draw_callback);
+    view_set_input_callback(nfc_maker_text_input->view, nfc_maker_text_input_view_input_callback);
+
+    nfc_maker_text_input->timer = furi_timer_alloc(
+        nfc_maker_text_input_timer_callback, FuriTimerTypeOnce, nfc_maker_text_input);
+
+    with_view_model(
+        nfc_maker_text_input->view,
+        NFCMaker_TextInputModel * model,
+        {
+            model->validator_text = furi_string_alloc();
+            model->minimum_length = 1;
+            model->cursor_pos = 0;
+            model->cursor_select = false;
+        },
+        false);
+
+    nfc_maker_text_input_reset(nfc_maker_text_input);
+
+    return nfc_maker_text_input;
+}
+
+void nfc_maker_text_input_free(NFCMaker_TextInput* nfc_maker_text_input) {
+    furi_assert(nfc_maker_text_input);
+    with_view_model(
+        nfc_maker_text_input->view,
+        NFCMaker_TextInputModel * model,
+        { furi_string_free(model->validator_text); },
+        false);
+
+    // Send stop command
+    furi_timer_stop(nfc_maker_text_input->timer);
+    // Release allocated memory
+    furi_timer_free(nfc_maker_text_input->timer);
+
+    view_free(nfc_maker_text_input->view);
+
+    free(nfc_maker_text_input);
+}
+
+void nfc_maker_text_input_reset(NFCMaker_TextInput* nfc_maker_text_input) {
+    furi_assert(nfc_maker_text_input);
+    with_view_model(
+        nfc_maker_text_input->view,
+        NFCMaker_TextInputModel * model,
+        {
+            model->header = "";
+            model->selected_row = 0;
+            model->selected_column = 0;
+            model->selected_keyboard = 0;
+            model->minimum_length = 1;
+            model->clear_default_text = false;
+            model->cursor_pos = 0;
+            model->cursor_select = false;
+            model->text_buffer = NULL;
+            model->text_buffer_size = 0;
+            model->callback = NULL;
+            model->callback_context = NULL;
+            model->validator_callback = NULL;
+            model->validator_callback_context = NULL;
+            furi_string_reset(model->validator_text);
+            model->validator_message_visible = false;
+        },
+        true);
+}
+
+View* nfc_maker_text_input_get_view(NFCMaker_TextInput* nfc_maker_text_input) {
+    furi_assert(nfc_maker_text_input);
+    return nfc_maker_text_input->view;
+}
+
+void nfc_maker_text_input_set_result_callback(
+    NFCMaker_TextInput* nfc_maker_text_input,
+    NFCMaker_TextInputCallback callback,
+    void* callback_context,
+    char* text_buffer,
+    size_t text_buffer_size,
+    bool clear_default_text) {
+    with_view_model(
+        nfc_maker_text_input->view,
+        NFCMaker_TextInputModel * model,
+        {
+            model->callback = callback;
+            model->callback_context = callback_context;
+            model->text_buffer = text_buffer;
+            model->text_buffer_size = text_buffer_size;
+            model->clear_default_text = clear_default_text;
+            model->cursor_select = false;
+            if(text_buffer && text_buffer[0] != '\0') {
+                model->cursor_pos = strlen(text_buffer);
+                // Set focus on Save
+                model->selected_row = 2;
+                model->selected_column = 9;
+                model->selected_keyboard = 0;
+            } else {
+                model->cursor_pos = 0;
+            }
+        },
+        true);
+}
+
+void nfc_maker_text_input_set_minimum_length(
+    NFCMaker_TextInput* nfc_maker_text_input,
+    size_t minimum_length) {
+    with_view_model(
+        nfc_maker_text_input->view,
+        NFCMaker_TextInputModel * model,
+        { model->minimum_length = minimum_length; },
+        true);
+}
+
+void nfc_maker_text_input_set_validator(
+    NFCMaker_TextInput* nfc_maker_text_input,
+    NFCMaker_TextInputValidatorCallback callback,
+    void* callback_context) {
+    with_view_model(
+        nfc_maker_text_input->view,
+        NFCMaker_TextInputModel * model,
+        {
+            model->validator_callback = callback;
+            model->validator_callback_context = callback_context;
+        },
+        true);
+}
+
+NFCMaker_TextInputValidatorCallback
+    nfc_maker_text_input_get_validator_callback(NFCMaker_TextInput* nfc_maker_text_input) {
+    NFCMaker_TextInputValidatorCallback validator_callback = NULL;
+    with_view_model(
+        nfc_maker_text_input->view,
+        NFCMaker_TextInputModel * model,
+        { validator_callback = model->validator_callback; },
+        false);
+    return validator_callback;
+}
+
+void* nfc_maker_text_input_get_validator_callback_context(
+    NFCMaker_TextInput* nfc_maker_text_input) {
+    void* validator_callback_context = NULL;
+    with_view_model(
+        nfc_maker_text_input->view,
+        NFCMaker_TextInputModel * model,
+        { validator_callback_context = model->validator_callback_context; },
+        false);
+    return validator_callback_context;
+}
+
+void nfc_maker_text_input_set_header_text(
+    NFCMaker_TextInput* nfc_maker_text_input,
+    const char* text) {
+    with_view_model(
+        nfc_maker_text_input->view,
+        NFCMaker_TextInputModel * model,
+        { model->header = text; },
+        true);
+}

applications/external/nfc_maker/nfc_maker_text_input.h

@@ -0,0 +1,85 @@
+#pragma once
+
+#include <gui/view.h>
+#include "nfc_maker_validators.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Text input anonymous structure */
+typedef struct NFCMaker_TextInput NFCMaker_TextInput;
+typedef void (*NFCMaker_TextInputCallback)(void* context);
+typedef bool (
+    *NFCMaker_TextInputValidatorCallback)(const char* text, FuriString* error, void* context);
+
+/** Allocate and initialize text input 
+ * 
+ * This text input is used to enter string
+ *
+ * @return     NFCMaker_TextInput instance
+ */
+NFCMaker_TextInput* nfc_maker_text_input_alloc();
+
+/** Deinitialize and free text input
+ *
+ * @param      text_input  NFCMaker_TextInput instance
+ */
+void nfc_maker_text_input_free(NFCMaker_TextInput* text_input);
+
+/** Clean text input view Note: this function does not free memory
+ *
+ * @param      text_input  Text input instance
+ */
+void nfc_maker_text_input_reset(NFCMaker_TextInput* text_input);
+
+/** Get text input view
+ *
+ * @param      text_input  NFCMaker_TextInput instance
+ *
+ * @return     View instance that can be used for embedding
+ */
+View* nfc_maker_text_input_get_view(NFCMaker_TextInput* text_input);
+
+/** Set text input result callback
+ *
+ * @param      text_input          NFCMaker_TextInput instance
+ * @param      callback            callback fn
+ * @param      callback_context    callback context
+ * @param      text_buffer         pointer to YOUR text buffer, that we going
+ *                                 to modify
+ * @param      text_buffer_size    YOUR text buffer size in bytes. Max string
+ *                                 length will be text_buffer_size-1.
+ * @param      clear_default_text  clear text from text_buffer on first OK
+ *                                 event
+ */
+void nfc_maker_text_input_set_result_callback(
+    NFCMaker_TextInput* text_input,
+    NFCMaker_TextInputCallback callback,
+    void* callback_context,
+    char* text_buffer,
+    size_t text_buffer_size,
+    bool clear_default_text);
+
+void nfc_maker_text_input_set_validator(
+    NFCMaker_TextInput* text_input,
+    NFCMaker_TextInputValidatorCallback callback,
+    void* callback_context);
+
+void nfc_maker_text_input_set_minimum_length(NFCMaker_TextInput* text_input, size_t minimum_length);
+
+NFCMaker_TextInputValidatorCallback
+    nfc_maker_text_input_get_validator_callback(NFCMaker_TextInput* text_input);
+
+void* nfc_maker_text_input_get_validator_callback_context(NFCMaker_TextInput* text_input);
+
+/** Set text input header text
+ *
+ * @param      text_input  NFCMaker_TextInput instance
+ * @param      text        text to be shown
+ */
+void nfc_maker_text_input_set_header_text(NFCMaker_TextInput* text_input, const char* text);
+
+#ifdef __cplusplus
+}
+#endif

applications/external/nfc_maker/nfc_maker_validators.c

@@ -0,0 +1,57 @@
+#include <furi.h>
+#include "nfc_maker_validators.h"
+#include <storage/storage.h>
+
+struct ValidatorIsFile {
+    char* app_path_folder;
+    const char* app_extension;
+    char* current_name;
+};
+
+bool validator_is_file_callback(const char* text, FuriString* error, void* context) {
+    furi_assert(context);
+    ValidatorIsFile* instance = context;
+
+    if(instance->current_name != NULL) {
+        if(strcmp(instance->current_name, text) == 0) {
+            return true;
+        }
+    }
+
+    bool ret = true;
+    FuriString* path = furi_string_alloc_printf(
+        "%s/%s%s", instance->app_path_folder, text, instance->app_extension);
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    if(storage_common_stat(storage, furi_string_get_cstr(path), NULL) == FSE_OK) {
+        ret = false;
+        furi_string_printf(error, "This name\nexists!\nChoose\nanother one.");
+    } else {
+        ret = true;
+    }
+    furi_string_free(path);
+    furi_record_close(RECORD_STORAGE);
+
+    return ret;
+}
+
+ValidatorIsFile* validator_is_file_alloc_init(
+    const char* app_path_folder,
+    const char* app_extension,
+    const char* current_name) {
+    ValidatorIsFile* instance = malloc(sizeof(ValidatorIsFile));
+
+    instance->app_path_folder = strdup(app_path_folder);
+    instance->app_extension = app_extension;
+    if(current_name != NULL) {
+        instance->current_name = strdup(current_name);
+    }
+
+    return instance;
+}
+
+void validator_is_file_free(ValidatorIsFile* instance) {
+    furi_assert(instance);
+    free(instance->app_path_folder);
+    free(instance->current_name);
+    free(instance);
+}

applications/external/nfc_maker/nfc_maker_validators.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <core/common_defines.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef struct ValidatorIsFile ValidatorIsFile;
+
+ValidatorIsFile* validator_is_file_alloc_init(
+    const char* app_path_folder,
+    const char* app_extension,
+    const char* current_name);
+
+void validator_is_file_free(ValidatorIsFile* instance);
+
+bool validator_is_file_callback(const char* text, FuriString* error, void* context);
+
+#ifdef __cplusplus
+}
+#endif

applications/external/nfc_maker/scenes/nfc_maker_scene_https.c

@@ -12,13 +12,13 @@ static void nfc_maker_scene_https_text_input_callback(void* context) {
 
 void nfc_maker_scene_https_on_enter(void* context) {
     NfcMaker* app = context;
-    TextInput* text_input = app->text_input;
+    NFCMaker_TextInput* text_input = app->text_input;
 
-    text_input_set_header_text(text_input, "Enter HTTPS Link:");
+    nfc_maker_text_input_set_header_text(text_input, "Enter HTTPS Link:");
 
     strlcpy(app->text_buf, "google.com", TEXT_INPUT_LEN);
 
-    text_input_set_result_callback(
+    nfc_maker_text_input_set_result_callback(
         text_input,
         nfc_maker_scene_https_text_input_callback,
         app,
@@ -49,5 +49,5 @@ bool nfc_maker_scene_https_on_event(void* context, SceneManagerEvent event) {
 
 void nfc_maker_scene_https_on_exit(void* context) {
     NfcMaker* app = context;
-    text_input_reset(app->text_input);
+    nfc_maker_text_input_reset(app->text_input);
 }

applications/external/nfc_maker/scenes/nfc_maker_scene_mail.c

@@ -12,13 +12,13 @@ static void nfc_maker_scene_mail_text_input_callback(void* context) {
 
 void nfc_maker_scene_mail_on_enter(void* context) {
     NfcMaker* app = context;
-    TextInput* text_input = app->text_input;
+    NFCMaker_TextInput* text_input = app->text_input;
 
-    text_input_set_header_text(text_input, "Enter EMail Address:");
+    nfc_maker_text_input_set_header_text(text_input, "Enter Email Address:");
 
     strlcpy(app->text_buf, "ben.dover@example.com", TEXT_INPUT_LEN);
 
-    text_input_set_result_callback(
+    nfc_maker_text_input_set_result_callback(
         text_input,
         nfc_maker_scene_mail_text_input_callback,
         app,
@@ -49,5 +49,5 @@ bool nfc_maker_scene_mail_on_event(void* context, SceneManagerEvent event) {
 
 void nfc_maker_scene_mail_on_exit(void* context) {
     NfcMaker* app = context;
-    text_input_reset(app->text_input);
+    nfc_maker_text_input_reset(app->text_input);
 }

applications/external/nfc_maker/scenes/nfc_maker_scene_menu.c

@@ -22,7 +22,7 @@ void nfc_maker_scene_menu_on_enter(void* context) {
         submenu, "HTTPS Link", NfcMakerSceneHttps, nfc_maker_scene_menu_submenu_callback, app);
 
     submenu_add_item(
-        submenu, "Mail Address", NfcMakerSceneMail, nfc_maker_scene_menu_submenu_callback, app);
+        submenu, "Email Address", NfcMakerSceneMail, nfc_maker_scene_menu_submenu_callback, app);
 
     submenu_add_item(
         submenu, "Phone Number", NfcMakerScenePhone, nfc_maker_scene_menu_submenu_callback, app);

applications/external/nfc_maker/scenes/nfc_maker_scene_name.c

@@ -12,13 +12,13 @@ static void nfc_maker_scene_name_text_input_callback(void* context) {
 
 void nfc_maker_scene_name_on_enter(void* context) {
     NfcMaker* app = context;
-    TextInput* text_input = app->text_input;
+    NFCMaker_TextInput* text_input = app->text_input;
 
-    text_input_set_header_text(text_input, "Name the NFC tag:");
+    nfc_maker_text_input_set_header_text(text_input, "Name the NFC tag:");
 
     set_random_name(app->name_buf, TEXT_INPUT_LEN);
 
-    text_input_set_result_callback(
+    nfc_maker_text_input_set_result_callback(
         text_input,
         nfc_maker_scene_name_text_input_callback,
         app,
@@ -28,7 +28,7 @@ void nfc_maker_scene_name_on_enter(void* context) {
 
     ValidatorIsFile* validator_is_file =
         validator_is_file_alloc_init(NFC_APP_FOLDER, NFC_APP_EXTENSION, NULL);
-    text_input_set_validator(text_input, validator_is_file_callback, validator_is_file);
+    nfc_maker_text_input_set_validator(text_input, validator_is_file_callback, validator_is_file);
 
     view_dispatcher_switch_to_view(app->view_dispatcher, NfcMakerViewTextInput);
 }
@@ -53,5 +53,5 @@ bool nfc_maker_scene_name_on_event(void* context, SceneManagerEvent event) {
 
 void nfc_maker_scene_name_on_exit(void* context) {
     NfcMaker* app = context;
-    text_input_reset(app->text_input);
+    nfc_maker_text_input_reset(app->text_input);
 }

applications/external/nfc_maker/scenes/nfc_maker_scene_phone.c

@@ -12,13 +12,13 @@ static void nfc_maker_scene_phone_text_input_callback(void* context) {
 
 void nfc_maker_scene_phone_on_enter(void* context) {
     NfcMaker* app = context;
-    TextInput* text_input = app->text_input;
+    NFCMaker_TextInput* text_input = app->text_input;
 
-    text_input_set_header_text(text_input, "Enter Phone Number:");
+    nfc_maker_text_input_set_header_text(text_input, "Enter Phone Number:");
 
     strlcpy(app->text_buf, "+", TEXT_INPUT_LEN);
 
-    text_input_set_result_callback(
+    nfc_maker_text_input_set_result_callback(
         text_input,
         nfc_maker_scene_phone_text_input_callback,
         app,
@@ -49,5 +49,5 @@ bool nfc_maker_scene_phone_on_event(void* context, SceneManagerEvent event) {
 
 void nfc_maker_scene_phone_on_exit(void* context) {
     NfcMaker* app = context;
-    text_input_reset(app->text_input);
+    nfc_maker_text_input_reset(app->text_input);
 }

applications/external/nfc_maker/scenes/nfc_maker_scene_text.c

@@ -12,13 +12,13 @@ static void nfc_maker_scene_text_text_input_callback(void* context) {
 
 void nfc_maker_scene_text_on_enter(void* context) {
     NfcMaker* app = context;
-    TextInput* text_input = app->text_input;
+    NFCMaker_TextInput* text_input = app->text_input;
 
-    text_input_set_header_text(text_input, "Enter Text Note:");
+    nfc_maker_text_input_set_header_text(text_input, "Enter Text Note:");
 
     strlcpy(app->text_buf, "Lorem ipsum", TEXT_INPUT_LEN);
 
-    text_input_set_result_callback(
+    nfc_maker_text_input_set_result_callback(
         text_input,
         nfc_maker_scene_text_text_input_callback,
         app,
@@ -49,5 +49,5 @@ bool nfc_maker_scene_text_on_event(void* context, SceneManagerEvent event) {
 
 void nfc_maker_scene_text_on_exit(void* context) {
     NfcMaker* app = context;
-    text_input_reset(app->text_input);
+    nfc_maker_text_input_reset(app->text_input);
 }

applications/external/nfc_maker/scenes/nfc_maker_scene_url.c

@@ -12,13 +12,13 @@ static void nfc_maker_scene_url_text_input_callback(void* context) {
 
 void nfc_maker_scene_url_on_enter(void* context) {
     NfcMaker* app = context;
-    TextInput* text_input = app->text_input;
+    NFCMaker_TextInput* text_input = app->text_input;
 
-    text_input_set_header_text(text_input, "Enter Plain URL:");
+    nfc_maker_text_input_set_header_text(text_input, "Enter Plain URL:");
 
     strlcpy(app->text_buf, "https://google.com", TEXT_INPUT_LEN);
 
-    text_input_set_result_callback(
+    nfc_maker_text_input_set_result_callback(
         text_input,
         nfc_maker_scene_url_text_input_callback,
         app,
@@ -49,5 +49,5 @@ bool nfc_maker_scene_url_on_event(void* context, SceneManagerEvent event) {
 
 void nfc_maker_scene_url_on_exit(void* context) {
     NfcMaker* app = context;
-    text_input_reset(app->text_input);
+    nfc_maker_text_input_reset(app->text_input);
 }

applications/external/nfc_maker/scenes/nfc_maker_scene_wifi.c

@@ -12,13 +12,13 @@ static void nfc_maker_scene_wifi_text_input_callback(void* context) {
 
 void nfc_maker_scene_wifi_on_enter(void* context) {
     NfcMaker* app = context;
-    TextInput* text_input = app->text_input;
+    NFCMaker_TextInput* text_input = app->text_input;
 
-    text_input_set_header_text(text_input, "Enter WiFi SSID:");
+    nfc_maker_text_input_set_header_text(text_input, "Enter WiFi SSID:");
 
     strlcpy(app->text_buf, "Bill Wi the Science Fi", WIFI_INPUT_LEN);
 
-    text_input_set_result_callback(
+    nfc_maker_text_input_set_result_callback(
         text_input,
         nfc_maker_scene_wifi_text_input_callback,
         app,
@@ -51,5 +51,5 @@ bool nfc_maker_scene_wifi_on_event(void* context, SceneManagerEvent event) {
 
 void nfc_maker_scene_wifi_on_exit(void* context) {
     NfcMaker* app = context;
-    text_input_reset(app->text_input);
+    nfc_maker_text_input_reset(app->text_input);
 }

applications/external/nfc_maker/scenes/nfc_maker_scene_wifi_pass.c

@@ -12,13 +12,13 @@ static void nfc_maker_scene_wifi_pass_text_input_callback(void* context) {
 
 void nfc_maker_scene_wifi_pass_on_enter(void* context) {
     NfcMaker* app = context;
-    TextInput* text_input = app->text_input;
+    NFCMaker_TextInput* text_input = app->text_input;
 
-    text_input_set_header_text(text_input, "Enter WiFi Password:");
+    nfc_maker_text_input_set_header_text(text_input, "Enter WiFi Password:");
 
     strlcpy(app->pass_buf, "244466666", WIFI_INPUT_LEN);
 
-    text_input_set_result_callback(
+    nfc_maker_text_input_set_result_callback(
         text_input,
         nfc_maker_scene_wifi_pass_text_input_callback,
         app,
@@ -49,5 +49,5 @@ bool nfc_maker_scene_wifi_pass_on_event(void* context, SceneManagerEvent event)
 
 void nfc_maker_scene_wifi_pass_on_exit(void* context) {
     NfcMaker* app = context;
-    text_input_reset(app->text_input);
+    nfc_maker_text_input_reset(app->text_input);
 }

applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_console_output.c

@@ -182,6 +182,11 @@ bool wifi_marauder_scene_console_output_on_event(void* context, SceneManagerEven
         consumed = true;
     } else if(event.type == SceneManagerEventTypeTick) {
         consumed = true;
+    } else {
+        if(app->flash_worker_busy) {
+            // ignore button presses while flashing
+            consumed = true;
+        }
     }
 
     return consumed;

applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_flasher.c

@@ -1,9 +1,14 @@
 #include "../wifi_marauder_app_i.h"
+#include "../wifi_marauder_flasher.h"
 
 enum SubmenuIndex {
+    SubmenuIndexS3Mode,
     SubmenuIndexBoot,
     SubmenuIndexPart,
+    SubmenuIndexNvs,
+    SubmenuIndexBootApp0,
     SubmenuIndexApp,
+    SubmenuIndexCustom,
     SubmenuIndexFlash,
 };
 
@@ -20,16 +25,33 @@ static void wifi_marauder_scene_flasher_callback(void* context, uint32_t index)
 
     // TODO refactor
     switch(index) {
+    case SubmenuIndexS3Mode:
+        // toggle S3 mode
+        app->selected_flash_options[SelectedFlashS3Mode] =
+            !app->selected_flash_options[SelectedFlashS3Mode];
+        view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
+        break;
     case SubmenuIndexBoot:
-        if(dialog_file_browser_show(
-               app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
-            strncpy(
-                app->bin_file_path_boot,
-                furi_string_get_cstr(selected_filepath),
-                sizeof(app->bin_file_path_boot));
+        app->selected_flash_options[SelectedFlashBoot] =
+            !app->selected_flash_options[SelectedFlashBoot];
+        if(app->selected_flash_options[SelectedFlashBoot]) {
+            if(dialog_file_browser_show(
+                   app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
+                strncpy(
+                    app->bin_file_path_boot,
+                    furi_string_get_cstr(selected_filepath),
+                    sizeof(app->bin_file_path_boot));
+            }
         }
+        if(app->bin_file_path_boot[0] == '\0') {
+            // if user didn't select a file, leave unselected
+            app->selected_flash_options[SelectedFlashBoot] = false;
+        }
+        view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
         break;
     case SubmenuIndexPart:
+        app->selected_flash_options[SelectedFlashPart] =
+            !app->selected_flash_options[SelectedFlashPart];
         if(dialog_file_browser_show(
                app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
             strncpy(
@@ -37,8 +59,47 @@ static void wifi_marauder_scene_flasher_callback(void* context, uint32_t index)
                 furi_string_get_cstr(selected_filepath),
                 sizeof(app->bin_file_path_part));
         }
+        if(app->bin_file_path_part[0] == '\0') {
+            // if user didn't select a file, leave unselected
+            app->selected_flash_options[SelectedFlashPart] = false;
+        }
+        view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
+        break;
+    case SubmenuIndexNvs:
+        app->selected_flash_options[SelectedFlashNvs] =
+            !app->selected_flash_options[SelectedFlashNvs];
+        if(dialog_file_browser_show(
+               app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
+            strncpy(
+                app->bin_file_path_nvs,
+                furi_string_get_cstr(selected_filepath),
+                sizeof(app->bin_file_path_nvs));
+        }
+        if(app->bin_file_path_nvs[0] == '\0') {
+            // if user didn't select a file, leave unselected
+            app->selected_flash_options[SelectedFlashNvs] = false;
+        }
+        view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
+        break;
+    case SubmenuIndexBootApp0:
+        app->selected_flash_options[SelectedFlashBootApp0] =
+            !app->selected_flash_options[SelectedFlashBootApp0];
+        if(dialog_file_browser_show(
+               app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
+            strncpy(
+                app->bin_file_path_boot_app0,
+                furi_string_get_cstr(selected_filepath),
+                sizeof(app->bin_file_path_boot_app0));
+        }
+        if(app->bin_file_path_boot_app0[0] == '\0') {
+            // if user didn't select a file, leave unselected
+            app->selected_flash_options[SelectedFlashBootApp0] = false;
+        }
+        view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
         break;
     case SubmenuIndexApp:
+        app->selected_flash_options[SelectedFlashApp] =
+            !app->selected_flash_options[SelectedFlashApp];
         if(dialog_file_browser_show(
                app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
             strncpy(
@@ -46,10 +107,42 @@ static void wifi_marauder_scene_flasher_callback(void* context, uint32_t index)
                 furi_string_get_cstr(selected_filepath),
                 sizeof(app->bin_file_path_app));
         }
+        if(app->bin_file_path_app[0] == '\0') {
+            // if user didn't select a file, leave unselected
+            app->selected_flash_options[SelectedFlashApp] = false;
+        }
+        view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
+        break;
+    case SubmenuIndexCustom:
+        app->selected_flash_options[SelectedFlashCustom] =
+            !app->selected_flash_options[SelectedFlashCustom];
+        if(dialog_file_browser_show(
+               app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
+            strncpy(
+                app->bin_file_path_custom,
+                furi_string_get_cstr(selected_filepath),
+                sizeof(app->bin_file_path_custom));
+        }
+        if(app->bin_file_path_custom[0] == '\0') {
+            // if user didn't select a file, leave unselected
+            app->selected_flash_options[SelectedFlashCustom] = false;
+        }
+        view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
         break;
     case SubmenuIndexFlash:
-        // TODO error checking
-        scene_manager_next_scene(app->scene_manager, WifiMarauderSceneConsoleOutput);
+        // count how many options are selected
+        app->num_selected_flash_options = 0;
+        for(bool* option = &app->selected_flash_options[SelectedFlashBoot];
+            option < &app->selected_flash_options[NUM_FLASH_OPTIONS];
+            ++option) {
+            if(*option) {
+                ++app->num_selected_flash_options;
+            }
+        }
+        if(app->num_selected_flash_options) {
+            // only start next scene if at least one option is selected
+            scene_manager_next_scene(app->scene_manager, WifiMarauderSceneConsoleOutput);
+        }
         break;
     }
 
@@ -57,31 +150,112 @@ static void wifi_marauder_scene_flasher_callback(void* context, uint32_t index)
     furi_string_free(predefined_filepath);
 }
 
-void wifi_marauder_scene_flasher_on_enter(void* context) {
-    WifiMarauderApp* app = context;
-
+#define STR_SELECT "[x]"
+#define STR_UNSELECT "[ ]"
+#define STR_BOOT "Bootloader (" TOSTRING(ESP_ADDR_BOOT) ")"
+#define STR_BOOT_S3 "Bootloader (" TOSTRING(ESP_ADDR_BOOT_S3) ")"
+#define STR_PART "Part Table (" TOSTRING(ESP_ADDR_PART) ")"
+#define STR_NVS "NVS (" TOSTRING(ESP_ADDR_NVS) ")"
+#define STR_BOOT_APP0 "boot_app0 (" TOSTRING(ESP_ADDR_BOOT_APP0) ")"
+#define STR_APP "Firmware (" TOSTRING(ESP_ADDR_APP) ")"
+#define STR_CUSTOM "Custom"
+#define STR_FLASH_S3 "[>] FLASH (ESP32-S3)"
+#define STR_FLASH "[>] FLASH"
+static void _refresh_submenu(WifiMarauderApp* app) {
     Submenu* submenu = app->submenu;
 
+    submenu_reset(app->submenu);
+
     submenu_set_header(submenu, "Browse for files to flash");
     submenu_add_item(
-        submenu, "Bootloader", SubmenuIndexBoot, wifi_marauder_scene_flasher_callback, app);
+        submenu,
+        app->selected_flash_options[SelectedFlashS3Mode] ? "[x] Using ESP32-S3" :
+                                                           "[ ] Check if using S3",
+        SubmenuIndexS3Mode,
+        wifi_marauder_scene_flasher_callback,
+        app);
+    const char* strSelectBootloader = STR_UNSELECT " " STR_BOOT;
+    if(app->selected_flash_options[SelectedFlashS3Mode]) {
+        if(app->selected_flash_options[SelectedFlashBoot]) {
+            strSelectBootloader = STR_SELECT " " STR_BOOT_S3;
+        } else {
+            strSelectBootloader = STR_UNSELECT " " STR_BOOT_S3;
+        }
+    } else {
+        if(app->selected_flash_options[SelectedFlashBoot]) {
+            strSelectBootloader = STR_SELECT " " STR_BOOT;
+        } else {
+            strSelectBootloader = STR_UNSELECT " " STR_BOOT;
+        }
+    }
     submenu_add_item(
-        submenu, "Partition Table", SubmenuIndexPart, wifi_marauder_scene_flasher_callback, app);
+        submenu, strSelectBootloader, SubmenuIndexBoot, wifi_marauder_scene_flasher_callback, app);
     submenu_add_item(
-        submenu, "Application", SubmenuIndexApp, wifi_marauder_scene_flasher_callback, app);
+        submenu,
+        app->selected_flash_options[SelectedFlashPart] ? STR_SELECT " " STR_PART :
+                                                         STR_UNSELECT " " STR_PART,
+        SubmenuIndexPart,
+        wifi_marauder_scene_flasher_callback,
+        app);
     submenu_add_item(
-        submenu, "[>] FLASH", SubmenuIndexFlash, wifi_marauder_scene_flasher_callback, app);
+        submenu,
+        app->selected_flash_options[SelectedFlashNvs] ? STR_SELECT " " STR_NVS :
+                                                        STR_UNSELECT " " STR_NVS,
+        SubmenuIndexNvs,
+        wifi_marauder_scene_flasher_callback,
+        app);
+    submenu_add_item(
+        submenu,
+        app->selected_flash_options[SelectedFlashBootApp0] ? STR_SELECT " " STR_BOOT_APP0 :
+                                                             STR_UNSELECT " " STR_BOOT_APP0,
+        SubmenuIndexBootApp0,
+        wifi_marauder_scene_flasher_callback,
+        app);
+    submenu_add_item(
+        submenu,
+        app->selected_flash_options[SelectedFlashApp] ? STR_SELECT " " STR_APP :
+                                                        STR_UNSELECT " " STR_APP,
+        SubmenuIndexApp,
+        wifi_marauder_scene_flasher_callback,
+        app);
+    // TODO: custom addr
+    //submenu_add_item(
+    //    submenu, app->selected_flash_options[SelectedFlashCustom] ? STR_SELECT " " STR_CUSTOM : STR_UNSELECT " " STR_CUSTOM, SubmenuIndexCustom, wifi_marauder_scene_flasher_callback, app);
+    submenu_add_item(
+        submenu,
+        app->selected_flash_options[SelectedFlashS3Mode] ? STR_FLASH_S3 : STR_FLASH,
+        SubmenuIndexFlash,
+        wifi_marauder_scene_flasher_callback,
+        app);
 
     submenu_set_selected_item(
         submenu, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneFlasher));
     view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewSubmenu);
 }
 
+void wifi_marauder_scene_flasher_on_enter(void* context) {
+    WifiMarauderApp* app = context;
+
+    memset(app->selected_flash_options, 0, sizeof(app->selected_flash_options));
+    app->bin_file_path_boot[0] = '\0';
+    app->bin_file_path_part[0] = '\0';
+    app->bin_file_path_nvs[0] = '\0';
+    app->bin_file_path_boot_app0[0] = '\0';
+    app->bin_file_path_app[0] = '\0';
+    app->bin_file_path_custom[0] = '\0';
+
+    _refresh_submenu(app);
+}
+
 bool wifi_marauder_scene_flasher_on_event(void* context, SceneManagerEvent event) {
-    //WifiMarauderApp* app = context;
-    UNUSED(context);
-    UNUSED(event);
+    WifiMarauderApp* app = context;
     bool consumed = false;
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == WifiMarauderEventRefreshSubmenu) {
+            _refresh_submenu(app);
+            consumed = true;
+        }
+    }
 
     return consumed;
 }

applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c

@@ -243,7 +243,6 @@ void wifi_marauder_scene_start_on_enter(void* context) {
 }
 
 bool wifi_marauder_scene_start_on_event(void* context, SceneManagerEvent event) {
-    UNUSED(context);
     WifiMarauderApp* app = context;
     bool consumed = false;
 

applications/external/wifi_marauder_companion/wifi_marauder_app.c

@@ -87,6 +87,7 @@ WifiMarauderApp* wifi_marauder_app_alloc() {
         app->view_dispatcher, WifiMarauderAppViewSubmenu, submenu_get_view(app->submenu));
 
     app->flash_mode = false;
+    app->flash_worker_busy = false;
 
     scene_manager_next_scene(app->scene_manager, WifiMarauderSceneStart);
 

applications/external/wifi_marauder_companion/wifi_marauder_app.h

@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#define WIFI_MARAUDER_APP_VERSION "v0.5.0"
+#define WIFI_MARAUDER_APP_VERSION "v0.5.1"
 
 typedef struct WifiMarauderApp WifiMarauderApp;
 

applications/external/wifi_marauder_companion/wifi_marauder_app_i.h

@@ -48,6 +48,17 @@ typedef enum WifiMarauderUserInputType {
     WifiMarauderUserInputTypeFileName
 } WifiMarauderUserInputType;
 
+typedef enum SelectedFlashOptions {
+    SelectedFlashS3Mode,
+    SelectedFlashBoot,
+    SelectedFlashPart,
+    SelectedFlashNvs,
+    SelectedFlashBootApp0,
+    SelectedFlashApp,
+    SelectedFlashCustom,
+    NUM_FLASH_OPTIONS
+} SelectedFlashOptions;
+
 struct WifiMarauderApp {
     Gui* gui;
     ViewDispatcher* view_dispatcher;
@@ -115,10 +126,16 @@ struct WifiMarauderApp {
     char special_case_input_dst_addr[20];
 
     // For flashing - TODO: put into its own struct?
+    bool selected_flash_options[NUM_FLASH_OPTIONS];
+    int num_selected_flash_options;
     char bin_file_path_boot[100];
     char bin_file_path_part[100];
+    char bin_file_path_nvs[100];
+    char bin_file_path_boot_app0[100];
     char bin_file_path_app[100];
+    char bin_file_path_custom[100];
     FuriThread* flash_worker;
+    bool flash_worker_busy;
     bool flash_mode;
 };
 

applications/external/wifi_marauder_companion/wifi_marauder_custom_event.h

@@ -10,5 +10,6 @@ typedef enum {
     WifiMarauderEventStartLogViewer,
     WifiMarauderEventStartScriptSelect,
     WifiMarauderEventStartSniffPmkidOptions,
-    WifiMarauderEventStartFlasher
+    WifiMarauderEventStartFlasher,
+    WifiMarauderEventRefreshSubmenu
 } WifiMarauderCustomEvent;

applications/external/wifi_marauder_companion/wifi_marauder_flasher.c

@@ -18,6 +18,8 @@ static esp_loader_error_t _flash_file(WifiMarauderApp* app, char* filepath, uint
     static uint8_t payload[1024];
     File* bin_file = storage_file_alloc(app->storage);
 
+    char user_msg[256];
+
     // open file
     if(!storage_file_open(bin_file, filepath, FSAM_READ, FSOM_OPEN_EXISTING)) {
         storage_file_close(bin_file);
@@ -28,48 +30,34 @@ static esp_loader_error_t _flash_file(WifiMarauderApp* app, char* filepath, uint
 
     uint64_t size = storage_file_size(bin_file);
 
-    /*
-    // TODO packet drops with higher BR?
-    err = esp_loader_change_transmission_rate(230400);
-    if (err != ESP_LOADER_SUCCESS) {
-        char err_msg[256];
-        snprintf(
-            err_msg,
-            sizeof(err_msg),
-            "Cannot change transmission rate. Error: %u\n",
-            err);
-        storage_file_close(bin_file);
-        storage_file_free(bin_file);
-        loader_port_debug_print(err_msg);
-        return;
-    }
-
-    furi_hal_uart_set_br(FuriHalUartIdUSART1, 230400);
-    // TODO remember to change BR back!
-    */
-
     loader_port_debug_print("Erasing flash...this may take a while\n");
     err = esp_loader_flash_start(addr, size, sizeof(payload));
     if(err != ESP_LOADER_SUCCESS) {
         storage_file_close(bin_file);
         storage_file_free(bin_file);
-        char err_msg[256];
-        snprintf(err_msg, sizeof(err_msg), "Erasing flash failed with error %d\n", err);
-        loader_port_debug_print(err_msg);
+        snprintf(user_msg, sizeof(user_msg), "Erasing flash failed with error %d\n", err);
+        loader_port_debug_print(user_msg);
         return err;
     }
 
     loader_port_debug_print("Start programming\n");
+    uint64_t last_updated = size;
     while(size > 0) {
+        if((last_updated - size) > 50000) {
+            // inform user every 50k bytes
+            // TODO: draw a progress bar next update
+            snprintf(user_msg, sizeof(user_msg), "%llu bytes left.\n", size);
+            loader_port_debug_print(user_msg);
+            last_updated = size;
+        }
         size_t to_read = MIN(size, sizeof(payload));
         uint16_t num_bytes = storage_file_read(bin_file, payload, to_read);
         err = esp_loader_flash_write(payload, num_bytes);
         if(err != ESP_LOADER_SUCCESS) {
-            char err_msg[256];
-            snprintf(err_msg, sizeof(err_msg), "Packet could not be written! Error: %u\n", err);
+            snprintf(user_msg, sizeof(user_msg), "Packet could not be written! Error: %u\n", err);
             storage_file_close(bin_file);
             storage_file_free(bin_file);
-            loader_port_debug_print(err_msg);
+            loader_port_debug_print(user_msg);
             return err;
         }
 
@@ -86,10 +74,59 @@ static esp_loader_error_t _flash_file(WifiMarauderApp* app, char* filepath, uint
     return ESP_LOADER_SUCCESS;
 }
 
+typedef struct {
+    SelectedFlashOptions selected;
+    const char* description;
+    char* path;
+    uint32_t addr;
+} FlashItem;
+
+static void _flash_all_files(WifiMarauderApp* app) {
+    esp_loader_error_t err;
+    const int num_steps = app->num_selected_flash_options;
+
+#define NUM_FLASH_ITEMS 6
+    FlashItem items[NUM_FLASH_ITEMS] = {
+        {SelectedFlashBoot,
+         "bootloader",
+         app->bin_file_path_boot,
+         app->selected_flash_options[SelectedFlashS3Mode] ? ESP_ADDR_BOOT_S3 : ESP_ADDR_BOOT},
+        {SelectedFlashPart, "partition table", app->bin_file_path_part, ESP_ADDR_PART},
+        {SelectedFlashNvs, "NVS", app->bin_file_path_nvs, ESP_ADDR_NVS},
+        {SelectedFlashBootApp0, "boot_app0", app->bin_file_path_boot_app0, ESP_ADDR_BOOT_APP0},
+        {SelectedFlashApp, "firmware", app->bin_file_path_app, ESP_ADDR_APP},
+        {SelectedFlashCustom, "custom data", app->bin_file_path_custom, 0x0},
+        /* if you add more entries, update NUM_FLASH_ITEMS above! */
+    };
+
+    char user_msg[256];
+
+    int current_step = 1;
+    for(FlashItem* item = &items[0]; item < &items[NUM_FLASH_ITEMS]; ++item) {
+        if(app->selected_flash_options[item->selected]) {
+            snprintf(
+                user_msg,
+                sizeof(user_msg),
+                "Flashing %s (%d/%d) to address 0x%lx\n",
+                item->description,
+                current_step++,
+                num_steps,
+                item->addr);
+            loader_port_debug_print(user_msg);
+            err = _flash_file(app, item->path, item->addr);
+            if(err) {
+                break;
+            }
+        }
+    }
+}
+
 static int32_t wifi_marauder_flash_bin(void* context) {
     WifiMarauderApp* app = (void*)context;
     esp_loader_error_t err;
 
+    app->flash_worker_busy = true;
+
     // alloc global objects
     flash_rx_stream = furi_stream_buffer_alloc(RX_BUF_SIZE, 1);
     timer = furi_timer_alloc(_timer_callback, FuriTimerTypePeriodic, app);
@@ -103,22 +140,36 @@ static int32_t wifi_marauder_flash_bin(void* context) {
         loader_port_debug_print(err_msg);
     }
 
+#if 0 // still getting packet drops with this
+    // higher BR
+    if(!err) {
+        loader_port_debug_print("Increasing speed for faster flash\n");
+        err = esp_loader_change_transmission_rate(230400);
+        if (err != ESP_LOADER_SUCCESS) {
+            char err_msg[256];
+            snprintf(
+                err_msg,
+                sizeof(err_msg),
+                "Cannot change transmission rate. Error: %u\n",
+                err);
+            loader_port_debug_print(err_msg);
+        }
+        furi_hal_uart_set_br(FuriHalUartIdUSART1, 230400);
+    }
+#endif
+
     if(!err) {
         loader_port_debug_print("Connected\n");
-        loader_port_debug_print("Flashing bootloader (1/3)\n");
-        err = _flash_file(app, app->bin_file_path_boot, 0x1000);
-    }
-    if(!err) {
-        loader_port_debug_print("Flashing partition table (2/3)\n");
-        err = _flash_file(app, app->bin_file_path_part, 0x8000);
-    }
-    if(!err) {
-        loader_port_debug_print("Flashing app (3/3)\n");
-        err = _flash_file(app, app->bin_file_path_app, 0x10000);
+        _flash_all_files(app);
+#if 0
+        loader_port_debug_print("Restoring transmission rate\n");
+        furi_hal_uart_set_br(FuriHalUartIdUSART1, 115200);
+#endif
         loader_port_debug_print("Done flashing. Please reset the board manually.\n");
     }
 
     // done
+    app->flash_worker_busy = false;
 
     // cleanup
     furi_stream_buffer_free(flash_rx_stream);

applications/external/wifi_marauder_companion/wifi_marauder_flasher.h

@@ -5,6 +5,13 @@
 #define SERIAL_FLASHER_INTERFACE_UART /* TODO why is application.fam not passing this via cdefines */
 #include "esp_loader_io.h"
 
+#define ESP_ADDR_BOOT_S3 0x0
+#define ESP_ADDR_BOOT 0x1000
+#define ESP_ADDR_PART 0x8000
+#define ESP_ADDR_NVS 0x9000
+#define ESP_ADDR_BOOT_APP0 0xE000
+#define ESP_ADDR_APP 0x10000
+
 void wifi_marauder_flash_start_thread(WifiMarauderApp* app);
 void wifi_marauder_flash_stop_thread(WifiMarauderApp* app);
 void wifi_marauder_flash_handle_rx_data_cb(uint8_t* buf, size_t len, void* context);

applications/main/application.fam

@@ -4,7 +4,6 @@ App(
     apptype=FlipperAppType.METAPACKAGE,
     provides=[
         "gpio",
-        "onewire",
         "ibutton",
         "infrared",
         "lfrfid",
@@ -15,23 +14,20 @@ App(
         "archive",
         "clock",
         "subghz_remote",
+        "main_apps_on_start",
     ],
 )
 
-# Enable apps that you need in DEBUG firmware here:
 App(
-    appid="main_apps_default",
-    name="Basic applications for main menu",
+    appid="main_apps_on_start",
+    name="On start hooks",
     apptype=FlipperAppType.METAPACKAGE,
     provides=[
-        # "gpio",
-        # "ibutton",
-        # "infrared",
-        "lfrfid",
-        # "nfc",
-        "subghz",
-        # "bad_usb",
-        # "u2f",
-        "archive",
+        "ibutton_start",
+        "onewire_start",
+        "subghz_start",
+        "infrared_start",
+        "lfrfid_start",
+        "nfc_start",
     ],
 )

applications/main/archive/scenes/archive_scene_browser.c

@@ -5,13 +5,14 @@
 #include "../helpers/archive_browser.h"
 #include "../views/archive_browser_view.h"
 #include "archive/scenes/archive_scene.h"
+#include <applications.h>
 
 #define TAG "ArchiveSceneBrowser"
 
 #define SCENE_STATE_DEFAULT (0)
 #define SCENE_STATE_NEED_REFRESH (1)
 
-const char* archive_get_flipper_app_name(ArchiveFileTypeEnum file_type) {
+static const char* archive_get_flipper_app_name(ArchiveFileTypeEnum file_type) {
     switch(file_type) {
     case ArchiveFileTypeIButton:
         return "iButton";

applications/main/bad_usb/application.fam

@@ -1,15 +1,12 @@
 App(
     appid="bad_usb",
     name="Bad USB",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.MENUEXTERNAL,
     entry_point="bad_usb_app",
-    cdefines=["APP_BAD_USB"],
-    requires=[
-        "gui",
-        "dialogs",
-    ],
     stack_size=2 * 1024,
     icon="A_BadUsb_14",
     order=70,
     fap_libs=["assets"],
+    fap_icon="icon.png",
+    fap_category="USB",
 )

applications/main/gpio/application.fam

@@ -1,12 +1,12 @@
 App(
     appid="gpio",
     name="GPIO",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.MENUEXTERNAL,
     entry_point="gpio_app",
-    cdefines=["APP_GPIO"],
-    requires=["gui"],
     stack_size=1 * 1024,
     icon="A_GPIO_14",
     order=50,
     fap_libs=["assets"],
+    fap_icon="icon.png",
+    fap_category="GPIO",
 )

applications/main/ibutton/application.fam

@@ -1,25 +1,21 @@
 App(
     appid="ibutton",
     name="iButton",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.MENUEXTERNAL,
     targets=["f7"],
     entry_point="ibutton_app",
-    cdefines=["APP_IBUTTON"],
-    requires=[
-        "gui",
-        "dialogs",
-    ],
-    provides=["ibutton_start"],
     icon="A_iButton_14",
     stack_size=2 * 1024,
     order=60,
     fap_libs=["assets"],
+    fap_icon="icon.png",
+    fap_category="iButton",
 )
 
 App(
     appid="ibutton_start",
     apptype=FlipperAppType.STARTUP,
+    targets=["f7"],
     entry_point="ibutton_on_system_start",
-    requires=["ibutton"],
     order=60,
 )

applications/main/infrared/application.fam

@@ -1,25 +1,21 @@
 App(
     appid="infrared",
     name="Infrared",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.MENUEXTERNAL,
     entry_point="infrared_app",
     targets=["f7"],
-    cdefines=["APP_INFRARED"],
-    requires=[
-        "gui",
-        "dialogs",
-    ],
-    provides=["infrared_start"],
     icon="A_Infrared_14",
     stack_size=3 * 1024,
     order=40,
     fap_libs=["assets"],
+    fap_icon="icon.png",
+    fap_category="Infrared",
 )
 
 App(
     appid="infrared_start",
     apptype=FlipperAppType.STARTUP,
+    targets=["f7"],
     entry_point="infrared_on_system_start",
-    requires=["infrared"],
     order=20,
 )

applications/main/lfrfid/application.fam

@@ -1,27 +1,21 @@
 App(
     appid="lfrfid",
     name="125 kHz RFID",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.MENUEXTERNAL,
     targets=["f7"],
     entry_point="lfrfid_app",
-    cdefines=["APP_LF_RFID"],
-    requires=[
-        "gui",
-        "dialogs",
-    ],
-    provides=[
-        "lfrfid_start",
-    ],
     icon="A_125khz_14",
     stack_size=2 * 1024,
     order=20,
     fap_libs=["assets"],
+    fap_icon="icon.png",
+    fap_category="RFID",
 )
 
 App(
     appid="lfrfid_start",
+    targets=["f7"],
     apptype=FlipperAppType.STARTUP,
     entry_point="lfrfid_on_system_start",
-    requires=["lfrfid"],
     order=50,
 )

applications/main/nfc/application.fam

@@ -1,24 +1,21 @@
 App(
     appid="nfc",
     name="NFC",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.MENUEXTERNAL,
     targets=["f7"],
     entry_point="nfc_app",
-    cdefines=["APP_NFC"],
-    requires=[
-        "gui",
-        "dialogs",
-    ],
-    provides=["nfc_start"],
     icon="A_NFC_14",
     stack_size=5 * 1024,
     order=30,
+    fap_libs=["assets"],
+    fap_icon="icon.png",
+    fap_category="NFC",
 )
 
 App(
     appid="nfc_start",
+    targets=["f7"],
     apptype=FlipperAppType.STARTUP,
     entry_point="nfc_on_system_start",
-    requires=["nfc"],
     order=30,
 )

applications/main/onewire/application.fam

@@ -1,14 +1,6 @@
-App(
-    appid="onewire",
-    name="1-Wire",
-    apptype=FlipperAppType.METAPACKAGE,
-    provides=["onewire_start"],
-)
-
 App(
     appid="onewire_start",
     apptype=FlipperAppType.STARTUP,
     entry_point="onewire_on_system_start",
-    requires=["onewire"],
     order=60,
 )

applications/main/subghz/application.fam

@@ -1,10 +1,9 @@
 App(
     appid="subghz",
     name="Sub-GHz",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.MENUEXTERNAL,
     targets=["f7"],
     entry_point="subghz_app",
-    cdefines=["APP_SUBGHZ"],
     requires=[
         "gui",
         "cli",
@@ -17,13 +16,16 @@ App(
     icon="A_Sub1ghz_14",
     stack_size=3 * 1024,
     order=10,
+    fap_libs=["assets", "hwdrivers"],
+    fap_icon="icon.png",
+    fap_category="Sub-GHz",
 )
 
 App(
     appid="subghz_start",
+    targets=["f7"],
     apptype=FlipperAppType.STARTUP,
     entry_point="subghz_on_system_start",
-    requires=["subghz"],
     order=40,
 )
 

applications/main/u2f/application.fam

@@ -1,15 +1,12 @@
 App(
     appid="u2f",
     name="U2F",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.MENUEXTERNAL,
     entry_point="u2f_app",
-    cdefines=["APP_U2F"],
-    requires=[
-        "gui",
-        "dialogs",
-    ],
     stack_size=2 * 1024,
     icon="A_U2F_14",
     order=80,
     fap_libs=["assets"],
+    fap_category="USB",
+    fap_icon="icon.png",
 )

applications/services/applications.h

@@ -17,6 +17,12 @@ typedef struct {
     const FlipperInternalApplicationFlag flags;
 } FlipperInternalApplication;
 
+typedef struct {
+    const char* name;
+    const Icon* icon;
+    const char* path;
+} FlipperExternalApplication;
+
 typedef void (*FlipperInternalOnStartHook)(void);
 
 extern const char* FLIPPER_AUTORUN_APP_NAME;
@@ -52,3 +58,9 @@ extern const FlipperInternalApplication FLIPPER_ARCHIVE;
  */
 extern const FlipperInternalApplication FLIPPER_SETTINGS_APPS[];
 extern const size_t FLIPPER_SETTINGS_APPS_COUNT;
+
+/* External Menu Apps list
+ * Spawned by loader
+ */
+extern const FlipperExternalApplication FLIPPER_EXTERNAL_APPS[];
+extern const size_t FLIPPER_EXTERNAL_APPS_COUNT;

applications/services/loader/loader.c

@@ -170,6 +170,16 @@ static const FlipperInternalApplication* loader_find_application_by_name(const c
     return application;
 }
 
+static const char* loader_find_external_application_by_name(const char* app_name) {
+    for(size_t i = 0; i < FLIPPER_EXTERNAL_APPS_COUNT; i++) {
+        if(strcmp(FLIPPER_EXTERNAL_APPS[i].name, app_name) == 0) {
+            return FLIPPER_EXTERNAL_APPS[i].path;
+        }
+    }
+
+    return NULL;
+}
+
 static void loader_start_app_thread(Loader* loader, FlipperInternalApplicationFlag flags) {
     // setup heap trace
     FuriHalRtcHeapTrackMode mode = furi_hal_rtc_get_heap_track_mode();
@@ -411,6 +421,14 @@ static LoaderStatus loader_do_start_by_name(
             break;
         }
 
+        // check External Applications
+        {
+            const char* path = loader_find_external_application_by_name(name);
+            if(path) {
+                name = path;
+            }
+        }
+
         // check external apps
         {
             Storage* storage = furi_record_open(RECORD_STORAGE);

applications/services/loader/loader_menu.c

@@ -52,12 +52,18 @@ static void loader_menu_start(const char* name) {
     furi_record_close(RECORD_LOADER);
 }
 
-static void loader_menu_callback(void* context, uint32_t index) {
+static void loader_menu_apps_callback(void* context, uint32_t index) {
     UNUSED(context);
     const char* name = FLIPPER_APPS[index].name;
     loader_menu_start(name);
 }
 
+static void loader_menu_external_apps_callback(void* context, uint32_t index) {
+    UNUSED(context);
+    const char* path = FLIPPER_EXTERNAL_APPS[index].path;
+    loader_menu_start(path);
+}
+
 static void loader_menu_applications_callback(void* context, uint32_t index) {
     UNUSED(index);
     UNUSED(context);
@@ -89,13 +95,24 @@ static uint32_t loader_menu_exit(void* context) {
 
 static void loader_menu_build_menu(LoaderMenuApp* app, LoaderMenu* menu) {
     size_t i;
+
+    for(i = 0; i < FLIPPER_EXTERNAL_APPS_COUNT; i++) {
+        menu_add_item(
+            app->primary_menu,
+            FLIPPER_EXTERNAL_APPS[i].name,
+            FLIPPER_EXTERNAL_APPS[i].icon,
+            i,
+            loader_menu_external_apps_callback,
+            (void*)menu);
+    }
+
     for(i = 0; i < FLIPPER_APPS_COUNT; i++) {
         menu_add_item(
             app->primary_menu,
             FLIPPER_APPS[i].name,
             FLIPPER_APPS[i].icon,
             i,
-            loader_menu_callback,
+            loader_menu_apps_callback,
             (void*)menu);
     }
     menu_add_item(

applications/settings/about/about.c

@@ -113,7 +113,9 @@ static DialogMessageButton icon1_screen(DialogsApp* dialogs, DialogMessage* mess
 static DialogMessageButton icon2_screen(DialogsApp* dialogs, DialogMessage* message) {
     DialogMessageButton result;
 
-    dialog_message_set_icon(message, &I_Certification2_98x33, 15, 10);
+    dialog_message_set_icon(message, &I_Certification2_46x33, 15, 10);
+    dialog_message_set_text(
+        message, furi_hal_version_get_mic_id(), 63, 27, AlignLeft, AlignCenter);
     result = dialog_message_show(dialogs, message);
     dialog_message_set_icon(message, NULL, 0, 0);