main

2024-05-23 14:46:51 +08:00 · 2024-05-23 14:46:51 +08:00 · 44ecf17940
parent 4bde49e3b8
commit 44ecf17940
92 changed files with 6581 additions and 17245 deletions
--- a/Board/Inc/ads1256.h
+++ b/Board/Inc/ads1256.h
@ -87,7 +87,7 @@

 long double ADS1256ReadData(uint8_t channel);
 void ADS1256_Init(void);
-void adc_task(void);
+void adc_task(uint8_t num);

 #endif

--- a/Board/Inc/mf.h
+++ b/Board/Inc/mf.h
@ -4,7 +4,8 @@
 #include "main.h"

 #define MF4700_ADDR   0x01
-#define MF5000_ADDR   0x02
+#define MF5003_ADDR   0x02
+#define MF5008_ADDR   0x03

 //功能码
 #define 	Read_Hold 		0x03	//读取一个或多个连续的保持寄存器的值
@ -39,12 +40,22 @@


 #define 	General_Data		0xAA55	//指定数据，用于自动校零和解除写保护
+#define 	Clear_Data			0x0001	//指定数据，用于清除累积流量

+extern uint8_t mf4700_buf[36];
+extern uint8_t mf5003_buf[36];
+extern uint8_t mf5008_buf[36];

 void read_mf4700_flow(void);
 void read_mf5000_flow(void);
 void mf4700_zero(void);
+void read_mf4701_flow(void);
 void mf5000_zero(void);
+void read_mf5003_flow(void);
+void read_mf5008_flow(void);
+void mf_read(void);
+void mf_clear(void);
+void mf_rx_cb(void);


 #endif
--- a/Board/Src/ads1256.c
+++ b/Board/Src/ads1256.c
@ -6,6 +6,8 @@ unsigned int sum;
 long ulResult;
 long double ldVolutage;

+int ads_cnt = 0;
+
 //-----------------------------------------------------------------//
 //	功    能：ADS1256 写数据
 //	入口参数: /
@ -17,15 +19,24 @@ void ADS1256WREG(unsigned char regaddr,unsigned char databyte)
 {
 	unsigned char cmd;
    //CS_0;
-	while(ADS1256_DRDY);//当AD2_DRDY为低时才能写寄存器
+	while(ADS1256_DRDY)
+	{
+		ads_cnt++;
+		if(ads_cnt >= OVER_TIMES)
+		{
+			ads_cnt = 0;
+			return;
+		}
+			
+	}//当AD2_DRDY为低时才能写寄存器
 	//向寄存器写入数据地址
 	cmd = ADS1256_CMD_WREG|(regaddr & 0x0F);
-	HAL_SPI_Transmit(&hspi3, &cmd, 1, 10);
+	HAL_SPI_Transmit(&hspi3, &cmd, 1, 1);
    //写入数据的个数n-1
 	cmd = 0x00;
-	HAL_SPI_Transmit(&hspi3, &cmd, 1, 10);
+	HAL_SPI_Transmit(&hspi3, &cmd, 1, 1);
    //向regaddr地址指向的寄存器写入数据databyte
-    HAL_SPI_Transmit(&hspi3, &databyte, 1, 10);
+    HAL_SPI_Transmit(&hspi3, &databyte, 1, 1);
 	//CS_1;
 }

@ -38,17 +49,25 @@ void ADS1256_Init(void)
 	ADS1256WREG(ADS1256_STATUS,0x06);// 高位在前、校准、使用缓冲
 	ADS1256WREG(ADS1256_MUX,ADS1256_MUXP_AIN0 | ADS1256_MUXN_AINCOM);// 初始化端口A0为‘+’，AINCOM位‘-’
 	ADS1256WREG(ADS1256_ADCON,0x00);// 放大倍数1
-	ADS1256WREG(ADS1256_DRATE,ADS1256_DRATE_100SPS);// 数据30000sps
+	ADS1256WREG(ADS1256_DRATE,ADS1256_DRATE_30000SPS);// 数据30000sps
 	ADS1256WREG(ADS1256_IO,0x00);
 }

 //读取AD值
 long double ADS1256ReadData(uint8_t channel)  
 {
-  //unsigned char data1,data2,data3;
  unsigned char cmd;
 	unsigned char data[3];
-  while(ADS1256_DRDY);
+  while(ADS1256_DRDY)
+	{
+		ads_cnt++;
+		if(ads_cnt >= OVER_TIMES)
+		{
+			ads_cnt = 0;
+			return ldVolutage;
+		}
+			
+	}//当AD2_DRDY为低时才能写寄存器;
  
  //切换通道
  //注意：本次写入的新通道在下次读取时才会生效，本次读到的是上一次的值
@ -82,23 +101,18 @@ long double ADS1256ReadData(uint8_t channel)

  //CS_0;
  cmd = ADS1256_CMD_SYNC;
-  HAL_SPI_Transmit(&hspi3, &cmd, 1, 10);
+  HAL_SPI_Transmit(&hspi3, &cmd, 1, 1);
  cmd = ADS1256_CMD_WAKEUP;
-  HAL_SPI_Transmit(&hspi3, &cmd, 1, 10);
+  HAL_SPI_Transmit(&hspi3, &cmd, 1, 1);

  //发送单次读命令
  cmd = ADS1256_CMD_RDATA;
-  HAL_SPI_Transmit(&hspi3, &cmd, 1, 10);
+  HAL_SPI_Transmit(&hspi3, &cmd, 1, 1);

  //读24位数据
-  HAL_SPI_Receive(&hspi3, (uint8_t *)data, 3, 10);
-//  HAL_SPI_Receive(&hspi3, &data1, 1, 10);
-//  HAL_SPI_Receive(&hspi3, &data2, 1, 10);
-//  HAL_SPI_Receive(&hspi3, &data3, 1, 10);
-//  sum = (unsigned int)(data1<<16)|(data2<<8)|data3;
+  HAL_SPI_Receive(&hspi3, (uint8_t *)data, 3, 1);
  sum = (unsigned int)(data[0]<<16)|(data[1]<<8)|data[2];
-  //CS_1;
-  //sum = 0x7fffff - sum;
+
  //单位转换为mV (VREF=2.5V) 
  ulResult = sum;
  if(ulResult & 0x800000)
@ -115,225 +129,258 @@ long double ADS1256ReadData(uint8_t channel)
  return ldVolutage;
 }

-
-void adc_task(void)
+void adc_task(uint8_t num)
 {
 	LL_ADC_REG_StartConversionSWStart(ADC1);
+	switch(num)
+	{
+		case 0 :
+		{
+			InputReg[2]  = (uint16_t)((ADS1256ReadData(1) * 10));// - 1507.8) / 0.082);//阀位反馈（0-25000uA）
+				//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
+				if(InputReg[2] <= 18312)
+				{
+					InputReg[2] = (uint16_t)((float)(InputReg[2] - 15036) / 0.819f) + 0 ;
+				}
+				else if(InputReg[2] > 18312 && InputReg[2] <= 21588)
+				{
+					InputReg[2] = (uint16_t)((float)(InputReg[2] - 18312) / 0.819f) + 4000 ;
+				}
+				else if(InputReg[2] > 21588 && InputReg[2] <= 24864)
+				{
+					InputReg[2] = (uint16_t)((float)(InputReg[2] - 21588) / 0.819f) + 8000 ;
+				}
+				else if(InputReg[2] > 24864 && InputReg[2] <= 28139)
+				{
+					InputReg[2] = (uint16_t)((float)(InputReg[2] - 24864) / 0.81875f) + 12000 ;
+				}
+				else if(InputReg[2] > 28139 && InputReg[2] <= 31414)
+				{
+					InputReg[2] = (uint16_t)((float)(InputReg[2] - 28139) / 0.81875f) + 16000 ;
+				}
+				else
+				{
+					InputReg[2] = (uint16_t)((float)(InputReg[2] - 31414) / 0.81875f) + 20000 ;
+				}
+		}
+		break;
 		
+		case 1 :
+		{
+			InputReg[3]  = (uint16_t)((ADS1256ReadData(2) * 10));// - 1507.9) / 0.082);//阀前压力（0-25000uA）
+				//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
+				if(InputReg[3] <= 18312)
+				{
+					InputReg[3] = (uint16_t)((float)(InputReg[3] - 15037) / 0.81875f) + 0 ;
+				}
+				else if(InputReg[3] > 18312 && InputReg[3] <= 21587)
+				{
+					InputReg[3] = (uint16_t)((float)(InputReg[3] - 18312) / 0.81875f) + 4000 ;
+				}
+				else if(InputReg[3] > 21587 && InputReg[3] <= 24862)
+				{
+					InputReg[3] = (uint16_t)((float)(InputReg[3] - 21587) / 0.81875f) + 8000 ;
+				}
+				else if(InputReg[3] > 24862 && InputReg[3] <= 28137)
+				{
+					InputReg[3] = (uint16_t)((float)(InputReg[3] - 24862) / 0.81875f) + 12000 ;
+				}
+				else if(InputReg[3] > 28137 && InputReg[3] <= 31410)
+				{
+					InputReg[3] = (uint16_t)((float)(InputReg[3] - 28137) / 0.81825f) + 16000 ;
+				}
+				else
+				{
+					InputReg[3] = (uint16_t)((float)(InputReg[3] - 31410) / 0.81825f) + 20000 ;
+				}
+		}
+		break;
 			
-	InputReg[2]  = (uint16_t)((ADS1256ReadData(1) * 10));// - 1507.8) / 0.082);//阀位反馈（0-25000uA）
-//		//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
-//		if(InputReg[2] <= 18312)
-//		{
-//			InputReg[2] = (uint16_t)((float)(InputReg[2] - 15036) / 0.819f) + 0 ;
-//		}
-//		else if(InputReg[2] > 18312 && InputReg[2] <= 21588)
-//		{
-//			InputReg[2] = (uint16_t)((float)(InputReg[2] - 18312) / 0.819f) + 4000 ;
-//		}
-//		else if(InputReg[2] > 21588 && InputReg[2] <= 24864)
-//		{
-//			InputReg[2] = (uint16_t)((float)(InputReg[2] - 21588) / 0.819f) + 8000 ;
-//		}
-//		else if(InputReg[2] > 24864 && InputReg[2] <= 28139)
-//		{
-//			InputReg[2] = (uint16_t)((float)(InputReg[2] - 24864) / 0.81875f) + 12000 ;
-//		}
-//		else if(InputReg[2] > 28139 && InputReg[2] <= 31414)
-//		{
-//			InputReg[2] = (uint16_t)((float)(InputReg[2] - 28139) / 0.81875f) + 16000 ;
-//		}
-//		else
-//		{
-//			InputReg[2] = (uint16_t)((float)(InputReg[2] - 31414) / 0.81875f) + 20000 ;
-//		}
+		case 2 :
+		{
+			InputReg[11] = (uint16_t)((ADS1256ReadData(3) * 10));// - 1507.8) / 0.082);//ADS1256数据备用（0-25000uA）
+				//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
+				if(InputReg[11] <= 18311)
+				{
+					InputReg[11] = (uint16_t)((float)(InputReg[11] - 15032) / 0.81975f) + 0 ;
+				}
+				else if(InputReg[11] > 18311 && InputReg[11] <= 21590)
+				{
+					InputReg[11] = (uint16_t)((float)(InputReg[11] - 18311) / 0.81975f) + 4000 ;
+				}
+				else if(InputReg[11] > 21590 && InputReg[11] <= 24868)
+				{
+					InputReg[11] = (uint16_t)((float)(InputReg[11] - 21590) / 0.8195f) + 8000 ;
+				}
+				else if(InputReg[11] > 24868 && InputReg[11] <= 28143)
+				{
+					InputReg[11] = (uint16_t)((float)(InputReg[11] - 24868) / 0.81975f) + 12000 ;
+				}
+				else if(InputReg[11] > 28143 && InputReg[11] <= 31419)
+				{
+					InputReg[11] = (uint16_t)((float)(InputReg[11] - 28143) / 0.81925f) + 16000 ;
+				}
+				else
+				{
+					InputReg[11] = (uint16_t)((float)(InputReg[11] - 31419) / 0.81925f) + 20000 ;
+				}
+		}
+		break;
 		
-	InputReg[3]  = (uint16_t)((ADS1256ReadData(2) * 10));// - 1507.9) / 0.082);//阀前压力（0-25000uA）
-//		//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
-//		if(InputReg[3] <= 18312)
-//		{
-//			InputReg[3] = (uint16_t)((float)(InputReg[3] - 15037) / 0.81875f) + 0 ;
-//		}
-//		else if(InputReg[3] > 18312 && InputReg[3] <= 21587)
-//		{
-//			InputReg[3] = (uint16_t)((float)(InputReg[3] - 18312) / 0.81875f) + 4000 ;
-//		}
-//		else if(InputReg[3] > 21587 && InputReg[3] <= 24862)
-//		{
-//			InputReg[3] = (uint16_t)((float)(InputReg[3] - 21587) / 0.81875f) + 8000 ;
-//		}
-//		else if(InputReg[3] > 24862 && InputReg[3] <= 28137)
-//		{
-//			InputReg[3] = (uint16_t)((float)(InputReg[3] - 24862) / 0.81875f) + 12000 ;
-//		}
-//		else if(InputReg[3] > 28137 && InputReg[3] <= 31410)
-//		{
-//			InputReg[3] = (uint16_t)((float)(InputReg[3] - 28137) / 0.81825f) + 16000 ;
-//		}
-//		else
-//		{
-//			InputReg[3] = (uint16_t)((float)(InputReg[3] - 31410) / 0.81825f) + 20000 ;
-//		}
-	InputReg[11] = (uint16_t)((ADS1256ReadData(3) * 10));// - 1507.8) / 0.082);//ADS1256数据备用（0-25000uA）
-//		//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
-//		if(InputReg[11] <= 18311)
-//		{
-//			InputReg[11] = (uint16_t)((float)(InputReg[11] - 15032) / 0.81975f) + 0 ;
-//		}
-//		else if(InputReg[11] > 18311 && InputReg[11] <= 21590)
-//		{
-//			InputReg[11] = (uint16_t)((float)(InputReg[11] - 18311) / 0.81975f) + 4000 ;
-//		}
-//		else if(InputReg[11] > 21590 && InputReg[11] <= 24868)
-//		{
-//			InputReg[11] = (uint16_t)((float)(InputReg[11] - 21590) / 0.8195f) + 8000 ;
-//		}
-//		else if(InputReg[11] > 24868 && InputReg[11] <= 28143)
-//		{
-//			InputReg[11] = (uint16_t)((float)(InputReg[11] - 24868) / 0.81975f) + 12000 ;
-//		}
-//		else if(InputReg[11] > 28143 && InputReg[11] <= 31419)
-//		{
-//			InputReg[11] = (uint16_t)((float)(InputReg[11] - 28143) / 0.81925f) + 16000 ;
-//		}
-//		else
-//		{
-//			InputReg[11] = (uint16_t)((float)(InputReg[11] - 31419) / 0.81925f) + 20000 ;
-//		}
+		case 3 :
+		{			
+			InputReg[12] = (uint16_t)((ADS1256ReadData(4) * 10));// - 1507.8) / 0.082);//ADS1256数据备用（0-25000uA）
+				//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
+				if(InputReg[12] <= 18313)
+				{
+					InputReg[12] = (uint16_t)((float)(InputReg[12] - 15036) / 0.81925f) + 0 ;
+				}
+				else if(InputReg[12] > 18313 && InputReg[12] <= 21590)
+				{
+					InputReg[12] = (uint16_t)((float)(InputReg[12] - 18313) / 0.81925f) + 4000 ;
+				}
+				else if(InputReg[12] > 21590 && InputReg[12] <= 24867)
+				{
+					InputReg[12] = (uint16_t)((float)(InputReg[12] - 21590) / 0.81925f) + 8000 ;
+				}
+				else if(InputReg[12] > 24867 && InputReg[12] <= 28143)
+				{
+					InputReg[12] = (uint16_t)((float)(InputReg[12] - 24867) / 0.819f) + 12000 ;
+				}
+				else if(InputReg[12] > 28143 && InputReg[12] <= 31419)
+				{
+					InputReg[12] = (uint16_t)((float)(InputReg[12] - 28143) / 0.819f) + 16000 ;
+				}
+				else
+				{
+					InputReg[12] = (uint16_t)((float)(InputReg[12] - 31419) / 0.819f) + 20000 ;
+				}
+		}
+		break;
 		
-	InputReg[12] = (uint16_t)((ADS1256ReadData(4) * 10));// - 1507.8) / 0.082);//ADS1256数据备用（0-25000uA）
-//		//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
-//		if(InputReg[12] <= 18313)
-//		{
-//			InputReg[12] = (uint16_t)((float)(InputReg[12] - 15036) / 0.81925f) + 0 ;
-//		}
-//		else if(InputReg[12] > 18313 && InputReg[12] <= 21590)
-//		{
-//			InputReg[12] = (uint16_t)((float)(InputReg[12] - 18313) / 0.81925f) + 4000 ;
-//		}
-//		else if(InputReg[12] > 21590 && InputReg[12] <= 24867)
-//		{
-//			InputReg[12] = (uint16_t)((float)(InputReg[12] - 21590) / 0.81925f) + 8000 ;
-//		}
-//		else if(InputReg[12] > 24867 && InputReg[12] <= 28143)
-//		{
-//			InputReg[12] = (uint16_t)((float)(InputReg[12] - 24867) / 0.819f) + 12000 ;
-//		}
-//		else if(InputReg[12] > 28143 && InputReg[12] <= 31419)
-//		{
-//			InputReg[12] = (uint16_t)((float)(InputReg[12] - 28143) / 0.819f) + 16000 ;
-//		}
-//		else
-//		{
-//			InputReg[12] = (uint16_t)((float)(InputReg[12] - 31419) / 0.819f) + 20000 ;
-//		}
+		case 4 :
+		{
+			InputReg[13] = (uint16_t)((ADS1256ReadData(5) * 10));// - 1507.6) / 0.082);//ADS1256数据备用（0-25000uA）
+				//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
+				if(InputReg[13] <= 18312)
+				{
+					InputReg[13] = (uint16_t)((float)(InputReg[13] - 15035) / 0.81925f) + 0 ;
+				}
+				else if(InputReg[13] > 18312 && InputReg[13] <= 21589)
+				{
+					InputReg[13] = (uint16_t)((float)(InputReg[13] - 18312) / 0.81925f) + 4000 ;
+				}
+				else if(InputReg[13] > 21589 && InputReg[13] <= 24866)
+				{
+					InputReg[13] = (uint16_t)((float)(InputReg[13] - 21589) / 0.81925f) + 8000 ;
+				}
+				else if(InputReg[13] > 24866 && InputReg[13] <= 28142)
+				{
+					InputReg[13] = (uint16_t)((float)(InputReg[13] - 24866) / 0.819f) + 12000 ;
+				}
+				else if(InputReg[13] > 28142 && InputReg[13] <= 31417)
+				{
+					InputReg[13] = (uint16_t)((float)(InputReg[13] - 28142) / 0.81875f) + 16000 ;
+				}
+				else
+				{
+					InputReg[13] = (uint16_t)((float)(InputReg[13] - 31417) / 0.81875f) + 20000 ;
+				}
+		}
+		break;
 		
-	InputReg[13] = (uint16_t)((ADS1256ReadData(5) * 10));// - 1507.6) / 0.082);//ADS1256数据备用（0-25000uA）
-//		//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
-//		if(InputReg[13] <= 18312)
-//		{
-//			InputReg[13] = (uint16_t)((float)(InputReg[13] - 15035) / 0.81925f) + 0 ;
-//		}
-//		else if(InputReg[13] > 18312 && InputReg[13] <= 21589)
-//		{
-//			InputReg[13] = (uint16_t)((float)(InputReg[13] - 18312) / 0.81925f) + 4000 ;
-//		}
-//		else if(InputReg[13] > 21589 && InputReg[13] <= 24866)
-//		{
-//			InputReg[13] = (uint16_t)((float)(InputReg[13] - 21589) / 0.81925f) + 8000 ;
-//		}
-//		else if(InputReg[13] > 24866 && InputReg[13] <= 28142)
-//		{
-//			InputReg[13] = (uint16_t)((float)(InputReg[13] - 24866) / 0.819f) + 12000 ;
-//		}
-//		else if(InputReg[13] > 28142 && InputReg[13] <= 31417)
-//		{
-//			InputReg[13] = (uint16_t)((float)(InputReg[13] - 28142) / 0.81875f) + 16000 ;
-//		}
-//		else
-//		{
-//			InputReg[13] = (uint16_t)((float)(InputReg[13] - 31417) / 0.81875f) + 20000 ;
-//		}
+		case 5 :
+		{
+			InputReg[14] = (uint16_t)((ADS1256ReadData(6) * 10));// - 1508.1) / 0.082);//ADS1256数据备用（0-25000uA）
+				//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
+				if(InputReg[14] <= 18308)
+				{
+					InputReg[14] = (uint16_t)((float)(InputReg[14] - 15034) / 0.8185f) + 0 ;
+				}
+				else if(InputReg[14] > 18308 && InputReg[14] <= 21581)
+				{
+					InputReg[14] = (uint16_t)((float)(InputReg[14] - 18308) / 0.81825f) + 4000 ;
+				}
+				else if(InputReg[14] > 21581 && InputReg[14] <= 24854)
+				{
+					InputReg[14] = (uint16_t)((float)(InputReg[14] - 21581) / 0.81825f) + 8000 ;
+				}
+				else if(InputReg[14] > 24854 && InputReg[14] <= 28127)
+				{
+					InputReg[14] = (uint16_t)((float)(InputReg[14] - 24854) / 0.81825f) + 12000 ;
+				}
+				else if(InputReg[14] > 28127 && InputReg[14] <= 31400)
+				{
+					InputReg[14] = (uint16_t)((float)(InputReg[14] - 28127) / 0.81825f) + 16000 ;
+				}
+				else
+				{
+					InputReg[14] = (uint16_t)((float)(InputReg[14] - 31400) / 0.81825f) + 20000 ;
+				}
+		}
+		break;
 		
-	InputReg[14] = (uint16_t)((ADS1256ReadData(6) * 10));// - 1508.1) / 0.082);//ADS1256数据备用（0-25000uA）
-//		//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
-//		if(InputReg[14] <= 18308)
-//		{
-//			InputReg[14] = (uint16_t)((float)(InputReg[14] - 15034) / 0.8185f) + 0 ;
-//		}
-//		else if(InputReg[14] > 18308 && InputReg[14] <= 21581)
-//		{
-//			InputReg[14] = (uint16_t)((float)(InputReg[14] - 18308) / 0.81825f) + 4000 ;
-//		}
-//		else if(InputReg[14] > 21581 && InputReg[14] <= 24854)
-//		{
-//			InputReg[14] = (uint16_t)((float)(InputReg[14] - 21581) / 0.81825f) + 8000 ;
-//		}
-//		else if(InputReg[14] > 24854 && InputReg[14] <= 28127)
-//		{
-//			InputReg[14] = (uint16_t)((float)(InputReg[14] - 24854) / 0.81825f) + 12000 ;
-//		}
-//		else if(InputReg[14] > 28127 && InputReg[14] <= 31400)
-//		{
-//			InputReg[14] = (uint16_t)((float)(InputReg[14] - 28127) / 0.81825f) + 16000 ;
-//		}
-//		else
-//		{
-//			InputReg[14] = (uint16_t)((float)(InputReg[14] - 31400) / 0.81825f) + 20000 ;
-//		}
+		case 6 :
+		{
+			InputReg[15] = (uint16_t)((ADS1256ReadData(7) * 10));// - 1507.6) / 0.082);//ADS1256数据备用（0-25000uA）
+				//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
+				if(InputReg[15] <= 18312)
+				{
+					InputReg[15] = (uint16_t)((float)(InputReg[15] - 15035) / 0.81925f) + 0 ;
+				}
+				else if(InputReg[15] > 18312 && InputReg[15] <= 21589)
+				{
+					InputReg[15] = (uint16_t)((float)(InputReg[15] - 18312) / 0.81925f) + 4000 ;
+				}
+				else if(InputReg[15] > 21589 && InputReg[15] <= 24865)
+				{
+					InputReg[15] = (uint16_t)((float)(InputReg[15] - 21589) / 0.819f) + 8000 ;
+				}
+				else if(InputReg[15] > 24865 && InputReg[15] <= 28141)
+				{
+					InputReg[15] = (uint16_t)((float)(InputReg[15] - 24865) / 0.819f) + 12000 ;
+				}
+				else if(InputReg[15] > 28141 && InputReg[15] <= 31416)
+				{
+					InputReg[15] = (uint16_t)((float)(InputReg[15] - 28141) / 0.81875f) + 16000 ;
+				}
+				else
+				{
+					InputReg[15] = (uint16_t)((float)(InputReg[15] - 31416) / 0.81875f) + 20000 ;
+				}
+		}
+		break;
 		
-	InputReg[15] = (uint16_t)((ADS1256ReadData(7) * 10));// - 1507.6) / 0.082);//ADS1256数据备用（0-25000uA）
-//		//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
-//		if(InputReg[15] <= 18312)
-//		{
-//			InputReg[15] = (uint16_t)((float)(InputReg[15] - 15035) / 0.81925f) + 0 ;
-//		}
-//		else if(InputReg[15] > 18312 && InputReg[15] <= 21589)
-//		{
-//			InputReg[15] = (uint16_t)((float)(InputReg[15] - 18312) / 0.81925f) + 4000 ;
-//		}
-//		else if(InputReg[15] > 21589 && InputReg[15] <= 24865)
-//		{
-//			InputReg[15] = (uint16_t)((float)(InputReg[15] - 21589) / 0.819f) + 8000 ;
-//		}
-//		else if(InputReg[15] > 24865 && InputReg[15] <= 28141)
-//		{
-//			InputReg[15] = (uint16_t)((float)(InputReg[15] - 24865) / 0.819f) + 12000 ;
-//		}
-//		else if(InputReg[15] > 28141 && InputReg[15] <= 31416)
-//		{
-//			InputReg[15] = (uint16_t)((float)(InputReg[15] - 28141) / 0.81875f) + 16000 ;
-//		}
-//		else
-//		{
-//			InputReg[15] = (uint16_t)((float)(InputReg[15] - 31416) / 0.81875f) + 20000 ;
-//		}
-	
-	InputReg[16] = (uint16_t)((ADS1256ReadData(0) * 10));// - 1507.8) / 0.082);//ADS1256数据备用（0-25000uA）
-//		//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
-//		if(InputReg[16] <= 18312)
-//		{
-//			InputReg[16] = (uint16_t)((float)(InputReg[16] - 15035) / 0.81925f) + 0 ;
-//		}
-//		else if(InputReg[16] > 18312 && InputReg[16] <= 21588)
-//		{
-//			InputReg[16] = (uint16_t)((float)(InputReg[16] - 18312) / 0.819f) + 4000 ;
-//		}
-//		else if(InputReg[16] > 21588 && InputReg[16] <= 24864)
-//		{
-//			InputReg[16] = (uint16_t)((float)(InputReg[16] - 21588) / 0.819f) + 8000 ;
-//		}
-//		else if(InputReg[16] > 24864 && InputReg[16] <= 28140)
-//		{
-//			InputReg[16] = (uint16_t)((float)(InputReg[16] - 24864) / 0.819f) + 12000 ;
-//		}
-//		else if(InputReg[16] > 28140 && InputReg[16] <= 31416)
-//		{
-//			InputReg[16] = (uint16_t)((float)(InputReg[16] - 28140) / 0.819f) + 16000 ;
-//		}
-//		else
-//		{
-//			InputReg[16] = (uint16_t)((float)(InputReg[16] - 31416) / 0.819f) + 20000 ;
-//		}
+		case 7 :
+		{
+			InputReg[16] = (uint16_t)((ADS1256ReadData(0) * 10));// - 1507.8) / 0.082);//ADS1256数据备用（0-25000uA）
+				//分段标定，采样值减去段首值除以标定后的增益加段首的理论值
+				if(InputReg[16] <= 18312)
+				{
+					InputReg[16] = (uint16_t)((float)(InputReg[16] - 15035) / 0.81925f) + 0 ;
+				}
+				else if(InputReg[16] > 18312 && InputReg[16] <= 21588)
+				{
+					InputReg[16] = (uint16_t)((float)(InputReg[16] - 18312) / 0.819f) + 4000 ;
+				}
+				else if(InputReg[16] > 21588 && InputReg[16] <= 24864)
+				{
+					InputReg[16] = (uint16_t)((float)(InputReg[16] - 21588) / 0.819f) + 8000 ;
+				}
+				else if(InputReg[16] > 24864 && InputReg[16] <= 28140)
+				{
+					InputReg[16] = (uint16_t)((float)(InputReg[16] - 24864) / 0.819f) + 12000 ;
+				}
+				else if(InputReg[16] > 28140 && InputReg[16] <= 31416)
+				{
+					InputReg[16] = (uint16_t)((float)(InputReg[16] - 28140) / 0.819f) + 16000 ;
+				}
+				else
+				{
+					InputReg[16] = (uint16_t)((float)(InputReg[16] - 31416) / 0.819f) + 20000 ;
+				}
+		}
+		break;
+	}
 }

