From f7de453da89091d162f01ddddeb259bf8a682472 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 10 Jul 2019 03:41:50 -0500
Subject: [PATCH] More general 'stm32_timer_t'

---
 Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp     | 4 ++--
 Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.h       | 4 ++--
 Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.cpp | 2 +-
 Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.h   | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp b/Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp
index f8e472f885..7a2de123d2 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp
+++ b/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
diff --git a/Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.h b/Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.h
index 38f1aa332f..aefe880b4e 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.h
+++ b/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
diff --git a/Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.cpp b/Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.cpp
index 71ceca91d2..ecd9c6dc29 100644
--- a/Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.cpp
+++ b/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
diff --git a/Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.h b/Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.h
index ed9ac49e84..726207fbcf 100644
--- a/Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.h
+++ b/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