From c73c487cfe292be301355ce96b5c39835204071a Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sat, 21 Oct 2023 06:35:49 +0100
Subject: [PATCH 1/8] BLE Spam base config support ok interaction

---
 applications/external/ble_spam/ble_spam.h     |  1 +
 .../external/ble_spam/protocols/_base.h       |  1 +
 .../external/ble_spam/protocols/continuity.c  | 38 +++++++++++++++++++
 .../external/ble_spam/protocols/easysetup.c   | 18 +++++++++
 .../external/ble_spam/protocols/fastpair.c    | 12 ++++++
 .../external/ble_spam/protocols/swiftpair.c   | 12 ++++++
 .../external/ble_spam/scenes/config.c         | 17 +++++++++
 7 files changed, 99 insertions(+)

diff --git a/applications/external/ble_spam/ble_spam.h b/applications/external/ble_spam/ble_spam.h
index edf2c55ca..eaf06b9e1 100644
--- a/applications/external/ble_spam/ble_spam.h
+++ b/applications/external/ble_spam/ble_spam.h
@@ -26,6 +26,7 @@ typedef struct Attack Attack;
 typedef struct {
     Attack* attack;
     uint8_t byte_store[3];
+    VariableItemListEnterCallback fallback_config_enter;
 
     ViewDispatcher* view_dispatcher;
     SceneManager* scene_manager;
diff --git a/applications/external/ble_spam/protocols/_base.h b/applications/external/ble_spam/protocols/_base.h
index 0b6fdacbd..6f32b9990 100644
--- a/applications/external/ble_spam/protocols/_base.h
+++ b/applications/external/ble_spam/protocols/_base.h
@@ -17,4 +17,5 @@ typedef struct {
     const char* (*get_name)(const ProtocolCfg* _cfg);
     void (*make_packet)(uint8_t* _size, uint8_t** _packet, const ProtocolCfg* _cfg);
     void (*extra_config)(Ctx* ctx);
+    uint8_t (*config_count)(const ProtocolCfg* _cfg);
 } Protocol;
diff --git a/applications/external/ble_spam/protocols/continuity.c b/applications/external/ble_spam/protocols/continuity.c
index 4233f0457..4b29683ab 100644
--- a/applications/external/ble_spam/protocols/continuity.c
+++ b/applications/external/ble_spam/protocols/continuity.c
@@ -277,11 +277,19 @@ enum {
     _ConfigPpExtraStart = ConfigExtraStart,
     ConfigPpModel,
     ConfigPpPrefix,
+    ConfigPpCOUNT,
 };
 enum {
     _ConfigNaExtraStart = ConfigExtraStart,
     ConfigNaAction,
     ConfigNaFlags,
+    ConfigNaCOUNT,
+};
+enum {
+    _ConfigCcExtraStart = ConfigExtraStart,
+    ConfigCcInfoLock,
+    ConfigCcInfoDevice,
+    ConfigCcCOUNT,
 };
 static void config_callback(void* _ctx, uint32_t index) {
     Ctx* ctx = _ctx;
@@ -297,6 +305,7 @@ static void config_callback(void* _ctx, uint32_t index) {
             scene_manager_next_scene(ctx->scene_manager, SceneContinuityPpPrefix);
             break;
         default:
+            ctx->fallback_config_enter(ctx, index);
             break;
         }
         break;
@@ -310,11 +319,24 @@ static void config_callback(void* _ctx, uint32_t index) {
             scene_manager_next_scene(ctx->scene_manager, SceneContinuityNaFlags);
             break;
         default:
+            ctx->fallback_config_enter(ctx, index);
+            break;
+        }
+        break;
+    }
+    case ContinuityTypeCustomCrash: {
+        switch(index) {
+        case ConfigCcInfoLock:
+        case ConfigCcInfoDevice:
+            break;
+        default:
+            ctx->fallback_config_enter(ctx, index);
             break;
         }
         break;
     }
     default:
+        ctx->fallback_config_enter(ctx, index);
         break;
     }
 }
@@ -470,11 +492,27 @@ static void continuity_extra_config(Ctx* ctx) {
     variable_item_list_set_enter_callback(list, config_callback, ctx);
 }
 
+static uint8_t config_counts[ContinuityTypeCOUNT] = {
+    [ContinuityTypeAirDrop] = 0,
+    [ContinuityTypeProximityPair] = ConfigPpCOUNT - ConfigExtraStart - 1,
+    [ContinuityTypeAirplayTarget] = 0,
+    [ContinuityTypeHandoff] = 0,
+    [ContinuityTypeTetheringSource] = 0,
+    [ContinuityTypeNearbyAction] = ConfigNaCOUNT - ConfigExtraStart - 1,
+    [ContinuityTypeNearbyInfo] = 0,
+    [ContinuityTypeCustomCrash] = ConfigCcCOUNT - ConfigExtraStart - 1,
+};
+static uint8_t continuity_config_count(const ProtocolCfg* _cfg) {
+    const ContinuityCfg* cfg = &_cfg->continuity;
+    return config_counts[cfg->type];
+}
+
 const Protocol protocol_continuity = {
     .icon = &I_apple,
     .get_name = continuity_get_name,
     .make_packet = continuity_make_packet,
     .extra_config = continuity_extra_config,
+    .config_count = continuity_config_count,
 };
 
 static void pp_model_callback(void* _ctx, uint32_t index) {
diff --git a/applications/external/ble_spam/protocols/easysetup.c b/applications/external/ble_spam/protocols/easysetup.c
index fa0a98aa2..98a9541de 100644
--- a/applications/external/ble_spam/protocols/easysetup.c
+++ b/applications/external/ble_spam/protocols/easysetup.c
@@ -171,10 +171,13 @@ void easysetup_make_packet(uint8_t* out_size, uint8_t** out_packet, const Protoc
 enum {
     _ConfigBudsExtraStart = ConfigExtraStart,
     ConfigBudsModel,
+    ConfigBudsInfoVersion,
+    ConfigBudsCOUNT,
 };
 enum {
     _ConfigWatchExtraStart = ConfigExtraStart,
     ConfigWatchModel,
+    ConfigWatchCOUNT,
 };
 static void config_callback(void* _ctx, uint32_t index) {
     Ctx* ctx = _ctx;
@@ -186,7 +189,10 @@ static void config_callback(void* _ctx, uint32_t index) {
         case ConfigBudsModel:
             scene_manager_next_scene(ctx->scene_manager, SceneEasysetupBudsModel);
             break;
+        case ConfigBudsInfoVersion:
+            break;
         default:
+            ctx->fallback_config_enter(ctx, index);
             break;
         }
         break;
@@ -197,11 +203,13 @@ static void config_callback(void* _ctx, uint32_t index) {
             scene_manager_next_scene(ctx->scene_manager, SceneEasysetupWatchModel);
             break;
         default:
+            ctx->fallback_config_enter(ctx, index);
             break;
         }
         break;
     }
     default:
+        ctx->fallback_config_enter(ctx, index);
         break;
     }
 }