--- a/Board/Src/dac7311.c
+++ b/Board/Src/dac7311.c
@ -2,11 +2,6 @@

 int cnum = 0;

-void delay(uint8_t us)
-{
-	for(; us !=0; us--);
-}
-
 void dac7311_init(void)
 {
 	AO1_SYNC_H();
@ -24,9 +19,9 @@ void ao1_write(uint16_t Data)
 	temp &= 0x3FFF;//设置模式为Normal
 	AO1_SYNC_H();
 	AO1_SCLK_H();
-	delay(10);
+	delay_tick(10);
 	AO1_SYNC_L();//使能输入移位寄存器
-	delay(10);
+	delay_tick(10);
 	
 	for(ui=0; ui<16; ui++)
 	{
@ -41,9 +36,9 @@ void ao1_write(uint16_t Data)
 		{
 			AO1_DIN_L();
 		}
-		delay(10);
+		delay_tick(10);
 		AO1_SCLK_L();
-		delay(10);
+		delay_tick(10);
 		temp <<=1;
 	}
 	
@ -59,9 +54,9 @@ void ao2_write(uint16_t Data)
 	temp &= 0x3FFF;//设置模式为Normal
 	AO2_SYNC_H();
 	AO2_SCLK_H();
-	delay(10);
+	delay_tick(10);
 	AO2_SYNC_L();//使能输入移位寄存器
-	delay(10);
+	delay_tick(10);
 	
 	for(ui=0; ui<16; ui++)
 	{
@ -76,9 +71,9 @@ void ao2_write(uint16_t Data)
 		{
 			AO2_DIN_L();
 		}
-		delay(10);
+		delay_tick(10);
 		AO2_SCLK_L();
-		delay(10);
+		delay_tick(10);
 		temp <<=1;
 	}
 	
--- a/Board/Src/hc165.c
+++ b/Board/Src/hc165.c
@ -18,9 +18,11 @@ uint16_t _74hc165_read_byte(void)
 	unsigned int temp = 0;
 	
 	HC165_LD_L(); //LD拉低，读取按键状态
-	delay_ms(1);
+	delay_tick(10);
+	//delay_us(1);
 	HC165_LD_H(); //LD拉高，停止按键读取
-	delay_ms(1);
+	delay_tick(10);
+	//delay_us(1);
 	
 	if(HC165_DAT_OUT == 1)        //等于1即并行输入D7引脚的按键被按下
 	{
@ -31,15 +33,18 @@ uint16_t _74hc165_read_byte(void)
 		temp = temp << 1;
 
 		HC165_CLK_L(); //HC165_CLK = 0 ——> HC165_CLK = 1 产生上升沿，次高位D(n-1)移到高位D(n)
-		delay_us(10);
+		delay_tick(10);
+		//delay_us(1);
 		HC165_CLK_H();
-		delay_us(5);
+		delay_tick(5);
+		//delay_us(1);
 
 		if(HC165_DAT_OUT == 1)
 		{
 			temp |= 0x01;
 		}
-		delay_us(5);
+		delay_tick(5);
+		//delay_us(5);
 	}
 	return temp;
 //	date = temp;
--- a/Board/Src/hc595.c
+++ b/Board/Src/hc595.c
@ -19,19 +19,6 @@ const T_HC595_PIN hc595 =
    .en_pin     = HC595_OE_Pin        //芯片使能
 };

-/******************
-函数名：hc595Delay
-功  能：实现us级延迟
-形  参：cnt--us值
-返回值：无
-备  注：
-*******************/
-void hc595_delay(volatile uint16_t cnt)
-{
-    while(cnt--)
-        continue;
-}
-
 /******************************
 函数名：hc595Init
 功  能：初始化hc595的使能脚(EN)，默认工作状态
@ -90,13 +77,13 @@ void hc595_writeStr(const T_HC595_PIN *pin, uint8_t *data, uint16_t length)
                LL_GPIO_ResetOutputPin(pin->data_port, pin->data_pin);//data=0
            }
            byte <<= 1;
-            hc595_delay(10);//us
+            delay_tick(10);//us
            LL_GPIO_SetOutputPin(pin->sck_port, pin->sck_pin); //clk = 1 存储数据至缓存区
-            hc595_delay(10);//us
+            delay_tick(10);//us
        }
    }
    LL_GPIO_ResetOutputPin(pin->rck_port, pin->rck_pin);
-    hc595_delay(10);
+    delay_tick(10);
    LL_GPIO_SetOutputPin(pin->rck_port, pin->rck_pin);//发送缓存区内容
 }

@ -191,12 +178,19 @@ void io_output(void)
 		LL_GPIO_SetOutputPin(DO8_GPIO_Port,DO8_Pin);
 		iostate[0] = 1;
 	}
+	//Á÷Á¿¼Æµ÷Áã
+	if(CoilState[1] & 0x01)
+	{
+		flow_state = 0;
+		CoilState[1] &= 0xFE;
+	}
 	//激光调零
 	if(CoilState[1] & 0x02)
 	{
 		laser_handle.state = LASER_OPEN_STATUS;
 		CoilState[1] &= 0xFD;
 	}
+	
 }


--- a/Board/Src/laser.c
+++ b/Board/Src/laser.c
@ -370,24 +370,24 @@ void laser_task(void)
 				it_500ms_falg = 0;
 			}
        }
-        else
-        {
-			if(it_10ms_falg == 1)
-			{
-				laser_handle.command_distance_read_req();
-				if(laser_handle.distance >= 0)
-				{
-					InputReg[4] = laser_handle.distance;
-				}
-				else
-				{
-					int laser_num = -laser_handle.distance;
-					
-					InputReg[4] = (uint16_t)((0xFFFF - laser_num) + 1);
-				}
-				it_10ms_falg = 0;
-				//laser_handle.connect = true;
-			}
-        }
+//        else
+//        {
+//			if(it_10ms_falg == 1)
+//			{
+//				laser_handle.command_distance_read_req();
+//				if(laser_handle.distance >= 0)
+//				{
+//					InputReg[4] = laser_handle.distance;
+//				}
+//				else
+//				{
+//					int laser_num = -laser_handle.distance;
+//					
+//					InputReg[4] = (uint16_t)((0xFFFF - laser_num) + 1);
+//				}
+//				it_10ms_falg = 0;
+//				//laser_handle.connect = true;
+//			}
+//        }
 }

--- a/Board/Src/mf.c
+++ b/Board/Src/mf.c
@ -1,5 +1,16 @@
 #include "mf.h"

+int flow_addr = 1;	//流量计地址
+double flow1 = 0;	//小流量计mf4700累积流量
+double flow2 = 0;	//大流量计mf5003累积流量
+double flow3 = 0;	//大流量计mf5008累积流量
+int mf_cnt = 0;		//数据接收计数
+
+uint8_t tx_buf[20] = {0};	//数据发送数组
+
+uint8_t mf4700_buf[36] = {0};//小流量计mf4700累积流量数据接收数组
+uint8_t mf5003_buf[36] = {0};//大流量计mf5003累积流量数据接收数组
+uint8_t mf5008_buf[36] = {0};//大流量计mf5008累积流量数据接收数组

 /*
 *发送:[硬件地址][03][起始地址高][起始地址低][总寄存器数高][总寄存器数低][CRC低][CRC高]
@ -7,19 +18,19 @@
 */
 void read_mf(uint8_t local_addr, uint16_t start_addr, uint16_t read_len)
 {
-	uint8_t tx_buf[20] = {0},tx_len = 0;
+	uint8_t tx_len = 0;
 	uint16_t CRC_Num = 0;
 	
-	tx_buf[tx_len ++] = local_addr;
-	tx_buf[tx_len ++] = Read_Hold;	
+	tx_buf[tx_len ++] = local_addr;						//通讯地址
+	tx_buf[tx_len ++] = Read_Hold;						//命令字 0x03
 	tx_buf[tx_len ++] = (uint8_t)(start_addr >> 8);
-	tx_buf[tx_len ++] = (uint8_t)(start_addr & 0xFF);
+	tx_buf[tx_len ++] = (uint8_t)(start_addr & 0xFF);	//起始地址
 	tx_buf[tx_len ++] = (uint8_t)(read_len >> 8);
-	tx_buf[tx_len ++] = (uint8_t)(read_len & 0xFF);
+	tx_buf[tx_len ++] = (uint8_t)(read_len & 0xFF);		//读取寄存器数

 	CRC_Num = ModbusCRC16(tx_buf,tx_len);
 	tx_buf[tx_len ++] = (uint8_t)(CRC_Num & 0xFF);
-	tx_buf[tx_len ++] = (uint8_t)(CRC_Num >> 8);
+	tx_buf[tx_len ++] = (uint8_t)(CRC_Num >> 8);		//CRC校验，低位在前
 	
 	usart6_send(tx_buf,tx_len);
 }
@ -30,19 +41,19 @@ void read_mf(uint8_t local_addr, uint16_t start_addr, uint16_t read_len)
 */
 void write_mf(uint8_t local_addr, uint16_t reg_addr, uint16_t write_data)
 {
-	uint8_t tx_buf[20] = {0},tx_len = 0;
+	uint8_t tx_len = 0;
 	uint16_t CRC_Num = 0;
 	
-	tx_buf[tx_len ++] = local_addr;
-	tx_buf[tx_len ++] = Write_Single;	
+	tx_buf[tx_len ++] = local_addr;						//通讯地址
+	tx_buf[tx_len ++] = Write_Single;					//命令字 0x06	
 	tx_buf[tx_len ++] = (uint8_t)(reg_addr >> 8);
-	tx_buf[tx_len ++] = (uint8_t)(reg_addr & 0xFF);
+	tx_buf[tx_len ++] = (uint8_t)(reg_addr & 0xFF);		//起始地址
 	tx_buf[tx_len ++] = (uint8_t)(write_data >> 8);
-	tx_buf[tx_len ++] = (uint8_t)(write_data & 0xFF);
+	tx_buf[tx_len ++] = (uint8_t)(write_data & 0xFF);	//写入数据

 	CRC_Num = ModbusCRC16(tx_buf,tx_len);
 	tx_buf[tx_len ++] = (uint8_t)(CRC_Num & 0xFF);
-	tx_buf[tx_len ++] = (uint8_t)(CRC_Num >> 8);
+	tx_buf[tx_len ++] = (uint8_t)(CRC_Num >> 8);		//CRC校验，低位在前
 	
 	usart6_send(tx_buf,tx_len);
 }
