区分按键与rfid

source/app/app_common.c

@@ -106,6 +106,8 @@ void Lu_register_init()
 
 	G.modbusstmp = 0;
 	G.flowStart = 0;
+
+	G._keyled = G._rfid = 0;
 }
 
 void L3_protocol_handler_uart4_fun(U8 *pPara)

source/app/app_common.h

@@ -204,6 +204,8 @@ typedef struct printer_maintenance_global
 	
 	U8 ccid[21]; //保存ccid卡号空间 20+'\0'
     TS_BoardStatus boardstatus;
+	U8 _keyled;
+	U8 _rfid;
 }PMGlobal;
 
 

source/app/app_drv.c

@@ -68,7 +68,10 @@ void L3_UARTcom3_exp_protocol(TS_Handle_PH3 *p)
 	#if 1
 		TS_PH3_ccmodbus ccmodbus;
 		byte_copy_uc((U8*)&ccmodbus,(U8*)&p->ts_ccmodbus,p->ts_ccmodbus.num + 3);
-		G.rfid = ccmodbus.buf[0];
+		if(ccmodbus.buf[0] != G._rfid)	//rfid发生改变
+		{
+			G.rfid = G._rfid = ccmodbus.buf[0];
+		}
 		L0_uart3_uc(G.rfid & 0xFF);
 	#else
 		L0_uart3_uc(p->reg);

source/app/app_task_485.c

@@ -65,6 +65,9 @@ void L3_task_485_handle(TS_485 *s)
 					//TODO 这里可以根据modbus协议让代码通用，
 					if(s->pAckPkg->oper == MODBUS_OPER_READ)
 					{
+						L0_uart0_uc(s->pAckPkg->salver);
+						Lc_delay_ms(70);
+						L0_uart0_uc(G.md_slaver_info[4].slaver);
 						if(s->pAckPkg->salver == G.md_slaver_info[0].slaver)
 						{
 							G.total_weight = 
@@ -82,9 +85,13 @@ void L3_task_485_handle(TS_485 *s)
 							L0_uart0_uc(s->pAckPkg->buf[1]);
 							Lc_delay_ms(70);
 							L0_uart0_uc(s->pAckPkg->buf[2]);
-							if(s->pAckPkg->buf[1] != 0 || s->pAckPkg->buf[2] != 0)	//按键不为0
+							//if(s->pAckPkg->buf[1] != 0 || s->pAckPkg->buf[2] != 0)	//按键不为0
+							//{
+							//	G.rfid =  (U16)(s->pAckPkg->buf[1]) << 8 | (U16)(s->pAckPkg->buf[2]);
+							//}
+							if(s->pAckPkg->buf[2] != G._keyled)	//按键发生改变
 							{
-								G.rfid =  (U16)(s->pAckPkg->buf[1]) << 8 | (U16)(s->pAckPkg->buf[2]);
+								G.rfid = G._keyled = s->pAckPkg->buf[2];
 							}
 						}
 					}