|
|
@@ -84,7 +84,7 @@ TIM_HandleTypeDef htim14;
|
|
|
UART_HandleTypeDef huart1;
|
|
|
UART_HandleTypeDef huart3;
|
|
|
|
|
|
-HCD_HandleTypeDef hhcd_USB_OTG_FS;
|
|
|
+PCD_HandleTypeDef hpcd_USB_OTG_FS;
|
|
|
|
|
|
/* USER CODE BEGIN PV */
|
|
|
/* Private variables ---------------------------------------------------------*/
|
|
|
@@ -108,7 +108,7 @@ static void MX_SDIO_SD_Init(void);
|
|
|
static void MX_TIM2_Init(void);
|
|
|
static void MX_SPI2_Init(void);
|
|
|
static void MX_TIM4_Init(void);
|
|
|
-static void MX_USB_OTG_FS_HCD_Init(void);
|
|
|
+static void MX_USB_OTG_FS_PCD_Init(void);
|
|
|
/* USER CODE BEGIN PFP */
|
|
|
/* Private function prototypes -----------------------------------------------*/
|
|
|
|
|
|
@@ -128,6 +128,7 @@ int main(void)
|
|
|
/* USER CODE BEGIN 1 */
|
|
|
|
|
|
/* USER CODE END 1 */
|
|
|
+
|
|
|
|
|
|
/* MCU Configuration--------------------------------------------------------*/
|
|
|
|
|
|
@@ -161,7 +162,7 @@ int main(void)
|
|
|
MX_TIM2_Init();
|
|
|
MX_SPI2_Init();
|
|
|
MX_TIM4_Init();
|
|
|
- MX_USB_OTG_FS_HCD_Init();
|
|
|
+ MX_USB_OTG_FS_PCD_Init();
|
|
|
/* USER CODE BEGIN 2 */
|
|
|
|
|
|
/* USER CODE END 2 */
|
|
|
@@ -189,11 +190,11 @@ void SystemClock_Config(void)
|
|
|
RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
|
|
|
RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
|
|
|
|
|
|
- /**Configure the main internal regulator output voltage
|
|
|
+ /** Configure the main internal regulator output voltage
|
|
|
*/
|
|
|
__HAL_RCC_PWR_CLK_ENABLE();
|
|
|
__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
|
|
|
- /**Initializes the CPU, AHB and APB busses clocks
|
|
|
+ /** Initializes the CPU, AHB and APB busses clocks
|
|
|
*/
|
|
|
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI|RCC_OSCILLATORTYPE_HSE
|
|
|
|RCC_OSCILLATORTYPE_LSE;
|
|
|
@@ -210,7 +211,7 @@ void SystemClock_Config(void)
|
|
|
{
|
|
|
Error_Handler();
|
|
|
}
|
|
|
- /**Initializes the CPU, AHB and APB busses clocks
|
|
|
+ /** Initializes the CPU, AHB and APB busses clocks
|
|
|
*/
|
|
|
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
|
|
|
|RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
|
|
|
@@ -248,7 +249,7 @@ static void MX_ADC1_Init(void)
|
|
|
/* USER CODE BEGIN ADC1_Init 1 */
|
|
|
|
|
|
/* USER CODE END ADC1_Init 1 */
|
|
|
- /**Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
|
|
|
+ /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
|
|
|
*/
|
|
|
hadc1.Instance = ADC1;
|
|
|
hadc1.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4;
|
|
|
@@ -266,7 +267,7 @@ static void MX_ADC1_Init(void)
|
|
|
{
|
|
|
Error_Handler();
|
|
|
}
|
|
|
- /**Configure for the selected ADC regular channel its corresponding rank in the sequencer and its sample time.
|
|
|
+ /** Configure for the selected ADC regular channel its corresponding rank in the sequencer and its sample time.
|
|
|
*/
|
|
|
sConfig.Channel = ADC_CHANNEL_5;
|
|
|
sConfig.Rank = 1;
|
|
|
@@ -293,21 +294,18 @@ static void MX_ETH_Init(void)
|
|
|
|
|
|
/* USER CODE END ETH_Init 0 */
|
|
|
|
|
|
- uint8_t MACAddr[6] ;
|
|
|
-
|
|
|
/* USER CODE BEGIN ETH_Init 1 */
|
|
|
|
|
|
/* USER CODE END ETH_Init 1 */
|
|
|
heth.Instance = ETH;
|
|
|
heth.Init.AutoNegotiation = ETH_AUTONEGOTIATION_ENABLE;
|
|
|
heth.Init.PhyAddress = LAN8742A_PHY_ADDRESS;
|
|
|
- MACAddr[0] = 0x00;
|
|
|
- MACAddr[1] = 0x80;
|
|
|
- MACAddr[2] = 0xE1;
|
|
|
- MACAddr[3] = 0x00;
|
|
|
- MACAddr[4] = 0x00;
|
|
|
- MACAddr[5] = 0x00;
|
|
|
- heth.Init.MACAddr = &MACAddr[0];
|
|
|
+ heth.Init.MACAddr[0] = 0x00;
|
|
|
+ heth.Init.MACAddr[1] = 0x80;
|
|
|
+ heth.Init.MACAddr[2] = 0xE1;
|
|
|
+ heth.Init.MACAddr[3] = 0x00;
|
|
|
+ heth.Init.MACAddr[4] = 0x00;
|
|
|
+ heth.Init.MACAddr[5] = 0x00;
|
|
|
heth.Init.RxMode = ETH_RXPOLLING_MODE;
|
|
|
heth.Init.ChecksumMode = ETH_CHECKSUM_BY_HARDWARE;
|
|
|
heth.Init.MediaInterface = ETH_MEDIA_INTERFACE_RMII;
|
|
|
@@ -369,7 +367,7 @@ static void MX_RTC_Init(void)
|
|
|
/* USER CODE BEGIN RTC_Init 1 */
|
|
|
|
|
|
/* USER CODE END RTC_Init 1 */
|
|
|
- /**Initialize RTC Only
|
|
|
+ /** Initialize RTC Only
|
|
|
*/
|
|
|
hrtc.Instance = RTC;
|
|
|
hrtc.Init.HourFormat = RTC_HOURFORMAT_24;
|
|
|
@@ -524,6 +522,7 @@ static void MX_TIM2_Init(void)
|
|
|
htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
|
|
|
htim2.Init.Period = 0;
|
|
|
htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
|
|
|
+ htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
|
|
|
if (HAL_TIM_Base_Init(&htim2) != HAL_OK)
|
|
|
{
|
|
|
Error_Handler();
|
|
|
@@ -581,6 +580,7 @@ static void MX_TIM4_Init(void)
|
|
|
htim4.Init.CounterMode = TIM_COUNTERMODE_UP;
|
|
|
htim4.Init.Period = 0;
|
|
|
htim4.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
|
|
|
+ htim4.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
|
|
|
sConfig.EncoderMode = TIM_ENCODERMODE_TI1;
|
|
|
sConfig.IC1Polarity = TIM_ICPOLARITY_RISING;
|
|
|
sConfig.IC1Selection = TIM_ICSELECTION_DIRECTTI;
|
|
|
@@ -626,6 +626,7 @@ static void MX_TIM11_Init(void)
|
|
|
htim11.Init.CounterMode = TIM_COUNTERMODE_UP;
|
|
|
htim11.Init.Period = 0;
|
|
|
htim11.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
|
|
|
+ htim11.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
|
|
|
if (HAL_TIM_Base_Init(&htim11) != HAL_OK)
|
|
|
{
|
|
|
Error_Handler();
|
|
|
@@ -656,6 +657,7 @@ static void MX_TIM13_Init(void)
|
|
|
htim13.Init.CounterMode = TIM_COUNTERMODE_UP;
|
|
|
htim13.Init.Period = 0;
|
|
|
htim13.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
|
|
|
+ htim13.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
|
|
|
if (HAL_TIM_Base_Init(&htim13) != HAL_OK)
|
|
|
{
|
|
|
Error_Handler();
|
|
|
@@ -686,6 +688,7 @@ static void MX_TIM14_Init(void)
|
|
|
htim14.Init.CounterMode = TIM_COUNTERMODE_UP;
|
|
|
htim14.Init.Period = 0;
|
|
|
htim14.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
|
|
|
+ htim14.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
|
|
|
if (HAL_TIM_Base_Init(&htim14) != HAL_OK)
|
|
|
{
|
|
|
Error_Handler();
|
|
|
@@ -767,7 +770,7 @@ static void MX_USART3_UART_Init(void)
|
|
|
* @param None
|
|
|
* @retval None
|
|
|
*/
|
|
|
-static void MX_USB_OTG_FS_HCD_Init(void)
|
|
|
+static void MX_USB_OTG_FS_PCD_Init(void)
|
|
|
{
|
|
|
|
|
|
/* USER CODE BEGIN USB_OTG_FS_Init 0 */
|
|
|
@@ -777,13 +780,17 @@ static void MX_USB_OTG_FS_HCD_Init(void)
|
|
|
/* USER CODE BEGIN USB_OTG_FS_Init 1 */
|
|
|
|
|
|
/* USER CODE END USB_OTG_FS_Init 1 */
|
|
|
- hhcd_USB_OTG_FS.Instance = USB_OTG_FS;
|
|
|
- hhcd_USB_OTG_FS.Init.Host_channels = 8;
|
|
|
- hhcd_USB_OTG_FS.Init.speed = HCD_SPEED_FULL;
|
|
|
- hhcd_USB_OTG_FS.Init.dma_enable = DISABLE;
|
|
|
- hhcd_USB_OTG_FS.Init.phy_itface = HCD_PHY_EMBEDDED;
|
|
|
- hhcd_USB_OTG_FS.Init.Sof_enable = DISABLE;
|
|
|
- if (HAL_HCD_Init(&hhcd_USB_OTG_FS) != HAL_OK)
|
|
|
+ hpcd_USB_OTG_FS.Instance = USB_OTG_FS;
|
|
|
+ hpcd_USB_OTG_FS.Init.dev_endpoints = 4;
|
|
|
+ hpcd_USB_OTG_FS.Init.speed = PCD_SPEED_FULL;
|
|
|
+ hpcd_USB_OTG_FS.Init.dma_enable = DISABLE;
|
|
|
+ hpcd_USB_OTG_FS.Init.phy_itface = PCD_PHY_EMBEDDED;
|
|
|
+ hpcd_USB_OTG_FS.Init.Sof_enable = DISABLE;
|
|
|
+ hpcd_USB_OTG_FS.Init.low_power_enable = DISABLE;
|
|
|
+ hpcd_USB_OTG_FS.Init.lpm_enable = DISABLE;
|
|
|
+ hpcd_USB_OTG_FS.Init.vbus_sensing_enable = DISABLE;
|
|
|
+ hpcd_USB_OTG_FS.Init.use_dedicated_ep1 = DISABLE;
|
|
|
+ if (HAL_PCD_Init(&hpcd_USB_OTG_FS) != HAL_OK)
|
|
|
{
|
|
|
Error_Handler();
|
|
|
}
|
liuxinaliang