@ -53,10 +64,28 @@ void read_mf4700_flow(void)
 	read_mf(MF4700_ADDR,MF4700_Ins_Flow_Addr,2);
 }

+//读mf4701累积流量
+void read_mf4701_flow(void)
+{
+	read_mf(MF4700_ADDR,MF4700_Cum_Flow_Addr,3);
+}
+
 //读mf5600瞬时流量
 void read_mf5000_flow(void)
 {
-	read_mf(MF5000_ADDR,MF5000_Ins_Flow_Addr,2);
+	read_mf(MF5003_ADDR,MF5000_Ins_Flow_Addr,2);
+}
+
+//读mf5603累积流量
+void read_mf5003_flow(void)
+{
+	read_mf(MF5003_ADDR,MF5000_Cum_Flow_Addr,3);
+}
+
+//读mf5608累积流量
+void read_mf5008_flow(void)
+{
+	read_mf(MF5008_ADDR,MF5000_Cum_Flow_Addr,3);
 }

 //mf4700自动校零
@ -68,7 +97,140 @@ void mf4700_zero(void)
 //mf5600自动校零
 void mf5000_zero(void)
 {
-	write_mf(MF5000_ADDR,MF5000_Auto_Zero_Addr,General_Data);
+	write_mf(MF5003_ADDR,MF5000_Auto_Zero_Addr,General_Data);
+}
+
+//获取流量计读数，存入保持寄存器
+void mf_read(void)
+{
+	switch(flow_addr)
+	{
+		case 1 :
+		{
+			read_mf4701_flow();
+			flow1 = mf4700_buf[3] * pow(2,24) + mf4700_buf[4] * pow(2,16) + mf4700_buf[5] * pow(2,8) + mf4700_buf[6]
+						+ ( mf4700_buf[7] * pow(2,8) + mf4700_buf[8] ) / 1000;
+			if(flow1 > 655) flow1 = 655;
+			InputReg[5] = flow1 * 100;
+			flow_addr++;
+		}
+		break;
+		case 2 :
+		{
+			read_mf5003_flow();
+			flow2 = mf5003_buf[3] * pow(2,24) + mf5003_buf[4] * pow(2,16) + mf5003_buf[5] * pow(2,8) + mf5003_buf[6]
+						+ ( mf5003_buf[7] * pow(2,8) + mf5003_buf[8] ) / 1000;
+			if(flow2 > 65) flow2 = 65;
+			InputReg[6] = flow2 * 1000;
+			flow_addr++;
+		}
+		break;
+		case 3 :
+		{
+//			read_mf5008_flow();
+//			flow3 = mf5008_buf[3] * pow(2,24) + mf5008_buf[4] * pow(2,16) + mf5008_buf[5] * pow(2,8) + mf5008_buf[6]
+//						+ ( mf5008_buf[7] * pow(2,8) + mf5008_buf[8] ) / 1000;
+//			memset(usart6_rx_buf,0,12);
+			flow_addr = 1;
+		}
+		break;
+	}
+}
+
+//清除累积流量
+//mf4700需要手动向累积流量寄存器写0
+//mf5003和mf5008需要先向写保护寄存器写入0xAA55关闭写保护，然后向指定寄存器写入0x0001清除累积流量
+void mf_clear(void)
+{
+	switch(flow_state)
+	{
+		case 0 :
+		{
+		  write_mf(MF4700_ADDR,0x04,0x0000);
+		  flow_state++;
+		}
+		break;
+		case 1 :
+		{
+		  write_mf(MF4700_ADDR,0x05,0x0000);
+		  flow_state++;
+		}
+		break;
+		case 2 :
+		{
+		  write_mf(MF4700_ADDR,0x06,0x0000);
+		  flow_state++;
+		}
+		break;
+		case 3 :
+		{
+		  write_mf(MF5003_ADDR,MF5000_Write_Protec,General_Data);
+		  flow_state++;
+		}
+		break;
+		case 4 :
+		{
+		  write_mf(MF5003_ADDR,MF5000_Clear_Addr,Clear_Data);
+		  flow_state++;
+		}
+		break;
+		case 5 :
+		{
+			//memset(usart6_rx_buf,0,12);
+			flow_state++;
+		}
+		break;
+	}
 }


+
+void mf_rx_cb(void)
+{
+	// 空闲中断，表明接收到了1帧所有的数据
+	if(LL_USART_IsActiveFlag_IDLE(USART6))
+    {
+    	//清除空闲中断
+        LL_USART_ClearFlag_IDLE(USART6);
+		int j = 0;
+		//根据地址将数据分别存入不同的数组
+		if(usart6_rx_buf[0] == 0x01 && usart6_rx_buf[1] == 0x03)
+		{
+			for(j = 0;j < mf_cnt+1;j++)
+			{
+				mf4700_buf[j] = usart6_rx_buf[j];
+			}
+		}
+		else if(usart6_rx_buf[0] == 0x02 && usart6_rx_buf[1] == 0x03)
+		{
+			for(j = 0;j < mf_cnt+1;j++)
+			{
+				mf5003_buf[j] = usart6_rx_buf[j];
+			}
+		}
+		else if(usart6_rx_buf[0] == 0x03 && usart6_rx_buf[1] == 0x03)
+		{
+			for(j = 0;j < mf_cnt+1;j++)
+			{
+				mf5008_buf[j] = usart6_rx_buf[j];
+			}
+		}
+		else
+		{
+			
+		}
+		mf_cnt = 0;
+		
+    }
+	
+	// Rx非空中断，表明接收到了一个字节
+    // 读取Rx可自动清除中断标志位
+	if(LL_USART_IsActiveFlag_RXNE(USART6))
+	{
+        // 如果数组长度大于设置的data最大长度，直接停止接收
+        if(mf_cnt > 50)
+              mf_cnt = 0; // wait for the next data
+	   usart6_rx_buf[mf_cnt] = LL_USART_ReceiveData8(USART6);
+	   mf_cnt ++;
+    }
+}
--- a/Board/Src/ms5803.c
+++ b/Board/Src/ms5803.c
@ -66,38 +66,19 @@ static int WriteCmd(uint8_t CMD)
 	memset(aTxBuffer,0,sizeof(aTxBuffer));
 	aTxBuffer[0] = CMD;
 	
-	ClrCS();
-	LL_mDelay(1);   // pull CSB low to start the command 
-	if(HAL_SPI_Transmit(&hspi1,(uint8_t*)aTxBuffer,1,10))
+	ClrCS();// pull CSB low to start the command
+	delay_tick(10);
+	
+	if(HAL_SPI_Transmit(&hspi1,(uint8_t*)aTxBuffer,1,1))
 	{
-		LL_mDelay(10);
 		SetCS();
-		LL_mDelay(1);
 		return 1;
 	}
 	else
 	{
-		LL_mDelay(10);
 		SetCS();
-		LL_mDelay(1);
 		return 0;
 	}
-	
-//	if(HAL_SPI_TransmitReceive(&hspi1, (uint8_t*)aTxBuffer, (uint8_t *)aRxBuffer, 1, 100))
-//	{
-//		LL_mDelay(10);
-//		SetCS();
-//		LL_mDelay(1);
-//		return 1;
-//	}
-//	else
-//	{
-//		LL_mDelay(10);
-//		SetCS();
-//		LL_mDelay(1);
-//		return 0;
-//	}
-	//return 1;
 }

 //****************************************
@ -111,35 +92,19 @@ static int ReadCmdData(uint8_t CMD,uint8_t Count)
 	aTxBuffer[0] = CMD;
 	
 	ClrCS();
-	LL_mDelay(1);   
+	delay_tick(10);
 		
-//	if(HAL_SPI_Transmit(&hspi1,(uint8_t*)aTxBuffer,1,10)&&HAL_SPI_Receive(&hspi1,(uint8_t *)aRxBuffer,Count+1,100))
-//	{
-//		SetCS(); // pull CSB high to finish the command 
-//		LL_mDelay(1);
-//		return 1;
-//	}
-//	else
-//	{
-//		SetCS(); // pull CSB high to finish the command 
-//		LL_mDelay(1);
-//		return 0;
-//	}
-		
-	if(HAL_SPI_TransmitReceive(&hspi1, (uint8_t*)aTxBuffer, (uint8_t *)aRxBuffer, Count+1, 100))
+	if(HAL_SPI_TransmitReceive(&hspi1, (uint8_t*)aTxBuffer, (uint8_t *)aRxBuffer, Count+1, 1))
 	{
 		SetCS();
-		LL_mDelay(1);
 		return 1;
 	}
 	else
 	{
 		SetCS();
-		LL_mDelay(1);
 		return 0;
 	}
 	//memmove(aRxBuffer,aRxBuffer+1,Count);//
-	//return 1;
 }

 //****************************************
@ -198,16 +163,19 @@ void MS5803Init()
 	SetCS();
 	
 	NSS_Select = 1;
+	delay_tick(10);
 	//놓迦뺏덜쯤
 	ResetDevice();
 	GetPromData();
 	
 	NSS_Select = 2;
+	delay_tick(10);
 	//놓迦뺏덜쯤
 	ResetDevice();
 	GetPromData();
 	
 	NSS_Select = 3;
+	delay_tick(10);
 	//놓迦뺏덜쯤
 	ResetDevice();
 	GetPromData();
@ -232,14 +200,14 @@ void StartCalculation()
 	
 	
 	//瘻뻣箕제
-	WriteCmd(CD1_4096);
-	LL_mDelay(10);			//必须延时10ms
+	WriteCmd(CD1_256);
+	LL_mDelay(1);			//必须延时10ms
 	ReadCmdData(ADC_Read,3);
 	D1 = (aRxBuffer[1]*pow(2,16)) + (aRxBuffer[2]*pow(2,8)) + aRxBuffer[3];
 	
 	//瘻뻣侊똑
-	WriteCmd(CD2_4096);
-	LL_mDelay(10);			//必须延时10ms
+	WriteCmd(CD2_256);
+	LL_mDelay(1);			//必须延时10ms
 	ReadCmdData(ADC_Read,3);
 	D2 = (aRxBuffer[1]*pow(2,16)) + (aRxBuffer[2]*pow(2,8)) + aRxBuffer[3];
 	
@ -312,10 +280,67 @@ void StartCalculation()

 void ms5803_task(void)
 {
-	if(NSS_Select > 3)
-		NSS_Select = 1;
 	StartCalculation();
-	InputReg[NSS_Select + 6] = CurrentPress/10;//压力数据存入
-	NSS_Select++;
+	
+	switch(NSS_Select)
+	{
+		case 1 :
+		{
+			press_array1[a1] = CurrentPress/10;
+			a1++;
+			if(a1 > 9) a1 = 0;
+			for(int a = 0;a < 10;a++)
+			{
+				press_array1_sum += press_array1[a];
+			}
+			InputReg[NSS_Select + 6] = press_array1_sum/10;//压力数据存入
+			press_array1_sum = 0;
+			NSS_Select++;
+		}
+		break;
+		case 2 :
+		{
+			press_array2[a2] = CurrentPress/10;
+			a2++;
+			if(a2 > 9) a2 = 0;
+			for(int a = 0;a < 10;a++)
+			{
+				press_array2_sum += press_array2[a];
+			}
+			InputReg[NSS_Select + 6] = press_array2_sum/10;//压力数据存入
+			press_array2_sum = 0;
+			NSS_Select++;
+		}
+		break;
+		case 3 :
+		{
+			press_array3[a3] = CurrentPress/10;
+			a3++;
+			if(a3 > 9) a3 = 0;
+			for(int a = 0;a < 10;a++)
+			{
+				press_array3_sum += press_array3[a];
+			}
+			InputReg[NSS_Select + 6] = press_array3_sum/10;//压力数据存入
+			press_array3_sum = 0;
+			NSS_Select = 1;
+		}
+		break;
+		case 4 :
+		{
+		  
+		}
+		break;
+		case 5 :
+		{
+		  
+		}
+		break;
+		case 6 :
+		{
+		  
+		}
+		break;
+	}
 }

--- a/Core/Inc/main.h
+++ b/Core/Inc/main.h
@ -64,7 +64,15 @@ extern "C" {

 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
+extern char step_cnt;

+extern uint16_t press_array1[10];
+extern uint16_t press_array2[10];
+extern uint16_t press_array3[10];
+extern uint32_t press_array1_sum;
+extern uint32_t press_array2_sum;
+extern uint32_t press_array3_sum;
+extern int a1,a2,a3;
 /* USER CODE END ET */

 /* Exported constants --------------------------------------------------------*/
@ -84,6 +92,9 @@ void Error_Handler(void);
 void delay_us(uint32_t nus);
 void delay_ms(uint16_t nms);
 void delay_tick(uint32_t ticks);
+
+extern int OVER_TIMES;
+//#define OVER_TIMES 24
 /* USER CODE END EFP */

 /* Private defines -----------------------------------------------------------*/
@ -197,7 +208,7 @@ void delay_tick(uint32_t ticks);
 #define ENCODER_B_GPIO_Port GPIOB

 /* USER CODE BEGIN Private defines */
-extern int i;
+extern int flow_state;
 #define osel_memset _memset
 #define osel_memcmp _memcmp
 #define osel_memcpy memcpyL
@ -267,6 +278,8 @@ static inline void memcpyR(uint8_t *dst, const uint8_t *src, uint16_t size)
            num = 0;                  \
        }                             \
    } while (0)
+	
+	void delay_init(uint16_t sysclk);
 /* USER CODE END Private defines */

 #ifdef __cplusplus
--- a/Core/Inc/stm32f4xx_it.h
+++ b/Core/Inc/stm32f4xx_it.h
@ -36,6 +36,8 @@ extern int it_5ms_falg;
 extern int it_5ms_cnt;
 extern int it_10ms_falg;
 extern int it_10ms_cnt;
+extern int it_25ms_falg;
+extern int it_25ms_cnt;
 extern int it_50ms_falg;
 extern int it_50ms_cnt;
 extern int it_100ms_falg;
--- a/Core/Src/dma.c
+++ b/Core/Src/dma.c
@ -46,19 +46,19 @@ void MX_DMA_Init(void)

  /* DMA interrupt init */
  /* DMA1_Stream3_IRQn interrupt configuration */
-  NVIC_SetPriority(DMA1_Stream3_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+  NVIC_SetPriority(DMA1_Stream3_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 1));
  NVIC_EnableIRQ(DMA1_Stream3_IRQn);
  /* DMA1_Stream6_IRQn interrupt configuration */
-  NVIC_SetPriority(DMA1_Stream6_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+  NVIC_SetPriority(DMA1_Stream6_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),2, 1));
  NVIC_EnableIRQ(DMA1_Stream6_IRQn);
  /* DMA2_Stream0_IRQn interrupt configuration */
-  NVIC_SetPriority(DMA2_Stream0_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+  NVIC_SetPriority(DMA2_Stream0_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),2, 1));
  NVIC_EnableIRQ(DMA2_Stream0_IRQn);
  /* DMA2_Stream1_IRQn interrupt configuration */
-  NVIC_SetPriority(DMA2_Stream1_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+  NVIC_SetPriority(DMA2_Stream1_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),2, 1));
  NVIC_EnableIRQ(DMA2_Stream1_IRQn);
  /* DMA2_Stream6_IRQn interrupt configuration */
-  NVIC_SetPriority(DMA2_Stream6_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+  NVIC_SetPriority(DMA2_Stream6_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),2, 1));
  NVIC_EnableIRQ(DMA2_Stream6_IRQn);

 }
--- a/Core/Src/gpio.c
+++ b/Core/Src/gpio.c
@ -57,9 +57,9 @@ void MX_GPIO_Init(void)

  /**/
  LL_GPIO_ResetOutputPin(GPIOE, SPI1_NSS4_Pin|SPI1_NSS3_Pin|SPI1_NSS2_Pin|SPI1_NSS1_Pin
-                          |SENSOR_SELECT_Pin|DO1_Pin|DO2_Pin|DO3_Pin
-                          |DO4_Pin|DO5_Pin|DO6_Pin|DO7_Pin
+                          |SENSOR_SELECT_Pin|DO6_Pin|DO7_Pin
                          |DO8_Pin|PE15_SPI7_Pin);
+  LL_GPIO_SetOutputPin(GPIOE, DO1_Pin|DO2_Pin|DO3_Pin|DO4_Pin|DO5_Pin);

  /**/
  LL_GPIO_ResetOutputPin(GPIOC, PC13_SPI8_Pin|PC14_SPI8_Pin|PC15_SPI8_Pin|HC165_INH_Pin
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@ -62,6 +62,7 @@ void SystemClock_Config(void);

 void sys_init()
 {
+	MS5803Init();
 	ADS1256_Init();
 //	hc595_init(&hc595);
 	_74hc165_init();
@ -69,32 +70,39 @@ void sys_init()
 	modbus_tim_init();
 	modbus_init();
 	adc1_start_dma();
-	MS5803Init();
 	laser_init(usart2_laser_send);
+	io_output();
 //	encode_init();
 }
+
 char step_cnt = 0;
 int i = 0;
-int flow_flag = 0;
 int bub_flag = 0;//气泡检测状态
 float AO1_data = 0;//AO1输出电流值
 float AO2_data = 0;//AO2输出电流值
 uint16_t dis_temp = 0;//DI输入存储中间量
-uint32_t flow1 = 0;
-uint32_t flow2 = 0;
-uint32_t flow3 = 0;

-uint8_t get_mf4700_addr[] = {0x01,0x03,0x00,0x01,0x00,0x01,0xD5,0xCA};
-uint8_t get_mf5000_addr[] = {0x02,0x03,0x00,0x81,0x00,0x01,0xD4,0x11};
+int flow_state = 0;
+int OVER_TIMES = 65535;
+
+uint16_t press_array1[10] = {0};
+uint16_t press_array2[10] = {0};
+uint16_t press_array3[10] = {0};
+uint32_t press_array1_sum = 0;
+uint32_t press_array2_sum = 0;
+uint32_t press_array3_sum = 0;
+int a1 = 0,a2 = 0,a3 = 0;

 void sys_task(void)
 {
+	//ao1_set(8);
 	//AO(0-25mA)输出,每当寄存器内数值更新时输出电流同步更新
 	if(!(AO1_data == (float)(HoldReg[0]) / 1000))
 	{
 		AO1_data = (float)(HoldReg[0]) / 1000;
 		if(AO1_data > 25)
 			AO1_data = 25;
+		dac7311_init();
 		ao1_set(AO1_data);
 	}
 	if(!(AO2_data == (float)(HoldReg[1]) / 1000))
@ -102,12 +110,15 @@ void sys_task(void)
 		AO2_data = (float)(HoldReg[1]) / 1000;
 		if(AO2_data > 25)
 			AO2_data = 25;
+		dac7311_init();
 		ao2_set(AO2_data);
 	}

-	adc_task();//ADS1256Êı¾İ²ÉÑù
+	adc_task(i);    //ADS1256Êý¾Ý²ÉÑù
+	i++;
+	if(i > 7) i = 0;
 	
-	ms5803_task();//ms5803Êı¾İ²ÉÑù
+	ms5803_task(); //ms5803Êý¾Ý²ÉÑù

 	laser_task();//获取一次激光传感器数据
 	
@ -120,34 +131,15 @@ void sys_task(void)
 	dis_temp =_74hc165_read_byte();
 	DisState[1] = ~((unsigned char)(dis_temp & 0x00ff));		//第二级74HC165的数据
 	DisState[0] = ~((unsigned char)((dis_temp >> 8) & 0x00ff));//第一级74HC165的数据
-	if(bub_flag != (DisState[0] & 0x40))
+	if(bub_flag != (DisState[0] & 0x04))
 	{
 		HoldReg[2] ++;
 		if(HoldReg[2] > 65500)
 			HoldReg[2] = 65500;
 	}
 	
-	if(it_50ms_falg == 1)
-	{
-		if(flow_flag == 1)
-		{
-			read_mf4700_flow();
-			flow1 = usart6_rx_buf[3] * 0xFFFFFF + usart6_rx_buf[4] * 0xFFFF + usart6_rx_buf[5] * 0xFF + usart6_rx_buf[6];
-		}
-		else if(flow_flag == 2)
-		{
-			read_mf5000_flow();
-			flow2 = usart6_rx_buf[3] * 0xFFFFFF + usart6_rx_buf[4] * 0xFFFF + usart6_rx_buf[5] * 0xFF + usart6_rx_buf[6];
-		}
-		else
-		{
-			read_mf5000_flow();
-			flow3 = usart6_rx_buf[3] * 0xFFFFFF + usart6_rx_buf[4] * 0xFFFF + usart6_rx_buf[5] * 0xFF + usart6_rx_buf[6];
-		}
-		it_50ms_falg = 0;
-	}
-}
 	
