Shorter paths to HAL, ExtUI (#17156)
This commit is contained in:
Scott Lahteine
GitHub
12
Marlin/src/HAL/STM32_F4_F7/STM32F4/README.md
Normal file
12
Marlin/src/HAL/STM32_F4_F7/STM32F4/README.md
Normal file
@ -0,0 +1,12 @@
|
||||
# This HAL is for the STM32F407 MCU used with STM32Generic Arduino core by danieleff.
|
||||
|
||||
# Arduino core is located at:
|
||||
|
||||
https://github.com/danieleff/STM32GENERIC
|
||||
|
||||
Unzip it into [Arduino]/hardware folder
|
||||
|
||||
# This HAL is in development.
|
||||
|
||||
This HAL is a modified version of Chris Barr's Picoprint STM32F4 HAL.
|
||||
|
||||
117
Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.cpp
Normal file
117
Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.cpp
Normal file
@ -0,0 +1,117 @@
|
||||
/**
|
||||
* Marlin 3D Printer Firmware
|
||||
*
|
||||
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
|
||||
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#if defined(STM32GENERIC) && defined(STM32F4)
|
||||
|
||||
#include "../HAL.h"
|
||||
#include "timers.h"
|
||||
|
||||
// ------------------------
|
||||
// Local defines
|
||||
// ------------------------
|
||||
|
||||
#define NUM_HARDWARE_TIMERS 2
|
||||
#define STEP_TIMER_IRQ_ID TIM5_IRQn
|
||||
#define TEMP_TIMER_IRQ_ID TIM7_IRQn
|
||||
|
||||
// ------------------------
|
||||
// Private Variables
|
||||
// ------------------------
|
||||
|
||||
stm32_timer_t TimerHandle[NUM_HARDWARE_TIMERS];
|
||||
|
||||
// ------------------------
|
||||
// Public functions
|
||||
// ------------------------
|
||||
|
||||
bool timers_initialized[NUM_HARDWARE_TIMERS] = {false};
|
||||
|
||||
void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
|
||||
|
||||
if (!timers_initialized[timer_num]) {
|
||||
constexpr uint32_t step_prescaler = STEPPER_TIMER_PRESCALE - 1,
|
||||
temp_prescaler = TEMP_TIMER_PRESCALE - 1;
|
||||
switch (timer_num) {
|
||||
case STEP_TIMER_NUM:
|
||||
// STEPPER TIMER TIM5 - use a 32bit timer
|
||||
__HAL_RCC_TIM5_CLK_ENABLE();
|
||||
TimerHandle[timer_num].handle.Instance = TIM5;
|
||||
TimerHandle[timer_num].handle.Init.Prescaler = step_prescaler;
|
||||
TimerHandle[timer_num].handle.Init.CounterMode = TIM_COUNTERMODE_UP;
|
||||
TimerHandle[timer_num].handle.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
|
||||
TimerHandle[timer_num].callback = (uint32_t)TC5_Handler;
|
||||
HAL_NVIC_SetPriority(STEP_TIMER_IRQ_ID, 1, 0);
|
||||
break;
|
||||
|
||||
case TEMP_TIMER_NUM:
|
||||
// TEMP TIMER TIM7 - any available 16bit Timer (1 already used for PWM)
|
||||
__HAL_RCC_TIM7_CLK_ENABLE();
|
||||
TimerHandle[timer_num].handle.Instance = TIM7;
|
||||
TimerHandle[timer_num].handle.Init.Prescaler = temp_prescaler;
|
||||
TimerHandle[timer_num].handle.Init.CounterMode = TIM_COUNTERMODE_UP;
|
||||
TimerHandle[timer_num].handle.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
|
||||
TimerHandle[timer_num].callback = (uint32_t)TC7_Handler;
|
||||
HAL_NVIC_SetPriority(TEMP_TIMER_IRQ_ID, 2, 0);
|
||||
break;
|
||||
}
|
||||
timers_initialized[timer_num] = true;
|
||||
}
|
||||
|
||||
TimerHandle[timer_num].handle.Init.Period = (((HAL_TIMER_RATE) / TimerHandle[timer_num].handle.Init.Prescaler) / frequency) - 1;
|
||||
if (HAL_TIM_Base_Init(&TimerHandle[timer_num].handle) == HAL_OK)
|
||||
HAL_TIM_Base_Start_IT(&TimerHandle[timer_num].handle);
|
||||
}
|
||||
|
||||
extern "C" void TIM5_IRQHandler() {
|
||||
((void(*)())TimerHandle[0].callback)();
|
||||
}
|
||||
extern "C" void TIM7_IRQHandler() {
|
||||
((void(*)())TimerHandle[1].callback)();
|
||||
}
|
||||
|
||||
void HAL_timer_enable_interrupt(const uint8_t timer_num) {
|
||||
switch (timer_num) {
|
||||
case STEP_TIMER_NUM: HAL_NVIC_EnableIRQ(STEP_TIMER_IRQ_ID); break;
|
||||
case TEMP_TIMER_NUM: HAL_NVIC_EnableIRQ(TEMP_TIMER_IRQ_ID); break;
|
||||
}
|
||||
}
|
||||
|
||||
void HAL_timer_disable_interrupt(const uint8_t timer_num) {
|
||||
switch (timer_num) {
|
||||
case STEP_TIMER_NUM: HAL_NVIC_DisableIRQ(STEP_TIMER_IRQ_ID); break;
|
||||
case TEMP_TIMER_NUM: HAL_NVIC_DisableIRQ(TEMP_TIMER_IRQ_ID); break;
|
||||
}
|
||||
// We NEED memory barriers to ensure Interrupts are actually disabled!
|
||||
// ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )
|
||||
__DSB();
|
||||
__ISB();
|
||||
}
|
||||
|
||||
bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
|
||||
switch (timer_num) {
|
||||
case STEP_TIMER_NUM: return NVIC->ISER[(uint32_t)((int32_t)STEP_TIMER_IRQ_ID) >> 5] & (uint32_t)(1 << ((uint32_t)((int32_t)STEP_TIMER_IRQ_ID) & (uint32_t)0x1F));
|
||||
case TEMP_TIMER_NUM: return NVIC->ISER[(uint32_t)((int32_t)TEMP_TIMER_IRQ_ID) >> 5] & (uint32_t)(1 << ((uint32_t)((int32_t)TEMP_TIMER_IRQ_ID) & (uint32_t)0x1F));
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
#endif // STM32GENERIC && STM32F4
|
||||
126
Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.h
Normal file
126
Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.h
Normal file
@ -0,0 +1,126 @@
|
||||
/**
|
||||
* Marlin 3D Printer Firmware
|
||||
*
|
||||
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
|
||||
* Copyright (c) 2017 Victor Perez
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
// ------------------------
|
||||
// Defines
|
||||
// ------------------------
|
||||
|
||||
#define FORCE_INLINE __attribute__((always_inline)) inline
|
||||
|
||||
#define hal_timer_t uint32_t // TODO: One is 16-bit, one 32-bit - does this need to be checked?
|
||||
#define HAL_TIMER_TYPE_MAX 0xFFFF
|
||||
|
||||
#define HAL_TIMER_RATE (HAL_RCC_GetSysClockFreq() / 2) // frequency of timer peripherals
|
||||
|
||||
#define STEP_TIMER_NUM 0 // index of timer to use for stepper
|
||||
#define TEMP_TIMER_NUM 1 // index of timer to use for temperature
|
||||
#define PULSE_TIMER_NUM STEP_TIMER_NUM
|
||||
|
||||
#define TEMP_TIMER_PRESCALE 1000 // prescaler for setting Temp timer, 72Khz
|
||||
#define TEMP_TIMER_FREQUENCY 1000 // temperature interrupt frequency
|
||||
|
||||
#define STEPPER_TIMER_PRESCALE 54 // was 40,prescaler for setting stepper timer, 2Mhz
|
||||
#define STEPPER_TIMER_RATE (HAL_TIMER_RATE / STEPPER_TIMER_PRESCALE) // frequency of stepper timer
|
||||
#define STEPPER_TIMER_TICKS_PER_US ((STEPPER_TIMER_RATE) / 1000000) // stepper timer ticks per µs
|
||||
|
||||
#define PULSE_TIMER_RATE STEPPER_TIMER_RATE // frequency of pulse timer
|
||||
#define PULSE_TIMER_PRESCALE STEPPER_TIMER_PRESCALE
|
||||
#define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US
|
||||
|
||||
#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(STEP_TIMER_NUM)
|
||||
#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(STEP_TIMER_NUM)
|
||||
#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(STEP_TIMER_NUM)
|
||||
|
||||
#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
|
||||
#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
|
||||
|
||||
// TODO change this
|
||||
|
||||
#ifdef STM32GENERIC
|
||||
extern void TC5_Handler();
|
||||
extern void TC7_Handler();
|
||||
#define HAL_STEP_TIMER_ISR() void TC5_Handler()
|
||||
#define HAL_TEMP_TIMER_ISR() void TC7_Handler()
|
||||
#else
|
||||
extern void TC5_Handler(stimer_t *htim);
|
||||
extern void TC7_Handler(stimer_t *htim);
|
||||
#define HAL_STEP_TIMER_ISR() void TC5_Handler(stimer_t *htim)
|
||||
#define HAL_TEMP_TIMER_ISR() void TC7_Handler(stimer_t *htim)
|
||||
#endif
|
||||
|
||||
|
||||
// ------------------------
|
||||
// Types
|
||||
// ------------------------
|
||||
|
||||
#ifdef STM32GENERIC
|
||||
typedef struct {
|
||||
TIM_HandleTypeDef handle;
|
||||
uint32_t callback;
|
||||
} tTimerConfig;
|
||||
typedef tTimerConfig stm32_timer_t;
|
||||
#else
|
||||
typedef stimer_t stm32_timer_t;
|
||||
#endif
|
||||
|
||||
// ------------------------
|
||||
// Public Variables
|
||||
// ------------------------
|
||||
|
||||
extern stm32_timer_t TimerHandle[];
|
||||
|
||||
// ------------------------
|
||||
// Public functions
|
||||
// ------------------------
|
||||
|
||||
void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency);
|
||||
void HAL_timer_enable_interrupt(const uint8_t timer_num);
|
||||
void HAL_timer_disable_interrupt(const uint8_t timer_num);
|
||||
bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
|
||||
|
||||
FORCE_INLINE static uint32_t HAL_timer_get_count(const uint8_t timer_num) {
|
||||
return __HAL_TIM_GET_COUNTER(&TimerHandle[timer_num].handle);
|
||||
}
|
||||
|
||||
FORCE_INLINE static void HAL_timer_set_compare(const uint8_t timer_num, const uint32_t compare) {
|
||||
__HAL_TIM_SET_AUTORELOAD(&TimerHandle[timer_num].handle, compare);
|
||||
if (HAL_timer_get_count(timer_num) >= compare)
|
||||
TimerHandle[timer_num].handle.Instance->EGR |= TIM_EGR_UG; // Generate an immediate update interrupt
|
||||
}
|
||||
|
||||
FORCE_INLINE static hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
|
||||
return __HAL_TIM_GET_AUTORELOAD(&TimerHandle[timer_num].handle);
|
||||
}
|
||||
|
||||
#ifdef STM32GENERIC
|
||||
FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
|
||||
if (__HAL_TIM_GET_FLAG(&TimerHandle[timer_num].handle, TIM_FLAG_UPDATE) == SET)
|
||||
__HAL_TIM_CLEAR_FLAG(&TimerHandle[timer_num].handle, TIM_FLAG_UPDATE);
|
||||
}
|
||||
#else
|
||||
#define HAL_timer_isr_prologue(TIMER_NUM)
|
||||
#endif
|
||||
|
||||
#define HAL_timer_isr_epilogue(TIMER_NUM)
|
||||
Reference in New Issue
Block a user