消除编译告警

Core/Inc/kzq.h

@@ -59,6 +59,7 @@ extern uint16_t RKG_SetTypeNum(uint8_t* pTx);
 
 extern void Sen_CangState_old(uint8_t* F_STATE);
 uint16_t Read_SoftVersion(uint8_t *pTx);
-
+uint16_t RW_SensorBusMaxRetry(uint8_t* pTx);
+uint16_t RW_PinIoHitSameParam(uint8_t* pTx);
 #endif
 

Core/Inc/main.h

@@ -33,7 +33,7 @@ extern "C" {
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
-//#define DEBUG
+#define DEBUG
 #ifdef DEBUG
 	#define WatchDogOn   0   //¹Ø±Õ¿´ÃŹ· 
 #else

Core/Src/bgy.c

@@ -61,7 +61,7 @@ void Get_Biguayou_data(void)
 {
 	//j = 0i = 0
   uint16_t 	ModbusCRC=0; 
-	 uint16_t receive_error = 0;	
+	uint16_t receive_error = 0;	
 	Biguayou_Inf* pBGY = biguayou_inf;	
 	ModbusCRC = USART3_RX_BUF002[5]<<8;
 	ModbusCRC |= USART3_RX_BUF002[6];
@@ -88,6 +88,8 @@ void Get_Biguayou_data(void)
 		USART3_RX_BUF002[3] = USART3_RX_BUF002[3];
 	
 	}
+	
+	UNUSED(receive_error);
 
 
 }

Core/Src/hdf.c

@@ -1,4 +1,5 @@
 #include "hdf.h"
+#include "cmsis_os.h"
 void TOUCHUAN_UART_NUM(uint8_t* pTx) ;
 void Get_ZN_hdf_data(void) ;
 HDF_Inf hdf_inf[SENSOR_DEEP];
