Jelajahi Sumber

重庆测试,版本号为1.2.1.11,修改了Fota升级时0x03不回复的Bug,取消了Can收发打印

CHENJIE-PC\QiXiang_CHENJIE 3 tahun lalu
induk
melakukan
459f3342b4
3 mengubah file dengan 5 tambahan dan 5 penghapusan
  1. 1 1
      inc/app.h
  2. 2 2
      src/Fota.c
  3. 2 2
      src/hal_module_adapter.c

+ 1 - 1
inc/app.h

@@ -34,7 +34,7 @@ extern "C" {
 #define HWVERSION		    0x0102    //硬件主版本,现为V1.2板
 #define	BLSWVERSION		0x01020000    //BootLoader版本号V1.2.0.0
 #define	DRVSWVERSION		0x01040000     //驱动层版本号V1.4.0.0
-#define	APPSWVERSION		0x0102010A      
+#define	APPSWVERSION		0x0102010B      
 
 //--------------------------------------------------------------------------------
 

+ 2 - 2
src/Fota.c

@@ -103,7 +103,7 @@ void Fota_Func(UINT8 *DataPtr,INT32 connectId)
                 memcpy(&Fota_Answer[4],(DataPtr+4),BATT_SN_LEN);
                 Fota_Answer[21] = TCP_ENCPT_DISABLE;
                 Fota_Answer[22] = 0x00;
-                Fota_Answer[23] = 0x13;
+                Fota_Answer[23] = 0x12;
                 memcpy(&Fota_Answer[24],(DataPtr+24),18);
                 Fota_Answer[42] =  bcc_chk_fota(Fota_Answer,42);
                 tcpipConnectionSend(connectId,Fota_Answer,43,0,0,0);
@@ -200,7 +200,7 @@ void Fota_Func(UINT8 *DataPtr,INT32 connectId)
                 memcpy(&Fota_Answer[4],(DataPtr+4),BATT_SN_LEN);
                 Fota_Answer[21] = TCP_ENCPT_DISABLE;
                 Fota_Answer[22] = 0x00;
-                Fota_Answer[23] = 0x13;
+                Fota_Answer[23] = 0x12;
                 memcpy(&Fota_Answer[24],(DataPtr+24),18);
                 Fota_Answer[42] =  bcc_chk_fota(Fota_Answer,42);
                 tcpipConnectionSend(connectId,Fota_Answer,43,0,0,0);

+ 2 - 2
src/hal_module_adapter.c

@@ -1038,7 +1038,7 @@ void  HAL_Can_Receive(CAN_Msg_Type* CanRxMsgBuffer)
 			CAN_ReadReg(RXB0D0+i,1,&((CanRxMsgBuffer[0]).Data[i]));
 			i++;
 		}	
-	#ifdef USING_PRINTF		
+	#ifdef USING_PRINTF1		
 		printf("buffer0 ID = %x\n",CanRxMsgBuffer[0].Id);
 		for(i=0;i<8;i++)
 		{
@@ -1076,7 +1076,7 @@ void  HAL_Can_Receive(CAN_Msg_Type* CanRxMsgBuffer)
 			i++;			
 		}
 
-	#ifdef USING_PRINTF		
+	#ifdef USING_PRINTF1		
 		printf("buffer1 ID = %x\n",CanRxMsgBuffer[1].Id);
 		for(i=0;i<8;i++)
 		{