Index: MSR/prj/MDK/YC3121_Keil.uvoptx =================================================================== --- /YC3121_demo/ModuleDemo/MSR/MSR/prj/MDK/YC3121_Keil.uvoptx (revision 659) +++ /YC3121_demo/ModuleDemo/MSR/MSR/prj/MDK/YC3121_Keil.uvoptx (working copy) @@ -244,18 +244,6 @@ 0 0 - - 2 - 4 - 1 - 0 - 0 - 0 - ..\..\user\bt_code.c - bt_code.c - 0 - 0 - @@ -266,7 +254,7 @@ 0 3 - 5 + 4 1 0 0 @@ -278,7 +266,7 @@ 3 - 6 + 5 1 0 0 @@ -290,19 +278,7 @@ 3 - 7 - 1 - 0 - 0 - 0 - ..\..\..\..\..\Librarier\sdk\yc_sysctrl.c - yc_sysctrl.c - 0 - 0 - - - 3 - 8 + 6 1 0 0 @@ -322,7 +298,7 @@ 0 4 - 9 + 7 2 0 0 @@ -334,7 +310,7 @@ 4 - 10 + 8 2 0 0 @@ -354,7 +330,7 @@ 0 5 - 11 + 9 4 0 0 Index: MSR/prj/MDK/YC3121_Keil.uvprojx =================================================================== --- /YC3121_demo/ModuleDemo/MSR/MSR/prj/MDK/YC3121_Keil.uvprojx (revision 659) +++ /YC3121_demo/ModuleDemo/MSR/MSR/prj/MDK/YC3121_Keil.uvprojx (working copy) @@ -401,11 +401,6 @@ 1 ..\..\user\main.c - - bt_code.c - 1 - ..\..\user\bt_code.c - @@ -422,11 +417,6 @@ ..\..\..\..\..\Librarier\sdk\yc_uart.c - yc_sysctrl.c - 1 - ..\..\..\..\..\Librarier\sdk\yc_sysctrl.c - - yc_timer.c 1 ..\..\..\..\..\Librarier\sdk\yc_timer.c Index: MSR/user/bt_code.h =================================================================== --- /YC3121_demo/ModuleDemo/MSR/MSR/user/bt_code.h (revision 659) +++ /YC3121_demo/ModuleDemo/MSR/MSR/user/bt_code.h (nonexistent) @@ -1 +0,0 @@ -extern const unsigned char bt_code[]; \ No newline at end of file Index: MSR/user/bt_code.c =================================================================== --- /YC3121_demo/ModuleDemo/MSR/MSR/user/bt_code.c (revision 659) +++ /YC3121_demo/ModuleDemo/MSR/MSR/user/bt_code.c (nonexistent) @@ -1,116 +0,0 @@ -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, -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, -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, -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, -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, -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, -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, -0x47,0x45,0x83,0x46,0xaa,0x55,0xb8,0x00,0x83,0x46,0x03,0x12,0x00,0x01,0x00,0x00, -0x01,0x00,0x01,0x00,0x01,0x36,0x00,0x52,0x09,0x00,0x00,0x0a,0x00,0x01,0x00,0x01, -0x09,0x00,0x01,0x35,0x03,0x19,0x12,0x00,0x09,0x00,0x04,0x35,0x0d,0x35,0x06,0x19, -0x01,0x00,0x09,0x00,0x01,0x35,0x03,0x19,0x00,0x01,0x09,0x00,0x09,0x35,0x08,0x35, -0x06,0x19,0x12,0x00,0x09,0x01,0x00,0x09,0x02,0x00,0x09,0x01,0x03,0x09,0x02,0x01, -0x09,0x05,0xac,0x09,0x02,0x02,0x09,0x02,0x39,0x09,0x02,0x03,0x09,0x06,0x44,0x09, -0x02,0x04,0x28,0x01,0x09,0x02,0x05,0x09,0x00,0x02,0x03,0x11,0x01,0x00,0x03,0x01, -0x00,0x00,0x01,0x00,0x03,0x36,0x00,0x46,0x09,0x00,0x00,0x0a,0x00,0x01,0x00,0x03, -0x09,0x00,0x01,0x35,0x03,0x19,0x11,0x01,0x09,0x00,0x02,0x0a,0x00,0x00,0x00,0x00, -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 -}; Index: MSR/user/main.c =================================================================== --- /YC3121_demo/ModuleDemo/MSR/MSR/user/main.c (revision 659) +++ /YC3121_demo/ModuleDemo/MSR/MSR/user/main.c (working copy) @@ -2,20 +2,20 @@ ****************************************************************************** * @file 3121Demo\ModuleDemo\MSR\MSR\user\main.c * @author Yichip Application Team - * @version V1.0.0 - * @date 10-Feb-2019 + * @version V1.0.1 + * @date 21-July-2020 * @brief MSR test program. ****************************************************************************** * @attention * * COPYRIGHT 2019 Yichip Microelectronics * - * The purpose of this firmware is to provide guidance to customers engaged in - * programming work to guide them smoothly to product development, + * The purpose of this firmware is to provide guidance to customers engaged in + * programming work to guide them smoothly to product development, * so as to save their time. * - * Therefore, Yichip microelectronics shall not be responsible for any direct, - * indirect or consequential damages caused by any content of this gu jiang + * Therefore, Yichip microelectronics shall not be responsible for any direct, + * indirect or consequential damages caused by any content of this gu jiang * and/or contained in this code used by the customer in its products. * ****************************************************************************** @@ -25,13 +25,12 @@ #include "yc3121.h" #include "yc_gpio.h" #include "yc_uart.h" -#include "misc.h" #include "yc_msr.h" +#include "misc.h" +#include "board_config.h" /* Private typedef -----------------------------------------------------------*/ /* Private define ------------------------------------------------------------*/ -#define uartBaud 115200 - /* Private macro -------------------------------------------------------------*/ /* Private variables ---------------------------------------------------------*/ /* Private function prototypes -----------------------------------------------*/ @@ -44,65 +43,65 @@ */ int main(void) { - UART_Configuration(); + UART_Configuration(); - MyPrintf("YcChip Yc3121 MSR Demo V1.0.\n"); + MyPrintf("YcChip Yc3121 MSR Demo V1.0.\n"); - track_data tdata[MAX_TRACK_NUM]; - int ret; - int i; - uint8_t cfmt, tflag; - int nResult=0; - uint8_t Opcode; - - MyPrintf("start MSR test\n"); - MSR_Init(); - MyPrintf("please swiping card\n"); - while(1) - { - //uart test - if(UART_IsRXFIFONotEmpty(UART0)) - { - Opcode=UART_ReceiveData(UART0); - UART_SendData(UART0,Opcode); - } - - nResult=MSR_DetectSwipingCard(); - if(nResult == DETECT_SWIPING_CARD) - { - cfmt = tflag = 0; - for(i=0;i0) - { - MyPrintf("track%d data:\n", i+1,tdata[i].len); - UART_SendBuf(UART0,tdata[i].buf,tdata[i].len); - MyPrintf("\n"); - } - MyPrintf("\n"); - } - } - - for(i=0;i0) - { - MyPrintf("T%d OK",i+1); - } - tdata[i].len=0; - } - MSR_ENABLE(DISABLE); - MSR_ENABLE(ENABLE); - MyPrintf("please swiping card\n"); - } - } + track_data tdata[MAX_TRACK_NUM]; + int ret; + int i; + uint8_t cfmt, tflag; + int nResult = 0; + uint8_t Opcode; + + MyPrintf("start MSR test\n"); + MSR_Init(); + MyPrintf("please swiping card\n"); + while (1) + { + //uart test + if (UART_IsRXFIFONotEmpty(UART0)) + { + Opcode = UART_ReceiveData(UART0); + UART_SendData(UART0, Opcode); + } + + nResult = MSR_DetectSwipingCard(); + if (nResult == DETECT_SWIPING_CARD) + { + cfmt = tflag = 0; + for (i = 0; i < MAX_TRACK_NUM; i++) tdata[i].len = 0; + + ret = MSR_GetDecodeData(tdata, TRACK_SELECT_1 | TRACK_SELECT_2 | TRACK_SELECT_3, &cfmt, &tflag); + //MyPrintf("T1 len = %d\nT2 len= %d\nT3 len = %d\ntflag = %02X\n", (tdata[0].len), (tdata[1].len), (tdata[2].len),tflag); + if (ret == MSR_SUCCESS) + { + for (i = 0; i < MAX_TRACK_NUM; i++) + { + MyPrintf("track%d len %d\n", i + 1, tdata[i].len); + if ((tdata[i].len) > 0) + { + MyPrintf("track%d data:\n", i + 1, tdata[i].len); + UART_SendBuf(UART0, tdata[i].buf, tdata[i].len); + MyPrintf("\n"); + } + MyPrintf("\n"); + } + } + + for (i = 0; i < MAX_TRACK_NUM; i++) + { + if (tdata[i].len > 0) + { + MyPrintf("T%d OK", i + 1); + } + tdata[i].len = 0; + } + MSR_ENABLE(DISABLE); + MSR_ENABLE(ENABLE); + MyPrintf("please swiping card\n"); + } + } } /** @@ -112,28 +111,28 @@ */ void UART_Configuration(void) { - UART_InitTypeDef UART_InitStruct; + UART_InitTypeDef UART_InitStruct; - /* Configure serial ports RX and TX for IO. */ - GPIO_Config(GPIOA, GPIO_Pin_1, UART0_TXD); - GPIO_Config(GPIOA, GPIO_Pin_0, UART0_RXD); - - /* USARTx configured as follow: - - BaudRate = 115200 baud - - Word Length = 8 Bits - - Stop Bit = 1 Stop Bit - - Parity = No Parity - - Hardware flow control disabled (RTS and CTS signals) - - Receive and transmit enabled - */ - UART_InitStruct.BaudRate = uartBaud; //Configure serial port baud rate, the baud rate defaults to 128000. - UART_InitStruct.DataBits = Databits_8b; - UART_InitStruct.StopBits = StopBits_1; - UART_InitStruct.Parity = Parity_None; - UART_InitStruct.FlowCtrl = FlowCtrl_None; - UART_InitStruct.Mode = Mode_duplex; + /* Configure serial ports RX and TX for IO. */ + UART0_TX_IO_CONFIG + UART0_RX_IO_CONFIG + + /* USARTx configured as follow: + - BaudRate = 115200 baud + - Word Length = 8 Bits + - Stop Bit = 1 Stop Bit + - Parity = No Parity + - Hardware flow control disabled (RTS and CTS signals) + - Receive and transmit enabled + */ + UART_InitStruct.BaudRate = UARTBAUD; //Configure serial port baud rate, the baud rate defaults to 128000. + UART_InitStruct.DataBits = Databits_8b; + UART_InitStruct.StopBits = StopBits_1; + UART_InitStruct.Parity = Parity_None; + UART_InitStruct.FlowCtrl = FlowCtrl_None; + UART_InitStruct.Mode = Mode_duplex; - UART_Init(UART0, &UART_InitStruct); + UART_Init(UART0, &UART_InitStruct); } /************************ (C) COPYRIGHT Yichip Microelectronics *****END OF FILE****/ Index: MSR_IT/prj/MDK/YC3121_Keil.uvoptx =================================================================== --- /YC3121_demo/ModuleDemo/MSR/MSR_IT/prj/MDK/YC3121_Keil.uvoptx (revision 659) +++ /YC3121_demo/ModuleDemo/MSR/MSR_IT/prj/MDK/YC3121_Keil.uvoptx (working copy) @@ -244,18 +244,6 @@ 0 0 - - 2 - 4 - 1 - 0 - 0 - 0 - ..\..\user\bt_code.c - bt_code.c - 0 - 0 - @@ -266,7 +254,7 @@ 0 3 - 5 + 4 1 0 0 @@ -278,7 +266,7 @@ 3 - 6 + 5 1 0 0 @@ -290,19 +278,7 @@ 3 - 7 - 1 - 0 - 0 - 0 - ..\..\..\..\..\Librarier\sdk\yc_sysctrl.c - yc_sysctrl.c - 0 - 0 - - - 3 - 8 + 6 1 0 0 @@ -322,7 +298,7 @@ 0 4 - 9 + 7 2 0 0 @@ -334,7 +310,7 @@ 4 - 10 + 8 2 0 0 @@ -354,7 +330,7 @@ 0 5 - 11 + 9 4 0 0 Index: MSR_IT/prj/MDK/YC3121_Keil.uvprojx =================================================================== --- /YC3121_demo/ModuleDemo/MSR/MSR_IT/prj/MDK/YC3121_Keil.uvprojx (revision 659) +++ /YC3121_demo/ModuleDemo/MSR/MSR_IT/prj/MDK/YC3121_Keil.uvprojx (working copy) @@ -401,11 +401,6 @@ 1 ..\..\user\main.c - - bt_code.c - 1 - ..\..\user\bt_code.c - @@ -422,11 +417,6 @@ ..\..\..\..\..\Librarier\sdk\yc_uart.c - yc_sysctrl.c - 1 - ..\..\..\..\..\Librarier\sdk\yc_sysctrl.c - - yc_timer.c 1 ..\..\..\..\..\Librarier\sdk\yc_timer.c Index: MSR_IT/user/bt_code.h =================================================================== --- /YC3121_demo/ModuleDemo/MSR/MSR_IT/user/bt_code.h (revision 659) +++ /YC3121_demo/ModuleDemo/MSR/MSR_IT/user/bt_code.h (nonexistent) @@ -1 +0,0 @@ -extern const unsigned char bt_code[]; \ No newline at end of file Index: MSR_IT/user/bt_code.c =================================================================== --- /YC3121_demo/ModuleDemo/MSR/MSR_IT/user/bt_code.c (revision 659) +++ /YC3121_demo/ModuleDemo/MSR/MSR_IT/user/bt_code.c (nonexistent) @@ -1,116 +0,0 @@ -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, -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, -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, -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, -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, -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, -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, -0x47,0x45,0x83,0x46,0xaa,0x55,0xb8,0x00,0x83,0x46,0x03,0x12,0x00,0x01,0x00,0x00, -0x01,0x00,0x01,0x00,0x01,0x36,0x00,0x52,0x09,0x00,0x00,0x0a,0x00,0x01,0x00,0x01, -0x09,0x00,0x01,0x35,0x03,0x19,0x12,0x00,0x09,0x00,0x04,0x35,0x0d,0x35,0x06,0x19, -0x01,0x00,0x09,0x00,0x01,0x35,0x03,0x19,0x00,0x01,0x09,0x00,0x09,0x35,0x08,0x35, -0x06,0x19,0x12,0x00,0x09,0x01,0x00,0x09,0x02,0x00,0x09,0x01,0x03,0x09,0x02,0x01, -0x09,0x05,0xac,0x09,0x02,0x02,0x09,0x02,0x39,0x09,0x02,0x03,0x09,0x06,0x44,0x09, -0x02,0x04,0x28,0x01,0x09,0x02,0x05,0x09,0x00,0x02,0x03,0x11,0x01,0x00,0x03,0x01, -0x00,0x00,0x01,0x00,0x03,0x36,0x00,0x46,0x09,0x00,0x00,0x0a,0x00,0x01,0x00,0x03, -0x09,0x00,0x01,0x35,0x03,0x19,0x11,0x01,0x09,0x00,0x02,0x0a,0x00,0x00,0x00,0x00, -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 -}; Index: MSR_IT/user/main.c =================================================================== --- /YC3121_demo/ModuleDemo/MSR/MSR_IT/user/main.c (revision 659) +++ /YC3121_demo/ModuleDemo/MSR/MSR_IT/user/main.c (working copy) @@ -2,20 +2,20 @@ ****************************************************************************** * @file 3121Demo\ModuleDemo\MSR\MSR_IT\user\main.c * @author Yichip Application Team - * @version V1.0.0 - * @date 26-Feb-2019 + * @version V1.0.1 + * @date 21-July-2020 * @brief MSR Interrupt test program. ****************************************************************************** * @attention * * COPYRIGHT 2019 Yichip Microelectronics * - * The purpose of this firmware is to provide guidance to customers engaged in - * programming work to guide them smoothly to product development, + * The purpose of this firmware is to provide guidance to customers engaged in + * programming work to guide them smoothly to product development, * so as to save their time. * - * Therefore, Yichip microelectronics shall not be responsible for any direct, - * indirect or consequential damages caused by any content of this gu jiang + * Therefore, Yichip microelectronics shall not be responsible for any direct, + * indirect or consequential damages caused by any content of this gu jiang * and/or contained in this code used by the customer in its products. * ****************************************************************************** @@ -25,25 +25,23 @@ #include "yc3121.h" #include "yc_gpio.h" #include "yc_uart.h" -#include "misc.h" #include "yc_msr.h" +#include "misc.h" +#include "board_config.h" /* Private typedef -----------------------------------------------------------*/ /* Private define ------------------------------------------------------------*/ -#define uartBaud 115200 - /* Private macro -------------------------------------------------------------*/ /* Private variables ---------------------------------------------------------*/ /* Private function prototypes -----------------------------------------------*/ void UART_Configuration(void); void NVIC_Configuration(void); - track_data tdata[MAX_TRACK_NUM]; int ret; int i; uint8_t cfmt, tflag; -int nResult=0; +int nResult = 0; uint8_t Opcode; /** @@ -53,21 +51,21 @@ */ int main(void) { - UART_Configuration(); + UART_Configuration(); + + MyPrintf("YcChip Yc3121 MSR Interrupt Demo V1.0.\n"); + - MyPrintf("YcChip Yc3121 MSR Interrupt Demo V1.0.\n"); + MyPrintf("start MSR test\n"); + MSR_Init(); - - MyPrintf("start MSR test\n"); - MSR_Init(); - - MSR_ITEnable(ENABLE,TRACK_SELECT_2);//使能磁道二触发中断， - NVIC_Configuration(); - MyPrintf("please swiping card\n"); - while(1) - { + MSR_ITEnable(ENABLE, TRACK_SELECT_2); //使能磁道二触发中断， + NVIC_Configuration(); + MyPrintf("please swiping card\n"); + while (1) + { - } + } } /** @@ -77,8 +75,8 @@ */ void NVIC_Configuration(void) { - NVIC_EnableIRQ(MSR_IRQn); - NVIC_SetPriority(MSR_IRQn, 0); + NVIC_EnableIRQ(MSR_IRQn); + NVIC_SetPriority(MSR_IRQn, 0); } /** @@ -88,32 +86,30 @@ */ void UART_Configuration(void) { - UART_InitTypeDef UART_InitStruct; + UART_InitTypeDef UART_InitStruct; - /* Configure serial ports RX and TX for IO. */ - GPIO_Config(GPIOA, GPIO_Pin_1, UART0_TXD); - GPIO_Config(GPIOA, GPIO_Pin_0, UART0_RXD); - - /* USARTx configured as follow: - - BaudRate = 115200 baud - - Word Length = 8 Bits - - Stop Bit = 1 Stop Bit - - Parity = No Parity - - Hardware flow control disabled (RTS and CTS signals) - - Receive and transmit enabled - */ - UART_InitStruct.BaudRate = uartBaud; //Configure serial port baud rate, the baud rate defaults to 128000. - UART_InitStruct.DataBits = Databits_8b; - UART_InitStruct.StopBits = StopBits_1; - UART_InitStruct.Parity = Parity_None; - UART_InitStruct.FlowCtrl = FlowCtrl_None; - UART_InitStruct.Mode = Mode_duplex; + /* Configure serial ports RX and TX for IO. */ + UART0_TX_IO_CONFIG + UART0_RX_IO_CONFIG + + /* USARTx configured as follow: + - BaudRate = 115200 baud + - Word Length = 8 Bits + - Stop Bit = 1 Stop Bit + - Parity = No Parity + - Hardware flow control disabled (RTS and CTS signals) + - Receive and transmit enabled + */ + UART_InitStruct.BaudRate = UARTBAUD; //Configure serial port baud rate, the baud rate defaults to 128000. + UART_InitStruct.DataBits = Databits_8b; + UART_InitStruct.StopBits = StopBits_1; + UART_InitStruct.Parity = Parity_None; + UART_InitStruct.FlowCtrl = FlowCtrl_None; + UART_InitStruct.Mode = Mode_duplex; - UART_Init(UART0, &UART_InitStruct); + UART_Init(UART0, &UART_InitStruct); } - - /** * @brief MSR interrupt service function. * @param None @@ -121,39 +117,38 @@ */ void MSR_IRQHandler(void) { - MyPrintf("msr irq handler\n"); - if(MSR_DetectSwipingCard() == DETECT_SWIPING_CARD) - { - ret = MSR_GetDecodeData(tdata, TRACK_SELECT_1|TRACK_SELECT_2|TRACK_SELECT_3, &cfmt, &tflag); - if (ret == MSR_SUCCESS) - { - for (i = 0; i < MAX_TRACK_NUM; i++) - { - MyPrintf("track%d len %d\n", i+1,tdata[i].len); - if ((tdata[i].len)>0) - { - MyPrintf("track%d data:\n", i+1,tdata[i].len); - UART_SendBuf(UART0,tdata[i].buf,tdata[i].len); - MyPrintf("\n"); - } - MyPrintf("\n"); - } - } - - for(i=0;i0) - { - MyPrintf("T%d OK",i+1); - } - tdata[i].len=0; - } - MSR_ENABLE(DISABLE); - MSR_ENABLE(ENABLE); - MyPrintf("please swiping card\n"); - } - MSR_ClearIT(TRACK_SELECT_2); + MyPrintf("msr irq handler\n"); + if (MSR_DetectSwipingCard() == DETECT_SWIPING_CARD) + { + ret = MSR_GetDecodeData(tdata, TRACK_SELECT_1 | TRACK_SELECT_2 | TRACK_SELECT_3, &cfmt, &tflag); + if (ret == MSR_SUCCESS) + { + for (i = 0; i < MAX_TRACK_NUM; i++) + { + MyPrintf("track%d len %d\n", i + 1, tdata[i].len); + if ((tdata[i].len) > 0) + { + MyPrintf("track%d data:\n", i + 1, tdata[i].len); + UART_SendBuf(UART0, tdata[i].buf, tdata[i].len); + MyPrintf("\n"); + } + MyPrintf("\n"); + } + } + + for (i = 0; i < MAX_TRACK_NUM; i++) + { + if (tdata[i].len > 0) + { + MyPrintf("T%d OK", i + 1); + } + tdata[i].len = 0; + } + MSR_ENABLE(DISABLE); + MSR_ENABLE(ENABLE); + MyPrintf("please swiping card\n"); + } + MSR_ClearIT(TRACK_SELECT_2); } - /************************ (C) COPYRIGHT Yichip Microelectronics *****END OF FILE****/