v2.0.3 修改tcp 认证包0x90

source/app/app_common.c

@@ -13,7 +13,7 @@ void L2_register_init()
 {
     U8 i = 0;
 	G.p.slaverId = 0x10;
-	G.p.wisdom_car_no = 0x91;
+	G.p.wisdom_car_no = 0x92;	//第一�车91,第二�车92
 	G.p.thrombolytic_ratio = 9;	//0.9
 	G.p.bolus_ratio = 1;	//0.9
 	G.p.hold_ratio = 9;		//0.1
@@ -79,14 +79,19 @@ void L2_register_init()
 		G.ccmd_slaver_info[i].mask = 0;
 	}
 
-	G.ccmd_slaver_info[0].slaver = SLAVER_TCP_SERVER_ID;	//�务�	//登陆包，写平车编�
+#if 0
+	G.ccmd_slaver_info[0].slaver = SLAVER_TCP_SERVER_ID;	//�务� //登陆包，写平车编�
 	G.ccmd_slaver_info[0].oper = MODBUS_OPER_WRITE_M;
 	G.ccmd_slaver_info[0].reg = 0x01;
 	G.ccmd_slaver_info[0].regnum = 0x01;
 	G.ccmd_slaver_info[0].bytes = G.ccmd_slaver_info[0].regnum * 2;
 	G.ccmd_slaver_info[0].buf = (U8*)&G.p.wisdom_car_no;
 	G.ccmd_slaver_info[0].mask = 0;
-
+#else
+	G.ccmd_slaver_info[0].slaver = SLAVER_TCP_SERVER_ID;	//�务�	//登陆包，写平车编�
+	G.ccmd_slaver_info[0].oper = MODBUS_OPER_AUTH;
+	G.ccmd_slaver_info[0].mask = 0;
+#endif
 	G.ccmd_slaver_info[1].slaver = SLAVER_TCP_SERVER_ID;	//�务�	//心跳包，写心跳寄存器
 	G.ccmd_slaver_info[1].oper = MODBUS_OPER_WRITE_M;
 	G.ccmd_slaver_info[1].reg = 0x02;

source/app/app_task_485.c

@@ -5,7 +5,7 @@
 
 //#define MODBUS_SLAVER_DW20_REG_START 0x02
 //#define MODBUS_SLAVER_DW20_REG_NUM 0x02
-#define MODBUS_SLAVER_RETRY_MAX_TIME 3
+#define MODBUS_SLAVER_RETRY_MAX_TIME 2
 
 TS_485 ts_485;
 
@@ -48,7 +48,7 @@ void L3_task_485_handle(TS_485 *s)
 		L2_task_go(D_task_485_wait_modbus_ack);
 		
     TTSS_Task_step(D_task_485_wait_modbus_ack)
-		if(s_nos_tick.t_5ms - s->sendStamp >= 20)
+		if(s_nos_tick.t_5ms - s->sendStamp >= 8)
 		{
 			if(s_uart2_rec.ok)
 			{
@@ -89,7 +89,7 @@ void L3_task_485_handle(TS_485 *s)
 							if(s->pAckPkg->buf[2] != G._keyled)	//按键发生改变
 							{
 								G._keyled = s->pAckPkg->buf[2];
-								L0_uart0_uc(G._keyled);
+								L0_uart0_uchex(G._keyled);
 								if(G._keyled == 0)
 								{
 									//TODO

source/app/main.c

@@ -137,21 +137,28 @@ void main(void)
 				G.pi_weight = G.total_weight;
 				L0_uart0_uc('#');
 			}
+			//if(s_nos_tick.t_1s >= 10)
+			//{
+				//G.jing_weight = (s_nos_tick.t_1s - 10)% 100* 10;
+				//G.rfid = s_nos_tick.t_1s - 10 % 13 + 1;
+			//}
 		}
+
 		//看门狗
 		L3_task_wdt_handle(&s_task_wdt);
-		
-		//串口0,3 RFID接收
-		L3_task_rfid_handle(&ts_rfid);
-		L3_UARTcom0_exp_protocol(&s_uart0_rec);
-		L3_UARTcom3_exp_protocol(&s_uart3_rec);
 
 		//485轮询
 		L3_task_485_handle(&ts_485);
 
 		//master->slaver发送逻辑控制
 		L3_task_485_control_handle(&ts_485_control);
-#if 1
+#if 1			
+		
+		//串口0,3 RFID接收
+		L3_task_rfid_handle(&ts_rfid);
+		L3_UARTcom0_exp_protocol(&s_uart0_rec);
+		L3_UARTcom3_exp_protocol(&s_uart3_rec);
+
 		//gm35维持连接
 		L3_task_gm35_core_handle();
 

source/tpc/tpc_ccmodbus.c

@@ -31,6 +31,7 @@ msp/uartx.c    底层代码	 和cpu相关
 
 #include "tpc_ccmodbus.h"
 #include "../clib/clib.h"
+#include "../app/app_common.h"
 
 U8 L3_pack_ccmodbus_03(TS_PH3_ccmodbus *pmodbus ,U8 slaverId, U16 reg, U16 num)
 {
@@ -86,6 +87,23 @@ U8 L3_pack_ccmodbus_10(TS_PH3_ccmodbus *pmodbus ,U8 slaverId, U16 reg, U16 num,
 	return bufsize + bytes + 2 + 2;
 }
 
+U8 L3_pack_ccmodbus_90(TS_PH3_ccmodbus *pmodbus ,U8 slaverId)
+{
+	U8 bufsize = 5,i = 0;
+	pmodbus->slaver = slaverId;
+	pmodbus->oper = MODBUS_OPER_AUTH;
+	pmodbus->buf[0] = APP_VERSION_HEX >> 4 & 0xF;	//major version
+	pmodbus->buf[1] = APP_VERSION_HEX >> 0 & 0xF;	//minor version
+	pmodbus->buf[2] = 0x00;	//mq high 
+	pmodbus->buf[3] = 0x03;	//mq low
+	pmodbus->buf[4] = G.p.wisdom_car_no;	//平车编号
+
+	crc16(pmodbus->crc,&pmodbus->slaver,2 + bufsize);
+	pmodbus->buf[bufsize] = pmodbus->crc[0];
+	pmodbus->buf[bufsize + 1] = pmodbus->crc[1];
+
+	return bufsize + 2 + 2;
+}
 
 U8 L3_pack_ccmodbus(TS_PH3_ccmodbus *pccmodbus, CCMD_SLAVER_INFO *slaver_info)
 {
@@ -103,6 +121,8 @@ U8 L3_pack_ccmodbus(TS_PH3_ccmodbus *pccmodbus, CCMD_SLAVER_INFO *slaver_info)
 	case MODBUS_OPER_WRITE_M:
 		pkglen = L3_pack_ccmodbus_10(pccmodbus,slaver_info->slaver,slaver_info->reg,slaver_info->regnum,slaver_info->bytes,slaver_info->buf);
 		break;
+	case MODBUS_OPER_AUTH:
+		pkglen = L3_pack_ccmodbus_90(pccmodbus,slaver_info->slaver);
 	default:
 		break;
 	}

source/tpc/tpc_modbus.h

@@ -37,6 +37,7 @@ enum MODBUS_OPER
 	MODBUS_OPER_WRITE = 0x06,
 	MODBUS_OPER_WRITE_M = 0x10,
 	MODBUS_OPER_ERR = 0x8F,
+	MODBUS_OPER_AUTH = 0x90,
 };
 
 enum MODBUS_ERR_CODE