From 474217b83e050c8a7d5b1512c4decb82db2bbe64 Mon Sep 17 00:00:00 2001
From: "mr.zhangsan" <zezhao_wei@163.com>
Date: Tue, 18 Jun 2024 14:17:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9rfid=5Ftask?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 keilp/cc_as_stc02_ps5ws.uvprojx | 25 ++++++++++---------------
 source/app/app_config.c         |  1 +
 source/app/task_rfid.c          |  7 +++++--
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/keilp/cc_as_stc02_ps5ws.uvprojx b/keilp/cc_as_stc02_ps5ws.uvprojx
index 49cd302..d897f82 100644
--- a/keilp/cc_as_stc02_ps5ws.uvprojx
+++ b/keilp/cc_as_stc02_ps5ws.uvprojx
@@ -400,11 +400,6 @@
         <Group>
           <GroupName>msp</GroupName>
           <Files>
-            <File>
-              <FileName>time.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\source\msp\time.c</FilePath>
-            </File>
             <File>
               <FileName>UART0.C</FileName>
               <FileType>1</FileType>
@@ -415,11 +410,6 @@
               <FileType>1</FileType>
               <FilePath>..\source\msp\eeprom.c</FilePath>
             </File>
-            <File>
-              <FileName>uart_x.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\source\msp\uart_x.c</FilePath>
-            </File>
             <File>
               <FileName>UART3.c</FileName>
               <FileType>1</FileType>
@@ -435,6 +425,11 @@
               <FileType>1</FileType>
               <FilePath>..\source\msp\UART4.C</FilePath>
             </File>
+            <File>
+              <FileName>UARTX.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\source\msp\UARTX.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -495,16 +490,16 @@
               <FileType>1</FileType>
               <FilePath>..\source\ctask\tick.c</FilePath>
             </File>
+            <File>
+              <FileName>time.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\source\ctask\time.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
           <GroupName>tpc</GroupName>
           <Files>
-            <File>
-              <FileName>modbus.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\source\tpc\modbus.c</FilePath>
-            </File>
             <File>
               <FileName>debug.c</FileName>
               <FileType>1</FileType>
diff --git a/source/app/app_config.c b/source/app/app_config.c
index cb454b3..13a72f0 100644
--- a/source/app/app_config.c
+++ b/source/app/app_config.c
@@ -238,6 +238,7 @@ void L3_set_power_mode(U8 mode)
 	}
 	else
 	{
+		//启用rfid
 		bsp_rfid_en(RFID_ENABLE);
 		//重新初始化RFID任务
 		L3_task_rfid_init();
diff --git a/source/app/task_rfid.c b/source/app/task_rfid.c
index 82e676f..a007db7 100644
--- a/source/app/task_rfid.c
+++ b/source/app/task_rfid.c
@@ -34,7 +34,8 @@ void L3_task_rfid_init(void)
 	L3_task_s_go(_s_task_rfid,D_task_init);
 }
 
-#define D_task_RFID_READ 0x50
+#define D_task_RFID_SET 0x50
+#define D_task_RFID_READ 0x51
 
 void L3_task_rfid_handler(S_TASK_RFID *s)
 {
@@ -43,7 +44,10 @@ void L3_task_rfid_handler(S_TASK_RFID *s)
 		L0_uart0_uchex(sizeof(rfidSetWCmd) / sizeof(U8));
 		L0_uart0_uchex(sizeof(rfidSelCmd) / sizeof(U8));
 		L0_uart0_uchex(sizeof(rfidLoopRead) / sizeof(U8));
+		//注意这里加delay，因为rfid_en是强推挽模式，强推挽模式生效有延迟
+		L2_task_go_Tdelay(D_task_RFID_SET,D_Tdelay_300ms);
 		
+	TTSS_Task_step(D_task_RFID_SET)
 		//1.设置天线
 		L0_uart4_sendArray(rfidSetChannelCmd, sizeof(rfidSetChannelCmd) / sizeof(U8));
 		NOP10();
@@ -56,7 +60,6 @@ void L3_task_rfid_handler(S_TASK_RFID *s)
 		//4.启动轮询
 		L0_uart4_sendArray(rfidLoopRead, sizeof(rfidLoopRead) / sizeof(U8));
 		NOP10();
-
 		L2_task_go(D_task_RFID_READ);
 
 	TTSS_Task_step(D_task_RFID_READ)