소스 검색

Merge nfc_magic from https://github.com/xMasterX/all-the-plugins

# Conflicts:
#	nfc_magic/scenes/nfc_magic_scene_gen4_set_direct_write_block_0_mode.c
#	nfc_magic/scenes/nfc_magic_scene_gen4_set_shd_mode.c
Willy-JL 2 년 전
부모
커밋
33b1bc02a0
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      nfc_magic/scenes/nfc_magic_scene_gen4_set_direct_write_block_0_mode.c
  2. 1 1
      nfc_magic/scenes/nfc_magic_scene_gen4_set_shd_mode.c

+ 1 - 1
nfc_magic/scenes/nfc_magic_scene_gen4_set_direct_write_block_0_mode.c

@@ -1,5 +1,5 @@
 #include "../nfc_magic_app_i.h"
-#include "lib/magic/protocols/gen4/gen4_poller_i.h"
+#include "../lib/magic/protocols/gen4/gen4_poller_i.h"
 
 enum {
     NfcMagicSceneGen4SetDirectWriteBlock0ModeStateCardSearch,

+ 1 - 1
nfc_magic/scenes/nfc_magic_scene_gen4_set_shd_mode.c

@@ -1,5 +1,5 @@
 #include "../nfc_magic_app_i.h"
-#include "lib/magic/protocols/gen4/gen4_poller_i.h"
+#include "../lib/magic/protocols/gen4/gen4_poller_i.h"
 
 enum {
     NfcMagicSceneGen4SetShadowModeStateCardSearch,