Browse Source

More general 'stm32_timer_t'

pull/1/head
Scott Lahteine 6 years ago
parent
commit
f7de453da8
  1. 4
      Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp
  2. 4
      Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.h
  3. 2
      Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.cpp
  4. 6
      Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.h

4
Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp

@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
#include "HAL.h"
@ -38,7 +38,7 @@
// Private Variables
// ------------------------
stm32f4_timer_t TimerHandle[NUM_HARDWARE_TIMERS];
stm32_timer_t TimerHandle[NUM_HARDWARE_TIMERS];
// ------------------------
// Public functions

4
Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.h

@ -128,13 +128,13 @@ extern void Temp_Handler(stimer_t *htim);
// Types
// ------------------------
typedef stimer_t stm32f4_timer_t;
typedef stimer_t stm32_timer_t;
// ------------------------
// Public Variables
// ------------------------
extern stm32f4_timer_t TimerHandle[];
extern stm32_timer_t TimerHandle[];
// ------------------------
// Public functions

2
Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.cpp

@ -39,7 +39,7 @@
// Private Variables
// ------------------------
stm32f4_timer_t TimerHandle[NUM_HARDWARE_TIMERS];
stm32_timer_t TimerHandle[NUM_HARDWARE_TIMERS];
// ------------------------
// Public functions

6
Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.h

@ -80,16 +80,16 @@
TIM_HandleTypeDef handle;
uint32_t callback;
} tTimerConfig;
typedef tTimerConfig stm32f4_timer_t;
typedef tTimerConfig stm32_timer_t;
#else
typedef stimer_t stm32f4_timer_t;
typedef stimer_t stm32_timer_t;
#endif
// ------------------------
// Public Variables
// ------------------------
extern stm32f4_timer_t TimerHandle[];
extern stm32_timer_t TimerHandle[];
// ------------------------
// Public functions

Loading…
Cancel
Save