Merge branch 'city_riding_TC013054-MB2001_莱祥' of http://192.168.1.74/MotorController/QD007E_CTRL_APP into city_riding_TC013054-MB2001_莱祥

# Conflicts:
#	MDK-ARM/QD007A_CTL_APP/QD007A_CTL_APP_CRC.hex
#	MDK-ARM/bin/MC_VS65X3&VS75X3-TC013054-MB2001HK-V2.1.5.1.1_20210701.bin
#	MDK-ARM/bin/QD007A_CTL_APP.bin

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/tim.c

@@ -182,11 +182,6 @@ 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);
-		
-		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 */