1.修正分支合并后代码异常

Inc/TerminalSlave485.h

@@ -459,7 +459,8 @@ void TerminalSlave485_Send_Data(uint8_t *buf,uint16_t len);
 void TerminalSlave485_TX_Set(uint8_t en);
 void TestUsart1_Receive(void);
 //int  	Process_CMD_0x30(void);//温度、密度等调试数据下发
-
+void DoInternalSensorScanAndPost(void);
+void InitSensorScanParam(void);
 int 	Process_CMD_0x30_ManualFix(void);//电子围栏自动施封
 int 	Process_CMD_0x38_AutoSeal_By_ElecFence(void);//电子围栏自动施封
 int 	Process_CMD_0x39_RemoteCali(uint8_t dataMode);//远程标定

Src/CollectMaster485.c

@@ -136,7 +136,46 @@ float ArrYeweiForWenyou[NumOf_WenYouPanduan+3];//
 float Yewei_max000,Yewei_min000,Yewei_peak000;
 
 Pass41SensorScanParam_TypeDef Pass41SensorScanParam; 
-	 
+
+
+void InitSensorScanParam(void)
+{
+	uint8_t data[16];
+	
+	FM25L16B_Read_N_Bytes(ADDR_Sensor_Scan_Param, data, 16);
+	if(data[0] == 0x5A){
+		uint8_t *buf = data+1;
+		Pass41SensorScanParam.enable = 1;
+		if(buf[0] > 1 && buf[1] > 0){
+			Pass41SensorScanParam.step = buf[0];
+			Pass41SensorScanParam.nstep = buf[1];
+			if(buf[2] > 0 && buf[2] <= 8){
+				Pass41SensorScanParam.cmd_num = buf[2];
+				for (int n = 0; n < Pass41SensorScanParam.cmd_num; n++){
+					Pass41SensorScanParam.cmd_arr[n] = buf[3+n];
+				}
+			}else{
+				Pass41SensorScanParam.cmd_num = 2;
+				Pass41SensorScanParam.cmd_arr[0] = 0x40;
+				Pass41SensorScanParam.cmd_arr[1] = 0x91;
+			}	
+		}else{
+			Pass41SensorScanParam.step = 5;
+			Pass41SensorScanParam.nstep = 6;
+			Pass41SensorScanParam.cmd_num = 2;
+			Pass41SensorScanParam.cmd_arr[0] = 0x40;
+			Pass41SensorScanParam.cmd_arr[1] = 0x91;
+		}
+	}else{
+		Pass41SensorScanParam.enable = 0;
+		Pass41SensorScanParam.step = 5;
+		Pass41SensorScanParam.nstep = 6;
+		Pass41SensorScanParam.cmd_num = 2;
+		Pass41SensorScanParam.cmd_arr[0] = 0x40;
+		Pass41SensorScanParam.cmd_arr[1] = 0x91;
+	}
+}
+
 void TestUsart2_Receive(void)
 {
 	if(usart2_rx_flag)

Src/TerminalSlave485.c

@@ -497,7 +497,7 @@ Data_frame_TypeDef data_frame,Tx_data_frame;
 
 int32_t WholeCarData(uint8_t *buf);
 int32_t StoreData(uint8_t *buf,int storeNo);
-
+int BuildTimeCmd(uint8_t *pBuf);
 void Reboot_System()
 {
 	 __set_FAULTMASK(1);
@@ -1141,6 +1141,9 @@ int BuildA1Cmd(uint8_t *pBuf, uint32_t flowID, uint8_t *pEmergencyflag)
 	int i,j;
 	unsigned char temp_i = 0x00;
 	
+	UNUSED(Lrc_temp);
+	UNUSED(temp_i);
+	
 	pBuf[send_pos++] = 0xA1;
 	pBuf[send_pos++] = 120;
 	if(StoreNumber>0)

Src/freertos.c

@@ -144,43 +144,7 @@ sT2C_ALL_Sensor_Data_Each_Cang *pT2C_ALL_Sensor_Data_Disp = &T2C_ALL_Sensor_Data
 
 /* Private function prototypes -----------------------------------------------*/
 /* USER CODE BEGIN FunctionPrototypes */
-void InitSensorScanParam(void)
-{
-	uint8_t data[16];
-	
-	FM25L16B_Read_N_Bytes(ADDR_Sensor_Scan_Param, data, 16);
-	if(data[0] == 0x5A){
-		uint8_t *buf = data+1;
-		Pass41SensorScanParam.enable = 1;
-		if(buf[0] > 1 && buf[1] > 0){
-			Pass41SensorScanParam.step = buf[0];
-			Pass41SensorScanParam.nstep = buf[1];
-			if(buf[2] > 0 && buf[2] <= 8){
-				Pass41SensorScanParam.cmd_num = buf[2];
-				for (int n = 0; n < Pass41SensorScanParam.cmd_num; n++){
-					Pass41SensorScanParam.cmd_arr[n] = buf[3+n];
-				}
-			}else{
-				Pass41SensorScanParam.cmd_num = 2;
-				Pass41SensorScanParam.cmd_arr[0] = 0x40;
-				Pass41SensorScanParam.cmd_arr[1] = 0x91;
-			}	
-		}else{
-			Pass41SensorScanParam.step = 5;
-			Pass41SensorScanParam.nstep = 6;
-			Pass41SensorScanParam.cmd_num = 2;
-			Pass41SensorScanParam.cmd_arr[0] = 0x40;
-			Pass41SensorScanParam.cmd_arr[1] = 0x91;
-		}
-	}else{
-		Pass41SensorScanParam.enable = 0;
-		Pass41SensorScanParam.step = 5;
-		Pass41SensorScanParam.nstep = 6;
-		Pass41SensorScanParam.cmd_num = 2;
-		Pass41SensorScanParam.cmd_arr[0] = 0x40;
-		Pass41SensorScanParam.cmd_arr[1] = 0x91;
-	}
-}
+
 
 void ControllerConfig_Init(void)
 {
@@ -1028,7 +992,7 @@ void Task_Usart1_Terminal(void const *argument)
 void Task_GetCPU_Usage(void const *argument)
 {
 	/* USER CODE BEGIN Task_GetCPU_Usage */
-	char min=0xff;
+	char hour=0xff;
 	int count;
 	int i_task01;
 	EventBits_t uxBits;