+}
 /* USER CODE END 0 */

 /**
@ -157,7 +149,7 @@ void sys_task(void)
 int main(void)
 {
  /* USER CODE BEGIN 1 */
-  step_cnt = 0;
+	step_cnt = 0;
  /* USER CODE END 1 */

  /* MCU Configuration--------------------------------------------------------*/
@ -191,10 +183,10 @@ int main(void)
  MX_TIM3_Init();
  /* USER CODE BEGIN 2 */
  
+	//delay_init(168);
 	LL_TIM_EnableCounter(TIM3);  //使能计数
 	LL_TIM_EnableIT_UPDATE(TIM3);  //使能更新中断
 	LL_TIM_EnableAllOutputs(TIM3); 
-
  /* USER CODE END 2 */

  /* Infinite loop */
@ -209,36 +201,20 @@ int main(void)
 			  {
 				  LL_GPIO_ResetOutputPin(SENSOR_SELECT_GPIO_Port,SENSOR_SELECT_Pin);//压力传感器板选择
 				  SetCS();//拉高压力传感器所有片选
-				  usart6_send(get_mf4700_addr,8);
 				  it_1000ms_falg = 0;
 				  step_cnt++;
 			  }
 			  break;
 			  case 1 :
 			  {
-				  if(usart6_rx_buf[0] == 0x01 && usart6_rx_buf[4] == 0x01)
-				  {
-					  flow_flag = 1;
-				  }
-				  else
-				  {
-					  usart6_send(get_mf5000_addr,8);
-				  }
 				  step_cnt++;
 				  it_1000ms_falg = 0;
 			  }
 			  break;
 			  case 2 :
 			  {
-				  if(usart6_rx_buf[0] == 0x02 && usart6_rx_buf[4] == 0x02)
-				  {
-					  flow_flag = 2;
-				  }
-				  else
-				  {
-					  usart6_send(get_mf5000_addr,8);
-				  }
 				  sys_init();//硬件初始化
+				  OVER_TIMES = 64;
 				  it_1000ms_falg = 0;
 				  step_cnt++;
 			  }
--- a/Core/Src/spi.c
+++ b/Core/Src/spi.c
@ -50,10 +50,11 @@ void MX_SPI1_Init(void)
  hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
  hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
  hspi1.Init.CRCPolynomial = 10;
-  if (HAL_SPI_Init(&hspi1) != HAL_OK)
-  {
-    Error_Handler();
-  }
+  HAL_SPI_Init(&hspi1);
+//  if (HAL_SPI_Init(&hspi1) != HAL_OK)
+//  {
+//    Error_Handler();
+//  }
  /* USER CODE BEGIN SPI1_Init 2 */
  /* USER CODE END SPI1_Init 2 */

@ -131,6 +132,7 @@ void MX_SPI3_Init(void)
  hspi3.Init.TIMode = SPI_TIMODE_DISABLE;
  hspi3.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
  hspi3.Init.CRCPolynomial = 10;
+  HAL_SPI_Init(&hspi3);
  if (HAL_SPI_Init(&hspi3) != HAL_OK)
  {
    Error_Handler();
--- a/Core/Src/stm32f4xx_it.c
+++ b/Core/Src/stm32f4xx_it.c
@ -55,6 +55,8 @@ int it_5ms_falg = 0;
 int it_5ms_cnt = 0;
 int it_10ms_falg = 0;
 int it_10ms_cnt = 0;
+int it_25ms_falg = 0;
+int it_25ms_cnt = 0;
 int it_50ms_falg = 0;
 int it_50ms_cnt = 0;
 int it_100ms_falg = 0;
@ -266,11 +268,31 @@ void TIM3_IRQHandler(void)
 		it_10ms_cnt++;
 		if(it_10ms_cnt > 9)
 		{
-			it_10ms_falg = 1;
+			if (laser_handle.state == LASER_READY)
+			{
+				laser_handle.command_distance_read_req();
+				if(laser_handle.distance >= 0)
+				{
+					InputReg[4] = laser_handle.distance;
+				}
+				else
+				{
+					int laser_num = -laser_handle.distance;
+					
+					InputReg[4] = (uint16_t)((0xFFFF - laser_num) + 1);
+				}
+			}
+			//it_10ms_falg = 1;
 			it_10ms_cnt = 0;
 		}
+		it_25ms_cnt++;
+		if(it_25ms_cnt > 24)
+		{
+			it_25ms_falg = 1;
+			it_25ms_cnt = 0;
+		}
 		it_50ms_cnt++;
-		if(it_50ms_cnt > 9)
+		if(it_50ms_cnt > 49)
 		{
 			it_50ms_falg = 1;
 			it_50ms_cnt = 0;
@ -278,8 +300,15 @@ void TIM3_IRQHandler(void)
 		it_100ms_cnt++;
 		if(it_100ms_cnt > 99)
 		{
-			it_100ms_falg = 1;
 			it_100ms_cnt = 0;
+			if(flow_state == 6)
+			{
+				mf_read();
+			}
+			else
+			{
+				mf_clear();
+			}
 		}
 		it_300ms_cnt++;
 		if(it_300ms_cnt > 299)
@ -403,7 +432,13 @@ void DMA2_Stream1_IRQHandler(void)
 void DMA2_Stream6_IRQHandler(void)
 {
  /* USER CODE BEGIN DMA2_Stream6_IRQn 0 */
-
+    if(LL_DMA_IsActiveFlag_TC6(DMA2))
+    {
+    	//Çå³ýStream3 TCÖÐ¶Ï
+        LL_DMA_ClearFlag_TC6(DMA2);
+        //¹Ø±ÕDMA1 Stream3
+        LL_DMA_DisableStream(DMA2,LL_DMA_STREAM_6);
+    }
  /* USER CODE END DMA2_Stream6_IRQn 0 */

  /* USER CODE BEGIN DMA2_Stream6_IRQn 1 */
@ -417,7 +452,7 @@ void DMA2_Stream6_IRQHandler(void)
 void USART6_IRQHandler(void)
 {
  /* USER CODE BEGIN USART6_IRQn 0 */
-
+	mf_rx_cb();
  /* USER CODE END USART6_IRQn 0 */
  /* USER CODE BEGIN USART6_IRQn 1 */

--- a/Core/Src/tim.c
+++ b/Core/Src/tim.c
@ -38,7 +38,7 @@ void MX_TIM3_Init(void)
  LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_TIM3);

  /* TIM3 interrupt Init */
-  NVIC_SetPriority(TIM3_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+  NVIC_SetPriority(TIM3_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),2, 1));
  NVIC_EnableIRQ(TIM3_IRQn);

  /* USER CODE BEGIN TIM3_Init 1 */
@ -130,7 +130,7 @@ void MX_TIM7_Init(void)
  LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_TIM7);

  /* TIM7 interrupt Init */
-  NVIC_SetPriority(TIM7_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),2, 1));
+  NVIC_SetPriority(TIM7_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
  NVIC_EnableIRQ(TIM7_IRQn);

  /* USER CODE BEGIN TIM7_Init 1 */
@ -138,7 +138,7 @@ void MX_TIM7_Init(void)
  /* USER CODE END TIM7_Init 1 */
  TIM_InitStruct.Prescaler = 16799;
  TIM_InitStruct.CounterMode = LL_TIM_COUNTERMODE_UP;
-  TIM_InitStruct.Autoreload = 39;
+  TIM_InitStruct.Autoreload = 9;
  LL_TIM_Init(TIM7, &TIM_InitStruct);
  LL_TIM_EnableARRPreload(TIM7);
  LL_TIM_SetTriggerOutput(TIM7, LL_TIM_TRGO_RESET);
--- a/Core/Src/usart.c
+++ b/Core/Src/usart.c
@ -37,9 +37,9 @@ int usart6_cnt = 0;
 UART_BUF usart3;			//串口结构体实体
 uint8_t RxBuffer;		//接收数据中间变量

-uint8_t mfc_ins_buf[8] = {0x01,0x03,0x00,0x10,0x00,0x02,0xC5,0xCE};//读取流量计瞬时流量命令
-uint8_t mfc_cum_buf[8] = {0x01,0x03,0x00,0x1A,0x00,0x02,0xE5,0xCC};//读取流量计累积流量命令
-uint8_t mfc_data_buf[8];//流量计返回数组
+//uint8_t mfc_ins_buf[8] = {0x01,0x03,0x00,0x10,0x00,0x02,0xC5,0xCE};//读取流量计瞬时流量命令
+//uint8_t mfc_cum_buf[8] = {0x01,0x03,0x00,0x1A,0x00,0x02,0xE5,0xCC};//读取流量计累积流量命令
+//uint8_t mfc_data_buf[8];//流量计返回数组

 /* USER CODE END 0 */

@ -81,7 +81,7 @@ void MX_USART1_UART_Init(void)
  LL_GPIO_Init(GPIOA, &GPIO_InitStruct);

  /* USART1 interrupt Init */
-  NVIC_SetPriority(USART1_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+  NVIC_SetPriority(USART1_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),2, 1));
  NVIC_EnableIRQ(USART1_IRQn);

  /* USER CODE BEGIN USART1_Init 1 */
@ -161,7 +161,7 @@ void MX_USART2_UART_Init(void)
  LL_DMA_DisableFifoMode(DMA1, LL_DMA_STREAM_6);

  /* USART2 interrupt Init */
-  NVIC_SetPriority(USART2_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+  NVIC_SetPriority(USART2_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),2, 1));
  NVIC_EnableIRQ(USART2_IRQn);

  /* USER CODE BEGIN USART2_Init 1 */
@ -241,7 +241,7 @@ void MX_USART3_UART_Init(void)
  LL_DMA_DisableFifoMode(DMA1, LL_DMA_STREAM_3);

  /* USART3 interrupt Init */
-  NVIC_SetPriority(USART3_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+  NVIC_SetPriority(USART3_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 1));
  NVIC_EnableIRQ(USART3_IRQn);

  /* USER CODE BEGIN USART3_Init 1 */
@ -346,7 +346,7 @@ void MX_USART6_UART_Init(void)
  LL_DMA_DisableFifoMode(DMA2, LL_DMA_STREAM_6);

  /* USART6 interrupt Init */
-  NVIC_SetPriority(USART6_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+  NVIC_SetPriority(USART6_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),2, 1));
  NVIC_EnableIRQ(USART6_IRQn);

  /* USER CODE BEGIN USART6_Init 1 */
@ -363,8 +363,7 @@ void MX_USART6_UART_Init(void)
  LL_USART_ConfigAsyncMode(USART6);
  LL_USART_Enable(USART6);
  /* USER CODE BEGIN USART6_Init 2 */
-
-	/*接收配置*/
+/*接收配置*/
    //使能空闲中断
    LL_USART_EnableIT_IDLE(USART6);
 	
@ -376,7 +375,7 @@ void MX_USART6_UART_Init(void)
    //使能DMA2发送完成中断
    LL_DMA_EnableIT_TC(DMA2,LL_DMA_STREAM_6);
 	
-	LL_USART_EnableIT_RXNE(USART2);	//开启接收中断
+	LL_USART_EnableIT_RXNE(USART6);	//开启接收中断
  /* USER CODE END USART6_Init 2 */

 }
@ -400,6 +399,8 @@ void modbus_init(void)

 void modbus_callback(void)
 {
+	if(step_cnt >= 3)
+	{
 		if(usart3.rx_buf_cnt >= USART3_RXSIZE-1)	//接收数据量超限，错误
 		{
 			usart3.rx_buf_cnt = 0;
@ -414,6 +415,7 @@ void modbus_callback(void)
 			LL_TIM_SetCounter(TIM7,0);//将定时器7的计数值清零后重新计数
 			LL_TIM_EnableCounter(TIM7);//TIM7计数使能
 		}
+	}
 }


@ -473,5 +475,4 @@ void usart6_rx_cb(void)//uint8_t uart_index, uint8_t *data, uint16_t len
 	   usart6_cnt ++;
    }
 }
-
 /* USER CODE END 1 */
--- a/MDK-ARM/FM_CCJY.uvguix.admin
+++ b/MDK-ARM/FM_CCJY.uvguix.admin
--- a/MDK-ARM/FM_CCJY.uvoptx
+++ b/MDK-ARM/FM_CCJY.uvoptx
@ -199,7 +199,7 @@
        <SetRegEntry>
          <Number>0</Number>
          <Key>JL2CM3</Key>
-          <Name>-U59610079 -O78 -S0 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407VGTx$CMSIS/Flash/STM32F4xx_1024.FLM)</Name>
+          <Name>-U59610079 -O78 -S0 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8001 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407VGTx$CMSIS/Flash/STM32F4xx_1024.FLM)</Name>
        </SetRegEntry>
        <SetRegEntry>
          <Number>0</Number>
@ -297,7 +297,7 @@
        <Ww>
          <count>16</count>
          <WinNumber>1</WinNumber>
-          <ItemText>ADS1256ReadData</ItemText>
+          <ItemText>ADS1256ReadData,0x0A</ItemText>
        </Ww>
        <Ww>
          <count>17</count>
@ -322,17 +322,37 @@
        <Ww>
          <count>21</count>
          <WinNumber>1</WinNumber>
-          <ItemText>\\FM_CCJY\../Modbus/Src/modbus.c\InputReg[10]</ItemText>
+          <ItemText>temp</ItemText>
        </Ww>
        <Ww>
          <count>22</count>
          <WinNumber>1</WinNumber>
-          <ItemText>temp</ItemText>
+          <ItemText>date_t</ItemText>
        </Ww>
        <Ww>
          <count>23</count>
          <WinNumber>1</WinNumber>
-          <ItemText>date_t</ItemText>
+          <ItemText>tx_len</ItemText>
+        </Ww>
+        <Ww>
+          <count>24</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>tx_buf</ItemText>
+        </Ww>
+        <Ww>
+          <count>25</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>flow1</ItemText>
+        </Ww>
+        <Ww>
+          <count>26</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>flow2</ItemText>
+        </Ww>
+        <Ww>
+          <count>27</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>usart6_rx_buf</ItemText>
        </Ww>
      </WatchWindow1>
      <Tracepoint>
@ -995,14 +1015,6 @@
    </File>
  </Group>

-  <Group>
-    <GroupName>New Group</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-  </Group>
-
  <Group>
    <GroupName>::CMSIS</GroupName>
    <tvExp>0</tvExp>
--- a/MDK-ARM/FM_CCJY.uvprojx
+++ b/MDK-ARM/FM_CCJY.uvprojx
@ -79,7 +79,7 @@
          </BeforeMake>
          <AfterMake>
            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>1</RunUserProg2>
+            <RunUserProg2>0</RunUserProg2>
            <UserProg1Name></UserProg1Name>
            <UserProg2Name></UserProg2Name>
            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
@ -347,7 +347,7 @@
          </ArmAdsMisc>
          <Cads>
            <interw>1</interw>
-            <Optim>4</Optim>
+            <Optim>2</Optim>
            <oTime>0</oTime>
            <SplitLS>0</SplitLS>
            <OneElfS>1</OneElfS>
@ -1859,9 +1859,6 @@
            </File>
          </Files>
        </Group>
-        <Group>
-          <GroupName>New Group</GroupName>
-        </Group>
        <Group>
          <GroupName>::CMSIS</GroupName>
        </Group>
--- a/MDK-ARM/FM_CCJY/FM_CCJY.axf
+++ b/MDK-ARM/FM_CCJY/FM_CCJY.axf
--- a/MDK-ARM/FM_CCJY/FM_CCJY.build_log.htm
+++ b/MDK-ARM/FM_CCJY/FM_CCJY.build_log.htm
@ -21,31 +21,11 @@ Target DLL:      Segger\JL2CM3.dll V2.99.13.0
 Dialog DLL:      TCM.DLL V1.14.4.0
 
 <h2>Project:</h2>
-D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\FM_CCJY.uvprojx
-Project File Date:  03/26/2024
+D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\FM_CCJY.uvprojx
+Project File Date:  03/29/2024

 <h2>Output:</h2>
 Build target 'FM_CCJY'
-compiling main.c...
-compiling gpio.c...
-compiling adc.c...
-compiling dma.c...
-compiling spi.c...
-compiling tim.c...
-compiling stm32f4xx_it.c...
-compiling usart.c...
-compiling stm32f4xx_hal_msp.c...
-compiling modbus.c...
-compiling ads1256.c...
-compiling hc595.c...
-compiling hc165.c...
-compiling dac7311.c...
-compiling ms5803.c...
-compiling laser.c...
-compiling mf.c...
-linking...
-Program Size: Code=27014 RO-data=698 RW-data=316 ZI-data=3212  
-FromELF: creating hex file...
 "FM_CCJY\FM_CCJY.axf" - 0 Error(s), 0 Warning(s).

 <h2>Software Packages used:</h2>
@ -57,7 +37,7 @@ Package Vendor: ARM
   * Component: CORE Version: 3.40.0

 <h2>Collection of Component include folders:</h2>
-  D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE
+  D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE
  D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include
  D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

--- a/MDK-ARM/FM_CCJY/FM_CCJY.hex
+++ b/MDK-ARM/FM_CCJY/FM_CCJY.hex
--- a/MDK-ARM/FM_CCJY/FM_CCJY.htm
+++ b/MDK-ARM/FM_CCJY/FM_CCJY.htm
--- a/MDK-ARM/FM_CCJY/FM_CCJY.map
+++ b/MDK-ARM/FM_CCJY/FM_CCJY.map
--- a/MDK-ARM/FM_CCJY/FM_CCJY_FM_CCJY.dep
+++ b/MDK-ARM/FM_CCJY/FM_CCJY_FM_CCJY.dep
@ -1,7 +1,7 @@
 Dependencies for Project 'FM_CCJY', Target 'FM_CCJY': (DO NOT MODIFY !)
-F (startup_stm32f407xx.s)(0x65F3C22E)(--cpu Cortex-M4.fp -g --apcs=interwork 

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

--pd "__UVISION_VERSION SETA 514" --pd "_RTE_ SETA 1" --pd "STM32F407xx SETA 1"

--list startup_stm32f407xx.lst --xref -o fm_ccjy\startup_stm32f407xx.o --depend fm_ccjy\startup_stm32f407xx.d)
-F (../Core/Src/main.c)(0x6602885C)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\main.o --omf_browse fm_ccjy\main.crf --depend fm_ccjy\main.d)
-I (../Core/Inc/main.h)(0x660280CD)
+F (startup_stm32f407xx.s)(0x65F3C22E)(--cpu Cortex-M4.fp -g --apcs=interwork 

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

--pd "__UVISION_VERSION SETA 514" --pd "_RTE_ SETA 1" --pd "STM32F407xx SETA 1"

--list startup_stm32f407xx.lst --xref -o fm_ccjy\startup_stm32f407xx.o --depend fm_ccjy\startup_stm32f407xx.d)
+F (../Core/Src/main.c)(0x662DE2DB)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\main.o --omf_browse fm_ccjy\main.crf --depend fm_ccjy\main.d)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -43,16 +43,16 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/spi.h)(0x65F253D4)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/dac7311.h)(0x65E57354)
@ -60,11 +60,11 @@ I (../Board/Inc/ms5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Board/Inc/mf.h)(0x660280A0)
+I (../Board/Inc/mf.h)(0x66139F01)
 I (../Core/Inc/dma.h)(0x65D7F0D6)
