V2.0.2_20200427

1、打开根据TE检测标志确定是否对TE故障检测；
2、CAN错误中断回调函数修改处理，避免错误后无法接收数据；
3、版本号：V2.0.2_20200427

Core/Src/can.c

@@ -116,11 +116,7 @@ void HAL_CAN_MspInit(CAN_HandleTypeDef* canHandle)
     canHandle->pTxMsg = &CAN_TxMessaage;
 		canHandle->pRxMsg = &CAN_RxMessaage;
 		CANFilterConfig_Scale32_IdMask_StandardIdOnly();
-		if(HAL_CAN_Receive_IT(&hcan, CAN_IT_FMP0) == HAL_BUSY)
-		{
-	  	__HAL_CAN_ENABLE_IT(&hcan, CAN_IT_FMP0);
-		}
-		
+		__HAL_CAN_ENABLE_IT(&hcan, CAN_IT_FMP0);		
   /* USER CODE END CAN1_MspInit 1 */
   }
 }
@@ -319,10 +315,7 @@ void CANFilterConfig_Scale32_IdMask_StandardIdOnly(void)
 
 void HAL_CAN_ErrorCallback(CAN_HandleTypeDef *hcan)
 {
-  if(HAL_CAN_Receive_IT(hcan, CAN_IT_FMP0) == HAL_BUSY)
-	{
-		__HAL_CAN_ENABLE_IT(hcan, CAN_IT_FMP0);
-	}
+	__HAL_CAN_ENABLE_IT(hcan, CAN_IT_FMP0);
 }
 
 /* USER CODE END 1 */

User/Src/can_process.c

@@ -212,8 +212,7 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 					}
 					break;
 				}
-				
-				#else //针对ECU的指令
+				#else //ECU的指令
 				case 0x3300://ECU查询用户参数
 				{
 				  GetParamFromEEprom_24C02(&I2C_Handle_EEPROM, EEPROM_24C02_ADDR_CONFIG_PARAM1, sizeof(MC_ConfigParam1), (uint8_t*)&MC_ConfigParam1.GasCtrlMode_Flag);
@@ -248,9 +247,9 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 					SendData(ID_MC_TO_PBU, MODE_REPORT, 0x5303, (uint8_t*)"ACK");
 					break;
 				}
-        #endif
-
-				case 0x3900://ECU查询版本信息
+				#endif
+				
+				case 0x3900://OBC/ECU查询版本信息
 				{
 				  ReadDataFromEEPROM_Flash(EEPROM_FLASH_ADDR_MODE, (uint8_t*)MC_VerInfo.Mode, 16);
 					ReadDataFromEEPROM_Flash(EEPROM_FLASH_ADDR_SN, (uint8_t*)MC_VerInfo.SN_Num, 16);
@@ -336,8 +335,6 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 						MC_RunInfo.Ride_Time = 0;
 					}
 				}
-				
-				
 				default:break;
 			}
 			break;

User/Src/fault_check.c

@@ -1008,7 +1008,7 @@ void MC_Fault_Check_Process(void)
 	MC_Fault_MOS_Process(ADC_3ShuntCurrent_RMSValue, &MC_ErrorCode);
 
   //TE故障检测
-	#if 0
+	#if 1
 	if(TE_CheckFlag == SET)//针对样机的TE软件版本，不检测故障
 	{
   	MC_Fault_TE_Process(&MC_TE_SensorStatus, IsComOK_TE.IsOK_Flag, &MC_ErrorCode);

User/Src/var.c

@@ -485,10 +485,10 @@ void Var_Init(void)
 		
 	//MC版本信息初始化，Mode和SN从EEPROM读取
   strncpy(MC_VerInfo.HW_Version, (char*)"QD007E.         ", 16);
-	strncpy(MC_VerInfo.FW_Version, (char*)"V2r0r2_20200417.", 16);
+	strncpy(MC_VerInfo.FW_Version, (char*)"V2r0r3_20200427.", 16);
 		
 	//电机型号
-	strncpy(MC_VerInfo.Mode, (char*)"MOTINOVA VOLANS.", 16);
+	strncpy(MC_VerInfo.Mode, (char*)"VL6500 & VS7500.", 16);
 	
 	//电机序列号
 	strncpy(MC_VerInfo.SN_Num, (char*)"0000000000000000", 16);
@@ -496,7 +496,7 @@ void Var_Init(void)
 	//生产信息
 	strncpy(MC_MacInfo.Manufacturer, (char*)"TTIUM.  ", 8);  //生产信息
 	strncpy(MC_MacInfo.MacAddr, (char*)"WUHAN.  ", 8);
-	strncpy(MC_MacInfo.MacDate, (char*)"20191101", 8);
+	strncpy(MC_MacInfo.MacDate, (char*)"20200101", 8);
 		
 	//MCU ID读取
 	memcpy((uint8_t*)MC_CheckInfo.MAC_ID, (uint8_t*)(0x1FFFF7E8), 12);

修改说明.txt

@@ -255,7 +255,10 @@ V2.0.2_20200417 Dail
 1、增加对ECU的指令处理，不过暂时未打开；
 4、版本号：V2r0r2_20200417
 
-
+V2.0.2_20200427
+1、打开根据TE检测标志确定是否对TE故障检测；
+2、CAN错误中断回调函数修改处理，避免错误后无法接收数据；
+3、版本号：V2.0.2_20200427