Forráskód Böngészése

V1r0r5_20191109
1、增加Error_Handle的处理,发送错误报告。

dail.zhou 5 éve
szülő
commit
a0ec4427e2

+ 0 - 1
Core/Src/can.c

@@ -79,7 +79,6 @@ void MX_CAN_Init(void)
   {
     _Error_Handler(__FILE__, __LINE__);
   }
-
 }
 
 void HAL_CAN_MspInit(CAN_HandleTypeDef* canHandle)

+ 10 - 0
Core/Src/main.c

@@ -406,6 +406,16 @@ void _Error_Handler(char *file, int line)
     MC_MotorStop(&MC_StarFlag);
 		Power12V_Driver_Process(RESET);
 		Disable_PwmGpio_Out();
+		
+		//Debug£¬Êä³öµ±Ç°´íÎóÐÅÏ¢
+		#if 1
+		uint8_t PrintData[32] = {0,};
+		memcpy((uint8_t*)PrintData, file, strlen(file));
+		memcpy((uint8_t*)(PrintData + strlen(file)), (uint8_t*)" , ", 3);
+		memcpy((uint8_t*)(PrintData + strlen(file) + 3), &line, sizeof(line));
+		SendData(ID_MC_BC, MODE_REPORT , 0xFF20, PrintData);		
+		HAL_Delay(200);
+		#endif
   }
   /* USER CODE END Error_Handler_Debug */
 }

BIN
MDK-ARM/bin/QD007A_CTL_APP.bin


+ 1 - 1
User/Src/fault_check.c

@@ -802,7 +802,7 @@ void MC_Fault_Check_Process(void)
 	}
 
 	//力矩传感器故障检测
-//	MC_Fault_TorqueSensor_Process(ADC1_Result[ADC1_RANK_TORQUE_SENSOR], MC_ControlCode.GearSt, MC_CadenceResult, &MC_ErrorCode);
+	MC_Fault_TorqueSensor_Process(ADC1_Result[ADC1_RANK_TORQUE_SENSOR], MC_ControlCode.GearSt, MC_CadenceResult, &MC_ErrorCode);
 	
 	//相线故障检测
 	MC_Fault_PhaseLine_Process(MC_CalParam.Foc_Flag, MC_RunInfo.BusCurrent, MC_RunInfo.MotorSpeed, ADC_3ShuntCurrent_RMSValue, &MC_ErrorCode);

+ 1 - 1
User/Src/motor_control.c

@@ -560,7 +560,7 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(uint16_t SenorData, MC_Gear
 	#if 1
 	
 	//²È̤Á¦¾ØÊäÈë
-  MC_TorqueProcess_Param.TorqueApp = 1000;//SenorData;
+  MC_TorqueProcess_Param.TorqueApp = SenorData;
 	
 	#elif 1
 	

+ 1 - 1
User/Src/var.c

@@ -447,7 +447,7 @@ void Var_Init(void)
 		
 	//MC版本信息初始化,Mode和SN从EEPROM读取
   strncpy(MC_VerInfo.HW_Version, (char*)"V0r5r0_20190610.", 16);//QD007E,增加修改同步IO和同步时钟的跳线,QD004D第二版设计可以引用
-	strncpy(MC_VerInfo.FW_Version, (char*)"V1r0r5_20191108.", 16);
+	strncpy(MC_VerInfo.FW_Version, (char*)"V1r0r5_20191109.", 16);
 	
 	//MC校验信息初始化,校验码从EEPROM读取
 	uint32_t ID_Temp;