-F (../Core/Src/gpio.c)(0x65F2550C)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\gpio.o --omf_browse fm_ccjy\gpio.crf --depend fm_ccjy\gpio.d)
+F (../Core/Src/gpio.c)(0x661248E5)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\gpio.o --omf_browse fm_ccjy\gpio.crf --depend fm_ccjy\gpio.d)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Core/Inc/main.h)(0x660280CD)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -106,15 +106,15 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/spi.h)(0x65F253D4)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/dac7311.h)(0x65E57354)
@ -122,10 +122,10 @@ I (../Board/Inc/ms5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Board/Inc/mf.h)(0x660280A0)
-F (../Core/Src/adc.c)(0x65F7A9F2)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\adc.o --omf_browse fm_ccjy\adc.crf --depend fm_ccjy\adc.d)
+I (../Board/Inc/mf.h)(0x66139F01)
+F (../Core/Src/adc.c)(0x65F7A9F2)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\adc.o --omf_browse fm_ccjy\adc.crf --depend fm_ccjy\adc.d)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
-I (../Core/Inc/main.h)(0x660280CD)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -167,15 +167,15 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/spi.h)(0x65F253D4)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/dac7311.h)(0x65E57354)
@ -183,10 +183,10 @@ I (../Board/Inc/ms5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Board/Inc/mf.h)(0x660280A0)
-F (../Core/Src/dma.c)(0x65F3C227)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\dma.o --omf_browse fm_ccjy\dma.crf --depend fm_ccjy\dma.d)
+I (../Board/Inc/mf.h)(0x66139F01)
+F (../Core/Src/dma.c)(0x662098FD)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\dma.o --omf_browse fm_ccjy\dma.crf --depend fm_ccjy\dma.d)
 I (../Core/Inc/dma.h)(0x65D7F0D6)
-I (../Core/Inc/main.h)(0x660280CD)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -228,16 +228,16 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/spi.h)(0x65F253D4)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/dac7311.h)(0x65E57354)
@ -245,10 +245,10 @@ I (../Board/Inc/ms5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Board/Inc/mf.h)(0x660280A0)
-F (../Core/Src/spi.c)(0x65F3C227)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\spi.o --omf_browse fm_ccjy\spi.crf --depend fm_ccjy\spi.d)
+I (../Board/Inc/mf.h)(0x66139F01)
+F (../Core/Src/spi.c)(0x661C8C6B)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\spi.o --omf_browse fm_ccjy\spi.crf --depend fm_ccjy\spi.d)
 I (../Core/Inc/spi.h)(0x65F253D4)
-I (../Core/Inc/main.h)(0x660280CD)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -290,15 +290,15 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/dac7311.h)(0x65E57354)
@ -306,10 +306,10 @@ I (../Board/Inc/ms5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Board/Inc/mf.h)(0x660280A0)
-F (../Core/Src/tim.c)(0x660273FB)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\tim.o --omf_browse fm_ccjy\tim.crf --depend fm_ccjy\tim.d)
+I (../Board/Inc/mf.h)(0x66139F01)
+F (../Core/Src/tim.c)(0x662DA879)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\tim.o --omf_browse fm_ccjy\tim.crf --depend fm_ccjy\tim.d)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/main.h)(0x660280CD)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -351,15 +351,15 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/spi.h)(0x65F253D4)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/dac7311.h)(0x65E57354)
@ -367,9 +367,9 @@ I (../Board/Inc/ms5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Board/Inc/mf.h)(0x660280A0)
-F (../Core/Src/stm32f4xx_it.c)(0x65FA7DAD)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_it.o --omf_browse fm_ccjy\stm32f4xx_it.crf --depend fm_ccjy\stm32f4xx_it.d)
-I (../Core/Inc/main.h)(0x660280CD)
+I (../Board/Inc/mf.h)(0x66139F01)
+F (../Core/Src/stm32f4xx_it.c)(0x662DE164)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_it.o --omf_browse fm_ccjy\stm32f4xx_it.crf --depend fm_ccjy\stm32f4xx_it.d)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -411,16 +411,16 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/spi.h)(0x65F253D4)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/dac7311.h)(0x65E57354)
@ -428,10 +428,10 @@ I (../Board/Inc/ms5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Board/Inc/mf.h)(0x660280A0)
-F (../Core/Src/usart.c)(0x6602765E)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\usart.o --omf_browse fm_ccjy\usart.crf --depend fm_ccjy\usart.d)
-I (../Core/Inc/usart.h)(0x6602765E)
-I (../Core/Inc/main.h)(0x660280CD)
+I (../Board/Inc/mf.h)(0x66139F01)
+F (../Core/Src/usart.c)(0x662098FC)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\usart.o --omf_browse fm_ccjy\usart.crf --depend fm_ccjy\usart.d)
+I (../Core/Inc/usart.h)(0x66061646)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -473,14 +473,14 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/spi.h)(0x65F253D4)
 I (../Core/Inc/tim.h)(0x65EA7F87)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/dac7311.h)(0x65E57354)
@ -488,10 +488,10 @@ I (../Board/Inc/ms5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Board/Inc/mf.h)(0x660280A0)
+I (../Board/Inc/mf.h)(0x66139F01)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
-F (../Core/Src/stm32f4xx_hal_msp.c)(0x65EEB1EF)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_msp.o --omf_browse fm_ccjy\stm32f4xx_hal_msp.crf --depend fm_ccjy\stm32f4xx_hal_msp.d)
-I (../Core/Inc/main.h)(0x660280CD)
+F (../Core/Src/stm32f4xx_hal_msp.c)(0x65EEB1EF)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_msp.o --omf_browse fm_ccjy\stm32f4xx_hal_msp.crf --depend fm_ccjy\stm32f4xx_hal_msp.d)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -533,16 +533,16 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/spi.h)(0x65F253D4)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/dac7311.h)(0x65E57354)
@ -550,8 +550,8 @@ I (../Board/Inc/ms5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Board/Inc/mf.h)(0x660280A0)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_gpio.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_gpio.o --omf_browse fm_ccjy\stm32f4xx_ll_gpio.crf --depend fm_ccjy\stm32f4xx_ll_gpio.d)
+I (../Board/Inc/mf.h)(0x66139F01)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_gpio.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_gpio.o --omf_browse fm_ccjy\stm32f4xx_ll_gpio.crf --depend fm_ccjy\stm32f4xx_ll_gpio.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h)(0x65A9DF62)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h)(0x65A9DF62)
@ -582,7 +582,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_bus.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_adc.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_adc.o --omf_browse fm_ccjy\stm32f4xx_ll_adc.crf --depend fm_ccjy\stm32f4xx_ll_adc.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_adc.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_adc.o --omf_browse fm_ccjy\stm32f4xx_ll_adc.crf --depend fm_ccjy\stm32f4xx_ll_adc.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_adc.h)(0x65A9DF68)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h)(0x65A9DF62)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h)(0x65A9DF62)
@ -613,7 +613,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_bus.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_dma.o --omf_browse fm_ccjy\stm32f4xx_ll_dma.crf --depend fm_ccjy\stm32f4xx_ll_dma.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_dma.o --omf_browse fm_ccjy\stm32f4xx_ll_dma.crf --depend fm_ccjy\stm32f4xx_ll_dma.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dma.h)(0x65A9DF68)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h)(0x65A9DF62)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h)(0x65A9DF62)
@ -644,7 +644,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_bus.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rcc.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_rcc.o --omf_browse fm_ccjy\stm32f4xx_ll_rcc.crf --depend fm_ccjy\stm32f4xx_ll_rcc.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rcc.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_rcc.o --omf_browse fm_ccjy\stm32f4xx_ll_rcc.crf --depend fm_ccjy\stm32f4xx_ll_rcc.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rcc.h)(0x65A9DF68)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h)(0x65A9DF62)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h)(0x65A9DF62)
@ -674,7 +674,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_utils.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_utils.o --omf_browse fm_ccjy\stm32f4xx_ll_utils.crf --depend fm_ccjy\stm32f4xx_ll_utils.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_utils.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_utils.o --omf_browse fm_ccjy\stm32f4xx_ll_utils.crf --depend fm_ccjy\stm32f4xx_ll_utils.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_utils.h)(0x65A9DF68)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h)(0x65A9DF62)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h)(0x65A9DF62)
@ -707,7 +707,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rcc.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_system.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_pwr.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_exti.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_exti.o --omf_browse fm_ccjy\stm32f4xx_ll_exti.crf --depend fm_ccjy\stm32f4xx_ll_exti.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_exti.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_exti.o --omf_browse fm_ccjy\stm32f4xx_ll_exti.crf --depend fm_ccjy\stm32f4xx_ll_exti.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_exti.h)(0x65A9DF68)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h)(0x65A9DF62)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h)(0x65A9DF62)
@ -737,7 +737,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_rcc.o --omf_browse fm_ccjy\stm32f4xx_hal_rcc.crf --depend fm_ccjy\stm32f4xx_hal_rcc.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_rcc.o --omf_browse fm_ccjy\stm32f4xx_hal_rcc.crf --depend fm_ccjy\stm32f4xx_hal_rcc.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -766,7 +766,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_rcc_ex.o --omf_browse fm_ccjy\stm32f4xx_hal_rcc_ex.crf --depend fm_ccjy\stm32f4xx_hal_rcc_ex.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_rcc_ex.o --omf_browse fm_ccjy\stm32f4xx_hal_rcc_ex.crf --depend fm_ccjy\stm32f4xx_hal_rcc_ex.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -795,7 +795,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_flash.o --omf_browse fm_ccjy\stm32f4xx_hal_flash.crf --depend fm_ccjy\stm32f4xx_hal_flash.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_flash.o --omf_browse fm_ccjy\stm32f4xx_hal_flash.crf --depend fm_ccjy\stm32f4xx_hal_flash.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -824,7 +824,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_flash_ex.o --omf_browse fm_ccjy\stm32f4xx_hal_flash_ex.crf --depend fm_ccjy\stm32f4xx_hal_flash_ex.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_flash_ex.o --omf_browse fm_ccjy\stm32f4xx_hal_flash_ex.crf --depend fm_ccjy\stm32f4xx_hal_flash_ex.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -853,7 +853,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_flash_ramfunc.o --omf_browse fm_ccjy\stm32f4xx_hal_flash_ramfunc.crf --depend fm_ccjy\stm32f4xx_hal_flash_ramfunc.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_flash_ramfunc.o --omf_browse fm_ccjy\stm32f4xx_hal_flash_ramfunc.crf --depend fm_ccjy\stm32f4xx_hal_flash_ramfunc.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -882,7 +882,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_gpio.o --omf_browse fm_ccjy\stm32f4xx_hal_gpio.crf --depend fm_ccjy\stm32f4xx_hal_gpio.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_gpio.o --omf_browse fm_ccjy\stm32f4xx_hal_gpio.crf --depend fm_ccjy\stm32f4xx_hal_gpio.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -911,7 +911,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_dma_ex.o --omf_browse fm_ccjy\stm32f4xx_hal_dma_ex.crf --depend fm_ccjy\stm32f4xx_hal_dma_ex.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_dma_ex.o --omf_browse fm_ccjy\stm32f4xx_hal_dma_ex.crf --depend fm_ccjy\stm32f4xx_hal_dma_ex.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -940,7 +940,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_dma.o --omf_browse fm_ccjy\stm32f4xx_hal_dma.crf --depend fm_ccjy\stm32f4xx_hal_dma.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_dma.o --omf_browse fm_ccjy\stm32f4xx_hal_dma.crf --depend fm_ccjy\stm32f4xx_hal_dma.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -969,7 +969,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_pwr.o --omf_browse fm_ccjy\stm32f4xx_hal_pwr.crf --depend fm_ccjy\stm32f4xx_hal_pwr.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_pwr.o --omf_browse fm_ccjy\stm32f4xx_hal_pwr.crf --depend fm_ccjy\stm32f4xx_hal_pwr.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -998,7 +998,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_pwr_ex.o --omf_browse fm_ccjy\stm32f4xx_hal_pwr_ex.crf --depend fm_ccjy\stm32f4xx_hal_pwr_ex.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_pwr_ex.o --omf_browse fm_ccjy\stm32f4xx_hal_pwr_ex.crf --depend fm_ccjy\stm32f4xx_hal_pwr_ex.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -1027,7 +1027,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_cortex.o --omf_browse fm_ccjy\stm32f4xx_hal_cortex.crf --depend fm_ccjy\stm32f4xx_hal_cortex.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_cortex.o --omf_browse fm_ccjy\stm32f4xx_hal_cortex.crf --depend fm_ccjy\stm32f4xx_hal_cortex.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -1056,7 +1056,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal.o --omf_browse fm_ccjy\stm32f4xx_hal.crf --depend fm_ccjy\stm32f4xx_hal.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal.o --omf_browse fm_ccjy\stm32f4xx_hal.crf --depend fm_ccjy\stm32f4xx_hal.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -1085,7 +1085,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_exti.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_exti.o --omf_browse fm_ccjy\stm32f4xx_hal_exti.crf --depend fm_ccjy\stm32f4xx_hal_exti.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_exti.c)(0x65A9DF68)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_exti.o --omf_browse fm_ccjy\stm32f4xx_hal_exti.crf --depend fm_ccjy\stm32f4xx_hal_exti.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -1114,7 +1114,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_spi.o --omf_browse fm_ccjy\stm32f4xx_hal_spi.crf --depend fm_ccjy\stm32f4xx_hal_spi.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_spi.o --omf_browse fm_ccjy\stm32f4xx_hal_spi.crf --depend fm_ccjy\stm32f4xx_hal_spi.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -1143,7 +1143,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_spi.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_spi.o --omf_browse fm_ccjy\stm32f4xx_ll_spi.crf --depend fm_ccjy\stm32f4xx_ll_spi.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_spi.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_spi.o --omf_browse fm_ccjy\stm32f4xx_ll_spi.crf --depend fm_ccjy\stm32f4xx_ll_spi.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h)(0x65A9DF62)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h)(0x65A9DF62)
@ -1175,7 +1175,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_bus.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rcc.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_tim.o --omf_browse fm_ccjy\stm32f4xx_hal_tim.crf --depend fm_ccjy\stm32f4xx_hal_tim.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_tim.o --omf_browse fm_ccjy\stm32f4xx_hal_tim.crf --depend fm_ccjy\stm32f4xx_hal_tim.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -1204,7 +1204,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_tim_ex.o --omf_browse fm_ccjy\stm32f4xx_hal_tim_ex.crf --depend fm_ccjy\stm32f4xx_hal_tim_ex.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_hal_tim_ex.o --omf_browse fm_ccjy\stm32f4xx_hal_tim_ex.crf --depend fm_ccjy\stm32f4xx_hal_tim_ex.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -1233,7 +1233,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_tim.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_tim.o --omf_browse fm_ccjy\stm32f4xx_ll_tim.crf --depend fm_ccjy\stm32f4xx_ll_tim.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_tim.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_tim.o --omf_browse fm_ccjy\stm32f4xx_ll_tim.crf --depend fm_ccjy\stm32f4xx_ll_tim.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h)(0x65A9DF62)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h)(0x65A9DF62)
@ -1264,7 +1264,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_bus.h)(0x65A9DF68)
-F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usart.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_usart.o --omf_browse fm_ccjy\stm32f4xx_ll_usart.crf --depend fm_ccjy\stm32f4xx_ll_usart.d)
+F (../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usart.c)(0x65A9DF69)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\stm32f4xx_ll_usart.o --omf_browse fm_ccjy\stm32f4xx_ll_usart.crf --depend fm_ccjy\stm32f4xx_ll_usart.d)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h)(0x65A9DF62)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h)(0x65A9DF62)
@ -1296,7 +1296,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rcc.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_bus.h)(0x65A9DF68)
-F (../Core/Src/system_stm32f4xx.c)(0x65A9DF62)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\system_stm32f4xx.o --omf_browse fm_ccjy\system_stm32f4xx.crf --depend fm_ccjy\system_stm32f4xx.d)
+F (../Core/Src/system_stm32f4xx.c)(0x65A9DF62)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\system_stm32f4xx.o --omf_browse fm_ccjy\system_stm32f4xx.crf --depend fm_ccjy\system_stm32f4xx.d)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h)(0x65A9DF62)
 I (../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h)(0x65A9DF62)
 I (../Drivers/CMSIS/Include/core_cm4.h)(0x65A9DF68)
@ -1325,10 +1325,10 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h)(0x65A9DF68
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x65A9DF68)
-F (..\Modbus\Src\modbus.c)(0x65FA5932)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\modbus.o --omf_browse fm_ccjy\modbus.crf --depend fm_ccjy\modbus.d)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
+F (..\Modbus\Src\modbus.c)(0x660CAD95)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\modbus.o --omf_browse fm_ccjy\modbus.crf --depend fm_ccjy\modbus.d)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/main.h)(0x660280CD)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -1370,14 +1370,14 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/spi.h)(0x65F253D4)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/dac7311.h)(0x65E57354)
@ -1385,10 +1385,10 @@ I (../Board/Inc/ms5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Board/Inc/mf.h)(0x660280A0)
-F (..\Board\Src\ads1256.c)(0x65FBCB4E)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\ads1256.o --omf_browse fm_ccjy\ads1256.crf --depend fm_ccjy\ads1256.d)
-I (../Board/Inc/ADS1256.h)(0x65F8DF77)
-I (../Core/Inc/main.h)(0x660280CD)
+I (../Board/Inc/mf.h)(0x66139F01)
+F (..\Board\Src\ads1256.c)(0x661DF35E)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\ads1256.o --omf_browse fm_ccjy\ads1256.crf --depend fm_ccjy\ads1256.d)
+I (../Board/Inc/ADS1256.h)(0x66061C20)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -1430,15 +1430,15 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/spi.h)(0x65F253D4)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/dac7311.h)(0x65E57354)
@ -1446,10 +1446,10 @@ I (../Board/Inc/ms5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Board/Inc/mf.h)(0x660280A0)
-F (..\Board\Src\hc595.c)(0x65FA5794)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\hc595.o --omf_browse fm_ccjy\hc595.crf --depend fm_ccjy\hc595.d)
+I (../Board/Inc/mf.h)(0x66139F01)
+F (..\Board\Src\hc595.c)(0x661CD68A)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\hc595.o --omf_browse fm_ccjy\hc595.crf --depend fm_ccjy\hc595.d)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
-I (../Core/Inc/main.h)(0x660280CD)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -1491,26 +1491,26 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/spi.h)(0x65F253D4)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/dac7311.h)(0x65E57354)
 I (../Board/Inc/ms5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Board/Inc/mf.h)(0x660280A0)
-F (..\Board\Src\hc165.c)(0x65FA4D09)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\hc165.o --omf_browse fm_ccjy\hc165.crf --depend fm_ccjy\hc165.d)
+I (../Board/Inc/mf.h)(0x66139F01)
+F (..\Board\Src\hc165.c)(0x6603D0B5)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\hc165.o --omf_browse fm_ccjy\hc165.crf --depend fm_ccjy\hc165.d)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
-I (../Core/Inc/main.h)(0x660280CD)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -1552,26 +1552,26 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/spi.h)(0x65F253D4)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/dac7311.h)(0x65E57354)
 I (../Board/Inc/ms5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Board/Inc/mf.h)(0x660280A0)
-F (..\Board\Src\dac7311.c)(0x65F007FC)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\dac7311.o --omf_browse fm_ccjy\dac7311.crf --depend fm_ccjy\dac7311.d)
+I (../Board/Inc/mf.h)(0x66139F01)
+F (..\Board\Src\dac7311.c)(0x661CD68A)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\dac7311.o --omf_browse fm_ccjy\dac7311.crf --depend fm_ccjy\dac7311.d)
 I (../Board/Inc/dac7311.h)(0x65E57354)
