修正部分注释

Inc/KeySlave485.h

@@ -325,7 +325,7 @@
 
 
 #define 	ADDR_Sw_VoicePlay							0x8000	//切换语音播报功能  
-#define 	ADDR_Sw_ValveRaw							0x8001			//切换阀门的原始数据或者汉字数据 
+#define 	ADDR_Sw_ValveRaw							0x8001	//切换阀门的原始数据或者汉字数据 
 
 
 //新增密码存储地址
@@ -482,6 +482,7 @@
 //功能码
 #define FrameHeader_Collect  0xAA
 #define EquipmentNum_Collect 0x00
+
 #define ValveState_Fuction   0x01
 #define SensorValue_Function 0x02
 #define WriteStore_Function  0x03
@@ -532,14 +533,14 @@
 #define Collector_Get_WenduYewei_Data_5to8		 			0x1122	 //5--8仓数据
 
 
-#define Collector_Get_All_Sensor_Data_Cang01		 			0x1193	 //传送1仓所有传感器命令，每个传感器4字节，不区分IO类或者模拟量类，详见《淡仓数据传输协议》
-#define Collector_Get_All_Sensor_Data_Cang02		 			0x1194	 //传送2仓所有传感器命令
-#define Collector_Get_All_Sensor_Data_Cang03		 			0x1195	 //传送3仓所有传感器命令
-#define Collector_Get_All_Sensor_Data_Cang04		 			0x1196	 //传送4仓所有传感器命令
-#define Collector_Get_All_Sensor_Data_Cang05		 			0x1197	 //传送5仓所有传感器命令
-#define Collector_Get_All_Sensor_Data_Cang06		 			0x1198	 //传送6仓所有传感器命令
-#define Collector_Get_All_Sensor_Data_Cang07		 			0x1199	 //传送7仓所有传感器命令
-#define Collector_Get_All_Sensor_Data_Cang08		 			0x119A	 //传送8仓所有传感器命令
+#define Collector_Get_All_Sensor_Data_Cang01		 				0x1193	 //传送1仓所有传感器命令，每个传感器4字节，不区分IO类或者模拟量类，详见《淡仓数据传输协议》
+#define Collector_Get_All_Sensor_Data_Cang02		 				0x1194	 //传送2仓所有传感器命令
+#define Collector_Get_All_Sensor_Data_Cang03		 				0x1195	 //传送3仓所有传感器命令
+#define Collector_Get_All_Sensor_Data_Cang04		 				0x1196	 //传送4仓所有传感器命令
+#define Collector_Get_All_Sensor_Data_Cang05		 				0x1197	 //传送5仓所有传感器命令
+#define Collector_Get_All_Sensor_Data_Cang06		 				0x1198	 //传送6仓所有传感器命令
+#define Collector_Get_All_Sensor_Data_Cang07		 				0x1199	 //传送7仓所有传感器命令
+#define Collector_Get_All_Sensor_Data_Cang08		 				0x119A	 //传送8仓所有传感器命令
 #define Collector_Get_All_Sensor_Data_WholeCar		 			0x119B	 //传送8仓所有传感器命令
 
 

MDK-ARM/TestF7.uvoptx

@@ -355,7 +355,7 @@
 
   <Group>
     <GroupName>Application/User</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -719,7 +719,7 @@
 
   <Group>
     <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -895,7 +895,7 @@
 
   <Group>
     <GroupName>APP</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -939,7 +939,7 @@
 
   <Group>
     <GroupName>COMM</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -995,7 +995,7 @@
 
   <Group>
     <GroupName>LIB</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

Src/CollectMaster485.c

@@ -1145,6 +1145,7 @@ void Platform_SetOilStyle (void)//
 	USART2_TX_BUF[6]=(CRC_dataTX>>8)&0xFF;//高位在前;
 	CollectMaster485_Send_Data(USART2_TX_BUF,8);
 }
+
 void Platform_ExceptionHandling (void)//新增
 {//当采集器接收到异常数据标志，不再判断人孔盖状态，只上传全关数据
 	uint16_t CRC_dataTX;

Src/TerminalSlave485.c

@@ -49,12 +49,12 @@ static uint8_t FlagPrint =0;       //
    0x3901,
 	 0x9551000,
 	 0x0003,
-   ADDR_Is_In_ElecFence,//0x0000,
-	 0x0001,        //操作的数据个数
-   0x55aa55aa,    //保留字4字节
+   ADDR_Is_In_ElecFence,	//0x0000,
+	 0x0001,        				//操作的数据个数
+   0x55aa55aa,    				//保留字4字节
    {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,\
 	 25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44},
-	 0x7788,//保留字2字节
+	 0x7788	,	//保留字2字节
    0x99aa   //校验2字节
 };
 sT2C_RemoteCaliDat *pT2C_RemoteCaliData = &T2C_RemoteCaliDat001; 
