20211112硬件测试OK

si4/soft_gsm_main.si4project/soft_gsm_main.siproj_settings.xml → si4/soft_gsm_main.si4project/soft_ps5ws.siproj_settings.xml

@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSettings
-	AppVer="4.00.0093"
-	AppVerMinReader="4.00.0034"
-	GlobalConfiguration="1"
-	GlobalWorkspace="0"
-	LocalsInDb="0"
-	IndexMembers="1"
-	IndexFragments="1"
-	UseMasterFileList="0"
-	SourceDir="..\..\source"
-	BackupDir="%PROJECT_DATA_DIR%\Backup"
-	MasterFileList="%PROJECT_SOURCE_DIR%\%PROJECT_NAME%_filelist.txt"
-	IsImportProject="0"
-	>
-	<Imports>
-		<ImportedLibs/>
-	</Imports>
-	<ParseConditions>
-		<Defines/>
-	</ParseConditions>
-</ProjectSettings>
+<?xml version="1.0" encoding="utf-8"?>
+<ProjectSettings
+	AppVer="4.00.0093"
+	AppVerMinReader="4.00.0034"
+	GlobalConfiguration="1"
+	GlobalWorkspace="0"
+	LocalsInDb="0"
+	IndexMembers="1"
+	IndexFragments="1"
+	UseMasterFileList="0"
+	SourceDir="..\..\source"
+	BackupDir="%PROJECT_DATA_DIR%\Backup"
+	MasterFileList="%PROJECT_SOURCE_DIR%\%PROJECT_NAME%_filelist.txt"
+	IsImportProject="0"
+	>
+	<Imports>
+		<ImportedLibs/>
+	</Imports>
+	<ParseConditions>
+		<Defines/>
+	</ParseConditions>
+</ProjectSettings>

source/app/app_common.c

@@ -15,21 +15,21 @@ U32 code key_rfid_map[KEY_RFID_MAP_SIZE] =
 	/// key,	rfid
 	//0x01,1,	///S1			///key_map[0]  key_map[1]  
 	//0x02,11,  ///S2			///key_map[n]	 key_map[n+1]  
-	0x02,0x02000020,     ///呼叫 S2 
-	0x12,0x02000001,     ///分诊 S12
-	0x03,0x03010301,     ///一线 S3 医生1
-	0x03,0x03010302,     ///一线 S3 医生2
-	0x16,0x02000059,     ///采血 S13
-	0x04,0x02000025,     ///心电 S4
-	0x17,0x02000003,     ///CT S14
-	0x08,0x03020301,     ///二线 S5 医生1
-	0x08,0x03020302,     ///二线 S5 医生2
-	0x18,0x01000008,     ///谈话 S15
-	0x09,0x01000009,     ///签字 S6
-	0x1D,0x02000060,     ///团注 S16
-	0x0A,0x02000005,     ///介入 S7
-	0x1F,0x0100000C,     ///置鞘（穿刺） S17
-	0x0B,0x02000023,     ///病房 S8
+	0x03,0x02000020,     ///呼叫 S2 
+	0x04,0x02000001,     ///分诊 S12
+	0x08,0x03010301,     ///一线 S3 医生1
+	0x08,0x03010302,     ///一线 S3 医生2
+	0x09,0x02000059,     ///采血 S13
+	0x0A,0x02000025,     ///心电 S4
+	0x0B,0x02000003,     ///CT S14
+	0x0F,0x03020301,     ///二线 S5 医生1
+	0x0F,0x03020302,     ///二线 S5 医生2
+	0x10,0x01000008,     ///谈话 S15
+	0x11,0x01000009,     ///签字 S6
+	0x12,0x02000060,     ///团注 S16
+	0x16,0x02000005,     ///介入 S7
+	0x17,0x0100000C,     ///置鞘（穿刺） S17
+	0x18,0x02000023,     ///病房 S8
 	//0x1d,9,     ///S16
 	//0x1f,10,    ///S17
 	//0x1e,0     ///	清零按键，无需亮灯

source/app/app_common.h

@@ -6,7 +6,7 @@
 #include "../tpc/tpc_modbus.h"
 #include "../tpc/tpc_ccmodbus.h"
 
-#define D_CAR_HOSPITAL_NO 0x0001
+#define D_CAR_HOSPITAL_NO 0x0000
 
 #define APP_VERSION_HEX 0x30	//高4位主版本，低4位次版本
 

source/app/app_drv.c

@@ -106,7 +106,8 @@ void L3_UARTcom0_exp_protocol(TS_Handle_PH3 *p)
 void L3_UARTcom4_exp_protocol(TS_Handle_PH3 *p)
 {
 	if (1 == p->ok ) //收到消息
-	{
+	{	
+		L0_uart0_uc('1');
 		if(p->ts_ccmodbus.slaver == G.p.wisdom_car_no )  
 		{//平车作为slaver，服务器作为master发送的ccmodbus消息
 			U16 reg = (U16)p->ts_ccmodbus.buf[0] << 8 | p->ts_ccmodbus.buf[1];
@@ -133,7 +134,12 @@ void L3_UARTcom4_exp_protocol(TS_Handle_PH3 *p)
 			{//0x90
 				G.authed = 1;
 			}
-			else
+			else if(p->ts_ccmodbus.oper == 0x91)	
+			{//0x90
+				G.flowStarted = 1;
+			}
+			#if 1
+			else//与服务器不匹配，暂时废弃
 			{//0x03,0x06,0x10
 				U16 reg = (U16)p->ts_ccmodbus.buf[0] << 8 | p->ts_ccmodbus.buf[1];
 				if(reg == 0x0003)	
@@ -141,6 +147,7 @@ void L3_UARTcom4_exp_protocol(TS_Handle_PH3 *p)
 					G.flowStarted = 1;
 				}
 			}
+			#endif
 		}	
 		p->ok = 0;
 	}

source/app/main.c

@@ -119,8 +119,9 @@ void main(void)
 				G.pi_weight = G.total_weight;
 				L0_uart0_uc('#');
 			}
+			//P55 ^=1;
 		}
-
+#if 1		
 		//看门狗
 		L3_task_wdt_handle(&s_task_wdt);
 
@@ -142,6 +143,7 @@ void main(void)
 
 		//服务端(4G)协议处理
 		L3_UARTcom4_exp_protocol(&s_uart4_tcp_rec);
+#endif
 	}
 }//end main
 

source/tpc/tpc_ccmodbus.c

@@ -168,6 +168,7 @@ void L1_s2b_PH3(TS_Handle_PH3 *p)// reentrant
 				crc16(p->crc,p->sp + p->crcOffset,p->num - 1 - p->crcOffset);	//p->num + 1 - 2 - p->crcOffset
 				if(p->crc[0] == p->sp[p->num-1] && p->crc[1] == p->sp[p->num])
 				{
+				//P55 ^= 1;
 					if (p->ok != 1)
 					{
 						byte_copy_uc((U8*)&p->ts_ccmodbus,(U8*)p->sp,p->num + 1);