发布版本2.0.0.3

inc/app.h

@@ -16,11 +16,7 @@ extern "C" {
 #define BMS_MANUFACTURE (1) //BMS制造商表示1-超力源，2-美顺
 #define DATA_MODULE_TYPE (1) //1表示NB模块，2表示4G cat1
 //#define BAT4830
-<<<<<<< HEAD
-#define BAT6060
-=======
 #define BAT6060  //电池型号变化需要更改
->>>>>>> V2版本集成
 #ifdef  BAT4830
     #define BATT_CELL_VOL_NUM  (14)
     #define BATT_TEMP_NUM  (3)
@@ -37,15 +33,9 @@ extern "C" {
  
 #define HWVERSION		    0x0102    //硬件主版本，现为V1.2板
 #define	BLSWVERSION		0x01020000    //BootLoader版本号V1.2.0.0
-<<<<<<< HEAD
-#define	DRVSWVERSION		0x01030000     //驱动层版本号V1.3.0.0
-#define	APPSWVERSION		0x02000002      
-
-=======
 #define	DRVSWVERSION		0x01040000     //驱动层版本号V1.4.0.0
 //#define	APPSWVERSION		0x0102011E     
 #define	APPSWVERSION		0x02000003
->>>>>>> V2版本集成
 //--------------------------------------------------------------------------------
 
 #define APP_CONFIG_FILE_LATEST_VERSION 0

src/CANTask.c

@@ -23,19 +23,10 @@
 #include "CANTask.h"
 #include "UDSService.h"
 
-<<<<<<< HEAD
-
-
-extern UINT32 Timer_count;
-extern volatile bool Sleep_flag;
-extern UartReadMsgType UartReadMsg;
-
-=======
 extern osMutexId_t UartMutex;
 extern UINT32 Timer_count;
 extern volatile bool Sleep_flag;
 extern UartReadMsgType UartReadMsg;
->>>>>>> V2版本集成
 CAN_Msg_Type CanRxMsg[2];
 /*线程声明*/
 #define 			PROC_CAN_RX_TASK_STACK_SIZE			(1024)
@@ -120,14 +111,9 @@ static void Can_Receive()
 						UDS_Service();
 						udsFlag = 0;							
 					}
-<<<<<<< HEAD
-					if(Timer_count%10==0&&UartReadMsg.len>0)
-					{
-=======
 					if(Timer_count%10==0)
 					{
 						osMutexAcquire(UartMutex, osWaitForever);
->>>>>>> V2版本集成
 						CANSendBuffer.Id = 0x7A9;
 						CANSendBuffer.DLC = 8;
 						CANSendBuffer.Data[0] = UartReadMsg.data[(0x19+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+BATT_OTHER_TEMP_NUM)*2+1];
@@ -138,15 +124,11 @@ static void Can_Receive()
 						CANSendBuffer.Data[5] = UartReadMsg.data[(0x0B+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+BATT_OTHER_TEMP_NUM)*2];
 						CANSendBuffer.Data[6] = 0x00;
 						CANSendBuffer.Data[7] = 0x00;
-<<<<<<< HEAD
-						HAL_Can_Transmit(CANSendBuffer);
-=======
 						if(UartReadMsg.len>0)
 						{
 						HAL_Can_Transmit(CANSendBuffer);
 						}
 						osMutexRelease(UartMutex); 
->>>>>>> V2版本集成
 					}		
 					break;
 				}