Index: NFC/YC5018/prj/MDK/Objects/YC3121_Keil.axf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: NFC/YC5018/prj/MDK/Objects/YC3121_Keil.axf
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: NFC/YC5018/prj/MDK/Objects/YC3121_Keil.build_log.htm
===================================================================
--- /YC3121_demo/ModuleDemo/NFC/YC5018/prj/MDK/Objects/YC3121_Keil.build_log.htm (revision 570)
+++ /YC3121_demo/ModuleDemo/NFC/YC5018/prj/MDK/Objects/YC3121_Keil.build_log.htm (nonexistent)
@@ -1,12 +0,0 @@
-
-
-
-礦ision Build Log
-Project:
-C:\Users\LX\Desktop\天喻\2019 12-25\ModuleDemo\NFC\YC5018\prj\MDK\YC3121_Keil.uvprojx
-Project File Date: 12/16/2019
-
-Output:
-
-
-
Index: NFC/YC5018/prj/MDK/YC3121_Keil.uvoptx
===================================================================
--- /YC3121_demo/ModuleDemo/NFC/YC5018/prj/MDK/YC3121_Keil.uvoptx (revision 570)
+++ /YC3121_demo/ModuleDemo/NFC/YC5018/prj/MDK/YC3121_Keil.uvoptx (working copy)
@@ -13,6 +13,7 @@
*.txt; *.h; *.inc
*.plm
*.cpp
+ 0
@@ -31,6 +32,7 @@
1
0
1
+ 0
1
@@ -75,7 +77,7 @@
0
1
- 0
+ 7
0
1
@@ -96,10 +98,12 @@
1
1
1
- 1
0
0
- 6
+ 1
+ 0
+ 0
+ 4
@@ -109,7 +113,7 @@
-
+ ..\..\..\..\..\ConfigFiles\MDK\flash.ini
Segger\JL2CM3.dll
@@ -141,7 +145,7 @@
0
JL2CM3
- -U4294967295 -O78 -S1 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO31 -FD20000 -FCA000 -FN1 -FF0YC3121 -FS01000000 -FL080000
+ -U4294967295 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO31 -FD20000 -FCA000 -FN1 -FF0YC3121 -FS01000000 -FL080000
0
@@ -181,6 +185,17 @@
+ 0
+ 0
+ 0
+
+
+
+
+
+
+
+
@@ -195,7 +210,6 @@
1
1
0
- 1
0
0
..\..\..\..\..\Librarier\core\misc.c
@@ -208,20 +222,6 @@
2
1
0
- 1
- 0
- 0
- ..\..\..\..\..\Librarier\core\rom_main.c
- rom_main.c
- 0
- 0
-
-
- 1
- 3
- 1
- 0
- 1
0
0
..\..\..\..\..\Librarier\core\system.c
@@ -239,10 +239,9 @@
0
2
- 4
+ 3
1
0
- 1
0
0
..\..\user\main.c
@@ -252,10 +251,9 @@
2
- 5
+ 4
1
0
- 1
0
0
..\..\user\bt_code.c
@@ -273,10 +271,9 @@
0
3
- 6
+ 5
1
0
- 1
0
0
..\..\..\..\..\Librarier\sdk\yc_gpio.c
@@ -286,10 +283,9 @@
3
- 7
+ 6
1
0
- 1
0
0
..\..\..\..\..\Librarier\sdk\yc_uart.c
@@ -299,10 +295,9 @@
3
- 8
+ 7
1
0
- 1
0
0
..\..\..\..\..\Librarier\sdk\yc_spi.c
@@ -312,10 +307,9 @@
3
- 9
+ 8
1
0
- 0
0
0
..\..\..\..\..\Librarier\sdk\yc_systick.c
@@ -325,10 +319,9 @@
3
- 10
+ 9
1
0
- 0
0
0
..\..\..\..\..\Librarier\sdk\yc_timer.c
@@ -338,10 +331,9 @@
3
- 11
+ 10
1
0
- 0
0
0
..\..\..\..\..\Librarier\sdk\yc_ipc.c
@@ -351,10 +343,9 @@
3
- 12
+ 11
1
0
- 0
0
0
..\..\..\..\..\Librarier\sdk\yc_bt.c
@@ -372,10 +363,9 @@
0
4
- 13
+ 12
2
0
- 1
0
0
..\..\..\..\..\Librarier\startup\flash_start.s
@@ -385,10 +375,9 @@
4
- 14
+ 13
2
0
- 1
0
0
..\..\..\..\..\Librarier\startup\startup.s
@@ -406,10 +395,9 @@
0
5
- 15
+ 14
1
0
- 0
0
0
..\..\..\..\..\Librarier\sdk\yc_nfc\yc_nfc_common.c
@@ -419,10 +407,9 @@
5
- 16
+ 15
1
0
- 0
0
0
..\..\..\..\..\Librarier\sdk\yc_nfc\yc_emv_contactless_l1.c
Index: NFC/YC5018/prj/MDK/YC3121_Keil.uvprojx
===================================================================
--- /YC3121_demo/ModuleDemo/NFC/YC5018/prj/MDK/YC3121_Keil.uvprojx (revision 570)
+++ /YC3121_demo/ModuleDemo/NFC/YC5018/prj/MDK/YC3121_Keil.uvprojx (working copy)
@@ -10,11 +10,13 @@
YC3121
0x4
ARM-ADS
+ 5060750::V5.06 update 6 (build 750)::ARMCC
+ 0
ARMCM0
ARM
- ARM.CMSIS.4.1.0
+ ARM.CMSIS.5.5.1
http://www.keil.com/pack/
IRAM(0x20000000,0x00020000) IROM(0x00000000,0x00040000) CPUTYPE("Cortex-M0") CLOCK(12000000) ESEL ELITTLE
@@ -84,6 +86,8 @@
0
0
+ 0
+ 0
0
@@ -122,48 +126,6 @@
0
16
-
- 0
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 0
- 1
-
-
- 1
- 1
- 1
- 1
- 1
- 1
- 0
- 1
- 1
- 1
- 1
-
- 0
- 6
-
-
-
-
-
-
-
-
-
-
-
-
-
- Segger\JL2CM3.dll
-
@@ -228,6 +190,7 @@
1
1
0
+ 0
3
3
0
@@ -348,7 +311,7 @@
1
- 1
+ 3
0
0
0
@@ -357,16 +320,24 @@
0
0
0
- 1
+ 2
0
0
1
+ 0
0
+ 1
+ 1
+ 1
+ 1
+ 0
+ 0
+ 0
--c99
__USEKEILCOMPILE__
- ..\..\..\..\..\Librarier\core;..\..\..\..\..\Librarier\sdk;..\..\..\..\..\Librarier\sdk\yc_nfc
+ ..\..\..\..\..\Librarier\core;..\..\..\..\..\Librarier\sdk;..\..\..\..\..\Librarier\sdk\yc_nfc;..\..\user
@@ -379,6 +350,7 @@
0
0
0
+ 0
@@ -415,11 +387,6 @@
..\..\..\..\..\Librarier\core\misc.c
- rom_main.c
- 1
- ..\..\..\..\..\Librarier\core\rom_main.c
-
-
system.c
1
..\..\..\..\..\Librarier\core\system.c
@@ -515,4 +482,10 @@
+
+
+
+
+
+
Index: NFC/YC5018/user/bt_code.h
===================================================================
--- /YC3121_demo/ModuleDemo/NFC/YC5018/user/bt_code.h (revision 570)
+++ /YC3121_demo/ModuleDemo/NFC/YC5018/user/bt_code.h (working copy)
@@ -1 +1 @@
-extern const unsigned char bt_code[];
\ No newline at end of file
+extern const unsigned char bt_code[];
Index: NFC/YC5018/user/bt_code.c
===================================================================
--- /YC3121_demo/ModuleDemo/NFC/YC5018/user/bt_code.c (revision 570)
+++ /YC3121_demo/ModuleDemo/NFC/YC5018/user/bt_code.c (working copy)
@@ -1,84 +1,64 @@
const unsigned char bt_code[] = {
-0x00,0x02,0xaa,0x55,0x7a,0x03,0xc0,0x42,0x80,0x19,0xc0,0x43,0x00,0x1b,0xc0,0x43,
-0x80,0x1f,0xc0,0x44,0x00,0x1d,0xc0,0x44,0x80,0x28,0xc0,0x45,0x00,0x2d,0xc0,0x02,
-0x00,0x0d,0xc0,0x03,0x00,0x08,0x20,0x40,0x57,0xaf,0x24,0x36,0xd8,0xa5,0x20,0x40,
-0x00,0xb5,0x20,0x40,0x49,0x36,0x20,0x20,0x58,0xa6,0x09,0x80,0x00,0x18,0x78,0x28,
-0x7c,0x00,0xdb,0x60,0x06,0x64,0x1f,0xef,0x7e,0x00,0x1f,0xf1,0x7e,0x00,0xe7,0xe6,
-0x00,0x05,0x20,0x23,0x46,0x49,0x78,0x36,0xfc,0x00,0x6f,0xe2,0x00,0x17,0x1f,0xe0,
-0x84,0x00,0x20,0x40,0x00,0xb9,0x20,0x20,0x58,0x97,0x20,0x40,0x00,0xb1,0x20,0x20,
-0x48,0xf6,0x20,0x40,0x00,0xb3,0x20,0x20,0x49,0x16,0x20,0x40,0x00,0xb7,0x20,0x20,
-0x49,0x22,0x60,0x42,0x00,0x17,0x20,0x20,0x00,0xbb,0x20,0x40,0x00,0xbb,0xda,0x20,
-0x89,0x60,0x20,0x40,0x00,0xa7,0xda,0x20,0x00,0x10,0x20,0x40,0x00,0xa7,0xda,0x20,
-0x00,0x00,0x20,0x20,0x00,0xd6,0x60,0x42,0x00,0x17,0x20,0x40,0x00,0xb9,0x58,0x00,
-0x03,0x84,0x20,0x40,0x4a,0x8e,0x20,0x20,0x49,0x36,0x70,0x89,0x07,0xff,0x70,0x80,
-0x42,0x05,0x20,0x00,0x03,0xe8,0x6f,0xe2,0x4f,0xef,0x24,0x7a,0x00,0x00,0x70,0x4f,
-0xef,0x01,0x70,0x89,0x4e,0xc2,0x70,0x89,0x4e,0xc0,0x20,0x40,0x00,0xca,0xc0,0x81,
-0x00,0x43,0x20,0x00,0x75,0x30,0x20,0x40,0x00,0xca,0xc0,0x81,0x00,0x43,0x20,0x00,
-0x27,0x10,0xda,0x20,0x89,0x56,0xda,0x40,0x00,0xf0,0x20,0x40,0x00,0xd1,0xda,0x20,
-0x89,0x55,0x20,0x40,0x00,0xa7,0xda,0x20,0x00,0x00,0x20,0x40,0x00,0xd6,0x20,0x60,
-0x00,0x00,0x20,0x20,0x00,0x43,0x20,0x40,0x00,0x46,0x20,0x20,0x48,0xf5,0x20,0x40,
-0x00,0x6e,0x20,0x40,0x00,0x77,0x79,0x20,0x2a,0x00,0x78,0x46,0xfc,0x00,0x78,0x2e,
-0xfc,0x00,0x78,0x30,0x7c,0x00,0x78,0x50,0xfc,0x00,0x19,0x31,0x7e,0x00,0x1f,0xec,
-0xfe,0x00,0x1f,0xf1,0xfe,0x00,0x08,0x00,0x86,0x28,0x78,0x24,0xfc,0x00,0x6f,0xe2,
-0x43,0xae,0x08,0x00,0x86,0x08,0xef,0xe2,0x00,0x06,0x1f,0xe1,0x72,0x3f,0x08,0x00,
-0x86,0x08,0x20,0x22,0x80,0x5b,0xef,0xe2,0x00,0x06,0x08,0x00,0x86,0x08,0xc2,0x00,
-0x00,0x58,0x78,0x24,0x7c,0x00,0x08,0x00,0x86,0x18,0x78,0x44,0x7c,0x00,0x37,0xd3,
-0x82,0x00,0x20,0x00,0x00,0x64,0x20,0x60,0x00,0x00,0x78,0x3b,0x7c,0x00,0x70,0x89,
-0x14,0x07,0x20,0x60,0x00,0x00,0x78,0x5b,0x7c,0x00,0x70,0x89,0x14,0x03,0x20,0x60,
-0x00,0x00,0x58,0x71,0x76,0x41,0x1f,0xed,0x7e,0x00,0x1f,0xe1,0xfe,0x29,0x98,0x00,
-0x12,0x00,0x58,0x55,0x55,0x55,0x67,0xe6,0x04,0x63,0x20,0x60,0x00,0x00,0x78,0x44,
-0xfc,0x00,0x78,0x43,0xfc,0x00,0x6f,0xe6,0x04,0x63,0x98,0x00,0x1e,0x00,0x6f,0xe2,
-0x00,0x16,0x1f,0xed,0x84,0x00,0x79,0x20,0x04,0x01,0x18,0x43,0x1c,0x00,0x20,0x60,
-0x00,0x00,0x20,0x40,0x00,0x7c,0x20,0x20,0x49,0x30,0x20,0x40,0x00,0x7c,0x20,0x40,
-0x49,0x1c,0x20,0x20,0x49,0x21,0x20,0x40,0x49,0x15,0x6f,0xe2,0x00,0x16,0x1f,0xe3,
-0x84,0x00,0x20,0x60,0x00,0x00,0x20,0x40,0x00,0x79,0x20,0x40,0x00,0x6e,0x78,0x56,
-0xfc,0x00,0x78,0x26,0xfc,0x00,0x78,0x4e,0xfc,0x00,0x78,0x30,0xfc,0x00,0x78,0x50,
-0x7c,0x00,0x19,0x62,0x36,0x00,0x37,0xc1,0x84,0x00,0x24,0x2c,0x48,0xf5,0x1b,0x42,
-0x04,0x00,0xdd,0x20,0x01,0xe0,0x1c,0x22,0x50,0x00,0x78,0x24,0xfc,0x00,0x09,0x80,
-0x00,0x08,0x19,0x89,0x7e,0x00,0x67,0xe2,0x02,0xd5,0x09,0x80,0x00,0x08,0x19,0x89,
-0x7e,0x00,0xe7,0xe2,0x00,0x05,0x1f,0xe1,0x72,0x3f,0x20,0x22,0x80,0x9a,0x09,0x80,
-0x00,0x08,0x19,0x89,0x7e,0x00,0xe7,0xe2,0x00,0x05,0xc2,0x00,0x00,0x96,0x09,0x80,
-0x00,0x18,0x78,0x28,0x7c,0x00,0xdb,0x60,0x06,0x64,0x1f,0xef,0x7e,0x00,0x1f,0xf1,
-0x7e,0x00,0xe7,0xe6,0x00,0x05,0x20,0x40,0x49,0xba,0x20,0x23,0x48,0xf5,0x78,0x36,
-0xfc,0x00,0x6f,0xe2,0x00,0x17,0x1f,0xe0,0xa2,0x02,0x20,0x40,0x49,0x80,0x20,0x20,
-0x49,0x15,0x58,0x00,0x00,0x00,0x67,0xf0,0x0a,0x96,0xdf,0x20,0x00,0x08,0xda,0x40,
-0x0a,0x96,0x20,0x40,0x00,0xcd,0xe7,0xe2,0x00,0x12,0x1a,0x40,0xa4,0x01,0x1a,0x20,
-0xa2,0x01,0xc2,0x00,0x00,0xab,0x20,0x60,0x00,0x00,0xda,0x40,0x00,0xfe,0x20,0x20,
-0x00,0xd2,0xda,0x40,0x00,0xfd,0x20,0x20,0x00,0xd2,0xda,0x40,0x00,0xfc,0x20,0x20,
-0x00,0xd2,0xda,0x40,0x00,0xfb,0x20,0x20,0x00,0xd2,0x18,0x42,0x24,0x00,0x20,0x20,
-0x00,0xd2,0x18,0x41,0xa4,0x80,0x20,0x20,0x00,0xd2,0x67,0xe2,0x89,0x4b,0x70,0x89,
-0x4e,0xc5,0x70,0x89,0x4e,0xc4,0x6f,0xe2,0x89,0x91,0xc4,0x00,0x80,0x00,0x20,0x20,
-0x00,0xc0,0x6f,0xe2,0x89,0x91,0xc3,0x00,0x00,0xc3,0x6f,0xe2,0x89,0x90,0x70,0x89,
-0x4e,0xc6,0x70,0x89,0x4e,0xc4,0x20,0x00,0x03,0xe8,0x20,0x60,0x00,0x00,0x58,0x00,
-0x00,0x02,0x20,0x40,0x00,0xbd,0x20,0x20,0x00,0xc3,0x20,0x40,0x00,0xd6,0x58,0x00,
-0x00,0x06,0x20,0x40,0x00,0xbd,0x20,0x20,0x00,0xc3,0x20,0x40,0x00,0xd6,0x58,0x00,
-0x00,0x05,0x20,0x40,0x00,0xbd,0x1a,0x42,0x7e,0x00,0x20,0x20,0x00,0xbd,0x58,0x00,
-0x00,0x0b,0x20,0x40,0x00,0xbd,0x1a,0x2c,0xfe,0x00,0x20,0x40,0x00,0xbd,0x58,0x00,
-0x00,0x03,0x20,0x40,0x00,0xbd,0x1a,0x21,0x7e,0xff,0x20,0x20,0x00,0xbd,0x3f,0xc9,
+0x00,0x02,0xaa,0x55,0x3a,0x02,0xc2,0x84,0x00,0x05,0xc0,0x00,0x80,0x0d,0xc0,0x5c,
+0x00,0x13,0xc0,0x5d,0x80,0x2d,0x20,0x20,0x4a,0x8b,0xc0,0x01,0x80,0x3c,0xc0,0x02,
+0x80,0x4c,0xc0,0x1d,0x00,0x55,0xc0,0x1f,0x00,0x5e,0xc0,0x20,0x80,0x70,0xc0,0x29,
+0x00,0x76,0xc0,0x4c,0x80,0x8a,0x20,0x20,0x4a,0x8b,0x20,0x40,0x68,0xc4,0x20,0x40,
+0x60,0xd7,0x20,0x40,0x00,0x11,0x20,0x20,0x40,0x0a,0x20,0x75,0x80,0x00,0x20,0x20,
+0x7b,0x9a,0x58,0x00,0x00,0x1b,0x67,0xe4,0x41,0xf6,0x58,0x00,0x00,0x23,0x67,0xe4,
+0x41,0xfe,0x20,0x40,0x4d,0xaf,0x20,0x40,0x4d,0xbc,0x20,0x40,0x4c,0x2a,0x20,0x20,
+0x50,0x4d,0x1a,0x62,0x7e,0x00,0xc0,0x04,0x80,0x21,0xc0,0x01,0x00,0x1f,0x20,0x20,
+0x4d,0xdf,0x70,0x4a,0xb1,0x00,0x20,0x20,0x4d,0xfb,0x70,0x4a,0xb1,0x06,0x20,0x20,
+0x4e,0x08,0x20,0x40,0x00,0x25,0x20,0x20,0x50,0xc3,0x6f,0xe2,0x4a,0xb1,0x20,0x7a,
+0x00,0x00,0x1f,0xe0,0xff,0xff,0x67,0xe2,0x4a,0xb1,0x24,0x7a,0x00,0x00,0x6f,0xe4,
+0x46,0x52,0xc2,0x80,0x4d,0x64,0x20,0x60,0x00,0x00,0x6f,0xe2,0x0a,0xff,0xc0,0x13,
+0x80,0x3a,0xc0,0x06,0x00,0x31,0x20,0x20,0x4e,0x5c,0x1a,0x22,0x06,0x00,0xef,0xe2,
+0x00,0x03,0xc0,0x00,0x4f,0x1c,0xc0,0x00,0xcf,0x1f,0xc0,0x01,0x4f,0x25,0xc0,0x01,
+0x80,0x38,0x20,0x20,0x50,0x1c,0x58,0x00,0x00,0x01,0x20,0x20,0x4f,0x20,0x20,0x40,
+0x50,0x1f,0x20,0x20,0x4d,0x85,0x20,0x40,0x49,0xba,0x78,0x23,0xfc,0x00,0x78,0x24,
+0xfc,0x00,0x09,0x80,0x00,0x08,0x19,0x89,0x7e,0x00,0x67,0xe2,0x02,0xd5,0x09,0x80,
+0x00,0x08,0x19,0x89,0x7e,0x00,0xe7,0xe2,0x00,0x05,0x1f,0xe1,0x72,0x3f,0x20,0x22,
+0xd8,0x8b,0x1f,0xe6,0x7c,0x33,0x24,0x41,0x00,0x4a,0x20,0x20,0x58,0x87,0xdf,0x20,
+0x00,0x33,0x20,0x60,0x00,0x00,0x20,0x40,0x58,0xa3,0x20,0x40,0x49,0x15,0x68,0x42,
+0x00,0x17,0x20,0x40,0x49,0x1c,0x20,0x00,0x05,0xdc,0x20,0x40,0x49,0x21,0x78,0x28,
+0x7c,0x00,0xd9,0x60,0x15,0x7c,0x20,0x20,0x58,0x69,0x6f,0xe2,0x00,0x7d,0xc0,0x08,
+0x00,0x58,0x20,0x20,0x60,0xfe,0x68,0x42,0x05,0x4e,0x18,0x46,0x7c,0x06,0x20,0x21,
+0x00,0x5c,0x20,0x20,0x62,0x06,0x70,0x00,0x7e,0x24,0x20,0x20,0x61,0x34,0x78,0x54,
+0x7c,0x00,0x20,0x40,0x66,0xa3,0x6f,0xe2,0x00,0x48,0x20,0x7a,0x00,0x00,0xc2,0x83,
+0x80,0x64,0x20,0x20,0x63,0xf2,0xc0,0x42,0x00,0x67,0xc0,0x41,0x80,0x6a,0x20,0x20,
+0x64,0x21,0x20,0x40,0x00,0x6d,0x6f,0xe2,0x00,0x48,0x20,0x20,0x64,0x7b,0x20,0x40,
+0x00,0x6d,0x6f,0xe2,0x00,0x48,0x20,0x20,0x64,0xef,0x6f,0xe2,0x46,0x2c,0x20,0x3a,
+0x65,0x0d,0x20,0x20,0x65,0x06,0x6f,0xe2,0x40,0x9e,0x79,0x3f,0xfe,0x03,0x67,0xe2,
+0x40,0x9e,0x58,0x00,0x00,0x01,0x67,0xe4,0x04,0xca,0x20,0x60,0x00,0x00,0x6f,0xe2,
+0x04,0xf9,0xc0,0x1f,0xe9,0x3e,0xc0,0x39,0xe9,0x47,0xc0,0x77,0x80,0x7c,0xc0,0x29,
+0xea,0x05,0x20,0x60,0x00,0x00,0x6f,0xe4,0x04,0xfd,0x1f,0xe2,0x0c,0x00,0x20,0x40,
+0x69,0x84,0x6f,0xe2,0x04,0xff,0xc0,0x20,0xe9,0x66,0xc0,0x20,0x69,0x6e,0xc0,0x38,
+0xe9,0xa7,0xc0,0x38,0x00,0x86,0xc0,0x24,0xe9,0xbe,0x20,0x20,0x6a,0x58,0x70,0x0a,
+0x95,0x08,0x20,0x40,0x7b,0xab,0x20,0x40,0x69,0x72,0x20,0x20,0x69,0xba,0x6f,0xe2,
+0x44,0x90,0x20,0x3a,0x5e,0xd0,0x20,0x40,0x74,0x38,0x20,0x20,0x79,0x32,0x1b,0xd2,
0xaa,0x55,0x01,0x00,0x92,0x40,0x0a,0xaa,0x55,0x01,0x00,0x54,0x46,0x40,0xaa,0x55,
-0x01,0x00,0x06,0x42,0x13,0xaa,0x55,0x08,0x00,0x98,0x40,0xff,0xff,0x8f,0xf8,0x9b,
-0x9d,0x59,0x83,0xaa,0x55,0x03,0x00,0x14,0x42,0x07,0x4a,0x05,0xaa,0x55,0x04,0x00,
+0x01,0x00,0x06,0x42,0x13,0xaa,0x55,0x08,0x00,0x98,0x40,0xff,0xfb,0x8f,0xf8,0x8b,
+0x85,0x59,0x83,0xaa,0x55,0x03,0x00,0x14,0x42,0x07,0x4a,0x05,0xaa,0x55,0x04,0x00,
0x3d,0x45,0x00,0x7f,0x00,0x07,0xaa,0x55,0x03,0x00,0x2d,0x46,0x03,0x00,0x04,0xaa,
0x55,0x01,0x00,0x2c,0x46,0x01,0xaa,0x55,0x06,0x00,0x57,0x46,0x04,0x30,0x30,0x30,
0x30,0x30,0xaa,0x55,0x10,0x00,0xf0,0x4f,0x00,0x1c,0xff,0x1f,0x00,0x1c,0x00,0x1c,
-0x00,0x4c,0xe0,0x4f,0x00,0x4c,0x00,0x4c,0xaa,0x55,0x02,0x00,0x68,0x46,0x00,0x01,
+0x00,0x4c,0xe0,0x4f,0x00,0x4c,0x00,0x4c,0xaa,0x55,0x02,0x00,0x68,0x46,0x00,0x02,
0xaa,0x55,0x01,0x00,0x6c,0x46,0x03,0xaa,0x55,0x01,0x00,0x6f,0x46,0x07,0xaa,0x55,
0x03,0x00,0xaa,0x40,0x24,0x04,0x04,0xaa,0x55,0x01,0x00,0x79,0x46,0x00,0xaa,0x55,
0x01,0x00,0x91,0x40,0x00,0xaa,0x55,0x03,0x00,0x54,0x41,0x00,0x01,0x08,0xaa,0x55,
-0x01,0x00,0x74,0x41,0x02,0xaa,0x55,0x01,0x00,0x93,0x40,0x03,0xaa,0x55,0x01,0x00,
-0x6d,0x46,0x28,0xaa,0x55,0x06,0x00,0xa0,0x40,0xa7,0x2a,0x2a,0x31,0x10,0x3a,0xaa,
-0x55,0x0c,0x00,0xe7,0x44,0x0b,0x59,0x69,0x63,0x68,0x69,0x70,0x20,0x33,0x31,0x32,
-0x31,0xaa,0x55,0x03,0x00,0xe4,0x41,0x20,0x00,0x01,0xaa,0x55,0x01,0x00,0xe8,0x41,
+0x01,0x00,0x74,0x41,0x02,0xaa,0x55,0x01,0x00,0x93,0x40,0x00,0xaa,0x55,0x01,0x00,
+0x6d,0x46,0x28,0xaa,0x55,0x06,0x00,0xa0,0x40,0xa7,0x2a,0x2a,0x21,0x10,0x3a,0xaa,
+0x55,0x0c,0x00,0xe7,0x44,0x0b,0x33,0x31,0x32,0x31,0x20,0x4d,0x6f,0x75,0x20,0x42,
+0x74,0xaa,0x55,0x03,0x00,0xe4,0x41,0x20,0x00,0x01,0xaa,0x55,0x01,0x00,0xe8,0x41,
0x00,0xaa,0x55,0x01,0x00,0x90,0x44,0x01,0xaa,0x55,0x01,0x00,0x5f,0x44,0x07,0xaa,
-0x55,0x01,0x00,0x98,0x44,0x01,0xaa,0x55,0x04,0x00,0x75,0x46,0x09,0x00,0x2f,0x00,
-0xaa,0x55,0x01,0x00,0x40,0x43,0x01,0xaa,0x55,0x02,0x00,0x54,0x44,0xf0,0x00,0xaa,
-0x55,0x01,0x00,0x6e,0x46,0x05,0xaa,0x55,0x06,0x00,0x72,0x44,0x21,0x22,0x00,0x33,
-0x02,0x3a,0xaa,0x55,0x10,0x00,0x81,0x43,0x0f,0x59,0x69,0x63,0x68,0x69,0x70,0x20,
-0x33,0x31,0x32,0x31,0x20,0x4d,0x6f,0x75,0xaa,0x55,0x04,0x00,0x41,0x43,0x03,0x02,
-0x01,0x0e,0xaa,0x55,0x13,0x00,0x61,0x43,0x0e,0x11,0x09,0x59,0x69,0x63,0x68,0x69,
+0x55,0x01,0x00,0x98,0x44,0x00,0xaa,0x55,0x04,0x00,0x75,0x46,0x2d,0x00,0x2f,0x00,
+0xaa,0x55,0x01,0x00,0x40,0x43,0x00,0xaa,0x55,0x02,0x00,0x54,0x44,0x40,0x00,0xaa,
+0x55,0x01,0x00,0x6e,0x46,0x05,0xaa,0x55,0x06,0x00,0x72,0x44,0x21,0x22,0x01,0x33,
+0x02,0x3a,0xaa,0x55,0x0d,0x00,0x81,0x43,0x0c,0x33,0x31,0x32,0x31,0x20,0x4d,0x6f,
+0x75,0x20,0x42,0x6c,0x65,0xaa,0x55,0x04,0x00,0x41,0x43,0x03,0x02,0x01,0x02,0xaa,
+0x55,0x16,0x00,0x61,0x43,0x0e,0x02,0x01,0x02,0x11,0x09,0x59,0x69,0x63,0x68,0x69,
0x70,0x20,0x31,0x30,0x32,0x31,0x73,0x20,0x4d,0x6f,0x75,0xaa,0x55,0x07,0x00,0x25,
0x44,0x02,0x03,0x00,0x05,0x10,0x02,0x03,0xaa,0x55,0x08,0x00,0x68,0x44,0x08,0x00,
-0x10,0x00,0x00,0x00,0x2c,0x01,0xaa,0x55,0x01,0x00,0x78,0x44,0xb5,0xaa,0x55,0x01,
+0x10,0x00,0x00,0x00,0x2c,0x01,0xaa,0x55,0x01,0x00,0x78,0x44,0xb9,0xaa,0x55,0x01,
0x00,0x7a,0x44,0x17,0xaa,0x55,0x02,0x00,0xcc,0x44,0x31,0x00,0xaa,0x55,0x01,0x00,
0xd1,0x40,0x01,0xaa,0x55,0x0c,0x00,0x49,0x45,0x05,0x03,0x00,0x12,0x00,0x01,0x01,
0x00,0x01,0x11,0x03,0x00,0xaa,0x55,0x01,0x00,0x5f,0x45,0x00,0xaa,0x55,0x02,0x00,
@@ -94,23 +74,53 @@
0x09,0x00,0x04,0x35,0x0c,0x35,0x03,0x19,0x01,0x00,0x35,0x05,0x19,0x00,0x03,0x08,
0x01,0x09,0x00,0x06,0x35,0x09,0x09,0x65,0x6e,0x09,0x00,0x6a,0x09,0x01,0x00,0x09,
0x01,0x00,0x25,0x0a,0x53,0x50,0x50,0x20,0x73,0x6c,0x61,0x76,0x65,0x00,0x00,0x00,
-0x01,0x00,0xaa,0x55,0x02,0x00,0x8e,0x44,0xaf,0x47,0xaa,0x55,0x8a,0x00,0xaf,0x47,
-0x01,0x00,0x02,0x00,0x28,0x02,0x00,0x18,0x02,0x00,0x02,0x03,0x28,0x01,0x0a,0x03,
-0x00,0x02,0x00,0x2a,0x13,0x41,0x73,0x74,0x20,0x4c,0x45,0x20,0x4d,0x6f,0x75,0x73,
-0x65,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x04,0x00,0x02,0x00,0x28,0x10,0x55,0xe4,
-0x05,0xd2,0xaf,0x9f,0xa9,0x8f,0xe5,0x4a,0x7d,0xfe,0x43,0x53,0x53,0x49,0x05,0x00,
-0x02,0x03,0x28,0x01,0x10,0x06,0x00,0x02,0x87,0x05,0x14,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,
-0x00,0x02,0x02,0x29,0x02,0x00,0x00,0x08,0x00,0x02,0x03,0x28,0x01,0x0e,0x09,0x00,
-0x02,0x98,0x05,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xaa,0x55,0x02,0x00,0x10,0x40,
-0xe0,0x07,0xaa,0x55,0x01,0x00,0x20,0x40,0x50,0xaa,0x55,0x04,0x00,0x79,0x41,0x0a,
-0x0b,0xb2,0x32,0xaa,0x55,0x02,0x00,0x57,0x41,0x8b,0x0b,0xaa,0x55,0x08,0x00,0xa1,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xaa,0x55,0x02,0x00,0xbd,0x40,0x02,
-0x24,0xaa,0x55,0x08,0x00,0xad,0x40,0x24,0x00,0x80,0x00,0x24,0x00,0x80,0x00,0xaa,
-0x55,0x02,0x00,0xbb,0x40,0x20,0x00,0xaa,0x55,0x04,0x00,0xb7,0x40,0x20,0x00,0x00,
-0x20,0xaa,0x55,0x04,0x00,0xbf,0x40,0x80,0x04,0x00,0x10,0xaa,0x55,0x05,0x00,0xe2,
-0x44,0x08,0x0e,0x05,0x04,0x00,0xaa,0x55,0x02,0x00,0x02,0x42,0x30,0x1f,0xaa,0x55,
-0x01,0x00,0x10,0x42,0x20,0xaa,0x55,0x01,0x00,0xe0,0x41,0x01,0xaa,0x55,0x01,0x00,
-0xe2,0x41,0xff,0xaa,0x55,0x02,0x00,0xc3,0x40,0xe2,0x41,0x97,0xc3
+0x01,0x00,0xaa,0x55,0x02,0x00,0x8e,0x44,0xaf,0x47,0xaa,0x55,0x36,0x02,0xaf,0x47,
+0x01,0x00,0x02,0x00,0x28,0x02,0x00,0x18,0x02,0x00,0x02,0x03,0x28,0x01,0x02,0x03,
+0x00,0x02,0x01,0x2a,0x02,0xc8,0x00,0x04,0x00,0x02,0x03,0x28,0x01,0x0a,0x05,0x00,
+0x02,0x00,0x2a,0x14,0x41,0x73,0x74,0x20,0x4c,0x45,0x20,0x4d,0x6f,0x75,0x73,0x65,
+0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x06,0x00,0x02,0x03,0x28,0x01,0x02,0x07,
+0x00,0x02,0x04,0x2a,0x08,0x06,0x00,0x06,0x00,0x64,0x00,0x2c,0x01,0x08,0x00,0x02,
+0x03,0x28,0x01,0x02,0x09,0x00,0x02,0x02,0x2a,0x01,0x01,0x0a,0x00,0x02,0x03,0x28,
+0x01,0x08,0x0b,0x00,0x02,0x03,0x2a,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x0c,0x00,
+0x02,0x00,0x28,0x02,0x01,0x18,0x0d,0x00,0x02,0x03,0x28,0x01,0x20,0x0e,0x00,0x02,
+0x05,0x2a,0x00,0x0f,0x00,0x02,0x02,0x29,0x02,0x00,0x00,0x10,0x00,0x02,0x00,0x28,
+0x02,0x04,0x18,0x11,0x00,0x02,0x03,0x28,0x01,0x16,0x12,0x00,0x02,0x07,0x2a,0x01,
+0x00,0x13,0x00,0x02,0x02,0x29,0x02,0x00,0x00,0x14,0x00,0x02,0x00,0x28,0x02,0x0f,
+0x18,0x15,0x00,0x02,0x03,0x28,0x01,0x12,0x16,0x00,0x02,0x19,0x2a,0x01,0x38,0x17,
+0x00,0x02,0x00,0x28,0x02,0x0a,0x18,0x18,0x00,0x02,0x03,0x28,0x01,0x02,0x19,0x00,
+0x02,0x23,0x2a,0x03,0x00,0x00,0x00,0x1a,0x00,0x02,0x03,0x28,0x01,0x02,0x1b,0x00,
+0x02,0x29,0x2a,0x08,0x46,0x6c,0x61,0x67,0x74,0x72,0x69,0x70,0x1c,0x00,0x02,0x03,
+0x28,0x01,0x02,0x1d,0x00,0x02,0x24,0x2a,0x06,0x79,0x69,0x63,0x68,0x69,0x70,0x1e,
+0x00,0x02,0x03,0x28,0x01,0x02,0x1f,0x00,0x02,0x25,0x2a,0x04,0x63,0x6f,0x6d,0x33,
+0x20,0x00,0x02,0x03,0x28,0x01,0x02,0x21,0x00,0x02,0x26,0x2a,0x03,0x31,0x2e,0x30,
+0x22,0x00,0x02,0x03,0x28,0x01,0x02,0x23,0x00,0x02,0x28,0x2a,0x03,0x31,0x2e,0x30,
+0x24,0x00,0x02,0x03,0x28,0x01,0x02,0x25,0x00,0x02,0x2a,0x2a,0x03,0x31,0x2e,0x30,
+0x26,0x00,0x02,0x03,0x28,0x01,0x02,0x27,0x00,0x02,0x25,0x2a,0x04,0x63,0x6f,0x6d,
+0x33,0x28,0x00,0x02,0x00,0x28,0x10,0x55,0xe4,0x05,0xd2,0xaf,0x9f,0xa9,0x8f,0xe5,
+0x4a,0x7d,0xfe,0x43,0x53,0x53,0x49,0x29,0x00,0x02,0x03,0x28,0x01,0x12,0x2a,0x00,
+0x10,0x16,0x96,0x24,0x47,0xc6,0x23,0x61,0xba,0xd9,0x4b,0x4d,0x1e,0x43,0x53,0x53,
+0x49,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x2b,0x00,0x02,0x02,0x29,0x02,0x00,0x00,0x2c,0x00,
+0x02,0x03,0x28,0x01,0x08,0x2d,0x00,0x10,0xb3,0x9b,0x72,0x34,0xbe,0xec,0xd4,0xa8,
+0xf4,0x43,0x41,0x88,0x43,0x53,0x53,0x49,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2e,0x00,0x02,
+0x03,0x28,0x01,0x04,0x2f,0x00,0x10,0xfe,0x69,0xca,0x9a,0x56,0x19,0xf6,0xab,0x02,
+0x4d,0xaa,0x6d,0x43,0x53,0x53,0x49,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x02,0x03,
+0x28,0x01,0x1a,0x31,0x00,0x10,0x18,0x03,0xa6,0x28,0x5e,0xd8,0xec,0x91,0x1c,0x48,
+0xa3,0xac,0x43,0x53,0x53,0x49,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x32,0x00,0x02,0x02,
+0x29,0x02,0x00,0x00,0x00,0x00,0xaa,0x55,0x01,0x00,0x00,0x40,0x02,0xaa,0x55,0x01,
+0x00,0x17,0x40,0x09,0xaa,0x55,0x01,0x00,0x20,0x40,0x28,0xaa,0x55,0x02,0x00,0x27,
+0x40,0x44,0x02,0xaa,0x55,0x01,0x00,0x2a,0x40,0x04,0xaa,0x55,0x01,0x00,0x33,0x40,
+0x02,0xaa,0x55,0x07,0x00,0x76,0x41,0x0f,0x84,0x30,0x0a,0x0b,0xb2,0x32,0xaa,0x55,
+0x02,0x00,0x57,0x41,0x8b,0x0b,0xaa,0x55,0x08,0x00,0xa1,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0xaa,0x55,0x02,0x00,0xbd,0x40,0x02,0x24,0xaa,0x55,0x08,0x00,
+0xad,0x40,0x40,0x00,0x00,0x02,0x32,0x00,0x00,0x02,0xaa,0x55,0x02,0x00,0xbb,0x40,
+0x20,0x00,0xaa,0x55,0x04,0x00,0xb7,0x40,0x20,0x00,0x00,0x20,0xaa,0x55,0x04,0x00,
+0xbf,0x40,0x80,0x04,0x00,0x08,0xaa,0x55,0x05,0x00,0xe2,0x44,0x08,0x0e,0x05,0x04,
+0x00,0xaa,0x55,0x02,0x00,0x02,0x42,0x30,0x1f,0xaa,0x55,0x01,0x00,0x10,0x42,0x20,
+0xaa,0x55,0x01,0x00,0xe0,0x41,0x01,0xaa,0x55,0x0f,0x00,0xb2,0x4a,0x4b,0xba,0x55,
+0xd0,0x56,0xe0,0x57,0x88,0x58,0x6c,0x59,0x10,0x07,0xff,0xff,0xaa,0x55,0x02,0x00,
+0xc3,0x40,0xb2,0x4a,0x08,0x49
};
Index: NFC/YC5018/user/main.c
===================================================================
--- /YC3121_demo/ModuleDemo/NFC/YC5018/user/main.c (revision 570)
+++ /YC3121_demo/ModuleDemo/NFC/YC5018/user/main.c (working copy)
@@ -24,17 +24,15 @@
/* Includes ------------------------------------------------------------------*/
#include "yc3121.h"
#include "yc_systick.h"
+#include "yc_ipc.h"
#include "yc_nfc_common.h"
#include "yc_emv_contactless_l1.h"
-//#include "yc_bt.h"
-uint8_t BT_Wake = 0;
extern EMV_Poll_Type_t Poll_Type;
/* Private function prototypes -----------------------------------------------*/
-//void NFC_CoreReg_Init(unsigned Software_reset,u8 External_irrigation_clock);
#define SOFTWARE_RESET 1
#define EXTERNAL_IRRIGATION_CLOCK 1
- void NFC_Systick_Init(void);
+void NFC_Systick_Init(void);
void NFC_CoreReg_Init(uint8_t Software_reset,uint8_t External_irrigation_clock);
unsigned char Nfc_Apdu_Transmission_Test();
unsigned char Nfc_Active_card();
@@ -55,7 +53,7 @@
SysTick_Delay_Ms(1000);
- MyPrintf("\nMFRC523 RF only, Date: %s, %s\r\n", __DATE__, __TIME__);
+ MyPrintf("\nYC5018 RF only, Date: %s, %s\r\n", __DATE__, __TIME__);
NFC_CoreReg_Init(SOFTWARE_RESET,EXTERNAL_IRRIGATION_CLOCK);
@@ -69,17 +67,21 @@
/*Open Rf*/
YC_EMV_Contactless_L1_Rf_Switch(ON);
+ MyPrintf("Please Swipe Your Card!\n");
+
while(1)
{
if(EMV_ERR_NONE == Nfc_Active_card())
{
if( EMV_ERR_NONE == Nfc_Apdu_Transmission_Test())
{
- MyPrintf("Nfc Apdu Transmission Test Sucess\n");
+ MyPrintf("Nfc Apdu Transmission Test Sucess\n");
+ MyPrintf("Please Swipe Your Card!\n");
}
else
{
MyPrintf("Nfc Apdu Transmission Test Fail\n");
+ MyPrintf("Please Swipe Your Card!\n");
}
YC_EMV_Contactless_L1_Rf_Switch(OFF);
@@ -93,7 +95,7 @@
/*
-函数功能: APDU 传输测试
+鍑芥暟鍔熻兘: APDU 浼犺緭娴嬭瘯
*/
unsigned char Nfc_Apdu_Transmission_Test()
{
@@ -105,7 +107,7 @@
}
/*
-函数功能: 进行TypeA，TypeB 轮询寻卡，有卡进行冲突检测，并激活
+鍑芥暟鍔熻兘: 杩涜TypeA锛孴ypeB 杞瀵诲崱锛屾湁鍗¤繘琛屽啿绐佹娴嬶紝骞舵縺娲
*/
unsigned char Nfc_Active_card()
{
@@ -145,24 +147,25 @@
}
/*
-函数功能: NFC时钟配置
+鍑芥暟鍔熻兘: NFC鏃堕挓閰嶇疆
*/
void NFC_Systick_Init(void)
{
- *(volatile uint32_t*)0x856c |= (1<<13);
- *(volatile uint8_t*)0xf853c= 0x9c;
- *(volatile byte*)0xc4ab1=0x7f;
- *(volatile byte*)0xc4ab2=0xff;
- *(volatile byte*)0xc4ab3=0xff;
- *(volatile byte*)0xc40c3=0xb1;
- *(volatile byte*)0xc40c4=0x4a;
- *(volatile byte*)0xc8905=0xff;
- GPIO_Config(GPIOA, GPIO_Pin_3, GPCFG_NFC_CLK_OUT);
+ *(volatile uint32_t*)0x856c |= (1<<13);
+ *(volatile uint8_t*)0xf853c= 0x9c;
+ IpcInit();
+// *(volatile byte*)0xc4ab1=0x7f;
+// *(volatile byte*)0xc4ab2=0xff;
+// *(volatile byte*)0xc4ab3=0xff;
+// *(volatile byte*)0xc40c3=0xb1;
+// *(volatile byte*)0xc40c4=0x4a;
+// *(volatile byte*)0xc8905=0xff;
+ GPIO_Config(GPIOA, GPIO_Pin_3, GPCFG_NFC_CLK_OUT);
}
/*
-函数功能: NFC上电初始化配置
-形参：Software_reset ：置1 NFC Reset 接主控IO控制；置0 NFC Reset 拉高
- External_irrigation_clock ：置1 ：NFC时钟不由晶体供给；置0 NFC时钟由晶体供给
+鍑芥暟鍔熻兘: NFC涓婄數鍒濆鍖栭厤缃
+褰㈠弬锛歋oftware_reset 锛氱疆1 NFC Reset 鎺ヤ富鎺O鎺у埗锛涚疆0 NFC Reset 鎷夐珮
+ External_irrigation_clock 锛氱疆1 锛歂FC鏃堕挓涓嶇敱鏅朵綋渚涚粰锛涚疆0 NFC鏃堕挓鐢辨櫠浣撲緵缁
*/
void NFC_CoreReg_Init(uint8_t Software_reset,uint8_t External_irrigation_clock)
{
@@ -249,12 +252,4 @@
}
}
-
-
-
-
-
-
-
-
-/************************ (C) COPYRIGHT Yichip Microelectronics *****END OF FILE****/
\ No newline at end of file
+/************************ (C) COPYRIGHT Yichip Microelectronics *****END OF FILE****/