Browse Source

More general 'stm32_timer_t'

Scott Lahteine 6 years ago
parent
commit
f7de453da8

+ 2
- 2
Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp View File

@@ -19,8 +19,8 @@
19 19
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20 20
  *
21 21
  */
22
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
23 22
 
23
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
24 24
 
25 25
 #include "HAL.h"
26 26
 
@@ -38,7 +38,7 @@
38 38
 // Private Variables
39 39
 // ------------------------
40 40
 
41
-stm32f4_timer_t TimerHandle[NUM_HARDWARE_TIMERS];
41
+stm32_timer_t TimerHandle[NUM_HARDWARE_TIMERS];
42 42
 
43 43
 // ------------------------
44 44
 // Public functions

+ 2
- 2
Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.h View File

@@ -128,13 +128,13 @@ extern void Temp_Handler(stimer_t *htim);
128 128
 // Types
129 129
 // ------------------------
130 130
 
131
-typedef stimer_t stm32f4_timer_t;
131
+typedef stimer_t stm32_timer_t;
132 132
 
133 133
 // ------------------------
134 134
 // Public Variables
135 135
 // ------------------------
136 136
 
137
-extern stm32f4_timer_t TimerHandle[];
137
+extern stm32_timer_t TimerHandle[];
138 138
 
139 139
 // ------------------------
140 140
 // Public functions

+ 1
- 1
Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.cpp View File

@@ -39,7 +39,7 @@
39 39
 // Private Variables
40 40
 // ------------------------
41 41
 
42
-stm32f4_timer_t TimerHandle[NUM_HARDWARE_TIMERS];
42
+stm32_timer_t TimerHandle[NUM_HARDWARE_TIMERS];
43 43
 
44 44
 // ------------------------
45 45
 // Public functions

+ 3
- 3
Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.h View File

@@ -80,16 +80,16 @@
80 80
     TIM_HandleTypeDef handle;
81 81
     uint32_t callback;
82 82
   } tTimerConfig;
83
-  typedef tTimerConfig stm32f4_timer_t;
83
+  typedef tTimerConfig stm32_timer_t;
84 84
 #else
85
-  typedef stimer_t stm32f4_timer_t;
85
+  typedef stimer_t stm32_timer_t;
86 86
 #endif
87 87
 
88 88
 // ------------------------
89 89
 // Public Variables
90 90
 // ------------------------
91 91
 
92
-extern stm32f4_timer_t TimerHandle[];
92
+extern stm32_timer_t TimerHandle[];
93 93
 
94 94
 // ------------------------
95 95
 // Public functions

Loading…
Cancel
Save