diff --git a/.catalog/README.md b/.catalog/README.md deleted file mode 100644 index 000498e2e62..00000000000 --- a/.catalog/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# NFC Magic - -This application allows you to check whether your NFC card is Magic, write data to Magic cards, and restore them to their original state. - -## What's a "Magic" Card? - -A Magic card is a card that allows you to change its UID. Generally, NFC cards have a UID pre-programmed at the factory, and it cannot be changed. However, some cards have a special backdoor feature that allows you to change the UID. These cards are called Magic cards. - -## Supported Cards - -Currently, not all Magic cards are supported. The following cards are supported: - -* Mifare Classic 1K/4K Gen1A/Gen1B (including OTP versions) -* Ultimate Magic Card (Gen4 GTU) - -For the Gen4 cards, both the Ultralight and the Classic modes are supported, with the ability to select a custom password. - -The following cards are currently not supported: - -* Mifare Classic 1K/4K Gen2 (DirectWrite/CUID/FUID/UFUID) -* Mifare Classic 1K/4K Gen3 (APDU) -* Mifare Classic Magic Gen4 (GDM) -* Supercard (Gen1 and Gen2) -* Mifare Ultralight Gen1A/Gen1B (including OTP versions) -* Mifare Ultralight DirectWrite -* Mifare Ultralight EV1 DirectWrite -* Mifare Ultralight C Gen1 -* Mifare Ultralight C DirectWrite -* NTAG (all versions) -* DESFire (all versions) -* NFC-V/ISO15693 Magic Cards (all versions) diff --git a/.catalog/screenshots/1.png b/.catalog/screenshots/1.png deleted file mode 100644 index 6b16e1b1298..00000000000 Binary files a/.catalog/screenshots/1.png and /dev/null differ diff --git a/.catalog/screenshots/2.png b/.catalog/screenshots/2.png deleted file mode 100644 index 9bb578f3e10..00000000000 Binary files a/.catalog/screenshots/2.png and /dev/null differ diff --git a/Nfc_10px.png b/Nfc_10px.png new file mode 100644 index 00000000000..6bc027111a7 Binary files /dev/null and b/Nfc_10px.png differ diff --git a/application.fam b/application.fam index cb89e71dfc9..83a148f21b5 100644 --- a/application.fam +++ b/application.fam @@ -1,6 +1,6 @@ App( appid="nfc_magic", - name="Nfc Magic", + name="NFC Magic", apptype=FlipperAppType.EXTERNAL, targets=["f7"], entry_point="nfc_magic_app", @@ -9,9 +9,8 @@ App( "gui", ], stack_size=4 * 1024, - fap_description="Application for writing to NFC tags with modifiable sector 0", - fap_version="1.0", - fap_icon="assets/125_10px.png", + order=30, + fap_icon="Nfc_10px.png", fap_category="NFC", fap_private_libs=[ Lib( diff --git a/nfc_magic_worker.c b/nfc_magic_worker.c index 17cca765987..fefb2792428 100644 --- a/nfc_magic_worker.c +++ b/nfc_magic_worker.c @@ -55,6 +55,9 @@ void nfc_magic_worker_start( furi_assert(magic_dev); furi_assert(dev_data); + furi_hal_nfc_deinit(); + furi_hal_nfc_init(); + nfc_magic_worker->callback = callback; nfc_magic_worker->context = context; nfc_magic_worker->magic_dev = magic_dev;