Browse Source

V2.1.9_20211012 TC011000-MS0000HK-V0r0
1、增加清除历史记录的指令。

dail 3 years ago
parent
commit
2e8aa98694

File diff suppressed because it is too large
+ 2443 - 2443
MDK-ARM/QD007A_CTL_APP/QD007A_CTL_APP_CRC.hex


BIN
MDK-ARM/bin/MC_VL65XX&VS75XX(125K)-TC011000-MS0000HK-V2.1.9.0.0_20211012.bin


BIN
MDK-ARM/bin/QD007A_CTL_APP.bin


+ 10 - 0
User/Src/can_process.c

@@ -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;

+ 21 - 19
User/Src/protect_check.c

@@ -345,7 +345,7 @@ void MC_OverCurrent_SoftProtect_Process(uint16_t BusCurrent, uint16_t MaxCurrent
 
 /******************************全局函数定义******************************/
 #define OC_CLEARFLAG_DELAYTIME 15 //过流标志间隔清零延时,单位ms
-#define OC_COUNTER_TH 1000        //过流保护计数判断阈值
+#define OC_COUNTER_TH 100         //过流保护计数判断阈值
 //过流保护检测
 /*
 检测原理:
@@ -356,38 +356,39 @@ void MC_OverCurrent_SoftProtect_Process(uint16_t BusCurrent, uint16_t MaxCurrent
 
 更改处理方式20210630
 1、关闭过流告警;
-2、出现过流信号时,封闭PWM2个周期
+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延时计数
 	
+	if(*OverCurrentTrigFlag == RESET)
 	{
-		if(*OverCurrentTrigFlag == RESET)
+		//关闭PWM计数清零
+		OffPwmCnt = 0;
+		//开启PWM
+		if(StarPwmCnt == 0)
 		{
-			//关闭PWM计数清零
-			OffPwmCnt = 0;
-			//开启PWM
-			if(StarPwmCnt == 0)
-			{
-				StarPwmCnt++;
-				Enable_PwmGpio_Out();
-			}
+			StarPwmCnt++;
+			Enable_PwmGpio_Out();
+		}
+	}
+	else
+	{
+		//开启PWM计数清零
+		StarPwmCnt = 0;
+		//2个PWM周期后,过流触发标志复位
+		if(OffPwmCnt >= 1)
+		{
+			*OverCurrentTrigFlag = RESET;
 		}
 		else
 		{
-			//开启PWM计数清零
-			StarPwmCnt = 0;
 			//关闭PWM
 			Disable_PwmGpio_Out();
-			//2个PWM周期后,过流触发标志复位
-			if(OffPwmCnt >= 1)
-			{
-				*OverCurrentTrigFlag = RESET;
-			}
-			OffPwmCnt++;
 		}
+		OffPwmCnt++;
 	}
 }
 
@@ -414,4 +415,5 @@ void MC_Protect_Check_Process(void)
 	
 	//软件过流保护检测
 	MC_OverCurrent_SoftProtect_Process(MC_RunInfo.BusCurrent, MC_ConfigParam1.CurrentLimit * 1000, &MC_ErrorCode);
+	
 }

+ 1 - 1
User/Src/tasks.c

@@ -541,8 +541,8 @@ void PowerOff_Process(TrueOrFalse_Flag_Struct_t ReturnEnable)
 	//关闭助力档位,关闭车灯
 	MC_ControlCode.GearSt = MC_GearSt_OFF;
 	MC_ControlCode.LightSwitch = MC_LightSwitch_OFF;
-	LightDriver_Process(MC_ConfigParam2.MC_TailLight_Mode, IsBreakTrig_Flag, MC_ControlCode.LightSwitch);
 	Update_MC_ControlCode_Back();
+	LightDriver_Process(MC_ConfigParam2.MC_TailLight_Mode, IsBreakTrig_Flag, MC_ControlCode.LightSwitch);
 	
 	#if 1 //存储到Flash,下次开机时从Flash取出转移到EEPROM
 	if(SaveFlag == RESET)

+ 1 - 5
User/Src/tim.c

@@ -184,6 +184,7 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base)
     /* Peripheral interrupt init*/
     HAL_NVIC_SetPriority(TIM1_UP_IRQn, 1, 1);
     HAL_NVIC_EnableIRQ(TIM1_UP_IRQn);
+		
   /* USER CODE BEGIN TIM1_MspInit 1 */
 
   /* USER CODE END TIM1_MspInit 1 */
@@ -463,11 +464,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 */
 
 /**

+ 1 - 1
User/Src/var.c

@@ -490,7 +490,7 @@ void Var_Init(void)
 		
 	//MC版本信息初始化,Mode和SN从EEPROM读取
   strncpy(MC_VerInfo.HW_Version, (char*)"QD007H_HK.      ", 16);
-	strncpy(MC_VerInfo.FW_Version, (char*)"V2r1r9_20211008.", 16);
+	strncpy(MC_VerInfo.FW_Version, (char*)"V2r1r9_20211012.", 16);
 	strncpy(Firmware_Special, (char*)"TC011000-MS0000HK-V0r0.         ", 32);
 		
 	//电机型号

+ 21 - 0
修改说明.txt

@@ -425,3 +425,24 @@ V2.1.9_20211008 TC011000-MS0000HK-V0r0
 
 V2.1.9_20211008 TC011000-MS0000HK-V0r0_1
 1、修改I2C操作SDA方式,解决频繁封波导致电机异常的问题。
+
+V2.1.9_20211012 TC011000-MS0000HK-V0r0
+1、增加清除历史记录的指令。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Some files were not shown because too many files changed in this diff