@@ -1271,12 +1271,12 @@ void Data_analysis(void)
 				data_frame.Frame_addr = MODBUS_ASCII_AsciiToHex(temp_dataFromUsart1+1);
 				//判断地址是否正确
 				if(((data_frame.Frame_addr>=0x47)&&(data_frame.Frame_addr<=0x4e))||
-					(data_frame.Frame_addr==TERMINAL_CONTROL_GET_SENSOR_D1)||
-				(data_frame.Frame_addr==0xA1)||
-				(data_frame.Frame_addr==TERMINAL_CONTROL_GET_SENSOR_D2)||
-				(data_frame.Frame_addr==0x40)||
-				((data_frame.Frame_addr>=0x30)&&(data_frame.Frame_addr<=0x6f))||
-				((data_frame.Frame_addr>=TERMINAL_CONTROL_GET_Store01_ALL_Sensor)&&(data_frame.Frame_addr<=TERMINAL_CONTROL_GET_Whole_Car_Sensor))
+						(data_frame.Frame_addr==TERMINAL_CONTROL_GET_SENSOR_D1)||
+						(data_frame.Frame_addr==0xA1)||
+						(data_frame.Frame_addr==TERMINAL_CONTROL_GET_SENSOR_D2)||
+						(data_frame.Frame_addr==0x40)||
+						((data_frame.Frame_addr>=0x30)&&(data_frame.Frame_addr<=0x6f))||
+						((data_frame.Frame_addr>=TERMINAL_CONTROL_GET_Store01_ALL_Sensor)&&(data_frame.Frame_addr<=TERMINAL_CONTROL_GET_Whole_Car_Sensor))
 				)
 				{//地址码或者功能码正确合法-----开始
 					Sealing_Data.TerminalOnLineFlag = True;
@@ -2705,63 +2705,63 @@ sT2C_ALL_Sensor_Data_Each_Cang* pT2C_ALL_Sensor_Data0x93;
   }
 
 	
