Scott Lahteine 6 лет назад
Родитель
Сommit
d45f19d385

+ 2
- 2
Marlin/src/HAL/HAL_DUE/HAL_timers_Due.h Просмотреть файл

@@ -109,8 +109,8 @@ FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
109 109
   return pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_CV;
110 110
 }
111 111
 
112
-FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_µs) {
113
-  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_µs * HAL_TICKS_PER_US;
112
+FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_us) {
113
+  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_us * HAL_TICKS_PER_US;
114 114
   if (HAL_timer_get_compare(timer_num) < mincmp) HAL_timer_set_compare(timer_num, mincmp);
115 115
 }
116 116
 

+ 2
- 2
Marlin/src/HAL/HAL_LPC1768/HAL_timers.h Просмотреть файл

@@ -120,8 +120,8 @@ FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
120 120
   return 0;
121 121
 }
122 122
 
123
-FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_µs) {
124
-  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_µs * HAL_TICKS_PER_US;
123
+FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_us) {
124
+  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_us * HAL_TICKS_PER_US;
125 125
   if (HAL_timer_get_compare(timer_num) < mincmp) HAL_timer_set_compare(timer_num, mincmp);
126 126
 }
127 127
 

+ 2
- 2
Marlin/src/HAL/HAL_STM32F1/HAL_timers_Stm32f1.h Просмотреть файл

@@ -154,8 +154,8 @@ FORCE_INLINE static hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
154 154
   }
155 155
 }
156 156
 
157
-FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_µs) {
158
-  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_µs * HAL_TICKS_PER_US;
157
+FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_us) {
158
+  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_us * HAL_TICKS_PER_US;
159 159
   if (HAL_timer_get_compare(timer_num) < mincmp) HAL_timer_set_compare(timer_num, mincmp);
160 160
 }
161 161
 

+ 2
- 2
Marlin/src/HAL/HAL_STM32F7/HAL_timers_STM32F7.cpp Просмотреть файл

@@ -137,8 +137,8 @@ uint32_t HAL_timer_get_count(const uint8_t timer_num) {
137 137
   return __HAL_TIM_GetCounter(&timerConfig[timer_num].timerdef);
138 138
 }
139 139
 
140
-void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_µs) {
141
-  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_µs * HAL_TICKS_PER_US;
140
+void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_us) {
141
+  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_us * HAL_TICKS_PER_US;
142 142
   if (HAL_timer_get_compare(timer_num) < mincmp) HAL_timer_set_compare(timer_num, mincmp);
143 143
 }
144 144
 

+ 1
- 1
Marlin/src/HAL/HAL_STM32F7/HAL_timers_STM32F7.h Просмотреть файл

@@ -96,7 +96,7 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
96 96
 void HAL_timer_set_compare(const uint8_t timer_num, const uint32_t compare);
97 97
 hal_timer_t HAL_timer_get_compare(const uint8_t timer_num);
98 98
 uint32_t HAL_timer_get_count(const uint8_t timer_num);
99
-void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_µs);
99
+void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_us);
100 100
 
101 101
 void HAL_timer_isr_prologue(const uint8_t timer_num);
102 102
 

+ 2
- 2
Marlin/src/HAL/HAL_TEENSY35_36/HAL_timers_Teensy.h Просмотреть файл

@@ -105,8 +105,8 @@ FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
105 105
   return 0;
106 106
 }
107 107
 
108
-FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_µs) {
109
-  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_µs * HAL_TICKS_PER_US;
108
+FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_us) {
109
+  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_us * HAL_TICKS_PER_US;
110 110
   if (HAL_timer_get_compare(timer_num) < mincmp) HAL_timer_set_compare(timer_num, mincmp);
111 111
 }
112 112
 

Загрузка…
Отмена
Сохранить