-I (../Core/Inc/main.h)(0x660280CD)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -1613,28 +1613,28 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/spi.h)(0x65F253D4)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/ms5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Board/Inc/mf.h)(0x660280A0)
-F (..\Board\Src\ms5803.c)(0x65FA7E77)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\ms5803.o --omf_browse fm_ccjy\ms5803.crf --depend fm_ccjy\ms5803.d)
+I (../Board/Inc/mf.h)(0x66139F01)
+F (..\Board\Src\ms5803.c)(0x662DBCE4)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\ms5803.o --omf_browse fm_ccjy\ms5803.crf --depend fm_ccjy\ms5803.d)
 I (../Board/Inc/MS5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
-I (../Core/Inc/main.h)(0x660280CD)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -1676,25 +1676,25 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/spi.h)(0x65F253D4)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/dac7311.h)(0x65E57354)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Board/Inc/mf.h)(0x660280A0)
-F (..\Board\Src\laser.c)(0x65FA78FB)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\laser.o --omf_browse fm_ccjy\laser.crf --depend fm_ccjy\laser.d)
+I (../Board/Inc/mf.h)(0x66139F01)
+F (..\Board\Src\laser.c)(0x661F1BB9)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\laser.o --omf_browse fm_ccjy\laser.crf --depend fm_ccjy\laser.d)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
 I (../Board/Inc/laser.h)(0x65F15B58)
-I (../Core/Inc/main.h)(0x660280CD)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -1736,25 +1736,25 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/spi.h)(0x65F253D4)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/dac7311.h)(0x65E57354)
 I (../Board/Inc/ms5803.h)(0x65FA7E78)
 I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5475F2FE)
 I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5475F300)
-I (../Board/Inc/mf.h)(0x660280A0)
-F (..\Board\Src\mf.c)(0x66027E15)(--c99 -c --cpu Cortex-M4.fp -g -O3 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\mf.o --omf_browse fm_ccjy\mf.crf --depend fm_ccjy\mf.d)
-I (../Board/Inc/mf.h)(0x660280A0)
-I (../Core/Inc/main.h)(0x660280CD)
+I (../Board/Inc/mf.h)(0x66139F01)
+F (..\Board\Src\mf.c)(0x6618837D)(--c99 -c --cpu Cortex-M4.fp -g -O1 --apcs=interwork --split_sections -I../Core/Inc -I../Drivers/STM32F4xx_HAL_Driver/Inc -I../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I../Drivers/CMSIS/Include -I../Modbus/Inc -I../Board/Inc -I../bsp -I../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy

-I "D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"

-I D:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include

-I D:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0

-D__UVISION_VERSION="514" -D_RTE_ -DSTM32F407xx -DSTM32F407xx -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER

-o fm_ccjy\mf.o --omf_browse fm_ccjy\mf.crf --depend fm_ccjy\mf.d)
+I (../Board/Inc/mf.h)(0x66139F01)
+I (../Core/Inc/main.h)(0x661E2F4F)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x65A9DF68)
 I (../Core/Inc/stm32f4xx_hal_conf.h)(0x65EEB1EF)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x65A9DF68)
@ -1796,16 +1796,16 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h)(0x65A9DF68)
 I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h)(0x65A9DF68)
-I (../Core/Inc/stm32f4xx_it.h)(0x65FA7DAD)
+I (../Core/Inc/stm32f4xx_it.h)(0x6618C525)
 I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5475F300)
 I (../Core/Inc/adc.h)(0x65F3EC4D)
 I (../Core/Inc/spi.h)(0x65F253D4)
 I (../Core/Inc/tim.h)(0x65EA7F87)
-I (../Core/Inc/usart.h)(0x6602765E)
+I (../Core/Inc/usart.h)(0x66061646)
 I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5475F300)
 I (../Core/Inc/gpio.h)(0x65AF5829)
-I (../Modbus/Inc/Modbus.h)(0x66026191)
-I (../Board/Inc/ads1256.h)(0x65F8DF77)
+I (../Modbus/Inc/Modbus.h)(0x660617EB)
+I (../Board/Inc/ads1256.h)(0x66061C20)
 I (../Board/Inc/hc165.h)(0x65FA40F7)
 I (../Board/Inc/hc595.h)(0x65EE9F20)
 I (../Board/Inc/dac7311.h)(0x65E57354)
--- a/MDK-ARM/FM_CCJY/adc.crf
+++ b/MDK-ARM/FM_CCJY/adc.crf
--- a/MDK-ARM/FM_CCJY/adc.o
+++ b/MDK-ARM/FM_CCJY/adc.o
--- a/MDK-ARM/FM_CCJY/ads1256.crf
+++ b/MDK-ARM/FM_CCJY/ads1256.crf
--- a/MDK-ARM/FM_CCJY/ads1256.o
+++ b/MDK-ARM/FM_CCJY/ads1256.o
--- a/MDK-ARM/FM_CCJY/dac7311.crf
+++ b/MDK-ARM/FM_CCJY/dac7311.crf
--- a/MDK-ARM/FM_CCJY/dac7311.o
+++ b/MDK-ARM/FM_CCJY/dac7311.o
--- a/MDK-ARM/FM_CCJY/dma.crf
+++ b/MDK-ARM/FM_CCJY/dma.crf
--- a/MDK-ARM/FM_CCJY/dma.o
+++ b/MDK-ARM/FM_CCJY/dma.o
--- a/MDK-ARM/FM_CCJY/gpio.crf
+++ b/MDK-ARM/FM_CCJY/gpio.crf
--- a/MDK-ARM/FM_CCJY/gpio.o
+++ b/MDK-ARM/FM_CCJY/gpio.o
--- a/MDK-ARM/FM_CCJY/hc165.crf
+++ b/MDK-ARM/FM_CCJY/hc165.crf
--- a/MDK-ARM/FM_CCJY/hc165.o
+++ b/MDK-ARM/FM_CCJY/hc165.o
--- a/MDK-ARM/FM_CCJY/hc595.crf
+++ b/MDK-ARM/FM_CCJY/hc595.crf
--- a/MDK-ARM/FM_CCJY/hc595.o
+++ b/MDK-ARM/FM_CCJY/hc595.o
--- a/MDK-ARM/FM_CCJY/laser.crf
+++ b/MDK-ARM/FM_CCJY/laser.crf
--- a/MDK-ARM/FM_CCJY/laser.o
+++ b/MDK-ARM/FM_CCJY/laser.o
--- a/MDK-ARM/FM_CCJY/main.crf
+++ b/MDK-ARM/FM_CCJY/main.crf
--- a/MDK-ARM/FM_CCJY/main.o
+++ b/MDK-ARM/FM_CCJY/main.o
--- a/MDK-ARM/FM_CCJY/mf.crf
+++ b/MDK-ARM/FM_CCJY/mf.crf
--- a/MDK-ARM/FM_CCJY/mf.o
+++ b/MDK-ARM/FM_CCJY/mf.o
--- a/MDK-ARM/FM_CCJY/modbus.crf
+++ b/MDK-ARM/FM_CCJY/modbus.crf
--- a/MDK-ARM/FM_CCJY/modbus.o
+++ b/MDK-ARM/FM_CCJY/modbus.o
--- a/MDK-ARM/FM_CCJY/ms5803.crf
+++ b/MDK-ARM/FM_CCJY/ms5803.crf
--- a/MDK-ARM/FM_CCJY/ms5803.o
+++ b/MDK-ARM/FM_CCJY/ms5803.o
--- a/MDK-ARM/FM_CCJY/spi.crf
+++ b/MDK-ARM/FM_CCJY/spi.crf
--- a/MDK-ARM/FM_CCJY/spi.o
+++ b/MDK-ARM/FM_CCJY/spi.o
--- a/MDK-ARM/FM_CCJY/startup_stm32f407xx.o
+++ b/MDK-ARM/FM_CCJY/startup_stm32f407xx.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_cortex.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_cortex.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_dma.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_dma.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_dma_ex.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_dma_ex.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_exti.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_exti.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_flash.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_flash.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_flash_ex.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_flash_ex.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_flash_ramfunc.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_flash_ramfunc.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_gpio.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_gpio.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_msp.crf
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_msp.crf
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_msp.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_msp.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_pwr.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_pwr.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_pwr_ex.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_pwr_ex.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_rcc.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_rcc.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_rcc_ex.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_rcc_ex.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_spi.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_spi.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_tim.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_tim.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_hal_tim_ex.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_hal_tim_ex.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_it.crf
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_it.crf
--- a/MDK-ARM/FM_CCJY/stm32f4xx_it.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_it.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_ll_adc.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_ll_adc.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_ll_dma.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_ll_dma.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_ll_exti.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_ll_exti.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_ll_gpio.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_ll_gpio.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_ll_rcc.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_ll_rcc.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_ll_spi.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_ll_spi.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_ll_tim.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_ll_tim.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_ll_usart.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_ll_usart.o
--- a/MDK-ARM/FM_CCJY/stm32f4xx_ll_utils.o
+++ b/MDK-ARM/FM_CCJY/stm32f4xx_ll_utils.o
--- a/MDK-ARM/FM_CCJY/system_stm32f4xx.o
+++ b/MDK-ARM/FM_CCJY/system_stm32f4xx.o
--- a/MDK-ARM/FM_CCJY/tim.crf
+++ b/MDK-ARM/FM_CCJY/tim.crf
--- a/MDK-ARM/FM_CCJY/tim.o
+++ b/MDK-ARM/FM_CCJY/tim.o
--- a/MDK-ARM/FM_CCJY/usart.crf
+++ b/MDK-ARM/FM_CCJY/usart.crf
--- a/MDK-ARM/FM_CCJY/usart.o
+++ b/MDK-ARM/FM_CCJY/usart.o
--- a/MDK-ARM/JLinkLog.txt
+++ b/MDK-ARM/JLinkLog.txt
--- a/MDK-ARM/startup_stm32f407xx.lst
+++ b/MDK-ARM/startup_stm32f407xx.lst
@ -849,10 +849,11 @@ erwork --depend=fm_ccjy\startup_stm32f407xx.d -ofm_ccjy\startup_stm32f407xx.o -
 ARM Macro Assembler    Page 14 


-ID:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\FM_CCJY\MDK-ARM\RTE -ID:\Keil_v5\ARM\PACK\ARM
-\CMSIS\4.2.0\CMSIS\Include -ID:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.12.0 --pr
-edefine="__UVISION_VERSION SETA 514" --predefine="_RTE_ SETA 1" --predefine="ST
-M32F407xx SETA 1" --list=startup_stm32f407xx.lst startup_stm32f407xx.s
+I"D:\×ÀÃæ\¹¤×÷×ÊÁÏ\03-·§ÃÅÖÕ¼ìÏîÄ¿\0-Ç¶ÈëÊ½Ô´Âë\FM_CCJY (NO.2±ê¶¨)\MDK-ARM\RTE"
+ -ID:\Keil_v5\ARM\PACK\ARM\CMSIS\4.2.0\CMSIS\Include -ID:\Keil_v5\ARM\PACK\Keil
+\STM32F4xx_DFP\2.12.0 --predefine="__UVISION_VERSION SETA 514" --predefine="_RT
+E_ SETA 1" --predefine="STM32F407xx SETA 1" --list=startup_stm32f407xx.lst star
+tup_stm32f407xx.s



--- a/Modbus/Inc/modbus.h
+++ b/Modbus/Inc/modbus.h
@ -62,8 +62,6 @@ typedef union var_reg
   uint16_t    InputReg[MAX_INPUT_REG_NUM];         // Reg Óë SamData
 }Var_Reg;

-uint16_t ModbusCRC16(uint8_t *ptr, uint16_t len);
-
 extern uint8_t  CoilState[(MAX_DIS_NUM + 7) / 8];
 extern uint8_t  DisState [(MAX_DIS_NUM + 7) / 8];
 extern uint16_t InputReg[MAX_INPUT_REG_NUM];
@ -71,7 +69,7 @@ extern uint16_t HoldReg[MAX_HOLD_REG_NUM];

 extern Var_Reg  SamVarReg;

-
+uint16_t ModbusCRC16(uint8_t *ptr, uint16_t len);
 extern void Modbus_Process(void);


--- a/Modbus/Src/modbus.c
+++ b/Modbus/Src/modbus.c
@ -1,15 +1,17 @@
 #include "Modbus.h"
 #include "string.h"

-#define MODBUS_UART usart3  // 将串口改成相应的变量即可，例如用到UART1，此处改为uart1
-#define MODBUS_HUART USART3 // 将串口改成相应的变量即可，例如用到UART1，此处改为huart1
+#define MODBUS_UART usart3			//将串口改成相应的变量即可，例如用到UART1，此处改为uart1
+#define MODBUS_HUART USART3			//将串口改成相应的变量即可，例如用到UART1，此处改为huart1

-uint8_t CoilState[(MAX_DIS_NUM + 7) / 8] = {0x00};       // 线圈寄存器
-uint8_t DisState[(MAX_DIS_NUM + 7) / 8] = {0x00};        // 离散量寄存器
-uint16_t InputReg[MAX_INPUT_REG_NUM] = {0x0000, 0x0000}; // 输入寄存器
-uint16_t HoldReg[MAX_HOLD_REG_NUM] = {0x0000, 0x0000};   // 保持寄存器
+uint8_t  CoilState[(MAX_DIS_NUM + 7) / 8] = {0x00};//线圈寄存器
+uint8_t  DisState [(MAX_DIS_NUM + 7) / 8] = {0xAA};//离散量寄存器
+uint16_t InputReg[MAX_INPUT_REG_NUM] = {0xAA55,0x55AA};//输入寄存器
+uint16_t HoldReg[MAX_HOLD_REG_NUM] = {0x0000, 0x0000,0x0000,0x0001};//保持寄存器
+
+
+Var_Reg  SamVarReg;

-Var_Reg SamVarReg;

 void MODBUS_ERRFunction(uint8_t uCmdCode, uint8_t uErrorCode);

@ -24,15 +26,14 @@ uint16_t ModbusCRC16(uint8_t *ptr, uint16_t len)
    uint8_t i;
    uint16_t crc = ~0x00;

-    if ((ptr == NULL) || (len == 0xFFFF))
-        return crc;
+    if((ptr == NULL) || (len == 0xFFFF)) return crc;

-    while (len--)
+    while(len--)
    {
        crc ^= *ptr++;
-        for (i = 0; i < 8; i++)
+        for(i = 0; i < 8; i++)
        {
-            if (crc & 0x01)
+            if(crc & 0x01)
            {
                crc >>= 1;
                crc ^= 0xA001;
@ -43,24 +44,25 @@ uint16_t ModbusCRC16(uint8_t *ptr, uint16_t len)
            }
        }
    }
-    return (crc);
+    return(crc);
 }

 void GetOneCoilVal(uint16_t wCoilAddr, uint8_t *pCoilVal)
 {
-    uint8_t uVal;
+	uint8_t uVal;
 	
-    uVal = CoilState[(wCoilAddr - COIL_ADD_MIN) / 8];
-    if (uVal & (1 << ((wCoilAddr - COIL_ADD_MIN) % 8)))
-    {
-        *pCoilVal = 0x01;
-    }
-    else
-    {
-        *pCoilVal = 0x00;
-    }
+	uVal = CoilState[(wCoilAddr - COIL_ADD_MIN) / 8 ];
+	if(uVal & ( 1 << ((wCoilAddr - COIL_ADD_MIN) % 8 )))
+	{
+		*pCoilVal = 0x01;
+	}
+	else
+	{
+		*pCoilVal = 0x00;
+	}
 }

+
 /*******************************************************************************
 函数名称 ： ReadCoilStateFUNC
 功    能 ： 功能码:0x01,读取线圈
@ -69,70 +71,70 @@ void GetOneCoilVal(uint16_t wCoilAddr, uint8_t *pCoilVal)
 *发送:[硬件地址][01][线圈起始地址高][线圈起始地址低][线圈数量高][线圈数量低][CRC低][CRC高]
 *返回:[硬件地址][01][字节长度][线圈值][线圈值][线圈值][CRC低][CRC高]
 *******************************************************************************/
-void ReadCoilStateFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)
+void ReadCoilStateFUNC(uint8_t * upRxdbuf, uint16_t wRxdLen)
 {
-    uint16_t wCoilStartAddr, wCoilNum, wTotalCoilNum, CRC16Temp;
-    uint8_t i, k, uCommIndexNum = 0, uByteCount, uCoilVal, uErrorCode, uExit = 0;
-    uint8_t upTxdbuf[50] = {0};
+	uint16_t wCoilStartAddr,wCoilNum,wTotalCoilNum,CRC16Temp;
+    uint8_t  i,k,uCommIndexNum = 0,uByteCount,uCoilVal,uErrorCode,uExit = 0;
+	uint8_t  upTxdbuf[50] = {0};

-    wCoilStartAddr = MAKEWORD(upRxdbuf[1], upRxdbuf[0]); // 获取线圈起始地址
-    wCoilNum = MAKEWORD(upRxdbuf[3], upRxdbuf[2]);       // 获取线圈个数
+    wCoilStartAddr  = MAKEWORD(upRxdbuf[1], upRxdbuf[0]); //获取线圈起始地址
+    wCoilNum        = MAKEWORD(upRxdbuf[3], upRxdbuf[2]); //获取线圈个数

-    if ((wCoilNum >= 0x0001) || (wCoilNum <= MAX_COIL_NUM))
-    {
-        if (((wCoilStartAddr <= COIL_ADD_MAX)) &&
-            (wCoilNum + wCoilStartAddr <= COIL_ADD_MAX + 1)) //(wCoilStartAddr >= COIL_ADD_MIN) &&
-        {
-            uByteCount = (wCoilNum + 7) / 8; // 返回数据字节个数
+	if((wCoilNum >= 0x0001) || (wCoilNum <= MAX_COIL_NUM))
+	{
+		if(((wCoilStartAddr <= COIL_ADD_MAX)) &&
+			(wCoilNum + wCoilStartAddr <= COIL_ADD_MAX + 1))//(wCoilStartAddr >= COIL_ADD_MIN) && 
+		{
+			uByteCount = (wCoilNum + 7) / 8;    //返回数据字节个数
 	
-            upTxdbuf[uCommIndexNum++] = LOCAL_ADDRESS;
-            upTxdbuf[uCommIndexNum++] = ReadCoilState;
-            upTxdbuf[uCommIndexNum++] = uByteCount;
+			upTxdbuf[uCommIndexNum ++] = LOCAL_ADDRESS;
+            upTxdbuf[uCommIndexNum ++] = ReadCoilState;
+			upTxdbuf[uCommIndexNum ++] = uByteCount;
 			
-            wTotalCoilNum = 0;
-            for (k = 0; k < uByteCount; k++)
-            {
-                upTxdbuf[uCommIndexNum] = 0;
-                for (i = 0; i < 8; i++)
-                {
-                    GetOneCoilVal(wCoilStartAddr + wTotalCoilNum, &uCoilVal);
-                    upTxdbuf[uCommIndexNum] |= uCoilVal << i;
+			wTotalCoilNum = 0;
+            for(k = 0; k < uByteCount; k++)
+			{
+				upTxdbuf[uCommIndexNum] = 0;
+				for(i = 0; i < 8; i++)
+				{
+					GetOneCoilVal(wCoilStartAddr + wTotalCoilNum,&uCoilVal);
+					upTxdbuf[uCommIndexNum] |= uCoilVal << i;
 
-                    wTotalCoilNum++;
-                    if (wTotalCoilNum >= wCoilNum)
-                    {
-                        uExit = 1;
-                        break;
-                    }
-                }
+					wTotalCoilNum ++;
+					if(wTotalCoilNum >= wCoilNum)
+					{
+						 uExit = 1;
+						 break;
+					}
+				}
 				
-                uCommIndexNum++;
+				uCommIndexNum ++;
 				
-                if (uExit == 1)
-                {
-                    break;
-                }
-            }
+				if(uExit == 1)
+				{
+					break;
+				}
+			}

            CRC16Temp = ModbusCRC16(upTxdbuf, uCommIndexNum);
-            upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp & 0xFF);
-            upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp >> 8);
+            upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp & 0xFF);
+            upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp >> 8);

            MODBUS_UART.tx_size = (uCommIndexNum <= MODBUS_UART.tx_buf_cnt ? uCommIndexNum : MODBUS_UART.tx_buf_cnt);
            memcpy(MODBUS_UART.tx_buf, upTxdbuf, MODBUS_UART.tx_size);
            modbus_send(MODBUS_HUART, MODBUS_UART.tx_buf, MODBUS_UART.tx_size);
 			
-            return;
-        }
-        else
-        {
-            uErrorCode = MB_EX_ILLEGAL_DATA_ADDRESS;
-        }
-    }
-    else
-    {
-        uErrorCode = MB_EX_ILLEGAL_DATA_VALUE;
-    }
+			return;
+		}
+		else
+		{
+			uErrorCode = MB_EX_ILLEGAL_DATA_ADDRESS;
+		}
+	}
+	else 
+	{
+		 uErrorCode = MB_EX_ILLEGAL_DATA_VALUE;
+	}

    MODBUS_ERRFunction(ReadCoilState, uErrorCode);
    return;
