收到此代码，发现有缓存区代码变动未提交，补充提交

Core/Inc/main.h

@@ -34,8 +34,8 @@ extern "C" {
 /* USER CODE BEGIN Includes */
 
 //0----关闭看门狗SP706   1----打开看门狗SP706--------------必须配置的参数1/3
-#define WatchDogOn   1   //是否打开看门狗 
-//#define WatchDogOn   0   //是否打开看门狗 
+//#define WatchDogOn   1   //是否打开看门狗 
+#define WatchDogOn   0   //是否打开看门狗 
 
 /* USER CODE END Includes */
 

Core/Inc/rkg.h

@@ -41,9 +41,9 @@ typedef struct
 typedef struct
 {
     uint16_t uiPos;
-    uint16_t uiRefrence;
-    int16_t uiXG;
-    int16_t uiDG;
+    int32_t uiRefrence;
+    int32_t uiXG;
+    int32_t uiDG;
     S_DELTA sDelta[ANGLE_DATA_CNT];
 }S_ANGLEDATA;
 

Core/Src/iap.c

@@ -382,6 +382,7 @@ void Process_CMD_IAP_Update(void)
 	case 3:
 		//	if(packIndex>2)
 		{														 //结束帧处理
+			int i,all_len;
 			crcIAP1 = LIB_CRC_MODBUS(&USART2_RX_BUF002[4], 133); //
 			crcTerminal = (USART2_RX_BUF002[lenRx1 - 5] << 8) + USART2_RX_BUF002[lenRx1 - 6];
 			if (crcIAP1 == crcTerminal)
@@ -389,17 +390,45 @@ void Process_CMD_IAP_Update(void)
 				int txLen;
 				HAL_GPIO_WritePin(GPIOA, con03_uart2_kongzhiqi_Pin, GPIO_PIN_RESET); //
 				delay_sys_us(80);
-				txLen = sprintf((char *)USART2_RX_BUF002, "%s=%d\r\n", ACK_Arr, packIndex);
+				txLen = sprintf((char *)USART2_RX_BUF002, "%s\r\n", ACK_Arr);
+				HAL_UART_Transmit_IT(&huart2,USART2_RX_BUF002,txLen);		
+				while (huart2.gState == HAL_UART_STATE_BUSY_TX)
+				{
+					osDelay(1);
+				}
+				HAL_GPIO_WritePin(GPIOA, con03_uart2_kongzhiqi_Pin, GPIO_PIN_SET); //
+				for (i = 0, all_len = 0; i < 4; ++i)
+				{
+					all_len = all_len << 8;
+					all_len |= *(unsigned char *)(StartMode_Addr + 68 + i);
+				}
+			if (1)//App2_MD5_Check(Application_Buffer_Addr,all_len))
+			{
+				txLen = sprintf((char *)USART2_RX_BUF002, "md5 check=ok\r\n");
+				HAL_GPIO_WritePin(GPIOA, con03_uart2_kongzhiqi_Pin, GPIO_PIN_RESET); //
+				delay_sys_us(80);
 				HAL_UART_Transmit_IT(&huart2,USART2_RX_BUF002,txLen);		
 				while (huart2.gState == HAL_UART_STATE_BUSY_TX)
 				{
 					osDelay(1);
 				}
 				HAL_GPIO_WritePin(GPIOA, con03_uart2_kongzhiqi_Pin, GPIO_PIN_SET); //
-				__NOP();
 				Set_Update_Down(); //设定标志位  下次启动时进行程序拷贝
 			}
 			else
+			{
+				txLen = sprintf((char *)USART2_RX_BUF002,"md5 check=error\r\n");
+			}
+				HAL_GPIO_WritePin(GPIOA, con03_uart2_kongzhiqi_Pin, GPIO_PIN_RESET); //
+				delay_sys_us(80);
+				HAL_UART_Transmit_IT(&huart2,USART2_RX_BUF002,txLen);		
+				while (huart2.gState == HAL_UART_STATE_BUSY_TX)
+				{
+					osDelay(1);
+				}
+				HAL_GPIO_WritePin(GPIOA, con03_uart2_kongzhiqi_Pin, GPIO_PIN_SET); //
+			}
+			else
 			{
 				HAL_GPIO_WritePin(GPIOA, con03_uart2_kongzhiqi_Pin, GPIO_PIN_RESET); //
 				delay_sys_us(80);

Core/Src/kzq.c

@@ -3439,14 +3439,14 @@ uint16_t RKG_SetZero(uint8_t* pTx)
 			//	RKG_TxBuf[i++] = 0x0D;
 			//	RKG_TxBuf[i++] = 0x0A;
 			}
-			RKG_TxBuf[i++] = pkzq->data_buf[17];
+			RKG_TxBuf[i++] = pkzq->data_buf[17]-0X30;
 			RKG_TxBuf[i++] = 0x06;
 			RKG_TxBuf[i++] = 0x00;
 			RKG_TxBuf[i++] = 0x10;
 			RKG_TxBuf[i++] = 0x00;
 			RKG_TxBuf[i++] = 0xFF;
 			
-			buf[0] = pkzq->data_buf[17];
+			buf[0] = pkzq->data_buf[17]-0x30;
 			buf[1] = 0x06;
 			buf[2] = 0x00;
 			buf[3] = 0x10;
@@ -3882,7 +3882,7 @@ uint16_t Tem_SetType(uint8_t* pTx)
 	else
 		return 0;
 }
