Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-27 01:58:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'flipperdevices:dev' into 420

Browse Source
This commit is contained in:
RogueMaster
2022-12-19 15:50:52 -05:00
committed by GitHub
parent 1e17516304 fa87216a1e
commit 84c2161a6a
6 changed files with 53 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/plugins/nfc_magic/nfc_magic.c
+1
View File
@@ -49,6 +49,7 @@ NfcMagic* nfc_magic_alloc() {
// Nfc device
nfc_magic->nfc_dev = nfc_device_alloc();
furi_string_set(nfc_magic->nfc_dev->folder, NFC_APP_FOLDER);
// Open GUI record
nfc_magic->gui = furi_record_open(RECORD_GUI);
applications/plugins/nfc_magic/nfc_magic_i.h
+2
View File
@@ -27,6 +27,8 @@
#include <lib/nfc/nfc_device.h>
#include "NFC_Magic_icons.h"
#define NFC_APP_FOLDER ANY_PATH("nfc")
enum NfcMagicCustomEvent {
// Reserve first 100 events for button types and indexes, starting from 0
NfcMagicCustomEventReserved = 100,