Browse Source

Remove obsolete HAL_timer_restrain

Scott Lahteine 7 years ago
parent
commit
6a3207391f

+ 0
- 2
Marlin/src/HAL/HAL_AVR/HAL.h View File

@@ -170,8 +170,6 @@ FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t freque
170 170
 
171 171
 #define _CAT(a, ...) a ## __VA_ARGS__
172 172
 #define HAL_timer_set_compare(timer, compare) (_CAT(TIMER_OCR_, timer) = compare)
173
-#define HAL_timer_restrain(timer, interval_ticks) NOLESS(_CAT(TIMER_OCR_, timer), _CAT(TIMER_COUNTER_, timer) + interval_ticks)
174
-
175 173
 #define HAL_timer_get_compare(timer) _CAT(TIMER_OCR_, timer)
176 174
 #define HAL_timer_get_count(timer) _CAT(TIMER_COUNTER_, timer)
177 175
 

+ 0
- 6
Marlin/src/HAL/HAL_DUE/HAL_timers_Due.h View File

@@ -109,12 +109,6 @@ 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
-// if counter too high then bump up compare
113
-FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_ticks) {
114
-  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_ticks;
115
-  if (HAL_timer_get_compare(timer_num) < mincmp) HAL_timer_set_compare(timer_num, mincmp);
116
-}
117
-
118 112
 void HAL_timer_enable_interrupt(const uint8_t timer_num);
119 113
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
120 114
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);

+ 0
- 6
Marlin/src/HAL/HAL_ESP32/HAL_timers_ESP32.h View File

@@ -98,12 +98,6 @@ void HAL_timer_set_compare(const uint8_t timer_num, const hal_timer_t count);
98 98
 hal_timer_t HAL_timer_get_compare(const uint8_t timer_num);
99 99
 hal_timer_t HAL_timer_get_count(const uint8_t timer_num);
100 100
 
101
-// if counter too high then bump up compare
102
-FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_ticks) {
103
-  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_ticks;
104
-  if (HAL_timer_get_compare(timer_num) < mincmp) HAL_timer_set_compare(timer_num, mincmp);
105
-}
106
-
107 101
 void HAL_timer_enable_interrupt(const uint8_t timer_num);
108 102
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
109 103
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);

+ 0
- 5
Marlin/src/HAL/HAL_LPC1768/HAL_timers.h View File

@@ -127,11 +127,6 @@ FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
127 127
   return 0;
128 128
 }
129 129
 
130
-FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_ticks) {
131
-  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_ticks;
132
-  if (HAL_timer_get_compare(timer_num) < mincmp) HAL_timer_set_compare(timer_num, mincmp);
133
-}
134
-
135 130
 FORCE_INLINE static void HAL_timer_enable_interrupt(const uint8_t timer_num) {
136 131
   switch (timer_num) {
137 132
     case 0: NVIC_EnableIRQ(TIMER0_IRQn); // Enable interrupt handler

+ 0
- 5
Marlin/src/HAL/HAL_STM32F1/HAL_timers_Stm32f1.h View File

@@ -151,11 +151,6 @@ FORCE_INLINE static hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
151 151
   }
152 152
 }
153 153
 
154
-FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_ticks) {
155
-  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_ticks;
156
-  if (HAL_timer_get_compare(timer_num) < mincmp) HAL_timer_set_compare(timer_num, mincmp);
157
-}
158
-
159 154
 FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
160 155
   switch (timer_num) {
161 156
   case STEP_TIMER_NUM:

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

@@ -120,12 +120,6 @@ FORCE_INLINE static hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
120 120
   return __HAL_TIM_GET_AUTORELOAD(&TimerHandle[timer_num].handle);
121 121
 }
122 122
 
123
-FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_ticks) {
124
-  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_ticks;
125
-  if (HAL_timer_get_compare(timer_num) < mincmp)
126
-    HAL_timer_set_compare(timer_num, mincmp);
127
-}
128
-
129 123
 #ifdef STM32GENERIC
130 124
   FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
131 125
     if (__HAL_TIM_GET_FLAG(&TimerHandle[timer_num].handle, TIM_FLAG_UPDATE) == SET)

+ 0
- 5
Marlin/src/HAL/HAL_STM32F7/HAL_timers_STM32F7.cpp View File

@@ -142,11 +142,6 @@ uint32_t HAL_timer_get_count(const uint8_t timer_num) {
142 142
   return __HAL_TIM_GetCounter(&timerConfig[timer_num].timerdef);
143 143
 }
144 144
 
145
-void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_ticks) {
146
-  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_ticks;
147
-  if (HAL_timer_get_compare(timer_num) < mincmp) HAL_timer_set_compare(timer_num, mincmp);
148
-}
149
-
150 145
 void HAL_timer_isr_prologue(const uint8_t timer_num) {
151 146
   if (__HAL_TIM_GET_FLAG(&timerConfig[timer_num].timerdef, TIM_FLAG_UPDATE) == SET) {
152 147
     __HAL_TIM_CLEAR_FLAG(&timerConfig[timer_num].timerdef, TIM_FLAG_UPDATE);

+ 0
- 2
Marlin/src/HAL/HAL_STM32F7/HAL_timers_STM32F7.h View File

@@ -96,8 +96,6 @@ 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_ticks);
100
-
101 99
 void HAL_timer_isr_prologue(const uint8_t timer_num);
102 100
 #define HAL_timer_isr_epilogue(TIMER_NUM)
103 101
 

+ 0
- 5
Marlin/src/HAL/HAL_TEENSY31_32/HAL_timers_Teensy.h View File

@@ -100,11 +100,6 @@ FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
100 100
   return 0;
101 101
 }
102 102
 
103
-FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_ticks) {
104
-  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_ticks;
105
-  if (HAL_timer_get_compare(timer_num) < mincmp) HAL_timer_set_compare(timer_num, mincmp);
106
-}
107
-
108 103
 void HAL_timer_enable_interrupt(const uint8_t timer_num);
109 104
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
110 105
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);

+ 0
- 5
Marlin/src/HAL/HAL_TEENSY35_36/HAL_timers_Teensy.h View File

@@ -102,11 +102,6 @@ FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
102 102
   return 0;
103 103
 }
104 104
 
105
-FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_ticks) {
106
-  const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_ticks;
107
-  if (HAL_timer_get_compare(timer_num) < mincmp) HAL_timer_set_compare(timer_num, mincmp);
108
-}
109
-
110 105
 void HAL_timer_enable_interrupt(const uint8_t timer_num);
111 106
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
112 107
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);

Loading…
Cancel
Save