Squashed 'nfc_magic/' changes from 7b8f2688e..58ffc023f

58ffc023f upd nfc magic
b0d9f7ff9 fix icon
6b4b1fb13 move base pack here
REVERT: 7b8f2688e Updated Gen4 Fast-Configuration command (#55)
REVERT: e7b96d220 Added fap_version field to all apps (#15)
REVERT: df11adb9f Add descriptions for all the faps (#13)
REVERT: e6f45b71f Manifest cleanup
REVERT: 2191e146a Added app descriptions (#8)
REVERT: f09316b7c Screenshots for app catalog (#6)
REVERT: 576b13c29 nfc_magic: fix icon dependency (#5)
REVERT: 11d98ac5d Move apps from flipperzero firmware into separate repository

git-subtree-dir: nfc_magic
git-subtree-split: 58ffc023f1237050d168df82b1a1de7394662b7b

.catalog/README.md

@@ -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)

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(

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;