DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-12-26 14:51:52 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Change MIFARE name accroding to new requirements"

Browse Source 
This reverts commit cfb974dc1f.
This commit is contained in:
RebornedBrain 2024-01-12 18:11:48 +03:00
parent 6103de1754
commit 22aba527b7
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/nfc/helpers/mf_classic_key_cache.c
View File

@ -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)) ff, mf_classic_key_cache_file_header, mf_classic_key_cache_file_version))
break; break;
if(!flipper_format_write_string_cstr( 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; 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 A map", &data->key_a_mask, 1)) break;
if(!flipper_format_write_hex_uint64(ff, "Key B map", &data->key_b_mask, 1)) break; if(!flipper_format_write_hex_uint64(ff, "Key B map", &data->key_b_mask, 1)) break;

2
applications/main/nfc/scenes/nfc_scene_extra_actions.c
View File

@ -24,7 +24,7 @@ void nfc_scene_extra_actions_on_enter(void* context) {
instance); instance);
submenu_add_item( submenu_add_item(
submenu, submenu,
"MIFARE Classic Keys", "Mifare Classic Keys",
SubmenuIndexMfClassicKeys, SubmenuIndexMfClassicKeys,
nfc_scene_extra_actions_submenu_callback, nfc_scene_extra_actions_submenu_callback,
instance); instance);

12
lib/nfc/protocols/mf_classic/mf_classic.c
View File

@ -21,21 +21,21 @@ static const MfClassicFeatures mf_classic_features[MfClassicTypeNum] = {
{ {
.sectors_total = 5, .sectors_total = 5,
.blocks_total = 20, .blocks_total = 20,
.full_name = "MIFARE Classic Mini 0.3K", .full_name = "Mifare Classic Mini 0.3K",
.type_name = "MINI", .type_name = "MINI",
}, },
[MfClassicType1k] = [MfClassicType1k] =
{ {
.sectors_total = 16, .sectors_total = 16,
.blocks_total = 64, .blocks_total = 64,
.full_name = "MIFARE Classic 1K", .full_name = "Mifare Classic 1K",
.type_name = "1K", .type_name = "1K",
}, },
[MfClassicType4k] = [MfClassicType4k] =
{ {
.sectors_total = 40, .sectors_total = 40,
.blocks_total = 256, .blocks_total = 256,
.full_name = "MIFARE Classic 4K", .full_name = "Mifare Classic 4K",
.type_name = "4K", .type_name = "4K",
}, },
}; };
@ -261,15 +261,15 @@ bool mf_classic_save(const MfClassicData* data, FlipperFormat* ff) {
do { do {
if(!iso14443_3a_save(data->iso14443_3a_data, ff)) break; 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( 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; break;
if(!flipper_format_write_uint32( if(!flipper_format_write_uint32(
ff, "Data format version", &mf_classic_data_format_version, 1)) ff, "Data format version", &mf_classic_data_format_version, 1))
break; break;
if(!flipper_format_write_comment_cstr( if(!flipper_format_write_comment_cstr(
ff, "MIFARE Classic blocks, \'??\' means unknown data")) ff, "Mifare Classic blocks, \'??\' means unknown data"))
break; break;
uint16_t blocks_total = mf_classic_get_total_block_num(data->type); uint16_t blocks_total = mf_classic_get_total_block_num(data->type);