V2.1.6_20210616_2 TC011052-MCK201001-V1r1

1、修改I2C的驱动方式，解决频繁封波时电机异常的问题；
2、增加清除历史记录的指令

User/Src/I2C_Analog.c

@@ -2,23 +2,12 @@
 
 static void _SDA_IN(I2C_Handle_Struct_t* I2C_Handle)
 {
-  GPIO_InitTypeDef GPIO_InitStruct;
-
-  GPIO_InitStruct.Pin = I2C_Handle->SDA_GPIO_Pin;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_MEDIUM;
-  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
-	GPIO_InitStruct.Pull = GPIO_PULLUP;
-  HAL_GPIO_Init(I2C_Handle->SDA_GPIOx, &GPIO_InitStruct);
+	HAL_GPIO_WritePin(I2C_Handle->SDA_GPIOx, I2C_Handle->SDA_GPIO_Pin, GPIO_PIN_SET);
 }
 
 static void _SDA_OUT(I2C_Handle_Struct_t* I2C_Handle)
 {
-  GPIO_InitTypeDef GPIO_InitStruct;
-
-  GPIO_InitStruct.Pin = I2C_Handle->SDA_GPIO_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_MEDIUM;
-  HAL_GPIO_Init(I2C_Handle->SDA_GPIOx, &GPIO_InitStruct);
+	__NOP();
 }
 
 static void _GPIO_CLK_Init(GPIO_TypeDef* GPIOx)
@@ -59,12 +48,12 @@ void I2C_GPIO_Config(I2C_Handle_Struct_t* I2C_Handle)
 
   GPIO_InitStruct.Pin = I2C_Handle->SCL_GPIO_Pin;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_MEDIUM;
-  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
   HAL_GPIO_Init(I2C_Handle->SCL_GPIOx, &GPIO_InitStruct);
 	
 	GPIO_InitStruct.Pin = I2C_Handle->SDA_GPIO_Pin;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_MEDIUM;
-  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
   HAL_GPIO_Init(I2C_Handle->SDA_GPIOx, &GPIO_InitStruct);
 }
 

User/Src/can_process.c

@@ -190,7 +190,8 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 				}
 				case 0x3408://OBC设置用户参数
 				{
-				  if(MC_ConfigParam1.WheelSizeAdj > 10)
+				  MC_ConfigParam1.WheelSizeAdj = (int8_t)Data[0];
+					if(MC_ConfigParam1.WheelSizeAdj > 10)
 					{
 						MC_ConfigParam1.WheelSizeAdj = 10;
 					}
@@ -198,7 +199,6 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 					{
 						MC_ConfigParam1.WheelSizeAdj = -10;
 					}
-					MC_ConfigParam1.WheelSizeAdj = (int8_t)Data[0];
 					MC_ConfigParam1.StarModel = (MC_StarMode_Struct_t)Data[1];
 					SaveParamToEEprom_24C02(&I2C_Handle_EEPROM, EEPROM_24C02_ADDR_CONFIG_PARAM1, sizeof(MC_ConfigParam1), (uint8_t*)&MC_ConfigParam1.GasCtrlMode_Flag);
 					SendData(ID_MC_TO_PBU, MODE_REPORT, 0x5303, (uint8_t*)"ACK");
@@ -225,7 +225,7 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 							strncpy((char*)UserString1, (char*)"CLEAR_ODO", 9);
 							IsFlashSaveDataUpdate = TRUE;
 						}	
-						SaveParamToEEprom_24C02(&I2C_Handle_EEPROM, EEPROM_24C02_ADDR_RIDE_LOG, sizeof(MC_RideLog_Struct_t), (uint8_t*)&MC_RideLog.ODO_Km);				
+						SaveParamToEEprom_24C02(&I2C_Handle_EEPROM, EEPROM_24C02_ADDR_RIDE_LOG, sizeof(MC_RideLog_Struct_t), (uint8_t*)&MC_RideLog.ODO_Km);
 						SendData(ID_MC_TO_PBU, MODE_REPORT, 0x5303, (uint8_t*)"ACK");
 						MC_RunInfo.Ride_Km = 0;
 						MC_RunInfo.Ride_Time = 0;