-									memcpy(&USART1_TX_BUF[1],&USART1_RX_BUF[1],4);
-									sprintf((char *)(char*)USART1_TX_BUF+5,"%02X",0x4a);//(16+4*33)/1
+		memcpy(&USART1_TX_BUF[1],&USART1_RX_BUF[1],4);
+		sprintf((char *)(char*)USART1_TX_BUF+5,"%02X",0x4a);//(16+4*33)/1
+
+
+		memcpy(&USART1_TX_BUF[1+6],pT2C_ALL_Sensor_Data0x93->FrameHead,16);
+	 
+		//pT2C_ALL_Sensor_Data0x93->ElecSealState=0x12345678;
+		//memcpy(&USART1_TX_BUF[17],&T2C_ALL_Sensor_Data01.ElecSealState,4); //17--20
+		
+		//pT2C_ALL_Sensor_Data0x93->ElecSealState=0x1122aacc;//*123.45f;//for test  仅用于测试
+		uni_0x93.u32Dat=pT2C_ALL_Sensor_Data0x93->ElecSealState;//T2C_ALL_Sensor_Data01.ElecSealState;
+		USART1_TX_BUF[17+0+6]=uni_0x93.array_u8[3];
+		USART1_TX_BUF[17+1+6]=uni_0x93.array_u8[2];
+		USART1_TX_BUF[17+2+6]=uni_0x93.array_u8[1];
+		USART1_TX_BUF[17+3+6]=uni_0x93.array_u8[0];
 	
 	
-									memcpy(&USART1_TX_BUF[1+6],pT2C_ALL_Sensor_Data0x93->FrameHead,16);
-								 
-								  //pT2C_ALL_Sensor_Data0x93->ElecSealState=0x12345678;
-								  //memcpy(&USART1_TX_BUF[17],&T2C_ALL_Sensor_Data01.ElecSealState,4); //17--20
-									
-									//pT2C_ALL_Sensor_Data0x93->ElecSealState=0x1122aacc;//*123.45f;//for test  仅用于测试
-								  uni_0x93.u32Dat=pT2C_ALL_Sensor_Data0x93->ElecSealState;//T2C_ALL_Sensor_Data01.ElecSealState;
-									USART1_TX_BUF[17+0+6]=uni_0x93.array_u8[3];
-									USART1_TX_BUF[17+1+6]=uni_0x93.array_u8[2];
-									USART1_TX_BUF[17+2+6]=uni_0x93.array_u8[1];
-									USART1_TX_BUF[17+3+6]=uni_0x93.array_u8[0];
-								
-								
-								
-									//memcpy(&USART1_TX_BUF[21],&T2C_ALL_Sensor_Data01.IO_Valve_Data_Every_Cang,21*4); //17--20
-								
-									//21个u32转换
-									for(i_0x93=0;i_0x93<21;i_0x93++)
-									{
-										uni_0x93.u32Dat=pT2C_ALL_Sensor_Data0x93->IO_Valve_Data_Every_Cang[i_0x93];
-										USART1_TX_BUF[21+0+i_0x93*4+0+6]=uni_0x93.array_u8[3];
-										USART1_TX_BUF[21+0+i_0x93*4+1+6]=uni_0x93.array_u8[2];
-										USART1_TX_BUF[21+0+i_0x93*4+2+6]=uni_0x93.array_u8[1];
-										USART1_TX_BUF[21+0+i_0x93*4+3+6]=uni_0x93.array_u8[0];
-									
-									}
-								
-								
-								  
-                  //memcpy(&USART1_TX_BUF[21+84],&T2C_ALL_Sensor_Data01.MoniLiang_Data_Every_Cang,11*4); //17--20
-								  
-								 
-								  //11个浮点数转换
-									for(i_0x93=0;i_0x93<11;i_0x93++)
-									{
-										uni_0x93.flo_Data=pT2C_ALL_Sensor_Data0x93->MoniLiang_Data_Every_Cang[i_0x93];
-										USART1_TX_BUF[21+84+i_0x93*4+0+6]=uni_0x93.array_u8[3];
-										USART1_TX_BUF[21+84+i_0x93*4+1+6]=uni_0x93.array_u8[2];
-										USART1_TX_BUF[21+84+i_0x93*4+2+6]=uni_0x93.array_u8[1];
-										USART1_TX_BUF[21+84+i_0x93*4+3+6]=uni_0x93.array_u8[0];
-									
-									}
-								
-								
-								
-									//Lrc_temp = MODBUS_Hex_GetLrc(USART1_TX_BUF+1,148);//154
-									Lrc_temp = MODBUS_ASCII_GetLrc(USART1_TX_BUF+1,154);//154
-									
-								  //USART1_TX_BUF[149+6]=Lrc_temp;
-									//sprintf((char *)&USART1_TX_BUF[149+6],"%02X",Lrc_temp);
-									sprintf((char *)(char*)USART1_TX_BUF+149+6,"%02X",Lrc_temp);
-								  USART1_TX_BUF[LenthOf_Reply0x93-2]=0x0d;
-								  USART1_TX_BUF[LenthOf_Reply0x93-1]=0x0a;
+	
+		//memcpy(&USART1_TX_BUF[21],&T2C_ALL_Sensor_Data01.IO_Valve_Data_Every_Cang,21*4); //17--20
+	
+		//21个u32转换
+		for(i_0x93=0;i_0x93<21;i_0x93++)
+		{
+			uni_0x93.u32Dat=pT2C_ALL_Sensor_Data0x93->IO_Valve_Data_Every_Cang[i_0x93];
+			USART1_TX_BUF[21+0+i_0x93*4+0+6]=uni_0x93.array_u8[3];
+			USART1_TX_BUF[21+0+i_0x93*4+1+6]=uni_0x93.array_u8[2];
+			USART1_TX_BUF[21+0+i_0x93*4+2+6]=uni_0x93.array_u8[1];
+			USART1_TX_BUF[21+0+i_0x93*4+3+6]=uni_0x93.array_u8[0];
+		
+		}
+	
+	
+		
+		//memcpy(&USART1_TX_BUF[21+84],&T2C_ALL_Sensor_Data01.MoniLiang_Data_Every_Cang,11*4); //17--20
+		
+	 
+		//11个浮点数转换
+		for(i_0x93=0;i_0x93<11;i_0x93++)
+		{
+			uni_0x93.flo_Data=pT2C_ALL_Sensor_Data0x93->MoniLiang_Data_Every_Cang[i_0x93];
+			USART1_TX_BUF[21+84+i_0x93*4+0+6]=uni_0x93.array_u8[3];
+			USART1_TX_BUF[21+84+i_0x93*4+1+6]=uni_0x93.array_u8[2];
+			USART1_TX_BUF[21+84+i_0x93*4+2+6]=uni_0x93.array_u8[1];
+			USART1_TX_BUF[21+84+i_0x93*4+3+6]=uni_0x93.array_u8[0];
+		
+		}
+	
+	
+	
+		//Lrc_temp = MODBUS_Hex_GetLrc(USART1_TX_BUF+1,148);//154
+		Lrc_temp = MODBUS_ASCII_GetLrc(USART1_TX_BUF+1,154);//154
+		
+		//USART1_TX_BUF[149+6]=Lrc_temp;
+		//sprintf((char *)&USART1_TX_BUF[149+6],"%02X",Lrc_temp);
+		sprintf((char *)(char*)USART1_TX_BUF+149+6,"%02X",Lrc_temp);
+		USART1_TX_BUF[LenthOf_Reply0x93-2]=0x0d;
+		USART1_TX_BUF[LenthOf_Reply0x93-1]=0x0a;
 }
 
 //数据的应答