@@ -56,7 +57,8 @@ GPIO_PinState Get_Pin(int Pin_No)
  */
 int DoPinIoHitSame(uint8_t pinNo, uint8_t *pstatus)
 {
-	uint8_t status = 0;
+	GPIO_PinState status = GPIO_PIN_RESET;
+	
 	static struct pin_same {
 		GPIO_PinState status;
 		uint16_t same_count;
@@ -64,8 +66,10 @@ int DoPinIoHitSame(uint8_t pinNo, uint8_t *pstatus)
 	
 
 	if(pinNo > 7) return 0;
+	
 	status = Get_Pin(pinNo);
-	*pstatus = status;
+	
+	*pstatus = (uint8_t)status;
 	
 	if(pin_cache[pinNo].status == status) {
 		pin_cache[pinNo].same_count++;

Core/Src/iap.c

@@ -52,7 +52,7 @@ int App2_MD5_Check(uint32_t addr,unsigned int all_len)
 		else
 			update_len = all_len-i;
 		memcpy(iapbuf,(const void *)(addr+i),update_len);
-		MD5Update (&md5c, (char *)iapbuf, update_len);
+		MD5Update (&md5c, (unsigned char *)iapbuf, update_len);
 		i += update_len;
 		HAL_GPIO_TogglePin(WDI_sp706_kanmemgou_GPIO_Port, WDI_sp706_kanmemgou_Pin);
 	}
@@ -117,7 +117,7 @@ void iap_load_app(uint32_t appxaddr)
  */
 void Start_BootLoader(void)
 {
-	unsigned int update_flag = 0xAAAAAAAA; ///< 对应bootloader的启动步骤
+//	unsigned int update_flag = 0xAAAAAAAA; ///< 对应bootloader的启动步骤
 	unsigned int ModeStart;
 	unsigned int i,all_len;
 	uint16_t ModeStart1[2];
@@ -214,8 +214,11 @@ void Process_CMD_IAP_Update(void)
 
 	int lenRx1, lenRx2;
 	int i;
-	uint16_t CP_CNT = 0, j = 0;
-	static uint16_t update_frame_num = 0;
+	//uint16_t CP_CNT = 0, j = 0;
+	//static uint16_t update_frame_num = 0;
+	
+	//UNUSED(CP_CNT);
+	
 	for (i = 0; i < 512; i++)
 	{
 		FileBuffArray[i] = 0;
@@ -274,7 +277,7 @@ void Process_CMD_IAP_Update(void)
 					txLen = sprintf((char *)FileBuffArray, "file=%d\r\n", packIndexbak);
 					HAL_GPIO_WritePin(GPIOA, con03_uart2_kongzhiqi_Pin, GPIO_PIN_RESET); //
 					delay_sys_us(80);
-					HAL_UART_Transmit_IT(&huart2,(char *)FileBuffArray,txLen);		
+					HAL_UART_Transmit_IT(&huart2,(uint8_t *)FileBuffArray,txLen);		
 					while (huart2.gState == HAL_UART_STATE_BUSY_TX)
 					{
 						osDelay(1);

Core/Src/kzq.c

@@ -2098,6 +2098,11 @@ uint16_t Read_CangSensorData_2(uint8_t* pTx)
 	XYF_Inf*  pxyf  = xyf_inf;
 	Yqhuishou_Inf* pYqhuishou = &yqhuishou_inf;	
 	
+	UNUSED(pkzq);
+	UNUSED(pYqhuishou);
+	
+	
+	
 //	static float test_val=100;
 	typedef union{
    float float_temp;   //青鸟贵和磁致伸缩液位温度一体传感器
@@ -2424,6 +2429,10 @@ uint16_t Read_CangSensorData_1(uint8_t* pTx)//
   }Hex_to_float;
   Hex_to_float hex_to_float;
     uint8_t Cang_Num = 1,i = 0,HDF_Start = 0,XYF_Start = 0,RKG_Start = 0,BGY_Start = 0;
+	
+	UNUSED(pkzq);
+	UNUSED(pYqhuishou);
+	
 	if(Cang_Num < 1 ||Cang_Num > 8)
 		return 0;
 	for(i = 0;i < Cang_Num - 1;i++)

Core/Src/level.c

@@ -1396,8 +1396,8 @@ static float h_x0;
 //信捷罐容查表计计算程序  邵磊明  增加
 float Calc_Vol(float RadarData, uint16_t *VolArray, const uint16_t *HArray, uint16_t StoreNum)
 {
-	float offset[8];
-	uint8_t i = 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;

Core/Src/main.c

@@ -150,7 +150,7 @@ DMA_HandleTypeDef hdma_usart1_tx;
 DMA_HandleTypeDef hdma_usart2_rx;
 DMA_HandleTypeDef hdma_usart3_rx;
 
-uint8_t bufMain[128];
+char bufMain[128];
 
 /* Definitions for defaultTask */
 osThreadId_t defaultTaskHandle;
@@ -523,11 +523,11 @@ void Cang_Init(void);
 static void MX_NVIC_Init(void);
 
 // for debug，将信息输出到指定的uart总线上
-static void DumpMsg(uint8_t *msg)
+static void DumpMsg(char *msg)
 {
 	HAL_GPIO_WritePin(GPIOA,con03_uart2_kongzhiqi_Pin,GPIO_PIN_RESET);
 	delay_sys_us(80);
-	HAL_UART_Transmit_IT(&huart2,msg,strlen(msg));		
+	HAL_UART_Transmit_IT(&huart2,(uint8_t *)msg,strlen(msg));		
 	while (huart2.gState == HAL_UART_STATE_BUSY_TX)
 	{
 		osDelay(1);
@@ -941,7 +941,7 @@ int main(void)
 	memset(bufMain,0,128);
 	spr000=sprintf((char*)bufMain,"sysytem reset...%5d, watchDogOn=%d, version:%d-%d",5,WatchDogOn,Version_Soft[7],Version_Soft[3]);
 	//HAL_UART_Transmit(&huart1,bufMain,32,300);
-	HAL_UART_Transmit(&huart2,bufMain,spr000,300);
+	HAL_UART_Transmit(&huart2,(uint8_t *)bufMain,spr000,300);
 	//HAL_UART_Transmit(&huart3,bufMain,32,300);
 	
  
@@ -2136,8 +2136,17 @@ void StartTask03(void *argument)															//
    /* USER CODE BEGIN StartTask02 */
   static  uint8_t i001=0,i002 = 0,i003 = 0,receive_error = 0;
 	uint16_t rkgaddr_max = 0,temaddr_max = 0,leveladdr_max = 0,RKG_angle = 0;                      
-	static uint16_t i = 0,rkdg_cnt = 0,rkxg_cnt = 0,level_cnt = 0,tem_cnt = 0,temp_dot_cnt=0,temp_dot_dex=0,ModbusCRC = 0,ModbusCRC1 = 0;
-	uint16_t rx_len,head = 0;
+	static uint16_t i = 0;
+	//static uint16_t rkdg_cnt = 0;
+	static uint16_t rkxg_cnt = 0;
+	//static uint16_t level_cnt = 0;	
+	//static uint16_t tem_cnt = 0;	
+	//static uint16_t temp_dot_cnt=0;
+	//static uint16_t temp_dot_dex=0;
+	static uint16_t ModbusCRC = 0;
+	//static uint16_t ModbusCRC1 = 0;
+	//static uint16_t 
+	static uint16_t rx_len,head = 0;
 	S_ANGLEDATA* psATsk3 = gs_AngleData;	
 	KZQ_Inf* pkzq = &kzq_inf;
 	RKG_Inf* prkg = rkg_inf;
@@ -2876,7 +2885,7 @@ void StartTask04(void *argument)                                    //
 	uint8_t* send_ptr;
 	uint16_t send_len;
 	uint32_t tmpU32;
-	
+	UNUSED(ModbusCRC1);
 	KZQ_Inf* pkzq = &kzq_inf;
 
 	extern uint8_t USART2_RX_BUF002[Uart2_BUF_SIZE];

Core/Src/md5c.c

@@ -323,6 +323,7 @@ void MDString (char *string,unsigned char digest[16])
 } 
 /* Digests a file and prints the result. 
  */ 
+#if 0
 int MD5File (char *filename,unsigned char digest[16]) 
 { 
  FILE *file; 
@@ -362,3 +363,5 @@ int MD5FileUpdateFile (MD5_CTX *context,char *filename)
  } 
  return 0; 
 } 
+#endif
+

Core/Src/yqhs.c

@@ -30,7 +30,8 @@ void Get_Yqhuishou_data(void)
 	pYqhuishou[USART3_RX_BUF002[0]-0x80].RTData_Num[0] = 1;
 	pYqhuishou[USART3_RX_BUF002[0]-0x80].Yqhuishou_SSWD[0] = USART3_RX_BUF002[3];  //
 	pYqhuishou[USART3_RX_BUF002[0]-0x80].Yqhuishou_SVAL[0] = USART3_RX_BUF002[4];
-
+	
+	UNUSED(receive_error);
 
 }
 

MDK-ARM/caijiqiV001.uvoptx

@@ -103,7 +103,7 @@
         <bEvRecOn>1</bEvRecOn>
         <bSchkAxf>0</bSchkAxf>
         <bTchkAxf>0</bTchkAxf>
-        <nTsel>6</nTsel>
+        <nTsel>4</nTsel>
         <sDll></sDll>
         <sDllPa></sDllPa>
         <sDlgDll></sDlgDll>
@@ -114,18 +114,18 @@
         <tDlgDll></tDlgDll>
         <tDlgPa></tDlgPa>
         <tIfile></tIfile>
-        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+        <pMon>Segger\JL2CM3.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGUARM</Key>
-          <Name>(105=-1,-1,-1,-1,0)</Name>
+          <Name>d</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>JL2CM3</Key>
-          <Name>-U69618568 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RE$Flash\STM32F10x_512.FLM)</Name>
+          <Name>-U69660481 -O78 -S1 -ZTIFSpeedSel10000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RE$Flash\STM32F10x_512.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -245,7 +245,7 @@
       <DebugFlag>
         <trace>0</trace>
         <periodic>1</periodic>
-        <aLwin>1</aLwin>
+        <aLwin>0</aLwin>
         <aCover>0</aCover>
         <aSer1>0</aSer1>
         <aSer2>0</aSer2>

MDK-ARM/caijiqiV001.uvprojx

@@ -16,7 +16,7 @@
         <TargetCommonOption>
           <Device>STM32F103RE</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F1xx_DFP.2.1.0</PackID>
+          <PackID>Keil.STM32F1xx_DFP.2.3.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>