@@ -297,11 +305,21 @@ static void easysetup_extra_config(Ctx* ctx) {
     variable_item_list_set_enter_callback(list, config_callback, ctx);
 }
 
+static uint8_t config_counts[EasysetupTypeCOUNT] = {
+    [EasysetupTypeBuds] = ConfigBudsCOUNT - ConfigExtraStart - 1,
+    [EasysetupTypeWatch] = ConfigWatchCOUNT - ConfigExtraStart - 1,
+};
+static uint8_t easysetup_config_count(const ProtocolCfg* _cfg) {
+    const EasysetupCfg* cfg = &_cfg->easysetup;
+    return config_counts[cfg->type];
+}
+
 const Protocol protocol_easysetup = {
     .icon = &I_android,
     .get_name = easysetup_get_name,
     .make_packet = easysetup_make_packet,
     .extra_config = easysetup_extra_config,
+    .config_count = easysetup_config_count,
 };
 
 static void buds_model_callback(void* _ctx, uint32_t index) {
diff --git a/applications/external/ble_spam/protocols/fastpair.c b/applications/external/ble_spam/protocols/fastpair.c
index 2e8f6749b..a5caf80cc 100644
--- a/applications/external/ble_spam/protocols/fastpair.c
+++ b/applications/external/ble_spam/protocols/fastpair.c
@@ -82,6 +82,8 @@ static void fastpair_make_packet(uint8_t* _size, uint8_t** _packet, const Protoc
 enum {
     _ConfigExtraStart = ConfigExtraStart,
     ConfigModel,
+    ConfigInfoRequire,
+    ConfigCOUNT,
 };
 static void config_callback(void* _ctx, uint32_t index) {
     Ctx* ctx = _ctx;
@@ -89,7 +91,11 @@ static void config_callback(void* _ctx, uint32_t index) {
     switch(index) {
     case ConfigModel:
         scene_manager_next_scene(ctx->scene_manager, SceneFastpairModel);
+        break;
+    case ConfigInfoRequire:
+        break;
     default:
+        ctx->fallback_config_enter(ctx, index);
         break;
     }
 }
@@ -139,11 +145,17 @@ static void fastpair_extra_config(Ctx* ctx) {
     variable_item_list_set_enter_callback(list, config_callback, ctx);
 }
 
+static uint8_t fastpair_config_count(const ProtocolCfg* _cfg) {
+    UNUSED(_cfg);
+    return ConfigCOUNT;
+}
+
 const Protocol protocol_fastpair = {
     .icon = &I_android,
     .get_name = fastpair_get_name,
     .make_packet = fastpair_make_packet,
     .extra_config = fastpair_extra_config,
+    .config_count = fastpair_config_count,
 };
 
 static void model_callback(void* _ctx, uint32_t index) {
diff --git a/applications/external/ble_spam/protocols/swiftpair.c b/applications/external/ble_spam/protocols/swiftpair.c
index d8280e598..fc21f1778 100644
--- a/applications/external/ble_spam/protocols/swiftpair.c
+++ b/applications/external/ble_spam/protocols/swiftpair.c
@@ -49,6 +49,8 @@ static void swiftpair_make_packet(uint8_t* _size, uint8_t** _packet, const Proto
 enum {
     _ConfigExtraStart = ConfigExtraStart,
     ConfigName,
+    ConfigInfoRequire,
+    ConfigCOUNT,
 };
 static void config_callback(void* _ctx, uint32_t index) {
     Ctx* ctx = _ctx;
@@ -56,7 +58,11 @@ static void config_callback(void* _ctx, uint32_t index) {
     switch(index) {
     case ConfigName:
         scene_manager_next_scene(ctx->scene_manager, SceneSwiftpairName);
+        break;
+    case ConfigInfoRequire:
+        break;
     default:
+        ctx->fallback_config_enter(ctx, index);
         break;
     }
 }
@@ -73,11 +79,17 @@ static void swiftpair_extra_config(Ctx* ctx) {
     variable_item_list_set_enter_callback(list, config_callback, ctx);
 }
 
+static uint8_t swiftpair_config_count(const ProtocolCfg* _cfg) {
+    UNUSED(_cfg);
+    return ConfigCOUNT;
+}
+
 const Protocol protocol_swiftpair = {
     .icon = &I_windows,
     .get_name = swiftpair_get_name,
     .make_packet = swiftpair_make_packet,
     .extra_config = swiftpair_extra_config,
+    .config_count = swiftpair_config_count,
 };
 
 static void name_callback(void* _ctx) {
diff --git a/applications/external/ble_spam/scenes/config.c b/applications/external/ble_spam/scenes/config.c
index afd7159af..5d1267276 100644
--- a/applications/external/ble_spam/scenes/config.c
+++ b/applications/external/ble_spam/scenes/config.c
@@ -8,6 +8,21 @@ static void random_mac_changed(VariableItem* item) {
     variable_item_set_current_value_text(item, ctx->attack->payload.random_mac ? "ON" : "OFF");
 }
 
+static void config_callback(void* _ctx, uint32_t index) {
+    Ctx* ctx = _ctx;
+    scene_manager_set_scene_state(ctx->scene_manager, SceneConfig, index);
+    if(ctx->attack->protocol && ctx->attack->protocol->config_count) {
+        uint8_t extra = ctx->attack->protocol->config_count(&ctx->attack->payload.cfg);
+        if(index > extra) index -= extra;
+    }
+
+    switch(index) {
+    case ConfigRandomMac:
+        break;
+    default:
+        break;
+    }
+}
 void scene_config_on_enter(void* _ctx) {
     Ctx* ctx = _ctx;
     VariableItem* item;
@@ -20,9 +35,11 @@ void scene_config_on_enter(void* _ctx) {
     variable_item_set_current_value_index(item, ctx->attack->payload.random_mac);
     variable_item_set_current_value_text(item, ctx->attack->payload.random_mac ? "ON" : "OFF");
 
+    variable_item_list_set_enter_callback(list, config_callback, ctx);
     if(!ctx->attack->protocol) {
         variable_item_list_add(list, "None shall escape the S I N K", 0, NULL, NULL);
     } else if(ctx->attack->protocol->extra_config) {
+        ctx->fallback_config_enter = config_callback;
         ctx->attack->protocol->extra_config(ctx);
     }
 

From f514efd95101e7f678bf8d01a0bce2d17e0b97ee Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sat, 21 Oct 2023 08:27:01 +0100
Subject: [PATCH 2/8] BLE Spam add led indicator blink (v3.2)

---
 .../external/ble_spam/application.fam         |  2 +-
 applications/external/ble_spam/ble_spam.c     | 30 ++++++++++++++++++-
 applications/external/ble_spam/ble_spam.h     |  4 +++
 .../external/ble_spam/scenes/config.c         | 22 +++++++++-----
 4 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/applications/external/ble_spam/application.fam b/applications/external/ble_spam/application.fam
index 23d80b459..b6a3ce5ea 100644
--- a/applications/external/ble_spam/application.fam
+++ b/applications/external/ble_spam/application.fam
@@ -8,7 +8,7 @@ App(
     fap_category="Bluetooth",
     fap_author="@Willy-JL @ECTO-1A @Spooks4576",
     fap_weburl="https://github.com/Flipper-XFW/Xtreme-Apps/tree/dev/ble_spam",
-    fap_version="3.1",
+    fap_version="3.2",
     fap_description="Flood BLE advertisements to cause spammy and annoying popups/notifications",
     fap_icon_assets="icons",
     fap_icon_assets_symbol="ble_spam",
diff --git a/applications/external/ble_spam/ble_spam.c b/applications/external/ble_spam/ble_spam.c
index 2277b51cd..11eeaabac 100644
--- a/applications/external/ble_spam/ble_spam.c
+++ b/applications/external/ble_spam/ble_spam.c
@@ -149,6 +149,27 @@ typedef struct {
     int8_t index;
 } State;
 
+NotificationMessage blink_message = {
+    .type = NotificationMessageTypeLedBlinkStart,
+    .data.led_blink.color = LightBlue | LightGreen,
+    .data.led_blink.on_time = 10,
+    .data.led_blink.period = 100,
+};
+const NotificationSequence blink_sequence = {
+    &blink_message,
+    &message_do_not_reset,
+    NULL,
+};
+static void start_blink(State* state) {
+    uint16_t period = delays[state->delay];
+    if(period <= 100) period += 30;
+    blink_message.data.led_blink.period = period;
+    notification_message_block(state->ctx.notification, &blink_sequence);
+}
+static void stop_blink(State* state) {
+    notification_message_block(state->ctx.notification, &sequence_blink_stop);
+}
+
 static int32_t adv_thread(void* _ctx) {
     State* state = _ctx;
     uint8_t size;
@@ -158,6 +179,7 @@ static int32_t adv_thread(void* _ctx) {
     Payload* payload = &attacks[state->index].payload;
     const Protocol* protocol = attacks[state->index].protocol;
     if(!payload->random_mac) furi_hal_random_fill_buf(mac, sizeof(mac));
+    if(state->ctx.led_indicator) start_blink(state);
 
     while(state->advertising) {
         if(protocol) {
@@ -175,6 +197,7 @@ static int32_t adv_thread(void* _ctx) {
         furi_hal_bt_custom_adv_stop();
     }
 
+    if(state->ctx.led_indicator) stop_blink(state);
     return 0;
 }
 
@@ -315,7 +338,7 @@ static void draw_callback(Canvas* canvas, void* _ctx) {
             "App+Spam: \e#WillyJL\e# XFW\n"
             "Apple+Crash: \e#ECTO-1A\e#\n"
             "Android+Win: \e#Spooks4576\e#\n"
-            "                                   Version \e#3.1\e#",
+            "                                   Version \e#3.2\e#",
             false);
         break;
     default: {
@@ -385,11 +408,13 @@ static bool input_callback(InputEvent* input, void* _ctx) {
         case InputKeyUp:
             if(is_attack && state->delay < COUNT_OF(delays) - 1) {
                 state->delay++;
+                if(advertising) start_blink(state);
             }
             break;
         case InputKeyDown:
             if(is_attack && state->delay > 0) {
                 state->delay--;
+                if(advertising) start_blink(state);
             }
             break;
         case InputKeyLeft:
@@ -429,7 +454,9 @@ int32_t ble_spam(void* p) {
     furi_thread_set_callback(state->thread, adv_thread);
     furi_thread_set_context(state->thread, state);
     furi_thread_set_stack_size(state->thread, 4096);
+    state->ctx.led_indicator = true;
 
+    state->ctx.notification = furi_record_open(RECORD_NOTIFICATION);
     Gui* gui = furi_record_open(RECORD_GUI);
     state->ctx.view_dispatcher = view_dispatcher_alloc();
     view_dispatcher_enable_queue(state->ctx.view_dispatcher);
@@ -486,6 +513,7 @@ int32_t ble_spam(void* p) {
     scene_manager_free(state->ctx.scene_manager);
     view_dispatcher_free(state->ctx.view_dispatcher);
     furi_record_close(RECORD_GUI);
+    furi_record_close(RECORD_NOTIFICATION);
 
     furi_thread_free(state->thread);
     free(state);
diff --git a/applications/external/ble_spam/ble_spam.h b/applications/external/ble_spam/ble_spam.h
index eaf06b9e1..b72ca7cc5 100644
--- a/applications/external/ble_spam/ble_spam.h
+++ b/applications/external/ble_spam/ble_spam.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <notification/notification_messages.h>
 #include <gui/view_dispatcher.h>
 #include <gui/modules/byte_input.h>
 #include <gui/modules/submenu.h>
@@ -19,6 +20,7 @@ enum {
 enum {
     ConfigRandomMac,
     ConfigExtraStart = ConfigRandomMac,
+    ConfigLedIndicator,
 };
 
 typedef struct Attack Attack;
@@ -27,7 +29,9 @@ typedef struct {
     Attack* attack;
     uint8_t byte_store[3];
     VariableItemListEnterCallback fallback_config_enter;
+    bool led_indicator;
 
+    NotificationApp* notification;
     ViewDispatcher* view_dispatcher;
     SceneManager* scene_manager;
 
diff --git a/applications/external/ble_spam/scenes/config.c b/applications/external/ble_spam/scenes/config.c
index 5d1267276..376d336ac 100644
--- a/applications/external/ble_spam/scenes/config.c
+++ b/applications/external/ble_spam/scenes/config.c
@@ -2,10 +2,15 @@
 
 #include "protocols/_protocols.h"
 
-static void random_mac_changed(VariableItem* item) {
-    Ctx* ctx = variable_item_get_context(item);
-    ctx->attack->payload.random_mac = variable_item_get_current_value_index(item);
-    variable_item_set_current_value_text(item, ctx->attack->payload.random_mac ? "ON" : "OFF");
+static void _config_bool(VariableItem* item) {
+    bool* value = variable_item_get_context(item);
+    *value = variable_item_get_current_value_index(item);
+    variable_item_set_current_value_text(item, *value ? "ON" : "OFF");
+}
+static void config_bool(VariableItemList* list, const char* name, bool* value) {
+    VariableItem* item = variable_item_list_add(list, name, 2, _config_bool, value);
+    variable_item_set_current_value_index(item, *value);
+    variable_item_set_current_value_text(item, *value ? "ON" : "OFF");
 }
 
 static void config_callback(void* _ctx, uint32_t index) {
@@ -19,21 +24,20 @@ static void config_callback(void* _ctx, uint32_t index) {
     switch(index) {
     case ConfigRandomMac:
         break;
+    case ConfigLedIndicator:
+        break;
     default:
         break;
     }
 }
 void scene_config_on_enter(void* _ctx) {
     Ctx* ctx = _ctx;
-    VariableItem* item;
     VariableItemList* list = ctx->variable_item_list;
     variable_item_list_reset(list);
 
     variable_item_list_set_header(list, ctx->attack->title);
 
-    item = variable_item_list_add(list, "Random MAC", 2, random_mac_changed, ctx);
-    variable_item_set_current_value_index(item, ctx->attack->payload.random_mac);
-    variable_item_set_current_value_text(item, ctx->attack->payload.random_mac ? "ON" : "OFF");
+    config_bool(list, "Random MAC", &ctx->attack->payload.random_mac);
 
     variable_item_list_set_enter_callback(list, config_callback, ctx);
     if(!ctx->attack->protocol) {
@@ -43,6 +47,8 @@ void scene_config_on_enter(void* _ctx) {
         ctx->attack->protocol->extra_config(ctx);
     }
 
+    config_bool(list, "LED Indicator", &ctx->led_indicator);
+
     variable_item_list_set_selected_item(
         list, scene_manager_get_scene_state(ctx->scene_manager, SceneConfig));
 

From aa9287313f73fdc75fe1103534e058ddaf464f3e Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sat, 21 Oct 2023 08:27:43 +0100
Subject: [PATCH 3/8] BLE Spam add lock keyboard option (v3.3)

---
 .../external/ble_spam/application.fam         |  2 +-
 applications/external/ble_spam/ble_spam.c     | 72 +++++++++++++++----
 applications/external/ble_spam/ble_spam.h     |  2 +
 .../external/ble_spam/scenes/config.c         | 11 ++-
 4 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/applications/external/ble_spam/application.fam b/applications/external/ble_spam/application.fam
index b6a3ce5ea..532a55cfb 100644
--- a/applications/external/ble_spam/application.fam
+++ b/applications/external/ble_spam/application.fam
@@ -8,7 +8,7 @@ App(
     fap_category="Bluetooth",
     fap_author="@Willy-JL @ECTO-1A @Spooks4576",
     fap_weburl="https://github.com/Flipper-XFW/Xtreme-Apps/tree/dev/ble_spam",
-    fap_version="3.2",
+    fap_version="3.3",
     fap_description="Flood BLE advertisements to cause spammy and annoying popups/notifications",
     fap_icon_assets="icons",
     fap_icon_assets_symbol="ble_spam",
diff --git a/applications/external/ble_spam/ble_spam.c b/applications/external/ble_spam/ble_spam.c
index 11eeaabac..5c7e886ec 100644
--- a/applications/external/ble_spam/ble_spam.c
+++ b/applications/external/ble_spam/ble_spam.c
@@ -142,6 +142,11 @@ static uint16_t delays[] = {20, 50, 100, 200};
 
 typedef struct {
     Ctx ctx;
+    View* main_view;
+    bool lock_warning;
+    uint8_t lock_count;
+    FuriTimer* lock_timer;
+
     bool resume;
     bool advertising;
     uint8_t delay;
@@ -208,9 +213,9 @@ static void toggle_adv(State* state) {
         furi_thread_join(state->thread);
         if(state->resume) furi_hal_bt_start_advertising();
     } else {
+        state->advertising = true;
         state->resume = furi_hal_bt_is_active();
         furi_hal_bt_stop_advertising();
-        state->advertising = true;
         furi_thread_start(state->thread);
     }
 }
@@ -338,11 +343,15 @@ static void draw_callback(Canvas* canvas, void* _ctx) {
             "App+Spam: \e#WillyJL\e# XFW\n"
             "Apple+Crash: \e#ECTO-1A\e#\n"
             "Android+Win: \e#Spooks4576\e#\n"
-            "                                   Version \e#3.2\e#",
+            "                                   Version \e#3.3\e#",
             false);
         break;
     default: {
         if(!attack) break;
+        if(state->ctx.lock_keyboard && !state->advertising) {
+            // Forgive me Lord for I have sinned by handling state in draw
+            toggle_adv(state);
+        }
         char str[32];
 
         canvas_set_font(canvas, FontBatteryPercent);
@@ -378,6 +387,17 @@ static void draw_callback(Canvas* canvas, void* _ctx) {
     if(state->index < PAGE_MAX) {
         elements_button_right(canvas, next);
     }
+
+    if(state->ctx.lock_keyboard) {
+        canvas_set_font(canvas, FontSecondary);
+        elements_bold_rounded_frame(canvas, 14, 8, 99, 48);
+        elements_multiline_text(canvas, 65, 26, "To unlock\npress:");
+        canvas_draw_icon(canvas, 65, 42, &I_Pin_back_arrow_10x8);
+        canvas_draw_icon(canvas, 80, 42, &I_Pin_back_arrow_10x8);
+        canvas_draw_icon(canvas, 95, 42, &I_Pin_back_arrow_10x8);
+        canvas_draw_icon(canvas, 16, 13, &I_WarningDolphin_45x42);
+        canvas_draw_dot(canvas, 17, 61);
+    }
 }
 
 static bool input_callback(InputEvent* input, void* _ctx) {
@@ -385,8 +405,22 @@ static bool input_callback(InputEvent* input, void* _ctx) {
     State* state = *(State**)view_get_model(view);
     bool consumed = false;
 
-    if(input->type == InputTypeShort || input->type == InputTypeLong ||
-       input->type == InputTypeRepeat) {
+    if(state->ctx.lock_keyboard) {
+        consumed = true;
+        with_view_model(
+            state->main_view, State * *model, { (*model)->lock_warning = true; }, true);
+        if(state->lock_count == 0) {
+            furi_timer_start(state->lock_timer, pdMS_TO_TICKS(1000));
+        }
+        if(input->type == InputTypeShort && input->key == InputKeyBack) {
+            state->lock_count++;
+        }
+        if(state->lock_count >= 3) {
+            furi_timer_start(state->lock_timer, 1);
+        }
+    } else if(
+        input->type == InputTypeShort || input->type == InputTypeLong ||
+        input->type == InputTypeRepeat) {
         consumed = true;
 
         bool is_attack = state->index >= 0 && state->index <= ATTACKS_COUNT - 1;
@@ -442,6 +476,18 @@ static bool input_callback(InputEvent* input, void* _ctx) {
     return consumed;
 }
 
+static void lock_timer_callback(void* _ctx) {
+    State* state = _ctx;
+    if(state->lock_count < 3) {
+        notification_message_block(state->ctx.notification, &sequence_display_backlight_off);
+    } else {
+        state->ctx.lock_keyboard = false;
+    }
+    with_view_model(
+        state->main_view, State * *model, { (*model)->lock_warning = false; }, true);
+    state->lock_count = 0;
+}
+
 static bool back_event_callback(void* _ctx) {
     Ctx* ctx = _ctx;
     return scene_manager_handle_back_event(ctx->scene_manager);
@@ -455,6 +501,7 @@ int32_t ble_spam(void* p) {
     furi_thread_set_context(state->thread, state);
     furi_thread_set_stack_size(state->thread, 4096);
     state->ctx.led_indicator = true;
+    state->lock_timer = furi_timer_alloc(lock_timer_callback, FuriTimerTypeOnce, state);
 
     state->ctx.notification = furi_record_open(RECORD_NOTIFICATION);
     Gui* gui = furi_record_open(RECORD_GUI);
@@ -464,14 +511,14 @@ int32_t ble_spam(void* p) {
     view_dispatcher_set_navigation_event_callback(state->ctx.view_dispatcher, back_event_callback);
     state->ctx.scene_manager = scene_manager_alloc(&scene_handlers, &state->ctx);
 
-    View* view_main = view_alloc();
-    view_allocate_model(view_main, ViewModelTypeLockFree, sizeof(State*));
+    state->main_view = view_alloc();
+    view_allocate_model(state->main_view, ViewModelTypeLocking, sizeof(State*));
     with_view_model(
-        view_main, State * *model, { *model = state; }, false);
-    view_set_context(view_main, view_main);
-    view_set_draw_callback(view_main, draw_callback);
-    view_set_input_callback(view_main, input_callback);
-    view_dispatcher_add_view(state->ctx.view_dispatcher, ViewMain, view_main);
+        state->main_view, State * *model, { *model = state; }, false);
+    view_set_context(state->main_view, state->main_view);
+    view_set_draw_callback(state->main_view, draw_callback);
+    view_set_input_callback(state->main_view, input_callback);
+    view_dispatcher_add_view(state->ctx.view_dispatcher, ViewMain, state->main_view);
 
     state->ctx.byte_input = byte_input_alloc();
     view_dispatcher_add_view(
@@ -508,13 +555,14 @@ int32_t ble_spam(void* p) {
     variable_item_list_free(state->ctx.variable_item_list);
 
     view_dispatcher_remove_view(state->ctx.view_dispatcher, ViewMain);
-    view_free(view_main);
+    view_free(state->main_view);
 
     scene_manager_free(state->ctx.scene_manager);
     view_dispatcher_free(state->ctx.view_dispatcher);
     furi_record_close(RECORD_GUI);
     furi_record_close(RECORD_NOTIFICATION);
 
+    furi_timer_free(state->lock_timer);
     furi_thread_free(state->thread);
     free(state);
     return 0;
diff --git a/applications/external/ble_spam/ble_spam.h b/applications/external/ble_spam/ble_spam.h
index b72ca7cc5..6be71147e 100644
--- a/applications/external/ble_spam/ble_spam.h
+++ b/applications/external/ble_spam/ble_spam.h
@@ -21,6 +21,7 @@ enum {
     ConfigRandomMac,
     ConfigExtraStart = ConfigRandomMac,
     ConfigLedIndicator,
+    ConfigLockKeyboard,
 };
 
 typedef struct Attack Attack;
@@ -30,6 +31,7 @@ typedef struct {
     uint8_t byte_store[3];
     VariableItemListEnterCallback fallback_config_enter;
     bool led_indicator;
+    bool lock_keyboard;
 
     NotificationApp* notification;
     ViewDispatcher* view_dispatcher;
diff --git a/applications/external/ble_spam/scenes/config.c b/applications/external/ble_spam/scenes/config.c
index 376d336ac..cfbbbf952 100644
--- a/applications/external/ble_spam/scenes/config.c
+++ b/applications/external/ble_spam/scenes/config.c
@@ -16,7 +16,9 @@ static void config_bool(VariableItemList* list, const char* name, bool* value) {
 static void config_callback(void* _ctx, uint32_t index) {
     Ctx* ctx = _ctx;
     scene_manager_set_scene_state(ctx->scene_manager, SceneConfig, index);
-    if(ctx->attack->protocol && ctx->attack->protocol->config_count) {
+    if(!ctx->attack->protocol) {
+        index--;
+    } else if(ctx->attack->protocol->config_count) {
         uint8_t extra = ctx->attack->protocol->config_count(&ctx->attack->payload.cfg);
         if(index > extra) index -= extra;
     }
@@ -26,6 +28,11 @@ static void config_callback(void* _ctx, uint32_t index) {
         break;
     case ConfigLedIndicator:
         break;
+    case ConfigLockKeyboard:
+        ctx->lock_keyboard = true;
+        scene_manager_previous_scene(ctx->scene_manager);
+        notification_message_block(ctx->notification, &sequence_display_backlight_off);
+        break;
     default:
         break;
     }
@@ -49,6 +56,8 @@ void scene_config_on_enter(void* _ctx) {
 
     config_bool(list, "LED Indicator", &ctx->led_indicator);
 
+    variable_item_list_add(list, "Lock Keyboard", 0, NULL, NULL);
+
     variable_item_list_set_selected_item(
         list, scene_manager_get_scene_state(ctx->scene_manager, SceneConfig));
 

From 9fb790e5c981ecd5891c53ebeaee19ccb36ce05e Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sat, 21 Oct 2023 21:47:28 +0100
Subject: [PATCH 4/8] Fix some graphical bugs --nobuild

---
 applications/external/ble_spam/ble_spam.c      | 2 +-
 applications/external/ble_spam/scenes/config.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/external/ble_spam/ble_spam.c b/applications/external/ble_spam/ble_spam.c
index 5c7e886ec..b3edf165f 100644
--- a/applications/external/ble_spam/ble_spam.c
+++ b/applications/external/ble_spam/ble_spam.c
@@ -388,7 +388,7 @@ static void draw_callback(Canvas* canvas, void* _ctx) {
         elements_button_right(canvas, next);
     }
 
-    if(state->ctx.lock_keyboard) {
+    if(state->lock_warning) {
         canvas_set_font(canvas, FontSecondary);
         elements_bold_rounded_frame(canvas, 14, 8, 99, 48);
         elements_multiline_text(canvas, 65, 26, "To unlock\npress:");
diff --git a/applications/external/ble_spam/scenes/config.c b/applications/external/ble_spam/scenes/config.c
index cfbbbf952..354de6399 100644
--- a/applications/external/ble_spam/scenes/config.c
+++ b/applications/external/ble_spam/scenes/config.c
@@ -48,7 +48,7 @@ void scene_config_on_enter(void* _ctx) {
 
     variable_item_list_set_enter_callback(list, config_callback, ctx);
     if(!ctx->attack->protocol) {
-        variable_item_list_add(list, "None shall escape the S I N K", 0, NULL, NULL);
+        variable_item_list_add(list, "None shall escape the SINK", 0, NULL, NULL);
     } else if(ctx->attack->protocol->extra_config) {
         ctx->fallback_config_enter = config_callback;
         ctx->attack->protocol->extra_config(ctx);

From 25045ca67f4c4cae453f8add5e9f8411c00e48ad Mon Sep 17 00:00:00 2001
From: Struan Clark <xtruan@gmail.com>
Date: Sat, 21 Oct 2023 20:16:37 -0600
Subject: [PATCH 5/8] feat: 1.14 update

---
 applications/external/flipbip/application.fam |   3 +-
 applications/external/flipbip/flipbip.c       |  30 ++++++++++++++++++
 applications/external/flipbip/flipbip.h       |  21 +++++++++++-
 .../flipbip/icons/ButtonDown_10x5.png         | Bin 6223 -> 0 bytes
 .../external/flipbip/icons/ButtonUp_10x5.png  | Bin 6233 -> 0 bytes
 .../flipbip/scenes/flipbip_scene_menu.c       |  23 +++++---------
 6 files changed, 60 insertions(+), 17 deletions(-)
 delete mode 100644 applications/external/flipbip/icons/ButtonDown_10x5.png
 delete mode 100644 applications/external/flipbip/icons/ButtonUp_10x5.png

diff --git a/applications/external/flipbip/application.fam b/applications/external/flipbip/application.fam
index 0831ff432..c7d67e3f9 100644
--- a/applications/external/flipbip/application.fam
+++ b/applications/external/flipbip/application.fam
@@ -7,6 +7,7 @@ App(
         "gui",
     ],
     stack_size=3 * 1024,
+    order=10,
     fap_icon="flipbip_10px.png",
     fap_private_libs=[
         Lib(
@@ -16,6 +17,6 @@ App(
     fap_category="Tools",
     fap_author="Struan Clark (xtruan)",
     fap_weburl="https://github.com/xtruan/FlipBIP",
-    fap_version=(1, 13),
+    fap_version=(1, 14),
     fap_description="Crypto wallet for Flipper",
 )
diff --git a/applications/external/flipbip/flipbip.c b/applications/external/flipbip/flipbip.c
index 7a7237639..46904592d 100644
--- a/applications/external/flipbip/flipbip.c
+++ b/applications/external/flipbip/flipbip.c
@@ -90,6 +90,23 @@ static void text_input_callback(void* context) {
     }
 }
 
+static void flipbip_scene_renew_dialog_callback(DialogExResult result, void* context) {
+    FlipBip* app = context;
+    if(result == DialogExResultRight) {
+        app->wallet_create(app);
+    } else {
+        view_dispatcher_switch_to_view(app->view_dispatcher, FlipBipViewIdMenu);
+    }
+}
+
+static void flipbip_wallet_create(void* context) {
+    FlipBip* app = context;
+    furi_assert(app);
+    scene_manager_set_scene_state(
+        app->scene_manager, FlipBipSceneMenu, SubmenuIndexScene1New);
+    scene_manager_next_scene(app->scene_manager, FlipBipSceneScene_1);
+}
+
 FlipBip* flipbip_app_alloc() {
     FlipBip* app = malloc(sizeof(FlipBip));
     app->gui = furi_record_open(RECORD_GUI);
@@ -148,6 +165,16 @@ FlipBip* flipbip_app_alloc() {
     view_dispatcher_add_view(
         app->view_dispatcher, FlipBipViewIdTextInput, text_input_get_view(app->text_input));
 
+    app->wallet_create = flipbip_wallet_create;
+    app->renew_dialog = dialog_ex_alloc();
+    dialog_ex_set_result_callback(app->renew_dialog, flipbip_scene_renew_dialog_callback);
+    dialog_ex_set_context(app->renew_dialog, app);
+    dialog_ex_set_left_button_text(app->renew_dialog, "No");
+    dialog_ex_set_right_button_text(app->renew_dialog, "Yes");
+    dialog_ex_set_header(app->renew_dialog, "Current wallet\nWill be lost.\nProceed?", 16, 12, AlignLeft, AlignTop);
+    view_dispatcher_add_view(
+        app->view_dispatcher, FlipBipViewRenewConfirm, dialog_ex_get_view(app->renew_dialog));
+
     // End Scene Additions
 
     return app;
@@ -168,6 +195,9 @@ void flipbip_app_free(FlipBip* app) {
     view_dispatcher_remove_view(app->view_dispatcher, FlipBipViewIdTextInput);
     submenu_free(app->submenu);
 
+    view_dispatcher_remove_view(app->view_dispatcher, FlipBipViewRenewConfirm);
+    dialog_ex_free(app->renew_dialog);
+
     view_dispatcher_free(app->view_dispatcher);
     furi_record_close(RECORD_GUI);
 
diff --git a/applications/external/flipbip/flipbip.h b/applications/external/flipbip/flipbip.h
index 9f5994b80..573ef0588 100644
--- a/applications/external/flipbip/flipbip.h
+++ b/applications/external/flipbip/flipbip.h
@@ -9,12 +9,13 @@
 #include <gui/view_dispatcher.h>
 #include <gui/modules/submenu.h>
 #include <gui/scene_manager.h>
+#include <gui/modules/dialog_ex.h>
 #include <gui/modules/variable_item_list.h>
 #include <gui/modules/text_input.h>
 #include "scenes/flipbip_scene.h"
 #include "views/flipbip_scene_1.h"
 
-#define FLIPBIP_VERSION "v1.13"
+#define FLIPBIP_VERSION "v1.14"
 
 #define COIN_BTC 0
 #define COIN_DOGE 3
@@ -23,6 +24,8 @@
 
 #define TEXT_BUFFER_SIZE 256
 
+
+
 typedef struct {
     Gui* gui;
     // NotificationApp* notification;
@@ -31,6 +34,7 @@ typedef struct {
     SceneManager* scene_manager;
     VariableItemList* variable_item_list;
     TextInput* text_input;
+    DialogEx* renew_dialog;
     FlipBipScene1* flipbip_scene_1;
     char* mnemonic_menu_text;
     // Settings options
@@ -45,6 +49,8 @@ typedef struct {
     char passphrase_text[TEXT_BUFFER_SIZE];
     char import_mnemonic_text[TEXT_BUFFER_SIZE];
     char input_text[TEXT_BUFFER_SIZE];
+
+    void (* wallet_create)(void* context);
 } FlipBip;
 
 typedef enum {
@@ -53,6 +59,7 @@ typedef enum {
     FlipBipViewIdScene1,
     FlipBipViewIdSettings,
     FlipBipViewIdTextInput,
+    FlipBipViewRenewConfirm,
 } FlipBipViewId;
 
 typedef enum {
@@ -86,3 +93,15 @@ typedef enum {
     FlipBipStatusSaveError = 12,
     FlipBipStatusMnemonicCheckError = 13,
 } FlipBipStatus;
+
+typedef enum {
+    SubmenuIndexScene1BTC = 10,
+    SubmenuIndexScene1ETH,
+    SubmenuIndexScene1DOGE,
+    SubmenuIndexScene1ZEC,
+    SubmenuIndexScene1New,
+    SubmenuIndexScene1Renew,
+    SubmenuIndexScene1Import,
+    SubmenuIndexSettings,
+    SubmenuIndexNOP,
+} SubmenuIndex;
diff --git a/applications/external/flipbip/icons/ButtonDown_10x5.png b/applications/external/flipbip/icons/ButtonDown_10x5.png
deleted file mode 100644
index b492b926c45def68d88b03c380527e226740beb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6223
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

diff --git a/applications/external/flipbip/icons/ButtonUp_10x5.png b/applications/external/flipbip/icons/ButtonUp_10x5.png
deleted file mode 100644
index 5da99d01ee968c974521c414e6f789237f888be2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6233
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
O5RwhWI?vL3-+urLRS4?<

diff --git a/applications/external/flipbip/scenes/flipbip_scene_menu.c b/applications/external/flipbip/scenes/flipbip_scene_menu.c
index 928a002f7..53fb2a917 100644
--- a/applications/external/flipbip/scenes/flipbip_scene_menu.c
+++ b/applications/external/flipbip/scenes/flipbip_scene_menu.c
@@ -3,18 +3,8 @@
 
 #define FLIPBIP_SUBMENU_TEXT "** FlipBIP wallet " FLIPBIP_VERSION " **"
 
-enum SubmenuIndex {
-    SubmenuIndexScene1BTC = 10,
-    SubmenuIndexScene1ETH,
-    SubmenuIndexScene1DOGE,
-    SubmenuIndexScene1ZEC,
-    SubmenuIndexScene1New,
-    SubmenuIndexScene1Import,
-    SubmenuIndexSettings,
-    SubmenuIndexNOP,
-};
-
 void flipbip_scene_menu_submenu_callback(void* context, uint32_t index) {
+    furi_assert(context);
     FlipBip* app = context;
     view_dispatcher_send_custom_event(app->view_dispatcher, index);
 }
@@ -59,7 +49,7 @@ void flipbip_scene_menu_on_enter(void* context) {
         submenu_add_item(
             app->submenu,
             "Regenerate wallet",
-            SubmenuIndexScene1New,
+            SubmenuIndexScene1Renew,
             flipbip_scene_menu_submenu_callback,
             app);
     } else {
@@ -130,9 +120,12 @@ bool flipbip_scene_menu_on_event(void* context, SceneManagerEvent event) {
         } else if(event.event == SubmenuIndexScene1New) {
             app->overwrite_saved_seed = 1;
             app->import_from_mnemonic = 0;
-            scene_manager_set_scene_state(
-                app->scene_manager, FlipBipSceneMenu, SubmenuIndexScene1New);
-            scene_manager_next_scene(app->scene_manager, FlipBipSceneScene_1);
+            app->wallet_create(app);
+            return true;
+        } else if(event.event == SubmenuIndexScene1Renew) {
+            app->overwrite_saved_seed = 1;
+            app->import_from_mnemonic = 0;
+            view_dispatcher_switch_to_view(app->view_dispatcher, FlipBipViewRenewConfirm);
             return true;
         } else if(event.event == SubmenuIndexScene1Import) {
             app->import_from_mnemonic = 1;

From 305e5d54133556b85e956e46930e18d1e93d0fa7 Mon Sep 17 00:00:00 2001
From: Struan Clark <xtruan@gmail.com>
Date: Sat, 21 Oct 2023 20:24:15 -0600
Subject: [PATCH 6/8] chore: update app

---
 applications/external/flipbip/application.fam | 1 -
 1 file changed, 1 deletion(-)

diff --git a/applications/external/flipbip/application.fam b/applications/external/flipbip/application.fam
index c7d67e3f9..2f36910ab 100644
--- a/applications/external/flipbip/application.fam
+++ b/applications/external/flipbip/application.fam
@@ -7,7 +7,6 @@ App(
         "gui",
     ],
     stack_size=3 * 1024,
-    order=10,
     fap_icon="flipbip_10px.png",
     fap_private_libs=[
         Lib(

From 942ef2c5b70cd26908657a6c1e7291d9b558afb0 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sun, 22 Oct 2023 03:39:53 +0100
Subject: [PATCH 7/8] Format --nobuild

---
 applications/external/flipbip/flipbip.c | 6 +++---
 applications/external/flipbip/flipbip.h | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/applications/external/flipbip/flipbip.c b/applications/external/flipbip/flipbip.c
index 46904592d..90abfb513 100644
--- a/applications/external/flipbip/flipbip.c
+++ b/applications/external/flipbip/flipbip.c
@@ -102,8 +102,7 @@ static void flipbip_scene_renew_dialog_callback(DialogExResult result, void* con
 static void flipbip_wallet_create(void* context) {
     FlipBip* app = context;
     furi_assert(app);
-    scene_manager_set_scene_state(
-        app->scene_manager, FlipBipSceneMenu, SubmenuIndexScene1New);
+    scene_manager_set_scene_state(app->scene_manager, FlipBipSceneMenu, SubmenuIndexScene1New);
     scene_manager_next_scene(app->scene_manager, FlipBipSceneScene_1);
 }
 
@@ -171,7 +170,8 @@ FlipBip* flipbip_app_alloc() {
     dialog_ex_set_context(app->renew_dialog, app);
     dialog_ex_set_left_button_text(app->renew_dialog, "No");
     dialog_ex_set_right_button_text(app->renew_dialog, "Yes");
-    dialog_ex_set_header(app->renew_dialog, "Current wallet\nWill be lost.\nProceed?", 16, 12, AlignLeft, AlignTop);
+    dialog_ex_set_header(
+        app->renew_dialog, "Current wallet\nWill be lost.\nProceed?", 16, 12, AlignLeft, AlignTop);
     view_dispatcher_add_view(
         app->view_dispatcher, FlipBipViewRenewConfirm, dialog_ex_get_view(app->renew_dialog));
 
diff --git a/applications/external/flipbip/flipbip.h b/applications/external/flipbip/flipbip.h
index 573ef0588..12d910497 100644
--- a/applications/external/flipbip/flipbip.h
+++ b/applications/external/flipbip/flipbip.h
@@ -24,8 +24,6 @@
 
 #define TEXT_BUFFER_SIZE 256
 
-
-
 typedef struct {
     Gui* gui;
     // NotificationApp* notification;
@@ -50,7 +48,7 @@ typedef struct {
     char import_mnemonic_text[TEXT_BUFFER_SIZE];
     char input_text[TEXT_BUFFER_SIZE];
 
-    void (* wallet_create)(void* context);
+    void (*wallet_create)(void* context);
 } FlipBip;
 
 typedef enum {

From eee662f188642941bcfec826daf8f825734845c4 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sun, 22 Oct 2023 03:47:49 +0100
Subject: [PATCH 8/8] Fix click offsets for fastpair and swiftpair --nobuild

---
 applications/external/ble_spam/protocols/fastpair.c  | 2 +-
 applications/external/ble_spam/protocols/swiftpair.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/external/ble_spam/protocols/fastpair.c b/applications/external/ble_spam/protocols/fastpair.c
index a5caf80cc..1e7c2920c 100644
--- a/applications/external/ble_spam/protocols/fastpair.c
+++ b/applications/external/ble_spam/protocols/fastpair.c
@@ -147,7 +147,7 @@ static void fastpair_extra_config(Ctx* ctx) {
 
 static uint8_t fastpair_config_count(const ProtocolCfg* _cfg) {
     UNUSED(_cfg);
-    return ConfigCOUNT;
+    return ConfigCOUNT - ConfigExtraStart - 1;
 }
 
 const Protocol protocol_fastpair = {
diff --git a/applications/external/ble_spam/protocols/swiftpair.c b/applications/external/ble_spam/protocols/swiftpair.c
index fc21f1778..b204f8eef 100644
--- a/applications/external/ble_spam/protocols/swiftpair.c
+++ b/applications/external/ble_spam/protocols/swiftpair.c
@@ -81,7 +81,7 @@ static void swiftpair_extra_config(Ctx* ctx) {
 
 static uint8_t swiftpair_config_count(const ProtocolCfg* _cfg) {
     UNUSED(_cfg);
-    return ConfigCOUNT;
+    return ConfigCOUNT - ConfigExtraStart - 1;
 }
 
 const Protocol protocol_swiftpair = {