@@ -4655,8 +4655,7 @@ int 	Process_CMD_0x39_RemoteCali(uint8_t dataMode)
 {
 		int i000,i001;
 		//uint8_t TempData;//,TmpValState00,TmpValState01;
-
-  		extern	uint16_t  bufText00[256];
+//  	extern	uint16_t  bufText00[256];
 		extern  uint16_t  bufText01Password[256];
 		extern 	uint32_t FunDebugCode;	
 

Src/freertos.c

@@ -113,7 +113,7 @@ SemaphoreHandle_t xSemaphore_uart4 = NULL; //
 
 unsigned char scrData[32];
 
-uint16_t bufText00[256];
+//uint16_t bufText00[256];
 uint16_t bufText01Password[256];
 uint32_t totalRunTimeCnt; //累计运行时间
 
@@ -592,7 +592,7 @@ void Task_Usart2_Collector(void const *argument)
 * @retval None
 */
 /* USER CODE END Header_Task_LCD_Update */
-uint16_t bufText00[256];
+//uint16_t bufText00[256];
 uint16_t bufText01Password[256];
 char msg000[256] = "罐车安全智能监控系统杭州嘉隆物联网科技有限公司";
 //char  Beijing_title[256]="    海底阀-卸油阀-人孔盖-排沉阀-有无油    ";//北京部队试用阀门标题栏
@@ -791,24 +791,24 @@ void Task_Usart3_LCD_Update(void const *argument)
 			i00task_usart3 = 0;
 		}
 
-		//		//if(((i00Data%2)==0) && (tmrForRemoteCali==0))//非标定模式
-		//		if(tmrForRemoteCali==0)//非标定模式 收到0x3901进入标定模式，保持20s 将资源留给标定命令
-		//		{
-		//
-		//			if((i00task_usart3%3)==0)
-		//			{
-		//				Elect_cover();////电子铅封系统处理
-		//			}
-		//
-		//
-		//			if(StartUpdate_Screen_Flag ==True)//1S更新一次小屏状态
-		//			{
-		//				StartUpdate_Screen_Flag =False;
-		//				Dispaly_CarAndValveState();
-		//			}
-		//
-		//			Test_get_state();   //实时获取阀门状态------------标定数据
-		//		}
+//		//if(((i00Data%2)==0) && (tmrForRemoteCali==0))//非标定模式
+//		if(tmrForRemoteCali==0)//非标定模式 收到0x3901进入标定模式，保持20s 将资源留给标定命令
+//		{
+//
+//			if((i00task_usart3%3)==0)
+//			{
+//				Elect_cover();////电子铅封系统处理
+//			}
+//
+//
+//			if(StartUpdate_Screen_Flag ==True)//1S更新一次小屏状态
+//			{
+//				StartUpdate_Screen_Flag =False;
+//				Dispaly_CarAndValveState();
+//			}
+//
+//			Test_get_state();   //实时获取阀门状态------------标定数据
+//		}