From 92969ecc1f93e79cd385ad2ecfbfe067557d9f47 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Tue, 24 Oct 2023 16:04:55 +0300 Subject: [PATCH] remove mf classic uid add manually temp --- .../main/nfc/scenes/nfc_scene_set_type.c | 4 - .../nfc/scenes/nfc_scene_set_type_mf_uid.c | 103 ------------------ .../main/nfc/scenes/nfc_scene_set_uid.c | 15 --- 3 files changed, 122 deletions(-) delete mode 100644 applications/main/nfc/scenes/nfc_scene_set_type_mf_uid.c diff --git a/applications/main/nfc/scenes/nfc_scene_set_type.c b/applications/main/nfc/scenes/nfc_scene_set_type.c index b66cc42d0..e33660080 100644 --- a/applications/main/nfc/scenes/nfc_scene_set_type.c +++ b/applications/main/nfc/scenes/nfc_scene_set_type.c @@ -53,10 +53,6 @@ bool nfc_scene_set_type_on_event(void* context, SceneManagerEvent event) { nfc_scene_set_type_init_edit_data(instance->iso14443_3a_edit_data, 4); scene_manager_next_scene(instance->scene_manager, NfcSceneSetSak); consumed = true; - } else if(event.event == SubmenuIndexMFClassicCustomUID) { - nfc_device_clear(nfc->dev); - scene_manager_next_scene(nfc->scene_manager, NfcSceneSetTypeMfUid); - consumed = true; } else { nfc_data_generator_fill_data(event.event, instance->nfc_device); scene_manager_set_scene_state( diff --git a/applications/main/nfc/scenes/nfc_scene_set_type_mf_uid.c b/applications/main/nfc/scenes/nfc_scene_set_type_mf_uid.c deleted file mode 100644 index 55919500a..000000000 --- a/applications/main/nfc/scenes/nfc_scene_set_type_mf_uid.c +++ /dev/null @@ -1,103 +0,0 @@ -#include "../nfc_i.h" -#include "lib/nfc/helpers/nfc_generators.h" - -enum SubmenuIndex { - SubmenuIndexMFC1k4b, - SubmenuIndexMFC4k4b, - SubmenuIndexMFC1k7b, - SubmenuIndexMFC4k7b, - SubmenuIndexMFCMini, -}; - -static const NfcGenerator ganeator_gag = { - .name = "Mifare Classic Custom UID", - .generator_func = NULL, -}; - -void nfc_scene_set_type_mf_uid_submenu_callback(void* context, uint32_t index) { - Nfc* nfc = context; - - view_dispatcher_send_custom_event(nfc->view_dispatcher, index); -} - -void nfc_scene_set_type_mf_uid_on_enter(void* context) { - Nfc* nfc = context; - Submenu* submenu = nfc->submenu; - - submenu_add_item( - submenu, - "Mifare Classic 1k 4byte UID", - SubmenuIndexMFC1k4b, - nfc_scene_set_type_mf_uid_submenu_callback, - nfc); - submenu_add_item( - submenu, - "Mifare Classic 4k 4byte UID", - SubmenuIndexMFC4k4b, - nfc_scene_set_type_mf_uid_submenu_callback, - nfc); - submenu_add_item( - submenu, - "Mifare Classic 1k 7byte UID", - SubmenuIndexMFC1k7b, - nfc_scene_set_type_mf_uid_submenu_callback, - nfc); - submenu_add_item( - submenu, - "Mifare Classic 4k 7byte UID", - SubmenuIndexMFC4k7b, - nfc_scene_set_type_mf_uid_submenu_callback, - nfc); - submenu_add_item( - submenu, - "Mifare Classic Mini", - SubmenuIndexMFCMini, - nfc_scene_set_type_mf_uid_submenu_callback, - nfc); - - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewMenu); -} - -bool nfc_scene_set_type_mf_uid_on_event(void* context, SceneManagerEvent event) { - Nfc* nfc = context; - bool consumed = false; - bool correct_index = false; - MfClassicType mf_type = MfClassicType1k; - - if(event.type == SceneManagerEventTypeCustom) { - if(event.event == SubmenuIndexMFC1k4b) { - nfc->dev->dev_data.nfc_data.uid_len = 4; - mf_type = MfClassicType1k; - correct_index = true; - } else if(event.event == SubmenuIndexMFC1k7b) { - nfc->dev->dev_data.nfc_data.uid_len = 7; - mf_type = MfClassicType1k; - correct_index = true; - } else if(event.event == SubmenuIndexMFC4k4b) { - nfc->dev->dev_data.nfc_data.uid_len = 4; - mf_type = MfClassicType4k; - correct_index = true; - } else if(event.event == SubmenuIndexMFC4k7b) { - nfc->dev->dev_data.nfc_data.uid_len = 7; - mf_type = MfClassicType4k; - correct_index = true; - } else if(event.event == SubmenuIndexMFCMini) { - nfc->dev->dev_data.nfc_data.uid_len = 4; - mf_type = MfClassicTypeMini; - correct_index = true; - } - if(correct_index) { - nfc->generator = &ganeator_gag; - scene_manager_set_scene_state(nfc->scene_manager, NfcSceneSetTypeMfUid, mf_type); - scene_manager_next_scene(nfc->scene_manager, NfcSceneSetUid); - consumed = true; - } - } - return consumed; -} - -void nfc_scene_set_type_mf_uid_on_exit(void* context) { - Nfc* nfc = context; - - submenu_reset(nfc->submenu); -} diff --git a/applications/main/nfc/scenes/nfc_scene_set_uid.c b/applications/main/nfc/scenes/nfc_scene_set_uid.c index 3ccecba92..df8a4dc72 100644 --- a/applications/main/nfc/scenes/nfc_scene_set_uid.c +++ b/applications/main/nfc/scenes/nfc_scene_set_uid.c @@ -44,21 +44,6 @@ bool nfc_scene_set_uid_on_event(void* context, SceneManagerEvent event) { scene_manager_next_scene(instance->scene_manager, NfcSceneSaveSuccess); consumed = true; } - } else if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneSetTypeMfUid)) { - MfClassicType mf_type = - scene_manager_get_scene_state(nfc->scene_manager, NfcSceneSetTypeMfUid); - if(mf_type > MfClassicTypeMini) { - furi_crash("Nfc unknown type"); - } - nfc_generate_mf_classic_ext( - &nfc->dev->dev_data, - nfc->dev_edit_data.uid_len, - mf_type, - false, - nfc->dev_edit_data.uid); - scene_manager_next_scene(nfc->scene_manager, NfcSceneGenerateInfo); - consumed = true; - } else { scene_manager_next_scene(instance->scene_manager, NfcSceneSaveName); consumed = true;