mainscnt/mains-frequency-counter-stm32
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes, enable ethernet

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2021-02-07 12:38:29 +01:00
parent ccdbab6f01
commit b3431fafa7
9 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cube/Core/Src/tim.c
View File

@ -34,7 +34,7 @@ void MX_TIM1_Init(void)
TIM_IC_InitTypeDef sConfigIC = {0};
htim1.Instance = TIM1;
htim1.Init.Prescaler = 35;
htim1.Init.Prescaler = 13;
htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
htim1.Init.Period = 65535;
htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
@ -44,7 +44,10 @@ void MX_TIM1_Init(void)
{
Error_Handler();
}
sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_ETRMODE2;
sClockSourceConfig.ClockPolarity = TIM_CLOCKPOLARITY_NONINVERTED;
sClockSourceConfig.ClockPrescaler = TIM_CLOCKPRESCALER_DIV1;
sClockSourceConfig.ClockFilter = 0;
if (HAL_TIM_ConfigClockSource(&htim1, &sClockSourceConfig) != HAL_OK)
{
Error_Handler();
@ -85,8 +88,9 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle)
__HAL_RCC_GPIOA_CLK_ENABLE();
/**TIM1 GPIO Configuration
PA8 ------> TIM1_CH1
PA12 ------> TIM1_ETR
*/
GPIO_InitStruct.Pin = GPIO_PIN_8;
GPIO_InitStruct.Pin = MAINS_CNT_TRG_Pin|MAINS_CNT_CLK_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct.Pull = GPIO_NOPULL;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
@ -113,8 +117,9 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle)
/**TIM1 GPIO Configuration
PA8 ------> TIM1_CH1
PA12 ------> TIM1_ETR
*/
HAL_GPIO_DeInit(GPIOA, GPIO_PIN_8);
HAL_GPIO_DeInit(GPIOA, MAINS_CNT_TRG_Pin|MAINS_CNT_CLK_Pin);
/* TIM1 interrupt Deinit */
HAL_NVIC_DisableIRQ(TIM1_CC_IRQn);