@ -140,19 +142,21 @@ void ReadCoilStateFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)

 void GetOneDisInputVal(uint16_t wDisInputAddr, uint8_t *pDisInputVal)
 {
-    uint8_t uVal;
+	uint8_t uVal;
 	
-    uVal = DisState[(wDisInputAddr - DIS_ADD_MIN) / 8];
-    if (uVal & (1 << ((wDisInputAddr - DIS_ADD_MIN) % 8)))
-    {
-        *pDisInputVal = 0x01;
-    }
-    else
-    {
-        *pDisInputVal = 0x00;
-    }
+	uVal = DisState[(wDisInputAddr - DIS_ADD_MIN) / 8 ];
+	if(uVal & ( 1 << ((wDisInputAddr - DIS_ADD_MIN) % 8 )))
+	{
+		*pDisInputVal = 0x01;
+	}
+	else
+	{
+		*pDisInputVal = 0x00;
+	}
 }

+ 
+
 /*******************************************************************************
 函数名称 ： ReadDisInputStateFUNC
 功    能 ： 功能码:0x02,读取离散量
@ -161,70 +165,70 @@ void GetOneDisInputVal(uint16_t wDisInputAddr, uint8_t *pDisInputVal)
 *发送:[硬件地址][02][离散量起始地址高][离散量起始地址低][离散量数量高][离散量数量低][CRC低][CRC高]
 *返回:[硬件地址][02][字节长度][离散量值][离散量值][离散量值][CRC低][CRC高]
 *******************************************************************************/
-void ReadDisInputStateFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)
+void ReadDisInputStateFUNC(uint8_t * upRxdbuf, uint16_t wRxdLen)
 {
-    uint16_t wDisStartAddr, wDisNum, wTotalDisNum, CRC16Temp;
-    uint8_t i, k, uCommIndexNum = 0, uByteCount, uDisVal, uErrorCode, uExit = 0;
-    uint8_t upTxdbuf[50];
+    uint16_t wDisStartAddr,wDisNum,wTotalDisNum,CRC16Temp;
+    uint8_t  i,k,uCommIndexNum = 0,uByteCount,uDisVal,uErrorCode,uExit = 0;
+	uint8_t  upTxdbuf[50];

-    wDisStartAddr = MAKEWORD(upRxdbuf[1], upRxdbuf[0]); // 获取离散量起始地址
-    wDisNum = MAKEWORD(upRxdbuf[3], upRxdbuf[2]);       // 获取离散量个数
+    wDisStartAddr  = MAKEWORD(upRxdbuf[1], upRxdbuf[0]); //获取离散量起始地址
+    wDisNum        = MAKEWORD(upRxdbuf[3], upRxdbuf[2]); //获取离散量个数

-    if ((wDisNum >= 0x0001) || (wDisNum <= MAX_DIS_NUM))
-    {
-        if (((wDisStartAddr <= DIS_ADD_MAX)) &&
-            (wDisNum + wDisStartAddr <= DIS_ADD_MAX + 1)) //(wDisStartAddr >= DIS_ADD_MIN) &&
-        {
-            uByteCount = (wDisNum + 7) / 8; // 返回数据字节个数
+	if((wDisNum >= 0x0001) || (wDisNum <= MAX_DIS_NUM))
+	{
+		if(((wDisStartAddr <= DIS_ADD_MAX)) &&
+			(wDisNum + wDisStartAddr <= DIS_ADD_MAX + 1))//(wDisStartAddr >= DIS_ADD_MIN) && 
+		{
+			uByteCount = (wDisNum + 7) / 8;    //返回数据字节个数
 	
-            upTxdbuf[uCommIndexNum++] = LOCAL_ADDRESS;
-            upTxdbuf[uCommIndexNum++] = ReadDisInputState;
-            upTxdbuf[uCommIndexNum++] = uByteCount;
+			upTxdbuf[uCommIndexNum ++] = LOCAL_ADDRESS;
+            upTxdbuf[uCommIndexNum ++] = ReadDisInputState;
+			upTxdbuf[uCommIndexNum ++] = uByteCount;
 			
-            wTotalDisNum = 0;
-            for (k = 0; k < uByteCount; k++)
-            {
-                upTxdbuf[uCommIndexNum] = 0;
-                for (i = 0; i < 8; i++)
-                {
-                    GetOneDisInputVal(wDisStartAddr + wTotalDisNum, &uDisVal);
-                    upTxdbuf[uCommIndexNum] |= uDisVal << i;
+			wTotalDisNum = 0;
+            for(k = 0; k < uByteCount; k++)
+			{
+				upTxdbuf[uCommIndexNum] = 0;
+				for(i = 0; i < 8; i++)
+				{
+					GetOneDisInputVal(wDisStartAddr + wTotalDisNum,&uDisVal);
+					upTxdbuf[uCommIndexNum] |= uDisVal << i;
 
-                    wTotalDisNum++;
-                    if (wTotalDisNum >= wDisNum)
-                    {
-                        uExit = 1;
-                        break;
-                    }
-                }
+					wTotalDisNum ++;
+					if(wTotalDisNum >= wDisNum)
+					{
+						 uExit = 1;
+						 break;
+					}
+				}
 				
-                uCommIndexNum++;
+				uCommIndexNum ++;
 				
-                if (uExit == 1)
-                {
-                    break;
-                }
-            }
+				if(uExit == 1)
+				{
+					break;
+				}
+			}

            CRC16Temp = ModbusCRC16(upTxdbuf, uCommIndexNum);
-            upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp & 0xFF);
-            upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp >> 8);
+            upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp & 0xFF);
+            upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp >> 8);

            MODBUS_UART.tx_size = (uCommIndexNum <= MODBUS_UART.tx_buf_cnt ? uCommIndexNum : MODBUS_UART.tx_buf_cnt);
            memcpy(MODBUS_UART.tx_buf, upTxdbuf, MODBUS_UART.tx_size);
            modbus_send(MODBUS_HUART, MODBUS_UART.tx_buf, MODBUS_UART.tx_size);
 			
-            return;
-        }
-        else
-        {
-            uErrorCode = MB_EX_ILLEGAL_DATA_ADDRESS;
-        }
-    }
-    else
-    {
-        uErrorCode = MB_EX_ILLEGAL_DATA_VALUE;
-    }
+			return;
+		}
+		else
+		{
+			uErrorCode = MB_EX_ILLEGAL_DATA_ADDRESS;
+		}
+	}
+	else 
+	{
+		 uErrorCode = MB_EX_ILLEGAL_DATA_VALUE;
+	}

    MODBUS_ERRFunction(ReadDisInputState, uErrorCode);
    return;	
@ -253,38 +257,37 @@ uint16_t GetHoldRegData(uint16_t RegAdd)
 *发送:[硬件地址][03][起始地址高][起始地址低][总寄存器数高][总寄存器数低][CRC低][CRC高]
 *返回:[硬件地址][03][字节数][寄存器0高][寄存器0低][寄存器1高][寄存器1低][寄存器n高][寄存器n低][CRC低][CRC高]
 *******************************************************************************/
-void ReadHoldRegFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)
+void ReadHoldRegFUNC(uint8_t * upRxdbuf, uint16_t wRxdLen)
 {
    uint16_t wRegStartAdd, wRegLen, i, wRegValue, CRC16Temp;
-    uint8_t uErrorCode, uCommIndexNum = 0;
-    uint8_t upTxdbuf[50];
+    uint8_t  uErrorCode, uCommIndexNum = 0;
+    uint8_t  upTxdbuf[50];

-    if (upRxdbuf == NULL)
-        return;
+    if(upRxdbuf == NULL)  return;

-    wRegStartAdd = MAKEWORD(upRxdbuf[1], upRxdbuf[0]); // 获取寄存器起始地址
-    wRegLen = MAKEWORD(upRxdbuf[3], upRxdbuf[2]);      // 获取读取寄存器长度
+    wRegStartAdd = MAKEWORD(upRxdbuf[1], upRxdbuf[0]); //获取寄存器起始地址
+    wRegLen      = MAKEWORD(upRxdbuf[3], upRxdbuf[2]); //获取读取寄存器长度

-    if ((wRegLen >= 0x01) && (wRegLen <= MAX_HOLD_REG_NUM))
+    if((wRegLen >= 0x01) && (wRegLen <= MAX_HOLD_REG_NUM))
    {
-        if (((wRegStartAdd <= HOLD_REG_ADD_MAX)) &&
-            (((wRegStartAdd + wRegLen) >= HOLD_REG_ADD_MIN) && ((wRegStartAdd + wRegLen) <= HOLD_REG_ADD_MAX + 1))) //(wRegStartAdd >= HOLD_REG_ADD_MIN) &&
+        if(((wRegStartAdd <= HOLD_REG_ADD_MAX)) &&
+                (((wRegStartAdd + wRegLen) >= HOLD_REG_ADD_MIN) && ((wRegStartAdd + wRegLen) <= HOLD_REG_ADD_MAX + 1)))//(wRegStartAdd >= HOLD_REG_ADD_MIN) && 
        {
-            upTxdbuf[uCommIndexNum++] = LOCAL_ADDRESS;
-            upTxdbuf[uCommIndexNum++] = ReadHoldReg;
-            upTxdbuf[uCommIndexNum++] = wRegLen * 2;
+            upTxdbuf[uCommIndexNum ++] = LOCAL_ADDRESS;
+            upTxdbuf[uCommIndexNum ++] = ReadHoldReg;
+            upTxdbuf[uCommIndexNum ++] = wRegLen * 2;

-            for (i = 0; i < wRegLen; i++)
+            for(i = 0; i < wRegLen; i++)
            {
-                // 获取16位数据并返回
+                //获取16位数据并返回
                wRegValue = GetHoldRegData(wRegStartAdd + i);
-                upTxdbuf[uCommIndexNum++] = (uint8_t)(wRegValue >> 8);
-                upTxdbuf[uCommIndexNum++] = (uint8_t)(wRegValue & 0xFF);
+                upTxdbuf[uCommIndexNum ++] = (uint8_t)(wRegValue >> 8);
+                upTxdbuf[uCommIndexNum ++] = (uint8_t)(wRegValue & 0xFF);
            }

            CRC16Temp = ModbusCRC16(upTxdbuf, uCommIndexNum);
-            upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp & 0xFF); // crc16低字节在前
-            upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp >> 8);   // crc16高字节在后
+            upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp & 0xFF); // crc16低字节在前
+            upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp >> 8);   // crc16高字节在后

            MODBUS_UART.tx_size = (uCommIndexNum <= MODBUS_UART.tx_buf_cnt ? uCommIndexNum : MODBUS_UART.tx_buf_cnt);
            memcpy(MODBUS_UART.tx_buf, upTxdbuf, MODBUS_UART.tx_size);
@ -306,6 +309,7 @@ void ReadHoldRegFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)
    return;
 }

+
 /*******************************************************************************
 函数名称 ： GetInputRegData
 功    能 ： 获取RegAdd的数据
@ -328,38 +332,37 @@ uint16_t GetInputRegData(uint16_t RegAdd)
 *发送:[硬件地址][04][起始地址高][起始地址低][总寄存器数高][总寄存器数低][    CRC低   ][     CRC高  ]
 *返回:[硬件地址][04][  字节数  ][寄存器0高 ][  寄存器0低 ][  寄存器1高 ][  寄存器1低 ][  寄存器n高 ][  寄存器n低 ][  CRC低 ][  CRC高 ]
 *******************************************************************************/
-void ReadInputRegFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)
+void ReadInputRegFUNC(uint8_t * upRxdbuf, uint16_t wRxdLen)
 {
    uint16_t wRegStartAdd, wRegLen, i, wRegValue, CRC16Temp;
-    uint8_t uErrorCode, uCommIndexNum = 0;
-    uint8_t upTxdbuf[50];
+    uint8_t  uErrorCode, uCommIndexNum = 0;
+	uint8_t  upTxdbuf[50];
   
-    if (upRxdbuf == NULL)
-        return;
+    if(upRxdbuf == NULL)  return;

-    wRegStartAdd = MAKEWORD(upRxdbuf[1], upRxdbuf[0]); // 获取寄存器起始地址
-    wRegLen = MAKEWORD(upRxdbuf[3], upRxdbuf[2]);      // 获取读取寄存器长度
+    wRegStartAdd = MAKEWORD(upRxdbuf[1], upRxdbuf[0]); //获取寄存器起始地址
+    wRegLen      = MAKEWORD(upRxdbuf[3], upRxdbuf[2]); //获取读取寄存器长度

-    if ((wRegLen >= 0x01) && (wRegLen <= MAX_INPUT_REG_NUM))
+    if((wRegLen >= 0x01) && (wRegLen <= MAX_INPUT_REG_NUM))
    {
-        if (((wRegStartAdd <= INPUT_REG_ADD_MAX)) &&
-            ((wRegStartAdd + wRegLen) <= INPUT_REG_ADD_MAX + 1)) //(wRegStartAdd >= INPUT_REG_ADD_MIN) &&
+        if(((wRegStartAdd <= INPUT_REG_ADD_MAX)) &&
+           ((wRegStartAdd + wRegLen) <= INPUT_REG_ADD_MAX + 1))//(wRegStartAdd >= INPUT_REG_ADD_MIN) && 
        {
-            upTxdbuf[uCommIndexNum++] = LOCAL_ADDRESS;
-            upTxdbuf[uCommIndexNum++] = ReadInputReg;
-            upTxdbuf[uCommIndexNum++] = wRegLen * 2;
+            upTxdbuf[uCommIndexNum ++] = LOCAL_ADDRESS;
+            upTxdbuf[uCommIndexNum ++] = ReadInputReg;
+            upTxdbuf[uCommIndexNum ++] = wRegLen * 2;

-            for (i = 0; i < wRegLen; i++)
+            for(i = 0; i < wRegLen; i++)
            {
-                // 获取16位数据并返回
+                //获取16位数据并返回
                wRegValue = GetInputRegData(wRegStartAdd + i);
-                upTxdbuf[uCommIndexNum++] = (uint8_t)(wRegValue >> 8);
-                upTxdbuf[uCommIndexNum++] = (uint8_t)(wRegValue & 0xFF);
+                upTxdbuf[uCommIndexNum ++] = (uint8_t)(wRegValue >> 8);
+                upTxdbuf[uCommIndexNum ++] = (uint8_t)(wRegValue & 0xFF);
            }

            CRC16Temp = ModbusCRC16(upTxdbuf, uCommIndexNum);
-            upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp & 0xFF); // crc16低字节在前
-            upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp >> 8);   // crc16高字节在后
+            upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp & 0xFF); // crc16低字节在前
+            upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp >> 8);   // crc16高字节在后

            MODBUS_UART.tx_size = (uCommIndexNum <= MODBUS_UART.tx_buf_cnt ? uCommIndexNum : MODBUS_UART.tx_buf_cnt);
            memcpy(MODBUS_UART.tx_buf, upTxdbuf, MODBUS_UART.tx_size);
@ -381,6 +384,8 @@ void ReadInputRegFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)
    return;
 }

+
+
 /*******************************************************************************
 函数名称 : WriteHoldRegData
 功    能 : 保存写入的保持寄存器数据
@ -400,30 +405,29 @@ void WriteHoldRegData(uint16_t wRegAddr, uint16_t RegData)
 *发送:[硬件地址][06][寄存器地址高][寄存器地址低][寄存器值高][寄存器值低][CRC低][CRC高]
 *返回:[硬件地址][06][寄存器地址高][寄存器地址低][寄存器值高][寄存器值低][CRC低][CRC高]
 *******************************************************************************/
-void WriteSingleRegFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)
+void WriteSingleRegFUNC(uint8_t * upRxdbuf, uint16_t wRxdLen)
 {
    uint16_t wRegAddr, wRegValue, CRC16Temp;
-    uint8_t uCommIndexNum = 0, uErrorCode;
-    uint8_t upTxdbuf[50];
+    uint8_t  uCommIndexNum = 0, uErrorCode;
+    uint8_t  upTxdbuf[50];

-    if (upRxdbuf == NULL)
-        return;
+    if(upRxdbuf == NULL)  return;

-    wRegAddr = MAKEWORD(upRxdbuf[1], upRxdbuf[0]);  // 获取寄存器地址
-    wRegValue = MAKEWORD(upRxdbuf[3], upRxdbuf[2]); // 获取数据
+    wRegAddr  = MAKEWORD(upRxdbuf[1], upRxdbuf[0]); //获取寄存器地址
+    wRegValue = MAKEWORD(upRxdbuf[3], upRxdbuf[2]); //获取数据

-    if ((wRegAddr <= HOLD_REG_ADD_MAX)) //(wRegAddr >= HOLD_REG_ADD_MIN) &&
+    if((wRegAddr <= HOLD_REG_ADD_MAX))//(wRegAddr >= HOLD_REG_ADD_MIN) && 
    {
        WriteHoldRegData(wRegAddr, wRegValue);

-        upTxdbuf[uCommIndexNum++] = LOCAL_ADDRESS;
-        upTxdbuf[uCommIndexNum++] = WriteSingleReg;
+        upTxdbuf[uCommIndexNum ++] = LOCAL_ADDRESS;
+        upTxdbuf[uCommIndexNum ++] = WriteSingleReg;
        memcpy(upTxdbuf + uCommIndexNum, upRxdbuf, 4);
        uCommIndexNum += 4;

        CRC16Temp = ModbusCRC16(upTxdbuf, uCommIndexNum);
-        upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp & 0xFF); // crc16低字节在前
-        upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp >> 8);   // crc16高字节在后
+        upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp & 0xFF); // crc16低字节在前
+        upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp >> 8);   // crc16高字节在后

        MODBUS_UART.tx_size = (uCommIndexNum <= MODBUS_UART.tx_buf_cnt ? uCommIndexNum : MODBUS_UART.tx_buf_cnt);
        memcpy(MODBUS_UART.tx_buf, upTxdbuf, MODBUS_UART.tx_size);
@ -445,38 +449,37 @@ void WriteSingleRegFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)
 参    数 ： 无
 返 回 值 ： 无
 *******************************************************************************/
