修改tcp控制流程

source/app/app_common.c

@@ -105,7 +105,8 @@ void Lu_register_init()
 	G.ccmd_slaver_info[3].mask = 0;
 
 	G.modbusstmp = 0;
-	G.flowStart = 0;
+	G.authed = 0;
+	G.flowStarted = 0;
 
 	G._keyled = G._rfid = 0;
 }

source/app/app_common.h

@@ -200,7 +200,8 @@ typedef struct printer_maintenance_global
 	CCMD_SLAVER_INFO ccmd_slaver_info[CCMD_SLAVER_INFO_MAX];
 	
 	vU32 modbusstmp;
-	U16 flowStart;
+	U8 authed;
+	U8 flowStarted;
 	
 	U8 ccid[21]; //保存ccid卡号空间 20+'\0'
     TS_BoardStatus boardstatus;

source/app/app_task_tcp.c

@@ -6,7 +6,7 @@
 
 #define MODBUS_SLAVER_DW20_REG_START 0x02
 #define MODBUS_SLAVER_DW20_REG_NUM 0x02
-#define MODBUS_SLAVER_RETRY_MAX_TIME 5
+#define MODBUS_SLAVER_RETRY_MAX_TIME 1
 
 TS_tcp ts_tcp;
 
@@ -50,7 +50,7 @@ void L3_task_tcp_handle(TS_tcp *s)
 		L2_task_go(D_task_tcp_wait_modbus_ack);
 		
     TTSS_Task_step(D_task_tcp_wait_modbus_ack)
-		if(s_nos_tick.t_5ms - s->sendStamp >= 300)
+		if(s_nos_tick.t_5ms - s->sendStamp >= 20)
 		{
 			if(s_uart4_tcp_rec.ok)
 			{
@@ -64,6 +64,20 @@ void L3_task_tcp_handle(TS_tcp *s)
 					{
 						G.ccmd_slaver_info[s->slaverIndex].mask = 0;
 					}
+					
+					if(s->pAckPkg->oper == MODBUS_OPER_WRITE_M)
+					{
+						U16 reg = (U16)(s->pAckPkg.buf[0]) << 8 | (U16)(s->pAckPkg.buf[1]);
+						if(reg == G.ccmd_slaver_info[0].reg)
+						{
+							//收到认证包ack
+							G.authed = 1;
+						}
+						else if(reg == G.md_slaver_info[2].reg)
+						{
+							G.flowStarted = 1;
+						}
+					}
 				}
 			}
 			else

source/app/app_task_tcp_control.c

@@ -17,6 +17,47 @@ void L3_task_tcp_control_init(void)
 #define D_task_tcp_control_01 0x51
 
 void L3_task_tcp_control_handle(TS_tcp_control *s)
+{
+  TTSS_Task_init();
+		L2_task_go(D_task_tcp_control_01);
+		
+	TTSS_Task_step(D_task_tcp_control_01)
+		if(s->conn_ok_pool != g_at_send_status.conn_ok)
+		{
+			G.authed = 0;
+			s->conn_ok_pool = g_at_send_status.conn_ok;
+		}
+		
+		if(s->conn_ok_pool)
+		{
+			if(!G.authed)
+			{
+				//发送认证包
+				G.ccmd_slaver_info[0].mask = 1;
+			}
+			else if(!G.flowStarted)
+			{
+				//发送流程开始包
+				G.ccmd_slaver_info[2].mask = 1;
+			}
+			else
+			{
+				//3s一次发送数据包
+				if(s_nos_tick.t_1s - ts_tcp_control.tcp_send_stmp >= 2)
+				{
+					G.ccmd_slaver_info[3].mask = 1;
+					ts_tcp_control.tcp_send_stmp = s_nos_tick.t_1s;
+				}
+			}
+		}
+		
+		L2_task_go(D_task_tcp_control_01);
+		
+	TTSS_Task_end();
+}
+
+
+void L3_task_tcp_control_handle111(TS_tcp_control *s)
 {
   TTSS_Task_init();
 		L2_task_go(D_task_tcp_control_01);
@@ -57,3 +98,4 @@ void L3_task_tcp_control_handle(TS_tcp_control *s)
 }
 
 
+