dail.zhou 6 жил өмнө
parent
commit
497406eac1

BIN
MDK-ARM/bin/QD007A_CTL_APP.bin


BIN
MDK-ARM/bin/QD007A_CTL_APP_CRC.bin


+ 9 - 9
User/Src/fault_check.c

@@ -636,29 +636,29 @@ void MC_Fault_Check_Process(void)
 	}
 
 	//力矩传感器故障检测
-	MC_Fault_TorqueSensor_Process(ADC1_Result[ADC1_RANK_TORQUE_SENSOR], MC_ControlCode.GearSt, MC_CadenceResult.Cadence_Data, &MC_ErrorCode);
+//	MC_Fault_TorqueSensor_Process(ADC1_Result[ADC1_RANK_TORQUE_SENSOR], MC_ControlCode.GearSt, MC_CadenceResult.Cadence_Data, &MC_ErrorCode);
 
 	//相线故障检测
-	MC_Fault_PhaseLine_Process(MC_CalParam.Foc_Flag, MC_RunInfo.BusCurrent, ADC_3ShuntCurrent, &MC_ErrorCode);
+//	MC_Fault_PhaseLine_Process(MC_CalParam.Foc_Flag, MC_RunInfo.BusCurrent, ADC_3ShuntCurrent, &MC_ErrorCode);
 
 	//温度传感器故障检测
-	MC_Fault_NTCSensor_Process(MC_RunInfo.T_PCB, MC_RunInfo.T_Roil, &MC_ErrorCode);
+//	MC_Fault_NTCSensor_Process(MC_RunInfo.T_PCB, MC_RunInfo.T_Roil, &MC_ErrorCode);
 
 	//踏频传感器故障检测
-	MC_Fault_CadenceSensor_Process(ADC_SensorData.TorqueSensor, MC_RunInfo.BikeSpeed, &MC_ErrorCode);
+//	MC_Fault_CadenceSensor_Process(ADC_SensorData.TorqueSensor, MC_RunInfo.BikeSpeed, &MC_ErrorCode);
 
 	//指拨故障检测
-	MC_Fault_GasSensor_Process(ADC1_Result[ADC1_RANK_GAS], &MC_ErrorCode);
+//	MC_Fault_GasSensor_Process(ADC1_Result[ADC1_RANK_GAS], &MC_ErrorCode);
 
 	//MOS故障检测
-	MC_Fault_MOS_Process(ADC_3ShuntCurrent, &MC_ErrorCode);
+//	MC_Fault_MOS_Process(ADC_3ShuntCurrent, &MC_ErrorCode);
 
   //TE故障检测
-	MC_Fault_TE_Process(&MC_TE_SensorStatus, IsComOK_TE, &MC_ErrorCode);
+//	MC_Fault_TE_Process(&MC_TE_SensorStatus, IsComOK_TE, &MC_ErrorCode);
 	
 	//电路故障检测
-	MC_Fault_Circuit_Process(&MC_ErrorCode);
+//	MC_Fault_Circuit_Process(&MC_ErrorCode);
 	
 	//PBU通信状态检测
-	MC_Fault_CanRx_Process(&MC_ErrorCode);
+//	MC_Fault_CanRx_Process(&MC_ErrorCode);
 }

+ 12 - 9
User/Src/tasks.c

@@ -374,15 +374,18 @@ void PowerOff_Process(void)
 //CAN设备通信状态检测处理
 void MC_CanRxCheck_Process(MC_GearSt_Struct_t* GearSt)
 {
-  //PBU通信状态检测
-	if(IsComOK_PBU.IsOK_Flag == TRUE)
+  if(MC_WorkMode == MC_WorkMode_Run)
 	{
-		if((HAL_GetTick() - IsComOK_PBU.OK_TrigTime) > 1000)
-	  {  
-	    IsComOK_PBU.IsOK_Flag = FALSE;
-			*GearSt = MC_GearSt_OFF;
-			Update_MC_ControlCode_Back();
-	  }
-	}	
+		//PBU通信状态检测
+		if(IsComOK_PBU.IsOK_Flag == TRUE)
+		{
+			if((HAL_GetTick() - IsComOK_PBU.OK_TrigTime) > 1000)
+			{  
+				IsComOK_PBU.IsOK_Flag = FALSE;
+				*GearSt = MC_GearSt_OFF;
+				Update_MC_ControlCode_Back();
+			}
+		}	
+	}
 }
 /**************************全局函数定义结束*****************/

+ 1 - 1
User/Src/var.c

@@ -192,7 +192,7 @@ void Var_Init(void)
 		
 	//MC版本信息初始化,Mode和SN从EEPROM读取
   strcpy(MC_VerInfo.HW_Version, (char*)"V1r0r1_20190307.");
-	strcpy(MC_VerInfo.FW_Version, (char*)"V1r1r0_20190324.");
+	strcpy(MC_VerInfo.FW_Version, (char*)"V0r1r0_20190429.");
 	
 	//MC校验信息初始化,校验码从EEPROM读取
 	MC_CheckInfo.MAC_ID[0] = *(__IO uint32_t*)(0x1FFFF7E8);