From cfb974dc1f5bff1d46a0483741b2b8f4726cdda3 Mon Sep 17 00:00:00 2001 From: RebornedBrain Date: Wed, 10 Jan 2024 19:23:34 +0300 Subject: [PATCH] Change MIFARE name accroding to new requirements --- .../main/nfc/helpers/mf_classic_key_cache.c | 2 +- .../main/nfc/scenes/nfc_scene_extra_actions.c | 2 +- lib/nfc/helpers/nfc_data_generator.c | 20 +++++++++---------- lib/nfc/protocols/mf_classic/mf_classic.c | 12 +++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/applications/main/nfc/helpers/mf_classic_key_cache.c b/applications/main/nfc/helpers/mf_classic_key_cache.c index 5127e645209..b28095110bd 100644 --- a/applications/main/nfc/helpers/mf_classic_key_cache.c +++ b/applications/main/nfc/helpers/mf_classic_key_cache.c @@ -58,7 +58,7 @@ bool mf_classic_key_cache_save(MfClassicKeyCache* instance, const MfClassicData* ff, mf_classic_key_cache_file_header, mf_classic_key_cache_file_version)) break; if(!flipper_format_write_string_cstr( - ff, "Mifare Classic type", mf_classic_get_device_name(data, NfcDeviceNameTypeShort))) + ff, "MIFARE Classic type", mf_classic_get_device_name(data, NfcDeviceNameTypeShort))) break; if(!flipper_format_write_hex_uint64(ff, "Key A map", &data->key_a_mask, 1)) break; if(!flipper_format_write_hex_uint64(ff, "Key B map", &data->key_b_mask, 1)) break; diff --git a/applications/main/nfc/scenes/nfc_scene_extra_actions.c b/applications/main/nfc/scenes/nfc_scene_extra_actions.c index 721919d2b1a..d14f80b6247 100644 --- a/applications/main/nfc/scenes/nfc_scene_extra_actions.c +++ b/applications/main/nfc/scenes/nfc_scene_extra_actions.c @@ -24,7 +24,7 @@ void nfc_scene_extra_actions_on_enter(void* context) { instance); submenu_add_item( submenu, - "Mifare Classic Keys", + "MIFARE Classic Keys", SubmenuIndexMfClassicKeys, nfc_scene_extra_actions_submenu_callback, instance); diff --git a/lib/nfc/helpers/nfc_data_generator.c b/lib/nfc/helpers/nfc_data_generator.c index 21f062605b6..0fb7062ff16 100644 --- a/lib/nfc/helpers/nfc_data_generator.c +++ b/lib/nfc/helpers/nfc_data_generator.c @@ -482,27 +482,27 @@ static void nfc_generate_mf_classic_4k_7b_uid(NfcDevice* nfc_device) { static const NfcDataGenerator nfc_data_generator[NfcDataGeneratorTypeNum] = { [NfcDataGeneratorTypeMfUltralight] = { - .name = "Mifare Ultralight", + .name = "MIFARE Ultralight", .handler = nfc_generate_mf_ul_orig, }, [NfcDataGeneratorTypeMfUltralightEV1_11] = { - .name = "Mifare Ultralight EV1 11", + .name = "MIFARE Ultralight EV1 11", .handler = nfc_generate_mf_ul_11, }, [NfcDataGeneratorTypeMfUltralightEV1_H11] = { - .name = "Mifare Ultralight EV1 H11", + .name = "MIFARE Ultralight EV1 H11", .handler = nfc_generate_mf_ul_h11, }, [NfcDataGeneratorTypeMfUltralightEV1_21] = { - .name = "Mifare Ultralight EV1 21", + .name = "MIFARE Ultralight EV1 21", .handler = nfc_generate_mf_ul_21, }, [NfcDataGeneratorTypeMfUltralightEV1_H21] = { - .name = "Mifare Ultralight EV1 H21", + .name = "MIFARE Ultralight EV1 H21", .handler = nfc_generate_mf_ul_h21, }, [NfcDataGeneratorTypeNTAG203] = @@ -547,27 +547,27 @@ static const NfcDataGenerator nfc_data_generator[NfcDataGeneratorTypeNum] = { }, [NfcDataGeneratorTypeMfClassicMini] = { - .name = "Mifare Mini", + .name = "MIFARE Mini", .handler = nfc_generate_mf_classic_mini, }, [NfcDataGeneratorTypeMfClassic1k_4b] = { - .name = "Mifare Classic 1k 4byte UID", + .name = "MIFARE Classic 1k 4byte UID", .handler = nfc_generate_mf_classic_1k_4b_uid, }, [NfcDataGeneratorTypeMfClassic1k_7b] = { - .name = "Mifare Classic 1k 7byte UID", + .name = "MIFARE Classic 1k 7byte UID", .handler = nfc_generate_mf_classic_1k_7b_uid, }, [NfcDataGeneratorTypeMfClassic4k_4b] = { - .name = "Mifare Classic 4k 4byte UID", + .name = "MIFARE Classic 4k 4byte UID", .handler = nfc_generate_mf_classic_4k_4b_uid, }, [NfcDataGeneratorTypeMfClassic4k_7b] = { - .name = "Mifare Classic 4k 7byte UID", + .name = "MIFARE Classic 4k 7byte UID", .handler = nfc_generate_mf_classic_4k_7b_uid, }, }; diff --git a/lib/nfc/protocols/mf_classic/mf_classic.c b/lib/nfc/protocols/mf_classic/mf_classic.c index e68e8c71872..e9dfb28f4a8 100644 --- a/lib/nfc/protocols/mf_classic/mf_classic.c +++ b/lib/nfc/protocols/mf_classic/mf_classic.c @@ -21,21 +21,21 @@ static const MfClassicFeatures mf_classic_features[MfClassicTypeNum] = { { .sectors_total = 5, .blocks_total = 20, - .full_name = "Mifare Classic Mini 0.3K", + .full_name = "MIFARE Classic Mini 0.3K", .type_name = "MINI", }, [MfClassicType1k] = { .sectors_total = 16, .blocks_total = 64, - .full_name = "Mifare Classic 1K", + .full_name = "MIFARE Classic 1K", .type_name = "1K", }, [MfClassicType4k] = { .sectors_total = 40, .blocks_total = 256, - .full_name = "Mifare Classic 4K", + .full_name = "MIFARE Classic 4K", .type_name = "4K", }, }; @@ -261,15 +261,15 @@ bool mf_classic_save(const MfClassicData* data, FlipperFormat* ff) { do { if(!iso14443_3a_save(data->iso14443_3a_data, ff)) break; - if(!flipper_format_write_comment_cstr(ff, "Mifare Classic specific data")) break; + if(!flipper_format_write_comment_cstr(ff, "MIFARE Classic specific data")) break; if(!flipper_format_write_string_cstr( - ff, "Mifare Classic type", mf_classic_features[data->type].type_name)) + ff, "MIFARE Classic type", mf_classic_features[data->type].type_name)) break; if(!flipper_format_write_uint32( ff, "Data format version", &mf_classic_data_format_version, 1)) break; if(!flipper_format_write_comment_cstr( - ff, "Mifare Classic blocks, \'??\' means unknown data")) + ff, "MIFARE Classic blocks, \'??\' means unknown data")) break; uint16_t blocks_total = mf_classic_get_total_block_num(data->type);