临时存档

apps/earphone/remote_control/RFID/rfid_event.c

@@ -4,10 +4,6 @@
  ********************************************************************************************************/
 
 #include "./include/rfid_main.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "./include/READER.h"
 #include "./include/READER_REG.h"
 #include "./include/MIFARE.h"
@@ -16,11 +12,11 @@
 #include "./rfid_hal.h" 
 
 
-#define ENABLE_XLOG 1
+#define FUN_ENABLE_XLOG 1
 #ifdef xlog
 #undef xlog
 #endif
-#if ENABLE_XLOG
+#if FUN_ENABLE_XLOG
     #define xlog(format, ...) printf("[XT:%s] " format, __func__, ##__VA_ARGS__)
 #else
     #define xlog(format, ...) ((void)0)
@@ -49,16 +45,16 @@ void TYPE_A_EVENT(void)
     if (result != SUCCESS)
     {
         xlog("INIT_ERROR\r\n");
-        SetCW(DISABLE);
+        SetCW(FUN_DISABLE);
         return;
     }
 
     // 打开RF场（载波）
-    result = SetCW(ENABLE);
+    result = SetCW(FUN_ENABLE);
     if (result != SUCCESS)
     {
         xlog("CW_ERROR\r\n");
-        SetCW(DISABLE);
+        SetCW(FUN_DISABLE);
         return;
     }
 
@@ -67,7 +63,7 @@ void TYPE_A_EVENT(void)
     if (result != SUCCESS)
     {
         // xlog("ReaderA_CardActivate_ERROR\r\n");
-        SetCW(DISABLE);
+        SetCW(FUN_DISABLE);
         return;
     }
 
@@ -102,7 +98,7 @@ void TYPE_A_EVENT(void)
         result = NTAG_EVENT();
     }
 
-    SetCW(DISABLE); // 关闭RF场
+    SetCW(FUN_DISABLE); // 关闭RF场
 }
 
 /**
@@ -124,12 +120,12 @@ void TYPE_B_EVENT(void)
     xlog("TYPE_B_EVENT begin\n");
 
     ReaderB_Initial();
-    SetCW(ENABLE);
+    SetCW(FUN_ENABLE);
 
     result = ReaderB_Request(&PICC_B);
     if (result != SUCCESS)
     {
-        SetCW(DISABLE);
+        SetCW(FUN_DISABLE);
         return;
     }
 
@@ -142,7 +138,7 @@ void TYPE_B_EVENT(void)
     result = ReaderB_Attrib(&PICC_B);
     if (result != SUCCESS)
     {
-        SetCW(DISABLE);
+        SetCW(FUN_DISABLE);
         return;
     }
     xlog("-> ATTRIB = %02X\r\n", PICC_B.CID);
@@ -150,14 +146,14 @@ void TYPE_B_EVENT(void)
     result = ReaderB_Get_SN(&PICC_B);
     if (result != SUCCESS)
     {
-        SetCW(DISABLE);
+        SetCW(FUN_DISABLE);
         return;
     }
     xlog("-> SN = ");
     for(i=0; i<8; i++) xlog("%02X", PICC_B.SN[i]);
     xlog("\r\n");
 
-    SetCW(DISABLE);
+    SetCW(FUN_DISABLE);
 }
 
 /**
@@ -178,12 +174,12 @@ void TYPE_V_EVENT(void)
     xlog("TYPE_V_EVENT begin\n");
 
     ReaderV_Initial();
-    SetCW(ENABLE);
+    SetCW(FUN_ENABLE);
 
     result = ReaderV_Inventory(&PICC_V);
     if (result != SUCCESS)
     {
-        SetCW(DISABLE);
+        SetCW(FUN_DISABLE);
         xlog("-> ReaderV Inventory ERROR!\r\n");
         return;
     }
@@ -199,7 +195,7 @@ void TYPE_V_EVENT(void)
     result = ReaderV_Select(&PICC_V);
     if (result != SUCCESS)
     {
-        SetCW(DISABLE);
+        SetCW(FUN_DISABLE);
         xlog("-> ReaderV Select ERROR!\r\n");
         return;
     }
@@ -209,7 +205,7 @@ void TYPE_V_EVENT(void)
     result = ReaderV_WriteSingleBlock(4, &PICC_V);
     if (result != SUCCESS)
     {
-        SetCW(DISABLE);
+        SetCW(FUN_DISABLE);
         xlog("-> ReaderV WriteSingleBlock ERROR!\r\n");
         return;
     }
@@ -219,13 +215,13 @@ void TYPE_V_EVENT(void)
     result = ReaderV_ReadSingleBlock(4, &PICC_V);
     if (result != SUCCESS)
     {
-        SetCW(DISABLE);
+        SetCW(FUN_DISABLE);
         xlog("-> ReaderV ReadSingleBlock ERROR!\r\n");
         return;
     }
     xlog("BLOCK DATA = %02X%02X%02X%02X \r\n", PICC_V.BLOCK_DATA[0], PICC_V.BLOCK_DATA[1], PICC_V.BLOCK_DATA[2], PICC_V.BLOCK_DATA[3]);
 
-    SetCW(DISABLE);
+    SetCW(FUN_DISABLE);
 }
 
 /**
@@ -245,12 +241,12 @@ void TYPE_F_EVENT(void)
     unsigned char result, i;
     xlog("TYPE_F_EVENT begin\n");
     ReaderF_Initial();
-    SetCW(ENABLE);
+    SetCW(FUN_ENABLE);
 
     result = ReaderF_Inventory(&PICC_F);
     if (result != SUCCESS)
     {
-        SetCW(DISABLE);
+        SetCW(FUN_DISABLE);
         return;
     }
 
@@ -259,7 +255,7 @@ void TYPE_F_EVENT(void)
     for(i=0; i<8; i++) xlog("%02X", PICC_F.UID[i]);
     xlog("\r\n");
 
-    SetCW(DISABLE);
+    SetCW(FUN_DISABLE);
 }
 
 
@@ -276,7 +272,8 @@ void rfid_task_fuc(void)
     if(first_init == 0){
         first_init = 1;
 
-        rfid_hal_init();
+        // rfid_hal_init();
+        FM176XX_HardInit();
         // 2. 复位 FM176XX 芯片
         while (1)
         {