222

source/app/app_common.c

@@ -93,7 +93,7 @@ void Lu_register_init()
 	G.ccmd_slaver_info[2].reg = 0x03;
 	G.ccmd_slaver_info[2].regnum = 0x01;
 	G.ccmd_slaver_info[2].bytes = G.ccmd_slaver_info[2].regnum * 2;
-	G.ccmd_slaver_info[2].buf = (U8*)&G.flowStart;
+	G.ccmd_slaver_info[2].buf = (U8*)&G.flowStarted;
 	G.ccmd_slaver_info[2].mask = 0;
 	
 	G.ccmd_slaver_info[3].slaver = SLAVER_TCP_SERVER_ID;	//�务�

source/app/app_task_tcp.c

@@ -67,7 +67,7 @@ void L3_task_tcp_handle(TS_tcp *s)
 					
 					if(s->pAckPkg->oper == MODBUS_OPER_WRITE_M)
 					{
-						U16 reg = (U16)(s->pAckPkg.buf[0]) << 8 | (U16)(s->pAckPkg.buf[1]);
+						U16 reg = (U16)(s->pAckPkg->buf[0]) << 8 | (U16)(s->pAckPkg->buf[1]);
 						if(reg == G.ccmd_slaver_info[0].reg)
 						{
 							//收到认证包ack

source/app/app_task_tcp_control.c

@@ -57,6 +57,7 @@ void L3_task_tcp_control_handle(TS_tcp_control *s)
 }
 
 
+#if 0
 void L3_task_tcp_control_handle111(TS_tcp_control *s)
 {
   TTSS_Task_init();
@@ -73,7 +74,7 @@ void L3_task_tcp_control_handle111(TS_tcp_control *s)
 				G.ccmd_slaver_info[0].mask = 1;
 
 				//发送流程开始包
-				if(G.flowStart == 0)
+				if(G.flowStarted == 0)
 				{
 					G.flowStart = 1;
 					G.ccmd_slaver_info[2].mask = 1;
@@ -96,6 +97,6 @@ void L3_task_tcp_control_handle111(TS_tcp_control *s)
 		
 	TTSS_Task_end();
 }
-
+#endif