diff --git a/applications/external/ble_spam/protocols/continuity.c b/applications/external/ble_spam/protocols/continuity.c index 45645356d..297710f3d 100644 --- a/applications/external/ble_spam/protocols/continuity.c +++ b/applications/external/ble_spam/protocols/continuity.c @@ -32,7 +32,6 @@ static uint8_t packet_sizes[ContinuityTypeCount] = { [ContinuityTypeNearbyInfo] = HEADER_LEN + 5, [ContinuityTypeCustomCrash] = HEADER_LEN + 11, }; - static void continuity_make_packet(uint8_t* _size, uint8_t** _packet, const ProtocolCfg* _cfg) { const ContinuityCfg* cfg = _cfg ? &_cfg->continuity : NULL; diff --git a/applications/external/ble_spam/protocols/continuity.h b/applications/external/ble_spam/protocols/continuity.h index eb6334731..54f568195 100644 --- a/applications/external/ble_spam/protocols/continuity.h +++ b/applications/external/ble_spam/protocols/continuity.h @@ -23,12 +23,12 @@ typedef struct { ContinuityType type; union { struct { + uint16_t model_id; uint8_t prefix; - uint16_t model; } proximity_pair; struct { - uint8_t flags; uint8_t type; + uint8_t flags; } nearby_action; } data; } ContinuityCfg; diff --git a/applications/external/ble_spam/protocols/fastpair.c b/applications/external/ble_spam/protocols/fastpair.c index 019c8fa5d..8944b7810 100644 --- a/applications/external/ble_spam/protocols/fastpair.c +++ b/applications/external/ble_spam/protocols/fastpair.c @@ -30,7 +30,6 @@ const struct { {0x13B39D, "Talking Sasquach"}, {0xAA1FE1, "ClownMaster"}, }; - const uint8_t models_count = COUNT_OF(models); static const char* fastpair_get_name(const ProtocolCfg* _cfg) { @@ -77,7 +76,6 @@ static void fastpair_make_packet(uint8_t* _size, uint8_t** _packet, const Protoc enum { ConfigModelId, }; - static void config_callback(void* _ctx, uint32_t index) { Ctx* ctx = _ctx; scene_manager_set_scene_state(ctx->scene_manager, SceneConfig, index); @@ -88,7 +86,6 @@ static void config_callback(void* _ctx, uint32_t index) { break; } } - static void model_id_changed(VariableItem* item) { FastpairCfg* cfg = variable_item_get_context(item); uint8_t index = variable_item_get_current_value_index(item); @@ -101,7 +98,6 @@ static void model_id_changed(VariableItem* item) { variable_item_set_current_value_text(item, "Random"); } } - static uint8_t fastpair_config_list(Ctx* ctx) { FastpairCfg* cfg = &ctx->attack->payload.cfg.fastpair; VariableItemList* list = ctx->variable_item_list; @@ -162,7 +158,6 @@ static void model_id_callback(void* _ctx, uint32_t index) { break; } } - void scene_fastpair_model_id_on_enter(void* _ctx) { Ctx* ctx = _ctx; FastpairCfg* cfg = &ctx->attack->payload.cfg.fastpair; @@ -193,13 +188,11 @@ void scene_fastpair_model_id_on_enter(void* _ctx) { view_dispatcher_switch_to_view(ctx->view_dispatcher, ViewSubmenu); } - bool scene_fastpair_model_id_on_event(void* _ctx, SceneManagerEvent event) { UNUSED(_ctx); UNUSED(event); return false; } - void scene_fastpair_model_id_on_exit(void* _ctx) { UNUSED(_ctx); } @@ -209,7 +202,6 @@ static void model_id_custom_callback(void* _ctx) { scene_manager_previous_scene(ctx->scene_manager); scene_manager_previous_scene(ctx->scene_manager); } - void scene_fastpair_model_id_custom_on_enter(void* _ctx) { Ctx* ctx = _ctx; FastpairCfg* cfg = &ctx->attack->payload.cfg.fastpair; @@ -227,13 +219,11 @@ void scene_fastpair_model_id_custom_on_enter(void* _ctx) { view_dispatcher_switch_to_view(ctx->view_dispatcher, ViewByteInput); } - bool scene_fastpair_model_id_custom_on_event(void* _ctx, SceneManagerEvent event) { UNUSED(_ctx); UNUSED(event); return false; } - void scene_fastpair_model_id_custom_on_exit(void* _ctx) { UNUSED(_ctx); } diff --git a/applications/external/ble_spam/protocols/swiftpair.c b/applications/external/ble_spam/protocols/swiftpair.c index 4f7bc82bf..802e93201 100644 --- a/applications/external/ble_spam/protocols/swiftpair.c +++ b/applications/external/ble_spam/protocols/swiftpair.c @@ -50,7 +50,6 @@ static void swiftpair_make_packet(uint8_t* _size, uint8_t** _packet, const Proto enum { ConfigDisplayName, }; - static void config_callback(void* _ctx, uint32_t index) { Ctx* ctx = _ctx; scene_manager_set_scene_state(ctx->scene_manager, SceneConfig, index); @@ -61,7 +60,6 @@ static void config_callback(void* _ctx, uint32_t index) { break; } } - static uint8_t swiftpair_config_list(Ctx* ctx) { SwiftpairCfg* cfg = &ctx->attack->payload.cfg.swiftpair; VariableItemList* list = ctx->variable_item_list; @@ -89,7 +87,6 @@ static void display_name_callback(void* _ctx) { Ctx* ctx = _ctx; scene_manager_previous_scene(ctx->scene_manager); } - void scene_swiftpair_display_name_on_enter(void* _ctx) { Ctx* ctx = _ctx; SwiftpairCfg* cfg = &ctx->attack->payload.cfg.swiftpair; @@ -105,13 +102,11 @@ void scene_swiftpair_display_name_on_enter(void* _ctx) { view_dispatcher_switch_to_view(ctx->view_dispatcher, ViewTextInput); } - bool scene_swiftpair_display_name_on_event(void* _ctx, SceneManagerEvent event) { UNUSED(_ctx); UNUSED(event); return false; } - void scene_swiftpair_display_name_on_exit(void* _ctx) { UNUSED(_ctx); }