1
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 12:42:30 +04:00

[FL-2970] Untangle NFC_APP_FOLDER from nfc_device (#2124)

* Untangle NFC_APP_FOLDER from nfc_device
* Make the folder an internal part of the nfc device struct
* Move the NFC folder definition to the nfc allocator
* Move the NFC folder definition to the allocator in the nfc magic FAP
* Replace furi_string_printf with furi_string_set for folder allocation and handle the cases when folder has no slashes
* Build and allocation fixes

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Astra
2022-12-19 21:57:48 +02:00
committed by GitHub
parent a81a5ca57c
commit fa87216a1e
6 changed files with 53 additions and 12 deletions

View File

@@ -20,7 +20,6 @@ extern "C" {
#define NFC_READER_DATA_MAX_SIZE 64
#define NFC_DICT_KEY_BATCH_SIZE 50
#define NFC_APP_FOLDER ANY_PATH("nfc")
#define NFC_APP_EXTENSION ".nfc"
#define NFC_APP_SHADOW_EXTENSION ".shd"
@@ -84,6 +83,7 @@ typedef struct {
NfcDeviceData dev_data;
char dev_name[NFC_DEV_NAME_MAX_LEN + 1];
FuriString* load_path;
FuriString* folder;
NfcDeviceSaveFormat format;
bool shadow_file_exist;