-uint32_t Version_Soft[8] = {2, 2, 3, 9, 1, 1, 0, 20220424};
+uint32_t Version_Soft[8] = {2, 2, 3, 13, 1, 1, 0, 20220531};
 uint16_t Read_SoftVersion(uint8_t *pTx)
 {
 	int i;

Core/Src/level.c

@@ -1394,76 +1394,77 @@ static uint16_t Inital_value_High[4]= {1865,1880,1880,1880};
 
 static float h_x0;
 //信捷罐容查表计计算程序  邵磊明  增加
-float  Calc_Vol(float RadarData,uint16_t* VolArray,const uint16_t* HArray,uint16_t StoreNum)
+float Calc_Vol(float RadarData, uint16_t *VolArray, const uint16_t *HArray, uint16_t StoreNum)
 {
-    float offset[8];
-	  uint8_t i=0;	
-		Level_Inf* plevel = level_inf;
-static    uint16_t Indexs = 0,Vt,H_x;	
-static    float V_y1 = 0,V_y2 = 0,H_x1 = 0,H_x2 = 0;		
+	float offset[8];
+	uint8_t i = 0;
+	Level_Inf *plevel = level_inf;
+	static uint16_t Indexs = 0, Vt, H_x;
+	static float V_y1 = 0, V_y2 = 0, H_x1 = 0, H_x2 = 0;
 	////高度换算
 	switch (StoreNum)
-  {
-  	case 1:			
-			h_x0=RadarData-plevel[1].Level_Cal_zero;
-		  plevel[1].Level_Data1 = h_x0;
-		  if(h_x0<(-0.5f))
-			h_x0 = (-0.5f);	
-  		break;
-  	case 2:			
-			h_x0=RadarData-plevel[2].Level_Cal_zero;
-			plevel[2].Level_Data1 = h_x0;
-			if(h_x0<(-0.5f))
-			h_x0 = (-0.5f);	
-  		break;
-  	case 3:			
-			h_x0=RadarData-plevel[3].Level_Cal_zero;
-		  plevel[3].Level_Data1 = h_x0;
-		  if(h_x0<(-0.5f))
-			h_x0 = (-0.5f);	
-  		break;
-  	case 4:			
-			h_x0=RadarData-plevel[4].Level_Cal_zero;
-			plevel[4].Level_Data1 = h_x0;
-			if(h_x0<(-0.5f))
-			h_x0 = (-0.5f);	
-  		break;
-		
-  	  default:
-		//	f000=RadarData-offset[0];
- 
-  		break;
-  }
+	{
+	case 1:
+		h_x0 = RadarData - plevel[1].Level_Cal_zero;
+		plevel[1].Level_Data1 = h_x0;
+		if (h_x0 < (-0.5f))
+			h_x0 = (-0.5f);
+		break;
+	case 2:
+		h_x0 = RadarData - plevel[2].Level_Cal_zero;
+		plevel[2].Level_Data1 = h_x0;
+		if (h_x0 < (-0.5f))
+			h_x0 = (-0.5f);
+		break;
+	case 3:
+		h_x0 = RadarData - plevel[3].Level_Cal_zero;
+		plevel[3].Level_Data1 = h_x0;
+		if (h_x0 < (-0.5f))
+			h_x0 = (-0.5f);
+		break;
+	case 4:
+	default:
+		h_x0 = RadarData - plevel[4].Level_Cal_zero;
+		plevel[4].Level_Data1 = h_x0;
+		if (h_x0 < (-0.5f))
+			h_x0 = (-0.5f);
+		break;
+
+
+	}
 
-	 H_x=(uint16_t)(h_x0*1000);
+	H_x = (uint16_t)(h_x0 * 1000);
 
-  for(Indexs=0;Indexs<=200;Indexs++)
-  {
-		if(H_x>HArray[Indexs]&&H_x<=HArray[Indexs+1])
+	for (Indexs = 0; Indexs <= 160; Indexs++)
+	{
+		if((HArray[Indexs]>HArray[Indexs + 1]) || (HArray[Indexs + 1]==0))
+			break;
+		V_y1 = VolArray[Indexs];
+		V_y2 = VolArray[Indexs + 1];
+		H_x1 = HArray[Indexs];
+		H_x2 = HArray[Indexs + 1];
+		if (H_x > HArray[Indexs] && H_x <= HArray[Indexs + 1])
 		{
-			 V_y1 = VolArray[Indexs];
-			 V_y2 = VolArray[Indexs+1];
-			 H_x1 = HArray[Indexs];
-		   H_x2 = HArray[Indexs+1];	
-       __NOP();	
-       break;			
+			break;
 		}
-
-  }
-	if(H_x<=0)
+	}
+	if((Indexs>=160)||(HArray[Indexs]>HArray[Indexs + 1]) || (HArray[Indexs + 1]==0))
+	{
+		H_x=H_x2;
+	}
+	if (H_x <= 0)
 	{
-	 V_y1 = 0;
-	 V_y2 = 0;
-	 H_x1 = 0;
-	 H_x2 =	0;
-	 H_x = 0;
+		V_y1 = 0;
+		V_y2 = 0;
+		H_x1 = 0;
+		H_x2 = 0;
+		H_x = 0;
 		Vt = 0;
 	}
 	else
-		Vt=(H_x - H_x1)/(H_x2 - H_x1)*(V_y2-V_y1)+V_y1;
+		Vt = (H_x - H_x1) / (H_x2 - H_x1) * (V_y2 - V_y1) + V_y1;
 
 	return Vt;
-		
 }
 
 /************************************************************************

Core/Src/main.c

@@ -2310,7 +2310,7 @@ void StartTask03(void *argument)															//
 					}
 					else*/
 						plevel[CMD_GetTempAndYewei[0]-0x50].RTData_Num++;                 //每个传感器发送帧累加  基准角度为0x30
-					if(CMD_GetTempAndYewei[0]-0x51 < leveladdr_max -1)
+					if(CMD_GetTempAndYewei[0]-0x50 < leveladdr_max)
 							CMD_GetTempAndYewei[0]++;
 						else
 							CMD_GetTempAndYewei[0] = 0x51;
@@ -2339,7 +2339,7 @@ void StartTask03(void *argument)															//
 				else*/
 					plevel[CMD_LDYW[0] - 0x50].RTData_Num++;
 
-				if (CMD_LDYW[0] - 0x50 < leveladdr_max - 1)
+				if (CMD_LDYW[0] - 0x50 < leveladdr_max)
 					CMD_LDYW[0]++;
 				else
 					CMD_LDYW[0] = 0x51;
@@ -2414,10 +2414,11 @@ void StartTask03(void *argument)															//
 				}
 #endif					
 				HAL_GPIO_WritePin(GPIOB,Con01_uart1_rankonggai_Pin,GPIO_PIN_SET);//
