From 16df48bac6f09cf56a47109886c30ee6662131a4 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Thu, 9 Mar 2023 01:23:57 +0300
Subject: [PATCH 1/3] Fix external module power disable

---
 firmware/targets/f7/furi_hal/furi_hal_subghz.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firmware/targets/f7/furi_hal/furi_hal_subghz.c b/firmware/targets/f7/furi_hal/furi_hal_subghz.c
index 50503530d..fcec64023 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_subghz.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_subghz.c
@@ -91,7 +91,7 @@ bool furi_hal_subghz_enable_ext_power(void) {
 }
 
 void furi_hal_subghz_disable_ext_power(void) {
-    if(furi_hal_subghz.radio_type != SubGhzRadioInternal) {
+    if(furi_hal_power_is_otg_enabled()) {
         furi_hal_power_disable_otg();
     }
 }

From 7a413f390deda5088f36d5edba5f3cfb243b6bf4 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Thu, 9 Mar 2023 02:18:51 +0300
Subject: [PATCH 2/3] NFC Magic fix - reinit nfc at start

---
 applications/plugins/nfc_magic/nfc_magic_worker.c | 3 +++
 firmware/targets/f7/api_symbols.csv               | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/applications/plugins/nfc_magic/nfc_magic_worker.c b/applications/plugins/nfc_magic/nfc_magic_worker.c
index 523c794f7..32202f12d 100644
--- a/applications/plugins/nfc_magic/nfc_magic_worker.c
+++ b/applications/plugins/nfc_magic/nfc_magic_worker.c
@@ -49,6 +49,9 @@ void nfc_magic_worker_start(
     furi_assert(nfc_magic_worker);
     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->dev_data = dev_data;
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index 8ff7b0caa..fe9a09c56 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -1195,13 +1195,13 @@ Function,+,furi_hal_mpu_protect_disable,void,FuriHalMpuRegion
 Function,+,furi_hal_mpu_protect_no_access,void,"FuriHalMpuRegion, uint32_t, FuriHalMPURegionSize"
 Function,+,furi_hal_mpu_protect_read_only,void,"FuriHalMpuRegion, uint32_t, FuriHalMPURegionSize"
 Function,+,furi_hal_nfc_activate_nfca,_Bool,"uint32_t, uint32_t*"
-Function,-,furi_hal_nfc_deinit,void,
+Function,+,furi_hal_nfc_deinit,void,
 Function,+,furi_hal_nfc_detect,_Bool,"FuriHalNfcDevData*, uint32_t"
 Function,+,furi_hal_nfc_emulate_nfca,_Bool,"uint8_t*, uint8_t, uint8_t*, uint8_t, FuriHalNfcEmulateCallback, void*, uint32_t"
 Function,+,furi_hal_nfc_exit_sleep,void,
 Function,+,furi_hal_nfc_field_off,void,
 Function,+,furi_hal_nfc_field_on,void,
-Function,-,furi_hal_nfc_init,void,
+Function,+,furi_hal_nfc_init,void,
 Function,+,furi_hal_nfc_is_busy,_Bool,
 Function,+,furi_hal_nfc_is_init,_Bool,
 Function,+,furi_hal_nfc_listen,_Bool,"uint8_t*, uint8_t, uint8_t*, uint8_t, _Bool, uint32_t"

From b0af6f4b53c8052ee0a8dc47c78451b00567d677 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Thu, 9 Mar 2023 02:39:40 +0300
Subject: [PATCH 3/3] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c73628d13..f55ad7fb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * SubGHz: Fix default frequency being overwritten bug (Add manually fixes)
 * SubGHz: Fix 464Mhz and (390MHz for external module only) was showing up in Frequency analyzer all the time due to noise
 * iButton: Fix ibutton app - add manually - duplicate names
+* Plugins: NFC Magic fix - reinit nfc at app start
 * Plugins: Update **SWD Probe** [(by g3gg0)](https://github.com/g3gg0/flipper-swd_probe)
 * Plugins: Massive plugins refactoring - not full refactoring, only small issues is fixed and moved all plugins to furi mutex instead of valuemutex
 * Plugins: Many small issues was found and fixed due mutex upgrade