|
@@ -121,7 +121,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
|
121
|
121
|
timer_set_count(STEP_TIMER_DEV, 0);
|
122
|
122
|
timer_set_prescaler(STEP_TIMER_DEV, (uint16_t)(STEPPER_TIMER_PRESCALE - 1));
|
123
|
123
|
timer_set_reload(STEP_TIMER_DEV, 0xFFFF);
|
124
|
|
- timer_set_compare(STEP_TIMER_DEV, STEP_TIMER_CHAN, MIN(HAL_TIMER_TYPE_MAX, (STEPPER_TIMER_RATE / frequency)));
|
|
124
|
+ timer_set_compare(STEP_TIMER_DEV, STEP_TIMER_CHAN, MIN(hal_timer_t(HAL_TIMER_TYPE_MAX), (STEPPER_TIMER_RATE / frequency)));
|
125
|
125
|
timer_attach_interrupt(STEP_TIMER_DEV, STEP_TIMER_CHAN, stepTC_Handler);
|
126
|
126
|
nvic_irq_set_priority(irq_num, 1);
|
127
|
127
|
timer_generate_update(STEP_TIMER_DEV);
|
|
@@ -132,7 +132,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
|
132
|
132
|
timer_set_count(TEMP_TIMER_DEV, 0);
|
133
|
133
|
timer_set_prescaler(TEMP_TIMER_DEV, (uint16_t)(TEMP_TIMER_PRESCALE - 1));
|
134
|
134
|
timer_set_reload(TEMP_TIMER_DEV, 0xFFFF);
|
135
|
|
- timer_set_compare(TEMP_TIMER_DEV, TEMP_TIMER_CHAN, MIN(HAL_TIMER_TYPE_MAX, ((F_CPU / TEMP_TIMER_PRESCALE) / frequency)));
|
|
135
|
+ timer_set_compare(TEMP_TIMER_DEV, TEMP_TIMER_CHAN, MIN(hal_timer_t(HAL_TIMER_TYPE_MAX), ((F_CPU / TEMP_TIMER_PRESCALE) / frequency)));
|
136
|
136
|
timer_attach_interrupt(TEMP_TIMER_DEV, TEMP_TIMER_CHAN, tempTC_Handler);
|
137
|
137
|
nvic_irq_set_priority(irq_num, 2);
|
138
|
138
|
timer_generate_update(TEMP_TIMER_DEV);
|
|
@@ -213,6 +213,7 @@ timer_dev* get_timer_dev(int number) {
|
213
|
213
|
#if STM32_HAVE_TIMER(14)
|
214
|
214
|
case 14: return &timer14;
|
215
|
215
|
#endif
|
|
216
|
+ default: return nullptr;
|
216
|
217
|
}
|
217
|
218
|
}
|
218
|
219
|
|