+				flagU1Rx=0;
 			}
 			
 			i002++;
-			if((flagU1Rx==1) && (i002 > 3))
+			if(((flagU1Rx==1) && (i002 > 3)) || i002>10)
 			{
 				pkzq->USE_RKG = 0;	
 				i002 = 0;	
@@ -3167,64 +3168,62 @@ void StartTask04(void *argument)                                    //
 #include"level.h"
 void StartTask05(void *argument)
 {
-  /* USER CODE BEGIN StartTask05 */
-  /* Infinite loop */
-	Level_Inf* plevel = level_inf;
-	Cang_Inf* pcang = &cang_inf;
+	/* USER CODE BEGIN StartTask05 */
+	/* Infinite loop */
+	Level_Inf *plevel = level_inf;
+	Cang_Inf *pcang = &cang_inf;
 	uint8_t i;
 	float v000;
-	uint16_t* VolArrayTsk05=Volume_1cang;
- 	const uint16_t* HArrayTsk05=H_1cang;
-  for(;;)
-  {
- 	  HAL_GPIO_TogglePin(WDI_sp706_kanmemgou_GPIO_Port, WDI_sp706_kanmemgou_Pin);	
+	uint16_t *VolArrayTsk05 = Volume_1cang;
+	const uint16_t *HArrayTsk05 = H_1cang;
+	for (;;)
+	{
+		HAL_GPIO_TogglePin(WDI_sp706_kanmemgou_GPIO_Port, WDI_sp706_kanmemgou_Pin);
 		AGL_JudgeState();
-		for(i = 0;i < pcang->Cang_Num;i++)
-		{
-			//Value_Manage(i);	
-			//for(uint8_t i = 0;i < 5;i++)
+		for (i = 0; i < pcang->Cang_Num+1; i++)
 		{
-			switch (i)
-      {
+			// Value_Manage(i);
+			// for(uint8_t i = 0;i < 5;i++)
+			{
+				switch (i)
+				{
 				case 0:
-				  //VolArrayTsk05=Volume_1cang;
-				  // HArrayTsk05=H_1cang;    
+					VolArrayTsk05 = Volume_1cang;
+					HArrayTsk05 = H_1cang;
 					break;
 				case 1:
-					VolArrayTsk05=Volume_1cang;
-				  HArrayTsk05=H_1cang;
+					VolArrayTsk05 = Volume_1cang;
+					HArrayTsk05 = H_1cang;
 					break;
 				case 2:
-					VolArrayTsk05=Volume_2cang;
-				  HArrayTsk05=H_2cang;
+					VolArrayTsk05 = Volume_2cang;
+					HArrayTsk05 = H_2cang;
 					break;
 				case 3:
-					VolArrayTsk05=Volume_3cang;
-				  HArrayTsk05=H_3cang;
+					VolArrayTsk05 = Volume_3cang;
+					HArrayTsk05 = H_3cang;
 					break;
 				case 4:
-					VolArrayTsk05=Volume_4cang;
-				  HArrayTsk05=H_4cang;
+					VolArrayTsk05 = Volume_4cang;
+					HArrayTsk05 = H_4cang;
 					break;
-      	default:
-				 //VolArrayTsk05=Volume_1cang;
-				 // HArrayTsk05=H_1cang;
-      		break;
-      }
-			
-			v000=Calc_Vol(plevel[i].Level_Data,VolArrayTsk05,HArrayTsk05,i);
-			plevel[i].Volume_Data=v000;
-			
-			DF_State(i);
-			//BGY_state(i);
+				default:
+					VolArrayTsk05 = Volume_4cang;
+					HArrayTsk05 = H_4cang;
+					break;
+				}
 
-			
-			osDelay(100);
-			
+				v000 = Calc_Vol(plevel[i].Level_Data, VolArrayTsk05, HArrayTsk05, i);
+				plevel[i].Volume_Data = v000;
+
+				DF_State(i);
+				// BGY_state(i);
+
+				osDelay(100);
+			}
 		}
 	}
-	}
-  /* USER CODE END StartTask05 */
+	/* USER CODE END StartTask05 */
 }
 
 /* USER CODE BEGIN Header_StartTask06 */

Core/Src/rkg.c

@@ -191,7 +191,7 @@ void AGL_CalcDeltaAll(int32_t rkg_addr, uint16_t uiDGXGType)
             p->iXG = AGL_CalcDelta(psAD[0].uiRefrence, psAD[srNo].uiXG, (uiDGXGType & BIT7)+2,srNo);
         }
 
-        if(psAD[rkg_addr - 0x30].uiDG != 0xFFFFFFFF)
+        if(psAD[srNo].uiDG != 0xFFFFFFFF)
         {
             p->iDG = AGL_CalcDelta(psAD[0].uiRefrence, psAD[srNo].uiDG, uiDGXGType & BIT6,srNo);
         }

MDK-ARM/caijiqiV001.uvoptx

@@ -135,7 +135,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGTARM</Key>
-          <Name>(1010=778,129,1228,686,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+          <Name>(1010=778,129,1228,686,0)(1007=-1,-1,-1,-1,0)(1008=193,120,569,356,0)(1009=-1,-1,-1,-1,0)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -155,43 +155,10 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U36FF6E064E55373453232143 -O8399 -SF1800 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RE$Flash\STM32F10x_512.FLM)</Name>
+          <Name>-U38FF6B064246373045120157 -O8430 -SF1800 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RE$Flash\STM32F10x_512.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>1904</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134248856</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>D:\zhuzl鐢佃剳澶囦唤\zhuzl_work\Collect\Collect\Core\Src\main.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\DZQF_CJB09A0_20220209_Temp1\../Core/Src/main.c\1904</Expression>
-        </Bp>
-        <Bp>
-          <Number>1</Number>
-          <Type>0</Type>
-          <LineNumber>185</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134222344</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>D:\zhuzl鐢佃剳澶囦唤\zhuzl_work\Collect\Collect\Core\Src\stm32f1xx_it.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\DZQF_CJB09A0_20220209_Temp1\../Core/Src/stm32f1xx_it.c\185</Expression>
-        </Bp>
-      </Breakpoint>
+      <Breakpoint/>
       <WatchWindow1>
         <Ww>
           <count>0</count>
@@ -201,22 +168,22 @@
         <Ww>
           <count>1</count>
           <WinNumber>1</WinNumber>
-          <ItemText>gs_AngleData</ItemText>
+          <ItemText>rkgaddr_max</ItemText>
         </Ww>
         <Ww>
           <count>2</count>
           <WinNumber>1</WinNumber>
-          <ItemText>kzq_inf</ItemText>
+          <ItemText>i003</ItemText>
         </Ww>
         <Ww>
           <count>3</count>
           <WinNumber>1</WinNumber>
-          <ItemText>cang_inf</ItemText>
+          <ItemText>i002</ItemText>
         </Ww>
         <Ww>
           <count>4</count>
           <WinNumber>1</WinNumber>
-          <ItemText>rkgaddr_max</ItemText>
+          <ItemText>psATsk3[i003].uiDG</ItemText>
         </Ww>
         <Ww>
           <count>5</count>
@@ -226,12 +193,7 @@
         <Ww>
           <count>6</count>
           <WinNumber>1</WinNumber>
-          <ItemText>rkg_inf</ItemText>
-        </Ww>
-        <Ww>
-          <count>7</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>USART3_RX_BUF002</ItemText>
+          <ItemText>ulAngle2</ItemText>
         </Ww>
       </WatchWindow1>
       <WatchWindow2>
@@ -258,33 +220,8 @@
         <Ww>
           <count>4</count>
           <WinNumber>2</WinNumber>
-          <ItemText>Flashbuf</ItemText>
-        </Ww>
-        <Ww>
-          <count>5</count>
-          <WinNumber>2</WinNumber>
-          <ItemText>Flashbuf</ItemText>
-        </Ww>
-        <Ww>
-          <count>6</count>
-          <WinNumber>2</WinNumber>
           <ItemText>PayLoadData</ItemText>
         </Ww>
-        <Ww>
-          <count>7</count>
-          <WinNumber>2</WinNumber>
-          <ItemText>USART2_RX_BUF003</ItemText>
-        </Ww>
-        <Ww>
-          <count>8</count>
-          <WinNumber>2</WinNumber>
-          <ItemText>ptxCang01Temp</ItemText>
-        </Ww>
-        <Ww>
-          <count>9</count>
-          <WinNumber>2</WinNumber>
-          <ItemText>tickMain</ItemText>
-        </Ww>
       </WatchWindow2>
       <MemoryWindow1>
         <Mm>
@@ -308,7 +245,7 @@
       <DebugFlag>
         <trace>0</trace>
         <periodic>1</periodic>
-        <aLwin>0</aLwin>
+        <aLwin>1</aLwin>
         <aCover>0</aCover>
         <aSer1>0</aSer1>
         <aSer2>0</aSer2>
@@ -344,16 +281,6 @@
       <pszMrulep></pszMrulep>
       <pSingCmdsp></pSingCmdsp>
       <pMultCmdsp></pMultCmdsp>
-      <SystemViewers>
-        <Entry>
-          <Name>System Viewer\USART2</Name>
-          <WinId>35905</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\USART3</Name>
-          <WinId>35904</WinId>
-        </Entry>
-      </SystemViewers>
       <DebugDescription>
         <Enable>0</Enable>
         <EnableFlashSeq>0</EnableFlashSeq>

MDK-ARM/caijiqiV001.uvprojx

@@ -16,7 +16,7 @@
         <TargetCommonOption>
           <Device>STM32F103RE</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F1xx_DFP.2.3.0</PackID>
+          <PackID>Keil.STM32F1xx_DFP.2.1.0</PackID>
           <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IRAM(0x20000000-0x2000FFFF) IROM(0x8000000-0x807FFFF) CLOCK(8000000) CPUTYPE("Cortex-M3") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -49,7 +49,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>caijiqiV001\</OutputDirectory>
-          <OutputName>DZQF-CJB09A0_20220209_Temp1</OutputName>
+          <OutputName>CJB_version220531_002_220711</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>
@@ -82,7 +82,7 @@
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>C:\Keil_v5\ARM\ARMCC\bin\fromelf.exe  --bin -o  ..\MDK-ARM\caijiqiV001\DZQF_CJB04_A0_APP888.bin ..\MDK-ARM\caijiqiV001\DZQF-CJB09A0_20220209_Temp1.axf</UserProg1Name>
+            <UserProg1Name>fromelf --bin -o "$L@L.bin" "#L"</UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -313,7 +313,7 @@
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
-            <Optim>4</Optim>
+            <Optim>1</Optim>
             <oTime>0</oTime>
             <SplitLS>0</SplitLS>
             <OneElfS>1</OneElfS>