@@ -380,7 +380,7 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 				{
 				  if(strncmp("CLEAR", (char*)Data, DataLength) == 0)
 					{
-						MC_RideLog.TRIP_Km = 0;
+					  MC_RideLog.TRIP_Km = 0;
 						MC_RideLog.TRIP_Time = 0;
 						if(strncmp("CLEAR_ODO", (char*)UserString1, 9) != 0)//利用UserString1作为是否允许清除ODO的标志
 						{
@@ -669,6 +669,16 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 					SendData(ID_MC_TO_CDL, MODE_REPORT, 0xA903, (uint8_t*)"ACK");
 					break;
 				}
+				case 0x3909://清除历史信息
+				{
+				  if(strncmp("LOG CLEAR", (char*)Data, DataLength) == 0)
+					{
+					  Var_SetToDefaultLog();
+						EEPROM_24C02_LogReset(&I2C_Handle_EEPROM);
+						SendData(ID_MC_TO_CDL, MODE_REPORT, 0xA903, (uint8_t*)"ACK");
+					}
+					break;
+				}
 				default:break;
 			}
 			break;

User/Src/protect_check.c

@@ -304,9 +304,48 @@ void MC_Protect_VoltageChange_Process(uint16_t Voltage, uint16_t Current, MC_Err
 	}
 }
 
+//软件过流保护检测
+void MC_OverCurrent_SoftProtect_Process(uint16_t BusCurrent, uint16_t MaxCurrent, MC_ErrorCode_Struct_t* p_MC_ErrorCode)
+{
+  static uint32_t Protect_TimeCnt = 0;
+	static uint32_t Fault_TimeCnt = 0;
+	uint16_t Current_Th;
+	
+	Current_Th = (MaxCurrent * 3) >> 1;//1.5倍
+	
+	if(p_MC_ErrorCode->ERROR_Bit.Protect_OverCurrent == 0)
+	{
+		if(BusCurrent < Current_Th)
+		{
+			Protect_TimeCnt = HAL_GetTick();
+		}
+		if((HAL_GetTick() - Protect_TimeCnt) > 5000)
+		{
+			p_MC_ErrorCode->ERROR_Bit.Protect_OverCurrent = 1;
+			//记录故障日志
+			MC_ErrorLogSaveInfo.NotesInfo1 = 2;
+			MC_ErrorLogSaveInfo.NotesInfo2 = Current_Th;
+			ErrorLogSave_Update(&MC_ErrorLogSaveInfo);
+		  IsErrorLogSaveInfoUpdateFlag = TRUE;
+			//存储故障次数
+			MC_RunLog1.OC_ProtectCnt++;
+			RunLogSaveIndex = 1;	
+			Fault_TimeCnt = HAL_GetTick();
+		}
+	}
+	else
+	{
+		//过流保护恢复
+		if((HAL_GetTick() - Fault_TimeCnt) > 5000)
+		{
+			MC_ErrorCode.ERROR_Bit.Protect_OverCurrent = 0;
+		}
+	}
+}
+
 /******************************全局函数定义******************************/
 #define OC_CLEARFLAG_DELAYTIME 15 //过流标志间隔清零延时，单位ms
