Merge branch 'master' of http://192.168.1.74/MotorController/QD007E_CTRL_APP

# Conflicts:
#	MDK-ARM/JLinkLog.txt
#	MDK-ARM/bin/QD007A_CTL_APP.bin
#	MDK-ARM/bin/QD007A_CTL_APP_CRC.bin
#	MDK-ARM/startup_stm32f103xb.lst

Core/Src/main.c

@@ -123,9 +123,7 @@ int main(void)
   MX_TIM2_Init();
 	MX_TIM3_Init();
   MX_DMA_Init();
-	#if DEBUG
-  MX_IWDG_Init();
-	#endif
+	
   MX_ADC1_Init();
   MX_ADC2_Init();
   MX_CAN_Init();
@@ -146,6 +144,10 @@ int main(void)
 	//´«¸ÐÆ÷³õʼ»¯
 	MC_SensorInit();
 	
+	#if DEBUG
+  MX_IWDG_Init();
+	#endif
+	
 	//EEPROM_24C02³õʼ»¯
 	EEPROM_24C02_Init(&I2C_Handle_EEPROM);
 	

User/Src/fault_check.c

@@ -487,16 +487,16 @@ void MC_Fault_TE_Process(MC_TE_SensorStatus_Struct_t* p_MC_TE_SensorStatus, True
 		}
 	}
 	
-	//TE时钟判断
-	if(  (MC_TE_SyncClockFreqScan < (p_MC_TE_SensorStatus->SyncClockFreq - 200))
-		 ||(MC_TE_SyncClockFreqScan > (p_MC_TE_SensorStatus->SyncClockFreq + 200)))
-	{
-	  TE_SyncClockFault_Flag = SET;
-	}
-	else
-	{
-	  TE_SyncClockFault_Flag = RESET;
-	}
+//	//TE时钟判断
+//	if(  (MC_TE_SyncClockFreqScan < (p_MC_TE_SensorStatus->SyncClockFreq - 200))
+//		 ||(MC_TE_SyncClockFreqScan > (p_MC_TE_SensorStatus->SyncClockFreq + 200)))
+//	{
+//	  TE_SyncClockFault_Flag = SET;
+//	}
+//	else
+//	{
+//	  TE_SyncClockFault_Flag = RESET;
+//	}
 	
 	//故障码输出
 	if((SensorCheckFault_Falg == RESET) && (TE_ComFault_Flag == RESET) && (TE_SyncClockFault_Flag == RESET))