aboutsummaryrefslogtreecommitdiff
path: root/stmhal/timer.h
diff options
context:
space:
mode:
authorDamien George2015-07-22 19:37:21 +0100
committerDamien George2015-07-22 19:41:13 +0100
commit7693ef3bd6e4456105c86909174a00f535a19261 (patch)
tree10e802dc6fd2aa502ed7bea85a147027205c3dbd /stmhal/timer.h
parent99a21dc05d7c7e42131264259f287c84afe86200 (diff)
stmhal: Allow ADC.read_timed to take Timer object in place of freq.
This allows a user-specified Timer for the triggering of the ADC read, mirroring the new behaviour of DAC.write_timed. Addresses issue #1129.
Diffstat (limited to 'stmhal/timer.h')
-rw-r--r--stmhal/timer.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/stmhal/timer.h b/stmhal/timer.h
index 879d7ae5d..8988197c0 100644
--- a/stmhal/timer.h
+++ b/stmhal/timer.h
@@ -31,14 +31,13 @@
extern TIM_HandleTypeDef TIM3_Handle;
extern TIM_HandleTypeDef TIM5_Handle;
-extern TIM_HandleTypeDef TIM6_Handle;
extern const mp_obj_type_t pyb_timer_type;
void timer_init0(void);
void timer_tim3_init(void);
void timer_tim5_init(void);
-void timer_tim6_init(uint freq);
+TIM_HandleTypeDef *timer_tim6_init(uint freq);
void timer_deinit(void);