Squashed 'nfc_magic/' changes from 7b8f268..58ffc02

58ffc02 upd nfc magic b0d9f7f fix icon 6b4b1fb move base pack here REVERT: 7b8f268 Updated Gen4 Fast-Configuration command (#55) REVERT: e7b96d2 Added fap_version field to all apps (#15) REVERT: df11adb Add descriptions for all the faps (#13) REVERT: e6f45b7 Manifest cleanup REVERT: 2191e14 Added app descriptions (#8) REVERT: f09316b Screenshots for app catalog (#6) REVERT: 576b13c nfc_magic: fix icon dependency (#5) REVERT: 11d98ac Move apps from flipperzero firmware into separate repository git-subtree-dir: nfc_magic git-subtree-split: 58ffc02
RogueMaster · Nov 12, 2023 · e43df8d · e43df8d
1 parent 7b8f268
commit e43df8d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 35 deletions.
diff --git a/.catalog/README.md b/.catalog/README.md
diff --git a/.catalog/screenshots/1.png b/.catalog/screenshots/1.png
diff --git a/.catalog/screenshots/2.png b/.catalog/screenshots/2.png
diff --git a/Nfc_10px.png b/Nfc_10px.png
diff --git 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
@@ -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;