diff --git a/stm32-stepper-root/stepper_h7/CM7/Core/Inc/main.h b/stm32-stepper-root/stepper_h7/CM7/Core/Inc/main.h index 6f965f0..1c009c6 100644 --- a/stm32-stepper-root/stepper_h7/CM7/Core/Inc/main.h +++ b/stm32-stepper-root/stepper_h7/CM7/Core/Inc/main.h @@ -105,15 +105,15 @@ void Error_Handler(void); #define LED_YELLOW_GPIO_Port GPIOE /* USER CODE BEGIN Private defines */ - -/* USER CODE END Private defines */ - +extern TIM_HandleTypeDef htim1; extern TIM_HandleTypeDef htim2; +extern TIM_HandleTypeDef htim4; extern SPI_HandleTypeDef hspi1; void green_led(); void red_led(); void blink_yellow_led(); +/* USER CODE END Private defines */ #ifdef __cplusplus } diff --git a/stm32-stepper-root/stepper_h7/CM7/Core/Src/Stepper/stepper.c b/stm32-stepper-root/stepper_h7/CM7/Core/Src/Stepper/stepper.c index 0154e8a..80cebf7 100644 --- a/stm32-stepper-root/stepper_h7/CM7/Core/Src/Stepper/stepper.c +++ b/stm32-stepper-root/stepper_h7/CM7/Core/Src/Stepper/stepper.c @@ -1,8 +1,17 @@ #include "Stepper/stepper.h" #include "LibL6474.h" #include "main.h" +#include "semphr.h" +// TIM4 (Pulse an PD15) laeuft mit 200 MHz / 128, TIM1 zaehlt die Pulse (16 Bit) +#define STEP_TICK_HZ 1562500u +#define STEP_CHUNK 60000u +#define STEP_HZ_MOVE 4000u // 300 mm/min bei 800 Schritten/mm +#define STEP_HZ_REFERENCE 500u // 37,5 mm/min bei 800 Schritten/mm +static SemaphoreHandle_t stepDone; +static volatile unsigned int stepsLeft = 0; +static unsigned int stepHz = STEP_HZ_MOVE; /* * States: @@ -47,7 +56,45 @@ void StepLibraryDelay(unsigned int ms){ vTaskDelay(pdMS_TO_TICKS(ms)); } -// 1) Funktion schreiben (oben in stepper.c, vor init_stepper) +// Pulsfrequenz einstellen, nur aufrufen wenn gerade keine Pulse laufen +static void StepTimerSetSpeed(unsigned int hz){ + uint32_t arr = (STEP_TICK_HZ / hz) - 1; + + stepHz = hz; + TIM4->ARR = arr; + TIM4->CCR4 = (arr + 1) / 2; // 50 % Duty + TIM4->EGR = TIM_EGR_UG; // Werte uebernehmen, Zaehler auf 0 +} + +// TIM1 auf die naechsten n Pulse stellen und starten, das oeffnet das Gate von TIM4 +static void StepTimerStartChunk(void){ + unsigned int n = (stepsLeft > STEP_CHUNK) ? STEP_CHUNK : stepsLeft; + + stepsLeft -= n; + TIM1->CNT = 0; + TIM1->CCR1 = n; + TIM1->SR = ~TIM_SR_CC1IF; + TIM1->CR1 |= TIM_CR1_CEN; +} + +// Wird ueber TIM1_CC_IRQHandler aufgerufen, sobald TIM1 n Pulse gezaehlt hat +void HAL_TIM_OC_DelayElapsedCallback(TIM_HandleTypeDef *htim){ + if(htim->Instance != TIM1){ + return; + } + + TIM1->CR1 &= ~TIM_CR1_CEN; // Gate zu + + if(stepsLeft > 0){ + StepTimerStartChunk(); + return; + } + + BaseType_t woken = pdFALSE; + xSemaphoreGiveFromISR(stepDone, &woken); + portYIELD_FROM_ISR(woken); +} + static int StepLibraryStep( void* pPWM, int dir, unsigned int numPulses ){ (void)pPWM; @@ -57,11 +104,18 @@ static int StepLibraryStep( void* pPWM, int dir, unsigned int numPulses ){ HAL_GPIO_WritePin(STEP_DIR_GPIO_Port, STEP_DIR_Pin, GPIO_PIN_RESET); } - for(unsigned int i = 0; i < numPulses; i++){ - HAL_GPIO_WritePin(STEP_PULSE_GPIO_Port, STEP_PULSE_Pin, GPIO_PIN_SET); - vTaskDelay(pdMS_TO_TICKS(1)); - HAL_GPIO_WritePin(STEP_PULSE_GPIO_Port, STEP_PULSE_Pin, GPIO_PIN_RESET); - vTaskDelay(pdMS_TO_TICKS(1)); + (void)xSemaphoreTake(stepDone, 0); // altes Signal verwerfen + + stepsLeft = numPulses; + StepTimerStartChunk(); + + // Erwartete Fahrzeit plus 1 s Reserve + uint32_t timeoutMs = (uint32_t)(((uint64_t)numPulses * 1000u) / stepHz) + 1000u; + + if(xSemaphoreTake(stepDone, pdMS_TO_TICKS(timeoutMs)) != pdTRUE){ + TIM1->CR1 &= ~TIM_CR1_CEN; + stepsLeft = 0; + return 1; } return 0; } @@ -76,8 +130,11 @@ L6474_Handle_t init_stepper(void* pIO, void* pGPO, void* pPWM){ (void)pGPO; (void)pPWM; - - + stepDone = xSemaphoreCreateBinary(); + StepTimerSetSpeed(STEP_HZ_MOVE); + TIM1->SR = ~TIM_SR_CC1IF; // sonst feuert der Interrupt sofort beim Freischalten + __HAL_TIM_ENABLE_IT(&htim1, TIM_IT_CC1); + HAL_TIM_PWM_Start(&htim4, TIM_CHANNEL_4); // laeuft erst bei offenem Gate static L6474x_Platform_t p; p.malloc = StepLibraryMalloc; @@ -257,7 +314,11 @@ int StepperConsoleFunction( int argc, char** argv, void* ctx ) return -1; } - if(stepper_reference(h, 0)){ + StepTimerSetSpeed(STEP_HZ_REFERENCE); + int refResult = stepper_reference(h, 0); + StepTimerSetSpeed(STEP_HZ_MOVE); + + if(refResult){ state = 0; printf("FAIL\r\n"); return -1; diff --git a/stm32-stepper-root/stepper_h7/CM7/Core/Src/main.c b/stm32-stepper-root/stepper_h7/CM7/Core/Src/main.c index 59b760a..39bd802 100644 --- a/stm32-stepper-root/stepper_h7/CM7/Core/Src/main.c +++ b/stm32-stepper-root/stepper_h7/CM7/Core/Src/main.c @@ -59,7 +59,9 @@ SPI_HandleTypeDef hspi1; +TIM_HandleTypeDef htim1; TIM_HandleTypeDef htim2; +TIM_HandleTypeDef htim4; UART_HandleTypeDef huart3; @@ -75,6 +77,8 @@ static void MX_GPIO_Init(void); static void MX_SPI1_Init(void); static void MX_TIM2_Init(void); static void MX_USART3_UART_Init(void); +static void MX_TIM1_Init(void); +static void MX_TIM4_Init(void); /* USER CODE BEGIN PFP */ extern void initialise_stdlib_abstraction( void ); @@ -299,6 +303,8 @@ int main(void) MX_SPI1_Init(); MX_TIM2_Init(); MX_USART3_UART_Init(); + MX_TIM1_Init(); + MX_TIM4_Init(); /* USER CODE BEGIN 2 */ // cretae a free rtos queue to buffer console characters received from debug uart @@ -520,6 +526,140 @@ static void MX_TIM2_Init(void) } +/** + * @brief TIM1 Initialization Function + * @param None + * @retval None + */ +static void MX_TIM1_Init(void) +{ + + /* USER CODE BEGIN TIM1_Init 0 */ + + /* USER CODE END TIM1_Init 0 */ + + TIM_SlaveConfigTypeDef sSlaveConfig = {0}; + TIM_MasterConfigTypeDef sMasterConfig = {0}; + TIM_OC_InitTypeDef sConfigOC = {0}; + + /* USER CODE BEGIN TIM1_Init 1 */ + + /* USER CODE END TIM1_Init 1 */ + htim1.Instance = TIM1; + htim1.Init.Prescaler = 0; + htim1.Init.CounterMode = TIM_COUNTERMODE_UP; + htim1.Init.Period = 65535; + htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; + htim1.Init.RepetitionCounter = 0; + htim1.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE; + if (HAL_TIM_Base_Init(&htim1) != HAL_OK) + { + Error_Handler(); + } + if (HAL_TIM_OC_Init(&htim1) != HAL_OK) + { + Error_Handler(); + } + if (HAL_TIM_OnePulse_Init(&htim1, TIM_OPMODE_SINGLE) != HAL_OK) + { + Error_Handler(); + } + sSlaveConfig.SlaveMode = TIM_SLAVEMODE_EXTERNAL1; + sSlaveConfig.InputTrigger = TIM_TS_ITR3; + if (HAL_TIM_SlaveConfigSynchro(&htim1, &sSlaveConfig) != HAL_OK) + { + Error_Handler(); + } + sMasterConfig.MasterOutputTrigger = TIM_TRGO_ENABLE; + sMasterConfig.MasterOutputTrigger2 = TIM_TRGO2_ENABLE; + sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE; + if (HAL_TIMEx_MasterConfigSynchronization(&htim1, &sMasterConfig) != HAL_OK) + { + Error_Handler(); + } + sConfigOC.OCMode = TIM_OCMODE_TIMING; + sConfigOC.Pulse = 0; + sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH; + sConfigOC.OCNPolarity = TIM_OCNPOLARITY_HIGH; + sConfigOC.OCFastMode = TIM_OCFAST_DISABLE; + sConfigOC.OCIdleState = TIM_OCIDLESTATE_RESET; + sConfigOC.OCNIdleState = TIM_OCNIDLESTATE_RESET; + if (HAL_TIM_OC_ConfigChannel(&htim1, &sConfigOC, TIM_CHANNEL_1) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN TIM1_Init 2 */ + + /* USER CODE END TIM1_Init 2 */ + +} + +/** + * @brief TIM4 Initialization Function + * @param None + * @retval None + */ +static void MX_TIM4_Init(void) +{ + + /* USER CODE BEGIN TIM4_Init 0 */ + + /* USER CODE END TIM4_Init 0 */ + + TIM_ClockConfigTypeDef sClockSourceConfig = {0}; + TIM_SlaveConfigTypeDef sSlaveConfig = {0}; + TIM_MasterConfigTypeDef sMasterConfig = {0}; + TIM_OC_InitTypeDef sConfigOC = {0}; + + /* USER CODE BEGIN TIM4_Init 1 */ + + /* USER CODE END TIM4_Init 1 */ + htim4.Instance = TIM4; + htim4.Init.Prescaler = 127; + htim4.Init.CounterMode = TIM_COUNTERMODE_UP; + htim4.Init.Period = 5624; + htim4.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; + htim4.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE; + if (HAL_TIM_Base_Init(&htim4) != HAL_OK) + { + Error_Handler(); + } + sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL; + if (HAL_TIM_ConfigClockSource(&htim4, &sClockSourceConfig) != HAL_OK) + { + Error_Handler(); + } + if (HAL_TIM_PWM_Init(&htim4) != HAL_OK) + { + Error_Handler(); + } + sSlaveConfig.SlaveMode = TIM_SLAVEMODE_GATED; + sSlaveConfig.InputTrigger = TIM_TS_ITR0; + if (HAL_TIM_SlaveConfigSynchro(&htim4, &sSlaveConfig) != HAL_OK) + { + Error_Handler(); + } + sMasterConfig.MasterOutputTrigger = TIM_TRGO_UPDATE; + sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE; + if (HAL_TIMEx_MasterConfigSynchronization(&htim4, &sMasterConfig) != HAL_OK) + { + Error_Handler(); + } + sConfigOC.OCMode = TIM_OCMODE_PWM2; + sConfigOC.Pulse = 2812; + sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH; + sConfigOC.OCFastMode = TIM_OCFAST_DISABLE; + if (HAL_TIM_PWM_ConfigChannel(&htim4, &sConfigOC, TIM_CHANNEL_4) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN TIM4_Init 2 */ + + /* USER CODE END TIM4_Init 2 */ + HAL_TIM_MspPostInit(&htim4); + +} + /** * @brief USART3 Initialization Function * @param None @@ -594,7 +734,7 @@ static void MX_GPIO_Init(void) HAL_GPIO_WritePin(GPIOB, LED_GREEN_Pin|LED_RED_Pin, GPIO_PIN_RESET); /*Configure GPIO pin Output Level */ - HAL_GPIO_WritePin(GPIOD, STEP_SPI_CS_Pin|STEP_PULSE_Pin, GPIO_PIN_RESET); + HAL_GPIO_WritePin(STEP_SPI_CS_GPIO_Port, STEP_SPI_CS_Pin, GPIO_PIN_RESET); /*Configure GPIO pin Output Level */ HAL_GPIO_WritePin(GPIOG, STEP_RSTN_Pin|STEP_DIR_Pin, GPIO_PIN_RESET); @@ -625,12 +765,12 @@ static void MX_GPIO_Init(void) GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); - /*Configure GPIO pins : STEP_SPI_CS_Pin STEP_PULSE_Pin */ - GPIO_InitStruct.Pin = STEP_SPI_CS_Pin|STEP_PULSE_Pin; + /*Configure GPIO pin : STEP_SPI_CS_Pin */ + GPIO_InitStruct.Pin = STEP_SPI_CS_Pin; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; - HAL_GPIO_Init(GPIOD, &GPIO_InitStruct); + HAL_GPIO_Init(STEP_SPI_CS_GPIO_Port, &GPIO_InitStruct); /*Configure GPIO pins : STEP_RSTN_Pin STEP_DIR_Pin */ GPIO_InitStruct.Pin = STEP_RSTN_Pin|STEP_DIR_Pin; diff --git a/stm32-stepper-root/stepper_h7/CM7/Core/Src/stm32h7xx_hal_msp.c b/stm32-stepper-root/stepper_h7/CM7/Core/Src/stm32h7xx_hal_msp.c index 74d98d3..d017a45 100644 --- a/stm32-stepper-root/stepper_h7/CM7/Core/Src/stm32h7xx_hal_msp.c +++ b/stm32-stepper-root/stepper_h7/CM7/Core/Src/stm32h7xx_hal_msp.c @@ -182,7 +182,23 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) */ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base) { - if(htim_base->Instance==TIM2) + if(htim_base->Instance==TIM1) + { + /* USER CODE BEGIN TIM1_MspInit 0 */ + + /* USER CODE END TIM1_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_TIM1_CLK_ENABLE(); + /* TIM1 interrupt Init */ + HAL_NVIC_SetPriority(TIM1_UP_IRQn, 5, 0); + HAL_NVIC_EnableIRQ(TIM1_UP_IRQn); + HAL_NVIC_SetPriority(TIM1_CC_IRQn, 5, 0); + HAL_NVIC_EnableIRQ(TIM1_CC_IRQn); + /* USER CODE BEGIN TIM1_MspInit 1 */ + + /* USER CODE END TIM1_MspInit 1 */ + } + else if(htim_base->Instance==TIM2) { /* USER CODE BEGIN TIM2_MspInit 0 */ @@ -192,7 +208,20 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base) /* USER CODE BEGIN TIM2_MspInit 1 */ /* USER CODE END TIM2_MspInit 1 */ + } + else if(htim_base->Instance==TIM4) + { + /* USER CODE BEGIN TIM4_MspInit 0 */ + /* USER CODE END TIM4_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_TIM4_CLK_ENABLE(); + /* TIM4 interrupt Init */ + HAL_NVIC_SetPriority(TIM4_IRQn, 5, 0); + HAL_NVIC_EnableIRQ(TIM4_IRQn); + /* USER CODE BEGIN TIM4_MspInit 1 */ + + /* USER CODE END TIM4_MspInit 1 */ } } @@ -222,6 +251,27 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim) /* USER CODE END TIM2_MspPostInit 1 */ } + else if(htim->Instance==TIM4) + { + /* USER CODE BEGIN TIM4_MspPostInit 0 */ + + /* USER CODE END TIM4_MspPostInit 0 */ + + __HAL_RCC_GPIOD_CLK_ENABLE(); + /**TIM4 GPIO Configuration + PD15 ------> TIM4_CH4 + */ + GPIO_InitStruct.Pin = STEP_PULSE_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF2_TIM4; + HAL_GPIO_Init(STEP_PULSE_GPIO_Port, &GPIO_InitStruct); + + /* USER CODE BEGIN TIM4_MspPostInit 1 */ + + /* USER CODE END TIM4_MspPostInit 1 */ + } } /** @@ -232,7 +282,22 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim) */ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) { - if(htim_base->Instance==TIM2) + if(htim_base->Instance==TIM1) + { + /* USER CODE BEGIN TIM1_MspDeInit 0 */ + + /* USER CODE END TIM1_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_TIM1_CLK_DISABLE(); + + /* TIM1 interrupt DeInit */ + HAL_NVIC_DisableIRQ(TIM1_UP_IRQn); + HAL_NVIC_DisableIRQ(TIM1_CC_IRQn); + /* USER CODE BEGIN TIM1_MspDeInit 1 */ + + /* USER CODE END TIM1_MspDeInit 1 */ + } + else if(htim_base->Instance==TIM2) { /* USER CODE BEGIN TIM2_MspDeInit 0 */ @@ -243,6 +308,20 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) /* USER CODE END TIM2_MspDeInit 1 */ } + else if(htim_base->Instance==TIM4) + { + /* USER CODE BEGIN TIM4_MspDeInit 0 */ + + /* USER CODE END TIM4_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_TIM4_CLK_DISABLE(); + + /* TIM4 interrupt DeInit */ + HAL_NVIC_DisableIRQ(TIM4_IRQn); + /* USER CODE BEGIN TIM4_MspDeInit 1 */ + + /* USER CODE END TIM4_MspDeInit 1 */ + } } diff --git a/stm32-stepper-root/stepper_h7/CM7/Core/Src/stm32h7xx_it.c b/stm32-stepper-root/stepper_h7/CM7/Core/Src/stm32h7xx_it.c index 83eab84..6397de3 100644 --- a/stm32-stepper-root/stepper_h7/CM7/Core/Src/stm32h7xx_it.c +++ b/stm32-stepper-root/stepper_h7/CM7/Core/Src/stm32h7xx_it.c @@ -55,6 +55,8 @@ /* USER CODE END 0 */ /* External variables --------------------------------------------------------*/ +extern TIM_HandleTypeDef htim1; +extern TIM_HandleTypeDef htim4; extern UART_HandleTypeDef huart3; /* USER CODE BEGIN EV */ @@ -210,6 +212,48 @@ void SysTick_Handler(void) /* please refer to the startup file (startup_stm32h7xx.s). */ /******************************************************************************/ +/** + * @brief This function handles TIM1 update interrupt. + */ +void TIM1_UP_IRQHandler(void) +{ + /* USER CODE BEGIN TIM1_UP_IRQn 0 */ + + /* USER CODE END TIM1_UP_IRQn 0 */ + HAL_TIM_IRQHandler(&htim1); + /* USER CODE BEGIN TIM1_UP_IRQn 1 */ + + /* USER CODE END TIM1_UP_IRQn 1 */ +} + +/** + * @brief This function handles TIM1 capture compare interrupt. + */ +void TIM1_CC_IRQHandler(void) +{ + /* USER CODE BEGIN TIM1_CC_IRQn 0 */ + + /* USER CODE END TIM1_CC_IRQn 0 */ + HAL_TIM_IRQHandler(&htim1); + /* USER CODE BEGIN TIM1_CC_IRQn 1 */ + + /* USER CODE END TIM1_CC_IRQn 1 */ +} + +/** + * @brief This function handles TIM4 global interrupt. + */ +void TIM4_IRQHandler(void) +{ + /* USER CODE BEGIN TIM4_IRQn 0 */ + + /* USER CODE END TIM4_IRQn 0 */ + HAL_TIM_IRQHandler(&htim4); + /* USER CODE BEGIN TIM4_IRQn 1 */ + + /* USER CODE END TIM4_IRQn 1 */ +} + /** * @brief This function handles USART3 global interrupt. */ diff --git a/stm32-stepper-root/stepper_h7/stepper_h7.ioc b/stm32-stepper-root/stepper_h7/stepper_h7.ioc index 0a6bc8d..b8c0d02 100644 --- a/stm32-stepper-root/stepper_h7/stepper_h7.ioc +++ b/stm32-stepper-root/stepper_h7/stepper_h7.ioc @@ -445,7 +445,7 @@ SPI1.VirtualType=VM_MASTER SYS.userName=SYS_M7 TIM1.Channel-Output\ Compare1\ No\ Output=TIM_CHANNEL_1 TIM1.IPParameters=Channel-Output Compare1 No Output,Period,TIM_MasterOutputTrigger,TIM_MasterOutputTrigger2 -TIM1.Period=8191 +TIM1.Period=65535 TIM1.TIM_MasterOutputTrigger=TIM_TRGO_ENABLE TIM1.TIM_MasterOutputTrigger2=TIM_TRGO2_ENABLE TIM2.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3 @@ -454,7 +454,8 @@ TIM2.IPParameters=Channel-PWM Generation3 CH3,Channel-PWM Generation4 CH4,Period TIM2.Period=9999 TIM4.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE TIM4.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4 -TIM4.IPParameters=Channel-PWM Generation4 CH4,Prescaler,Period,AutoReloadPreload,TIM_MasterOutputTrigger,Pulse-PWM Generation4 CH4 +TIM4.IPParameters=Channel-PWM Generation4 CH4,Prescaler,Period,AutoReloadPreload,TIM_MasterOutputTrigger,Pulse-PWM Generation4 CH4,OCMode_PWM-PWM Generation4 CH4 +TIM4.OCMode_PWM-PWM\ Generation4\ CH4=TIM_OCMODE_PWM2 TIM4.Period=5624 TIM4.Prescaler=127 TIM4.Pulse-PWM\ Generation4\ CH4=2812