2 Commits
Author SHA1 Message Date
fewikay 6a6a1589ee LEDS fix 2026-11-06 14:26:37 +01:00
fewikay fef883dca4 Test Pulse mit Timer 1 (Master) und Timer 4 (Slave) 2026-11-05 21:15:46 +01:00
6 changed files with 450 additions and 46 deletions

No files matched your search

@@ -105,15 +105,19 @@ void Error_Handler(void);
#define LED_YELLOW_GPIO_Port GPIOE #define LED_YELLOW_GPIO_Port GPIOE
/* USER CODE BEGIN Private defines */ /* USER CODE BEGIN Private defines */
extern TIM_HandleTypeDef htim1;
/* USER CODE END Private defines */
extern TIM_HandleTypeDef htim2; extern TIM_HandleTypeDef htim2;
extern TIM_HandleTypeDef htim4;
extern TIM_HandleTypeDef htim3;
extern TIM_HandleTypeDef htim12;
extern SPI_HandleTypeDef hspi1; extern SPI_HandleTypeDef hspi1;
void green_led(); void green_led();
void red_led(); void red_led();
void blink_yellow_led(); void blink_yellow_led();
void yellow_led_start();
void yellow_led_stop();
/* USER CODE END Private defines */
#ifdef __cplusplus #ifdef __cplusplus
} }
@@ -1,8 +1,19 @@
#include "Stepper/stepper.h" #include "Stepper/stepper.h"
#include "LibL6474.h" #include "LibL6474.h"
#include "main.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
#define STEP_POLL_MS 50u // Treiberstatus-Abfrage waehrend der Fahrt
static SemaphoreHandle_t stepDone;
static volatile unsigned int stepsLeft = 0;
static unsigned int stepHz = STEP_HZ_MOVE;
static L6474_Handle_t stepperHandle = NULL;
/* /*
* States: * States:
@@ -47,7 +58,63 @@ void StepLibraryDelay(unsigned int ms){
vTaskDelay(pdMS_TO_TICKS(ms)); vTaskDelay(pdMS_TO_TICKS(ms));
} }
// 1) Funktion schreiben (oben in stepper.c, vor init_stepper) // 1 wenn der Treiber nicht fahrbereit ist. L6474_GetStatus selbst meldet nur SPI-Fehler,
// die Flags muessen hier ausgewertet werden. HIGHZ bleibt nach OCD/UVLO/TH_SD stehen.
// Der Aufruf aus StepLibraryStep setzt LIBL6474_HAS_LOCKING 0 voraus.
static int StepperHasFault(L6474_Handle_t s){
L6474_Status_t status;
if(L6474_GetStatus(s, &status) != errcNONE){
return 1;
}
return status.HIGHZ || status.UVLO || status.TH_SD || status.OCD;
}
// 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;
if(stepsLeft > STEP_CHUNK){
n = STEP_CHUNK;
}else{
n = 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 ){ static int StepLibraryStep( void* pPWM, int dir, unsigned int numPulses ){
(void)pPWM; (void)pPWM;
@@ -57,11 +124,22 @@ static int StepLibraryStep( void* pPWM, int dir, unsigned int numPulses ){
HAL_GPIO_WritePin(STEP_DIR_GPIO_Port, STEP_DIR_Pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(STEP_DIR_GPIO_Port, STEP_DIR_Pin, GPIO_PIN_RESET);
} }
for(unsigned int i = 0; i < numPulses; i++){ (void)xSemaphoreTake(stepDone, 0); // altes Signal verwerfen
HAL_GPIO_WritePin(STEP_PULSE_GPIO_Port, STEP_PULSE_Pin, GPIO_PIN_SET);
vTaskDelay(pdMS_TO_TICKS(1)); stepsLeft = numPulses;
HAL_GPIO_WritePin(STEP_PULSE_GPIO_Port, STEP_PULSE_Pin, GPIO_PIN_RESET); StepTimerStartChunk();
vTaskDelay(pdMS_TO_TICKS(1));
// Erwartete Fahrzeit plus 1 s Reserve
uint32_t timeoutMs = (uint32_t)(((uint64_t)numPulses * 1000u) / stepHz) + 1000u;
TickType_t start = xTaskGetTickCount();
// Bei Fehler oder Timeout Pulse sofort stoppen
while(xSemaphoreTake(stepDone, pdMS_TO_TICKS(STEP_POLL_MS)) != pdTRUE){
if(StepperHasFault(stepperHandle) || (xTaskGetTickCount() - start) >= pdMS_TO_TICKS(timeoutMs)){
stepsLeft = 0; // zuerst, damit der Interrupt keinen neuen Chunk startet
TIM1->CR1 &= ~TIM_CR1_CEN;
return 1;
}
} }
return 0; return 0;
} }
@@ -76,8 +154,11 @@ L6474_Handle_t init_stepper(void* pIO, void* pGPO, void* pPWM){
(void)pGPO; (void)pGPO;
(void)pPWM; (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; static L6474x_Platform_t p;
p.malloc = StepLibraryMalloc; p.malloc = StepLibraryMalloc;
@@ -90,6 +171,7 @@ L6474_Handle_t init_stepper(void* pIO, void* pGPO, void* pPWM){
//p.stepAsync = StepTimerAsync; //p.stepAsync = StepTimerAsync;
//p.cancelStep = StepTimerCancelAsync; //p.cancelStep = StepTimerCancelAsync;
L6474_Handle_t s = L6474_CreateInstance(&p, pIO, pGPO, pPWM); L6474_Handle_t s = L6474_CreateInstance(&p, pIO, pGPO, pPWM);
stepperHandle = s;
return s; return s;
} }
@@ -108,17 +190,25 @@ int reset_stepper(L6474_Handle_t s){
result |= L6474_ResetStandBy(s); result |= L6474_ResetStandBy(s);
result |= L6474_Initialize(s, &b); result |= L6474_Initialize(s, &b);
result |= L6474_SetPowerOutputs(s, 0); result |= L6474_SetPowerOutputs(s, 0);
yellow_led_stop();
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_14, GPIO_PIN_RESET);
return result; return result;
} }
int stepper_reference(L6474_Handle_t s, int flag){ int stepper_reference(L6474_Handle_t s, int flag){
L6474_SetPowerOutputs(s, 1); if(L6474_SetPowerOutputs(s, 1) != errcNONE){
return 1;
}
yellow_led_start();
//flag: 0 keiner, 1 -t, 2 -e, 3 -s //flag: 0 keiner, 1 -t, 2 -e, 3 -s
if(HAL_GPIO_ReadPin(REFERENCE_MARK_GPIO_Port, REFERENCE_MARK_Pin) == GPIO_PIN_RESET){ if(HAL_GPIO_ReadPin(REFERENCE_MARK_GPIO_Port, REFERENCE_MARK_Pin) == GPIO_PIN_RESET){
L6474_StepIncremental(s, mm_to_step(5)); if(L6474_StepIncremental(s, mm_to_step(5)) != errcNONE){
return 1;
}
int button_pressed = 0; int button_pressed = 0;
@@ -137,18 +227,14 @@ int stepper_reference(L6474_Handle_t s, int flag){
if(flag == 3){ if(flag == 3){
L6474_SetAbsolutePosition(s, 0); L6474_SetAbsolutePosition(s, 0);
L6474_Status_t status; return StepperHasFault(s);
if(L6474_GetStatus(s, &status) != errcNONE){
return 1;
}
return 0;
} }
int button_pressed = 0; int button_pressed = 0;
while(!button_pressed){ while(!button_pressed){
L6474_StepIncremental(s, -1); if(L6474_StepIncremental(s, -1) != errcNONE){
return 1;
}
if(HAL_GPIO_ReadPin(REFERENCE_MARK_GPIO_Port, REFERENCE_MARK_Pin) == GPIO_PIN_RESET){ if(HAL_GPIO_ReadPin(REFERENCE_MARK_GPIO_Port, REFERENCE_MARK_Pin) == GPIO_PIN_RESET){
button_pressed=1; button_pressed=1;
} }
@@ -157,7 +243,7 @@ int stepper_reference(L6474_Handle_t s, int flag){
} }
L6474_SetAbsolutePosition(s, 0); L6474_SetAbsolutePosition(s, 0);
return 0; return StepperHasFault(s);
} }
@@ -167,9 +253,11 @@ void stepper_softstart(L6474_Handle_t s, unsigned int duration){
int stepper_pos(L6474_Handle_t s){ int stepper_pos(L6474_Handle_t s){
int position = 0; int position = 0;
L6474_GetAbsolutePosition(s, &position); if(L6474_GetAbsolutePosition(s, &position) != errcNONE){
return 1;
}
printf("Stepper position: %d", position); printf("Stepper position: %d", position);
return 0; return StepperHasFault(s);
} }
int stepper_status(L6474_Handle_t s){ int stepper_status(L6474_Handle_t s){
@@ -188,16 +276,12 @@ int stepper_move(L6474_Handle_t s, int pos){
int pos_diff = pos - position; int pos_diff = pos - position;
if(L6474_StepIncremental(s, pos_diff) != errcNONE){ // StepIncremental lehnt 0 Schritte als Fehler ab
if(pos_diff != 0 && L6474_StepIncremental(s, pos_diff) != errcNONE){
return 1; return 1;
} }
L6474_Status_t status; return StepperHasFault(s);
if(L6474_GetStatus(s, &status) != errcNONE){
return 1;
}
return 0;
} }
@@ -232,20 +316,32 @@ int StepperConsoleFunction( int argc, char** argv, void* ctx )
return -1; return -1;
} }
L6474_StepIncremental(h, atoi(argv[1])); int steps = atoi(argv[1]);
printf("%d steps", (int)atoi(argv[1])); if((steps != 0 && L6474_StepIncremental(h, steps) != errcNONE) || StepperHasFault(h)){
state = 0;
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_14, GPIO_PIN_SET);
printf("FAIL\r\n");
return -1;
}
printf("%d steps", steps);
} }
else if ( strcmp(argv[0], "reset") == 0 ) else if ( strcmp(argv[0], "reset") == 0 )
{ {
if(reset_stepper(h)){ if(reset_stepper(h)){
state = 0; state = 0;
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_0, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_14, GPIO_PIN_SET);
yellow_led_stop();
printf("FAIL\r\n"); printf("FAIL\r\n");
return -1; return -1;
} }
state = 1; state = 1;
HAL_GPIO_WritePin(GPIOE, GPIO_PIN_1, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_0, GPIO_PIN_SET);
printf("OK\r\n"); printf("OK\r\n");
return 0; return 0;
} }
@@ -257,8 +353,15 @@ int StepperConsoleFunction( int argc, char** argv, void* ctx )
return -1; 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; state = 0;
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_0, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_14, GPIO_PIN_SET);
yellow_led_stop();
printf("FAIL\r\n"); printf("FAIL\r\n");
return -1; return -1;
} }
@@ -277,6 +380,9 @@ int StepperConsoleFunction( int argc, char** argv, void* ctx )
if(stepper_pos(h)){ if(stepper_pos(h)){
state = 0; state = 0;
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_0, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_14, GPIO_PIN_SET);
yellow_led_stop();
printf("FAIL\r\n"); printf("FAIL\r\n");
return -1; return -1;
} }
@@ -308,6 +414,9 @@ int StepperConsoleFunction( int argc, char** argv, void* ctx )
if(stepper_move(h, mm_to_step(target_mm))==1){ if(stepper_move(h, mm_to_step(target_mm))==1){
state = 0; state = 0;
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_0, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_14, GPIO_PIN_SET);
yellow_led_stop();
printf("FAIL\r\n"); printf("FAIL\r\n");
return -1; return -1;
} }
@@ -59,7 +59,14 @@
SPI_HandleTypeDef hspi1; SPI_HandleTypeDef hspi1;
TIM_HandleTypeDef htim1;
TIM_HandleTypeDef htim2; TIM_HandleTypeDef htim2;
TIM_HandleTypeDef htim4;
//Für LEDS
TIM_HandleTypeDef htim3;
TIM_HandleTypeDef htim12;
UART_HandleTypeDef huart3; UART_HandleTypeDef huart3;
@@ -75,6 +82,8 @@ static void MX_GPIO_Init(void);
static void MX_SPI1_Init(void); static void MX_SPI1_Init(void);
static void MX_TIM2_Init(void); static void MX_TIM2_Init(void);
static void MX_USART3_UART_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 */ /* USER CODE BEGIN PFP */
extern void initialise_stdlib_abstraction( void ); extern void initialise_stdlib_abstraction( void );
@@ -115,8 +124,11 @@ void green_led(){
} }
} }
static TaskHandle_t yellowLedTask = NULL;
void blink_yellow_led(){ void blink_yellow_led(){
while(1){ while(1){
HAL_GPIO_WritePin(GPIOE, GPIO_PIN_1, GPIO_PIN_SET); HAL_GPIO_WritePin(GPIOE, GPIO_PIN_1, GPIO_PIN_SET);
vTaskDelay(pdMS_TO_TICKS(500)); vTaskDelay(pdMS_TO_TICKS(500));
HAL_GPIO_WritePin(GPIOE, GPIO_PIN_1, GPIO_PIN_RESET); HAL_GPIO_WritePin(GPIOE, GPIO_PIN_1, GPIO_PIN_RESET);
@@ -124,8 +136,26 @@ void blink_yellow_led(){
} }
} }
void yellow_led_start(void)
{
if (yellowLedTask == NULL) {
xTaskCreate(blink_yellow_led, "blink_yellow_led", 1024, NULL, 1, &yellowLedTask);
}
}
void yellow_led_stop(void)
{
if (yellowLedTask != NULL) {
vTaskDelete(yellowLedTask);
yellowLedTask = NULL;
HAL_GPIO_WritePin(GPIOE, GPIO_PIN_1, GPIO_PIN_RESET);
}
}
void red_led(){ void red_led(){
while(1){ while(1){
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_14, GPIO_PIN_SET); HAL_GPIO_WritePin(GPIOB, GPIO_PIN_14, GPIO_PIN_SET);
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_0, GPIO_PIN_RESET); HAL_GPIO_WritePin(GPIOB, GPIO_PIN_0, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOE, GPIO_PIN_1, GPIO_PIN_RESET); HAL_GPIO_WritePin(GPIOE, GPIO_PIN_1, GPIO_PIN_RESET);
@@ -133,6 +163,7 @@ void red_led(){
} }
// -------------------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------------------
static int CapabilityFunc( int argc, char** argv, void* ctx ) static int CapabilityFunc( int argc, char** argv, void* ctx )
// -------------------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------------------
@@ -141,9 +172,9 @@ static int CapabilityFunc( int argc, char** argv, void* ctx )
(void)argv; (void)argv;
(void)ctx; (void)ctx;
printf("%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\r\nOK", printf("%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\r\nOK",
0, // has spindle 1, // has spindle
0, // has spindle status 1, // has spindle status
0, // has stepper 1, // has stepper
0, // has stepper move relative 0, // has stepper move relative
0, // has stepper move speed 0, // has stepper move speed
0, // has stepper move async 0, // has stepper move async
@@ -153,7 +184,7 @@ static int CapabilityFunc( int argc, char** argv, void* ctx )
0, // has stepper refrun skip 0, // has stepper refrun skip
0, // has stepper refrun stay enabled 0, // has stepper refrun stay enabled
0, // has stepper reset 0, // has stepper reset
0, // has stepper position 1, // has stepper position
0, // has stepper config 0, // has stepper config
0, // has stepper config torque 0, // has stepper config torque
0, // has stepper config throvercurr 0, // has stepper config throvercurr
@@ -299,6 +330,8 @@ int main(void)
MX_SPI1_Init(); MX_SPI1_Init();
MX_TIM2_Init(); MX_TIM2_Init();
MX_USART3_UART_Init(); MX_USART3_UART_Init();
MX_TIM1_Init();
MX_TIM4_Init();
/* USER CODE BEGIN 2 */ /* USER CODE BEGIN 2 */
// cretae a free rtos queue to buffer console characters received from debug uart // cretae a free rtos queue to buffer console characters received from debug uart
@@ -520,6 +553,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 * @brief USART3 Initialization Function
* @param None * @param None
@@ -594,7 +761,7 @@ static void MX_GPIO_Init(void)
HAL_GPIO_WritePin(GPIOB, LED_GREEN_Pin|LED_RED_Pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(GPIOB, LED_GREEN_Pin|LED_RED_Pin, GPIO_PIN_RESET);
/*Configure GPIO pin Output Level */ /*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 */ /*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOG, STEP_RSTN_Pin|STEP_DIR_Pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(GPIOG, STEP_RSTN_Pin|STEP_DIR_Pin, GPIO_PIN_RESET);
@@ -625,12 +792,12 @@ static void MX_GPIO_Init(void)
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
/*Configure GPIO pins : STEP_SPI_CS_Pin STEP_PULSE_Pin */ /*Configure GPIO pin : STEP_SPI_CS_Pin */
GPIO_InitStruct.Pin = STEP_SPI_CS_Pin|STEP_PULSE_Pin; GPIO_InitStruct.Pin = STEP_SPI_CS_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; 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 */ /*Configure GPIO pins : STEP_RSTN_Pin STEP_DIR_Pin */
GPIO_InitStruct.Pin = STEP_RSTN_Pin|STEP_DIR_Pin; GPIO_InitStruct.Pin = STEP_RSTN_Pin|STEP_DIR_Pin;
@@ -182,7 +182,23 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi)
*/ */
void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base) 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 */ /* 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 BEGIN TIM2_MspInit 1 */
/* USER CODE END 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 */ /* 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) 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 */ /* 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 */ /* 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 */
}
} }
@@ -55,6 +55,8 @@
/* USER CODE END 0 */ /* USER CODE END 0 */
/* External variables --------------------------------------------------------*/ /* External variables --------------------------------------------------------*/
extern TIM_HandleTypeDef htim1;
extern TIM_HandleTypeDef htim4;
extern UART_HandleTypeDef huart3; extern UART_HandleTypeDef huart3;
/* USER CODE BEGIN EV */ /* USER CODE BEGIN EV */
@@ -210,6 +212,48 @@ void SysTick_Handler(void)
/* please refer to the startup file (startup_stm32h7xx.s). */ /* 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. * @brief This function handles USART3 global interrupt.
*/ */
+3 -2
View File
@@ -445,7 +445,7 @@ SPI1.VirtualType=VM_MASTER
SYS.userName=SYS_M7 SYS.userName=SYS_M7
TIM1.Channel-Output\ Compare1\ No\ Output=TIM_CHANNEL_1 TIM1.Channel-Output\ Compare1\ No\ Output=TIM_CHANNEL_1
TIM1.IPParameters=Channel-Output Compare1 No Output,Period,TIM_MasterOutputTrigger,TIM_MasterOutputTrigger2 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_MasterOutputTrigger=TIM_TRGO_ENABLE
TIM1.TIM_MasterOutputTrigger2=TIM_TRGO2_ENABLE TIM1.TIM_MasterOutputTrigger2=TIM_TRGO2_ENABLE
TIM2.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3 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 TIM2.Period=9999
TIM4.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE TIM4.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE
TIM4.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4 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.Period=5624
TIM4.Prescaler=127 TIM4.Prescaler=127
TIM4.Pulse-PWM\ Generation4\ CH4=2812 TIM4.Pulse-PWM\ Generation4\ CH4=2812