-#define OC_COUNTER_TH 100          //过流保护计数判断阈值
+#define OC_COUNTER_TH 100         //过流保护计数判断阈值
 //过流保护检测
 /*
 检测原理：
@@ -314,79 +353,42 @@ void MC_Protect_VoltageChange_Process(uint16_t Voltage, uint16_t Current, MC_Err
 2、在过流触发计数达到OC_COUNTER_TH 次之前，如果存在两次过流触发间隔时间超过OC_CLEARFLAG_DELAYTIME ms，清除过流触发计数；
 3、如果每两次过流触发间隔时间都不超过OC_CLEARFLAG_DELAYTIME ms，当过流触发计数达到OC_COUNTER_TH 次，则进入过流保护；
 4、进入过流保护后，超时5s解除。
+
+更改处理方式20210630
+1、关闭过流告警；
+2、出现过流信号时，封闭PWM2个周期
 */
 void MC_Protect_OverCurrent_Process(FlagStatus* OverCurrentTrigFlag, MC_ErrorCode_Struct_t* p_MC_ErrorCode)
 {
   static uint8_t OffPwmCnt = 0;        //过流信号触发后，关闭PWM延时计数
 	static uint8_t StarPwmCnt = 0;       //关闭PWM后启动PWM延时计数
-  static uint16_t ocCnt = 0;           //过流信号触发计数
-  static uint32_t ocTimeCnt = 0;       //过流信号触发计时
-	static uint32_t ocFaultTimeCnt = 0;  //过流保护后计时
 	
-	if(p_MC_ErrorCode->ERROR_Bit.Protect_OverCurrent == 0)
+	if(*OverCurrentTrigFlag == RESET)
 	{
-		if(*OverCurrentTrigFlag == RESET)
+		//关闭PWM计数清零
+		OffPwmCnt = 0;
+		//开启PWM
+		if(StarPwmCnt == 0)
 		{
-			//关闭PWM计数清零
-			OffPwmCnt = 0;
-			//两次过流触发间隔超时OC_CLEARFLAG_DELAYTIME ms，过流次数未达到OC_COUNTER_TH 次，过流计数清零
-			if(ocCnt < OC_COUNTER_TH)
-			{
-				if((HAL_GetTick() - ocTimeCnt) >= OC_CLEARFLAG_DELAYTIME)
-				{
-					ocTimeCnt = HAL_GetTick();
-					ocCnt = 0;
-				}
-			}
-			//开启PWM
-			if(StarPwmCnt == 0)
-			{
-				StarPwmCnt++;
-				Enable_PwmGpio_Out();
-			}
-		}
-		else
-		{
-			//开启PWM计数清零
-			StarPwmCnt = 0;
-			//关闭PWM
-			Disable_PwmGpio_Out();
-			//2个PWM周期后，过流触发标志复位
-			if(OffPwmCnt >= 1)
-			{
-				*OverCurrentTrigFlag = RESET;
-			}
-			//过流次数计数
-			if(ocCnt < OC_COUNTER_TH)
-			{
-				ocCnt++;
-			}
-			//过流标志计数次数达到OC_COUNTER_TH 次，启动过流保护
-			else
-			{
-				ocCnt = 0;
-				p_MC_ErrorCode->ERROR_Bit.Protect_OverCurrent = 1;
-				ocFaultTimeCnt = HAL_GetTick();
-				//记录故障日志
-			  ErrorLogSave_Update(&MC_ErrorLogSaveInfo);
-		  	IsErrorLogSaveInfoUpdateFlag = TRUE;
-				//存储故障次数
-				MC_RunLog1.OC_ProtectCnt++;
-				RunLogSaveIndex = 1;	
-			}
-			OffPwmCnt++;
-			ocTimeCnt = HAL_GetTick();
+			StarPwmCnt++;
+			Enable_PwmGpio_Out();
 		}
 	}
 	else
 	{
-		//过流恢复
-		if((HAL_GetTick() - ocFaultTimeCnt) > 5000)
+		//开启PWM计数清零
+		StarPwmCnt = 0;
+		//2个PWM周期后，过流触发标志复位
+		if(OffPwmCnt >= 1)
 		{
-			MC_ErrorCode.ERROR_Bit.Protect_OverCurrent = 0;
-			ocFaultTimeCnt = HAL_GetTick();
 			*OverCurrentTrigFlag = RESET;
 		}
+		else
+		{
+			//关闭PWM
+			Disable_PwmGpio_Out();
+		}
+		OffPwmCnt++;
 	}
 }
 