-void WriteMultiRegFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)
+void WriteMultiRegFUNC(uint8_t * upRxdbuf, uint16_t wRxdLen)
 {
    uint16_t i, wRegStartAdd, wRegNum, CRC16Temp, uErrorCode, wRegValue;
-    uint8_t uCommIndexNum = 0, uByteNum;
-    uint8_t upTxdbuf[50];
+    uint8_t  uCommIndexNum = 0, uByteNum;
+    uint8_t  upTxdbuf[50];

-    if (upRxdbuf == NULL)
-        return;
+    if(upRxdbuf == NULL)  return;

-    wRegStartAdd = MAKEWORD(upRxdbuf[1], upRxdbuf[0]); // 获取寄存器地址
-    wRegNum = MAKEWORD(upRxdbuf[3], upRxdbuf[2]);      // 获取寄存器数量
-    uByteNum = upRxdbuf[4];                            // 获取字节数
+    wRegStartAdd = MAKEWORD(upRxdbuf[1], upRxdbuf[0]);     //获取寄存器地址
+    wRegNum      = MAKEWORD(upRxdbuf[3], upRxdbuf[2]);     //获取寄存器数量
+    uByteNum     = upRxdbuf[4];                            //获取字节数

-    if ((wRegNum >= 0x01) && (wRegNum <= MAX_HOLD_REG_NUM) && (uByteNum == wRegNum * 2))
+    if((wRegNum >= 0x01) && (wRegNum <= MAX_HOLD_REG_NUM) && (uByteNum == wRegNum * 2))
    {
-        if (((wRegStartAdd <= HOLD_REG_ADD_MAX) &&
-             (wRegStartAdd + wRegNum <= HOLD_REG_ADD_MAX + 1))) //(wRegStartAdd >= HOLD_REG_ADD_MIN) &&
+        if(((wRegStartAdd <= HOLD_REG_ADD_MAX) && 
+			(wRegStartAdd + wRegNum <= HOLD_REG_ADD_MAX + 1)))//(wRegStartAdd >= HOLD_REG_ADD_MIN) && 
        {
-            for (i = 0; i < wRegNum; i++)
+            for(i = 0; i < wRegNum; i++)
            {
                wRegValue = MAKEWORD(upRxdbuf[6 + i * 2], upRxdbuf[5 + i * 2]);
                WriteHoldRegData(wRegStartAdd + i, wRegValue);
            }

-            upTxdbuf[uCommIndexNum++] = LOCAL_ADDRESS;
-            upTxdbuf[uCommIndexNum++] = WriteMultiReg;
+            upTxdbuf[uCommIndexNum ++] = LOCAL_ADDRESS;
+            upTxdbuf[uCommIndexNum ++] = WriteMultiReg;
            memcpy(upTxdbuf + uCommIndexNum, upRxdbuf, 4);
            uCommIndexNum += 4;

-            CRC16Temp = ModbusCRC16(upTxdbuf, uCommIndexNum);
-            upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp & 0xFF);
-            upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp >> 8);
+            CRC16Temp                 = ModbusCRC16(upTxdbuf, uCommIndexNum);
+            upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp & 0xFF);
+            upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp >> 8);

            MODBUS_UART.tx_size = (uCommIndexNum <= MODBUS_UART.tx_buf_cnt ? uCommIndexNum : MODBUS_UART.tx_buf_cnt);
            memcpy(MODBUS_UART.tx_buf, upTxdbuf, MODBUS_UART.tx_size);
@ -498,6 +501,7 @@ void WriteMultiRegFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)
    return;
 }

+
 /*******************************************************************************
 函数名称 : WriteOneCoilData
 功    能 : 保存写入的线圈寄存器数据
@ -506,14 +510,14 @@ void WriteMultiRegFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)
 *******************************************************************************/
 void WriteOneCoilData(uint16_t wRegAddr, uint16_t RegData)
 {
-    if (RegData == 0xFF00)
+	if(RegData == 0xFF00)
    {
-        CoilState[(wRegAddr - COIL_ADD_MIN) / 8] |= 1 << ((wRegAddr - COIL_ADD_MIN) % 8);
-    }
-    else if (RegData == 0x0000)
-    {
-        CoilState[(wRegAddr - COIL_ADD_MIN) / 8] &= ~(1 << ((wRegAddr - COIL_ADD_MIN) % 8));
-    }
+		CoilState[(wRegAddr - COIL_ADD_MIN) / 8] |= 1 << ((wRegAddr - COIL_ADD_MIN) % 8);
+	}
+	else if(RegData == 0x0000)
+	{
+		CoilState[(wRegAddr - COIL_ADD_MIN) / 8] &= ~(1 << ((wRegAddr - COIL_ADD_MIN) % 8));
+	}
 }
 /*******************************************************************************
 函数名称 ： WriteSingleCoilFUNC
@ -521,35 +525,35 @@ void WriteOneCoilData(uint16_t wRegAddr, uint16_t RegData)
 参    数 ： 无
 返 回 值 ： 无
 *******************************************************************************/
-void WriteSingleCoilFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)
+void WriteSingleCoilFUNC(uint8_t * upRxdbuf, uint16_t wRxdLen)
 {
    uint16_t wCoilAddr, wCoilValue, CRC16Temp;
-    uint8_t uCommIndexNum = 0, uErrorCode;
-    uint8_t upTxdbuf[50];
+    uint8_t  uCommIndexNum = 0, uErrorCode;
+    uint8_t  upTxdbuf[50];

-    wCoilAddr = MAKEWORD(upRxdbuf[1], upRxdbuf[0]);  // 获取线圈地址
-    wCoilValue = MAKEWORD(upRxdbuf[3], upRxdbuf[2]); // 获取线圈数据
+    wCoilAddr  = MAKEWORD(upRxdbuf[1], upRxdbuf[0]); //获取线圈地址
+    wCoilValue = MAKEWORD(upRxdbuf[3], upRxdbuf[2]); //获取线圈数据

-    if ((wCoilValue == 0x0000) || (wCoilValue == 0xFF00))
+    if((wCoilValue == 0x0000) || (wCoilValue == 0xFF00))
    {
-        if ((wCoilAddr <= COIL_ADD_MAX)) //(wCoilAddr >= DIS_ADD_MIN ) &&
+        if((wCoilAddr <= COIL_ADD_MAX))//(wCoilAddr >= DIS_ADD_MIN ) && 
        {
            WriteOneCoilData(wCoilAddr, wCoilValue);

-            upTxdbuf[uCommIndexNum++] = LOCAL_ADDRESS;
-            upTxdbuf[uCommIndexNum++] = WriteSingleCoil;
+            upTxdbuf[uCommIndexNum ++] = LOCAL_ADDRESS;
+            upTxdbuf[uCommIndexNum ++] = WriteSingleCoil;
            memcpy(upTxdbuf + uCommIndexNum, upRxdbuf, 4);
            uCommIndexNum += 4;

            CRC16Temp = ModbusCRC16(upTxdbuf, uCommIndexNum);
-            upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp & 0xFF);
-            upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp >> 8);
+            upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp & 0xFF);
+            upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp >> 8);

            MODBUS_UART.tx_size = (uCommIndexNum <= MODBUS_UART.tx_buf_cnt ? uCommIndexNum : MODBUS_UART.tx_buf_cnt);
            memcpy(MODBUS_UART.tx_buf, upTxdbuf, MODBUS_UART.tx_size);
            modbus_send(MODBUS_HUART, MODBUS_UART.tx_buf, MODBUS_UART.tx_size);
 			
-            return;
+			return;
        }
        else
        {
@ -573,72 +577,70 @@ void WriteSingleCoilFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)
 *发送:[硬件地址][0F][起始地址高][起始地址低][线圈数量高][线圈数量低][字节数][线圈值][CRC低][CRC高]
 *返回:[硬件地址][0F][起始地址高][起始地址低][线圈数量高][线圈数量低][CRC低][CRC高]
 *******************************************************************************/
-void WriteMultiCoilFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)
+void WriteMultiCoilFUNC(uint8_t * upRxdbuf, uint16_t wRxdLen)
 {
-    uint16_t wCoilStartAddr, wCoilNum, wCoilVal, wTotalCoilNum, CRC16Temp;
-    uint8_t i, k, uCommIndexNum = 0, uByteNum, uByteVal, uExit = 0, uErrorCode;
-    uint8_t upTxdbuf[50];
+	uint16_t wCoilStartAddr,wCoilNum,wCoilVal,wTotalCoilNum,CRC16Temp;
+    uint8_t  i,k,uCommIndexNum = 0,uByteNum,uByteVal,uExit = 0,uErrorCode;
+	uint8_t  upTxdbuf[50];

-    wCoilStartAddr = MAKEWORD(upRxdbuf[1], upRxdbuf[0]); // 获取线圈地址
-    wCoilNum = MAKEWORD(upRxdbuf[3], upRxdbuf[2]);       // 获取线圈个数
-    uByteNum = upRxdbuf[4];                              // 获取字节数
+    wCoilStartAddr  = MAKEWORD(upRxdbuf[1], upRxdbuf[0]); //获取线圈地址
+    wCoilNum        = MAKEWORD(upRxdbuf[3], upRxdbuf[2]); //获取线圈个数
+	uByteNum        = upRxdbuf[4];                        //获取字节数

-    if ((wCoilNum >= 0x01) && (wCoilNum <= MAX_COIL_NUM) && (wCoilNum <= 8 * uByteNum))
-    {
-        if ((wCoilStartAddr <= COIL_ADD_MAX) &&
-            (wCoilStartAddr + wCoilNum <= COIL_ADD_MAX + 1)) //(wCoilStartAddr >= COIL_ADD_MIN) &&
-        {
-            wTotalCoilNum = 0;
-            for (k = 0; k < uByteNum; k++)
-            {
-                uByteVal = upRxdbuf[5 + k];
-                for (i = 0; i < 8; i++)
-                {
-                    if (uByteVal & (1 << i))
-                        wCoilVal = 0xFF00;
-                    else
-                        wCoilVal = 0x0000;
+	if((wCoilNum >= 0x01) && (wCoilNum <= MAX_COIL_NUM) && (wCoilNum  <= 8 * uByteNum))
+	{
+		if((wCoilStartAddr <= COIL_ADD_MAX) && 
+		   (wCoilStartAddr + wCoilNum <= COIL_ADD_MAX + 1))//(wCoilStartAddr >= COIL_ADD_MIN) && 
+		{
+			wTotalCoilNum = 0;
+            for(k = 0; k < uByteNum; k++)
+			{
+				uByteVal = upRxdbuf[5 + k];
+				for(i = 0; i < 8; i++)
+				{
+					if(uByteVal & (1 << i)) wCoilVal = 0xFF00;
+					else                    wCoilVal = 0x0000;
 					
-                    WriteOneCoilData(wCoilStartAddr + wTotalCoilNum, wCoilVal);
+					WriteOneCoilData(wCoilStartAddr + wTotalCoilNum, wCoilVal);
 					 
-                    wTotalCoilNum++;
-                    if (wTotalCoilNum >= wCoilNum)
-                    {
-                        uExit = 1;
-                        break;
-                    }
-                }
+					wTotalCoilNum ++;
+					if(wTotalCoilNum >= wCoilNum)
+					{
+						 uExit = 1;
+						 break;
+					}
+				}
 				
-                if (uExit == 1)
-                {
-                    break;
-                }
-            }
+				if(uExit == 1)
+				{
+					break;
+				}
+			}
 			
-            upTxdbuf[uCommIndexNum++] = LOCAL_ADDRESS;
-            upTxdbuf[uCommIndexNum++] = WriteMultiCoil;
+			upTxdbuf[uCommIndexNum ++] = LOCAL_ADDRESS;
+            upTxdbuf[uCommIndexNum ++] = WriteMultiCoil;
            memcpy(upTxdbuf + uCommIndexNum, upRxdbuf, 4);
            uCommIndexNum += 4;

            CRC16Temp = ModbusCRC16(upTxdbuf, uCommIndexNum);
-            upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp & 0xFF);
-            upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp >> 8);
+            upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp & 0xFF);
+            upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp >> 8);

            MODBUS_UART.tx_size = (uCommIndexNum <= MODBUS_UART.tx_buf_cnt ? uCommIndexNum : MODBUS_UART.tx_buf_cnt);
            memcpy(MODBUS_UART.tx_buf, upTxdbuf, MODBUS_UART.tx_size);
            modbus_send(MODBUS_HUART, MODBUS_UART.tx_buf, MODBUS_UART.tx_size);
 			
-            return;
-        }
-        else
-        {
-            uErrorCode = MB_EX_ILLEGAL_DATA_ADDRESS;
-        }
-    }
-    else
-    {
+			return;
+		}
+		else
+		{
+			uErrorCode = MB_EX_ILLEGAL_DATA_ADDRESS;
+		}
+	}
+	else
+	{
        uErrorCode = MB_EX_ILLEGAL_DATA_VALUE;
-    }
+	}
 	
    MODBUS_ERRFunction(WriteMultiCoil, uErrorCode);
    return;
@ -654,17 +656,17 @@ void WriteMultiCoilFUNC(uint8_t *upRxdbuf, uint16_t wRxdLen)
 *******************************************************************************/
 void MODBUS_ERRFunction(uint8_t uCmdCode, uint8_t uErrorCode)
 {
-    uint8_t uCommIndexNum = 0;
-    uint16_t CRC16Temp = 0;
+    uint8_t  uCommIndexNum = 0;
+    uint16_t CRC16Temp     = 0;
    uint8_t upTxdbuf[50];

-    upTxdbuf[uCommIndexNum++] = LOCAL_ADDRESS;
-    upTxdbuf[uCommIndexNum++] = uCmdCode | 0x80;
-    upTxdbuf[uCommIndexNum++] = uErrorCode;
+    upTxdbuf[uCommIndexNum ++] = LOCAL_ADDRESS;
+    upTxdbuf[uCommIndexNum ++] = uCmdCode | 0x80;
+    upTxdbuf[uCommIndexNum ++] = uErrorCode;

    CRC16Temp = ModbusCRC16(upTxdbuf, uCommIndexNum);
-    upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp & 0xFF); // crc16低字节在前
-    upTxdbuf[uCommIndexNum++] = (uint8_t)(CRC16Temp >> 8);
+    upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp & 0xFF); //crc16低字节在前
+    upTxdbuf[uCommIndexNum ++] = (uint8_t)(CRC16Temp >> 8);

    MODBUS_UART.tx_size = (uCommIndexNum <= MODBUS_UART.tx_buf_cnt ? uCommIndexNum : MODBUS_UART.tx_buf_cnt);
    memcpy(MODBUS_UART.tx_buf, upTxdbuf, MODBUS_UART.tx_size);
@ -677,78 +679,77 @@ void MODBUS_ERRFunction(uint8_t uCmdCode, uint8_t uErrorCode)
 参    数 ： ptr--校验数组指针  len--校验数据长度
 返 回 值 ： CRC校验码，双字节
 *******************************************************************************/
-void Modbus_Analysis(uint8_t *upRxdbuf, uint16_t wRxdLen)
+void Modbus_Analysis(uint8_t * upRxdbuf, uint16_t wRxdLen)
 {
-    uint8_t uSlaveAdd, uCmdCode;
+    uint8_t  uSlaveAdd, uCmdCode;

-    if ((upRxdbuf == NULL) || (wRxdLen < 2))
-        return;
+    if((upRxdbuf == NULL) || (wRxdLen < 2))  return;

-    uSlaveAdd = upRxdbuf[0];
-    uCmdCode = upRxdbuf[1];
+    uSlaveAdd    = upRxdbuf[0];
+    uCmdCode     = upRxdbuf[1];

    // 从机地址为本机地址或者是广播帧
-    if ((uSlaveAdd == LOCAL_ADDRESS) || (uSlaveAdd == BROADCAST_ADDRESS))
+    if((uSlaveAdd == LOCAL_ADDRESS) || (uSlaveAdd == BROADCAST_ADDRESS))
    {
-        switch (uCmdCode)
-        {
-        case ReadCoilState:
-            ReadCoilStateFUNC(upRxdbuf + 2, wRxdLen - 2); // 读线圈状态
-            break;
+      switch(uCmdCode)
+      {
+			case ReadCoilState:
+				ReadCoilStateFUNC(upRxdbuf + 2, wRxdLen - 2);             // 读线圈状态
+				break;

-        case ReadDisInputState:
-            ReadDisInputStateFUNC(upRxdbuf + 2, wRxdLen - 2); // 读离散输入状态
-            break;
+			case ReadDisInputState:
+				ReadDisInputStateFUNC(upRxdbuf + 2, wRxdLen - 2);         // 读离散输入状态
+				break;
 			
-        case ReadHoldReg:
-            ReadHoldRegFUNC(upRxdbuf + 2, wRxdLen - 2); // 读取保持寄存器
-            break;
+			case ReadHoldReg:
+				ReadHoldRegFUNC(upRxdbuf + 2, wRxdLen - 2);               // 读取保持寄存器
+				break;
 			
-        case ReadInputReg:
-            ReadInputRegFUNC(upRxdbuf + 2, wRxdLen - 2); // 读取输入寄存器
-            break;
+			case ReadInputReg:
+				ReadInputRegFUNC(upRxdbuf + 2, wRxdLen - 2);              // 读取输入寄存器
+				break;
 			
-        case WriteSingleReg:
-            WriteSingleRegFUNC(upRxdbuf + 2, wRxdLen - 2); // 写单个寄存器
-            break;
+			case WriteSingleReg:
+				WriteSingleRegFUNC(upRxdbuf + 2, wRxdLen - 2);            // 写单个寄存器
+				break;

-        case WriteMultiCoil:
-            WriteMultiCoilFUNC(upRxdbuf + 2, wRxdLen - 2); // 写多个线圈
-            break;
+					case WriteMultiCoil:
+				WriteMultiCoilFUNC(upRxdbuf + 2, wRxdLen - 2);            // 写多个线圈
+				break;
 			
-        case WriteMultiReg:
-            WriteMultiRegFUNC(upRxdbuf + 2, wRxdLen - 2); // 写多个寄存器
-            break;
+			case WriteMultiReg:
+				WriteMultiRegFUNC(upRxdbuf + 2, wRxdLen - 2);             // 写多个寄存器
+				break;

-        case WriteSingleCoil:
-            WriteSingleCoilFUNC(upRxdbuf + 2, wRxdLen - 2); // 写单个线圈
-            break;
+			case WriteSingleCoil:
+				WriteSingleCoilFUNC(upRxdbuf + 2, wRxdLen - 2);           // 写单个线圈
+				break;

-        default:
-            MODBUS_ERRFunction(upRxdbuf[1], 0x01); // 错误码处理
-            break;
+			default:
+				MODBUS_ERRFunction(upRxdbuf[1], 0x01);                    // 错误码处理
+				break;
        }
    }
 }

+
+
 void Modbus_Process(void)
 {
-    uint8_t *pFrame;
+    uint8_t  *pFrame;
    uint16_t wFrameLen = 0;
    uint16_t wFrameCRC, wCalCRC;

-    pFrame = MODBUS_UART.rx_buf;     // 接收数据起始地址
-    wFrameLen = MODBUS_UART.rx_size; // 接收数据长度
+    pFrame    = MODBUS_UART.rx_buf;    // 接收数据起始地址
+    wFrameLen = MODBUS_UART.rx_size;   // 接收数据长度

-    if (wFrameLen < 2)
-        return; // 数据长度不是有效值
+    if(wFrameLen < 2) return;    // 数据长度不是有效值

    // 获取接收数据帧中的校验和
    wFrameCRC = MAKEWORD(pFrame[wFrameLen - 2], pFrame[wFrameLen - 1]);
    // 计算接收到的数据的校验和
-    wCalCRC = ModbusCRC16(pFrame, wFrameLen - 2);
-    if (wFrameCRC != wCalCRC)
-        return;
+    wCalCRC   = ModbusCRC16(pFrame, wFrameLen - 2);
+    if(wFrameCRC != wCalCRC) return;

-    Modbus_Analysis(MODBUS_UART.rx_buf, MODBUS_UART.rx_size); // 协议处理
+    Modbus_Analysis(MODBUS_UART.rx_buf, MODBUS_UART.rx_size);                        // 协议处理
 }