@@ -394,11 +396,11 @@ void MC_Protect_OverCurrent_Process(FlagStatus* OverCurrentTrigFlag, MC_ErrorCod
 void MC_Protect_Check_Process(void)
 {
 	//低压保护检测
-	  MC_Protect_UnderVoltage_Process(((IsComOK_BMS.IsOK_Flag == TRUE) ? BMS_RunInfo.Voltage : MC_RunInfo.BusVoltage), 
+  MC_Protect_UnderVoltage_Process(((IsComOK_BMS.IsOK_Flag == TRUE) ? BMS_RunInfo.Voltage : MC_RunInfo.BusVoltage), 
 	                                MC_MotorParam.Rate_Voltage, 
 	                                ((MC_ConfigParam1.UV_Protect_TH == 0) ? 3100 : MC_ConfigParam1.UV_Protect_TH), 
 	                                &MC_ErrorCode);
-
+	
 	//过压保护检测
 	MC_Protect_OverVoltage_Process(MC_RunInfo.BusVoltage, MC_MotorParam.Rate_Voltage, &MC_ErrorCode);
 
@@ -411,4 +413,7 @@ void MC_Protect_Check_Process(void)
 	//电压波动异常保护检测
 	MC_Protect_VoltageChange_Process(MC_RunInfo.BusVoltage, MC_RunInfo.BusCurrent, &MC_ErrorCode);
 	
+	//软件过流保护检测
+	MC_OverCurrent_SoftProtect_Process(MC_RunInfo.BusCurrent, MC_ConfigParam1.CurrentLimit * 1000, &MC_ErrorCode);
+	
 }

User/Src/pwm_driver.c

@@ -44,8 +44,6 @@ void	Enable_Pwm_Output(void)
 	HAL_TIMEx_PWMN_Start(&PWM_TIMER,TIM_CHANNEL_4);
 	
 	Pwm_Timer_Start();
-	HAL_NVIC_SetPriority(TIM1_BRK_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ(TIM1_BRK_IRQn);
 }
 
 /**

User/Src/remain_distance.c

@@ -545,3 +545,4 @@ uint8_t Battery_SocCal(uint16_t Voltage_mV)
 		return Result;
 	}
 }
+

User/Src/tim.c

@@ -183,10 +183,6 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base)
     HAL_NVIC_SetPriority(TIM1_UP_IRQn, 1, 1);
     HAL_NVIC_EnableIRQ(TIM1_UP_IRQn);
 		
-		HAL_NVIC_SetPriority(TIM1_BRK_IRQn, 0, 0);
-    HAL_NVIC_EnableIRQ(TIM1_BRK_IRQn);
-		
-		__HAL_TIM_ENABLE_IT(&htim1, TIM_IT_BREAK);
   /* USER CODE BEGIN TIM1_MspInit 1 */
 
   /* USER CODE END TIM1_MspInit 1 */
@@ -463,11 +459,6 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
 	
 }
 
-void HAL_TIMEx_BreakCallback(TIM_HandleTypeDef *htim)
-{
-
-	__HAL_TIM_CLEAR_IT(htim, TIM_IT_BREAK);
-}
 /* USER CODE END 1 */
 
 /**

修改说明.txt

@@ -395,5 +395,9 @@ V2.1.6_20210616_1 TC011052-MCK201001-V1r1
 1、里程统计增加过滤，避免干扰信号导致里程统计不准；
 2、针对开机后母线电压采集上升缓慢，优化SOC初始值的计算方法。
 
+V2.1.6_20210616_2 TC011052-MCK201001-V1r1
+1、修改I2C的驱动方式，解决频繁封波时电机异常的问题；
+2、增加清除历史记录的指令
+