projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
stmf0
/
ao_timer.c
diff --git
a/src/stmf0/ao_timer.c
b/src/stmf0/ao_timer.c
index 5c05e4f187c09017876b1dfd476ed6a9259e7e9d..1def5f69f8e1c1d77d7a6a9d7344e4adcc1001fc 100644
(file)
--- a/
src/stmf0/ao_timer.c
+++ b/
src/stmf0/ao_timer.c
@@
-36,8
+36,8
@@
ao_time(void)
}
#if AO_DATA_ALL
}
#if AO_DATA_ALL
-volatile
__data uint8_t
ao_data_interval = 1;
-volatile
__data uint8_t
ao_data_count;
+volatile
uint8_t
ao_data_interval = 1;
+volatile
uint8_t
ao_data_count;
#endif
void stm_systick_isr(void)
#endif
void stm_systick_isr(void)
@@
-86,6
+86,7
@@
ao_timer_set_adc_interval(uint8_t interval)
void
ao_timer_init(void)
{
void
ao_timer_init(void)
{
+ stm_systick.csr = 0;
stm_systick.rvr = SYSTICK_RELOAD;
stm_systick.cvr = 0;
stm_systick.csr = ((1 << STM_SYSTICK_CSR_ENABLE) |
stm_systick.rvr = SYSTICK_RELOAD;
stm_systick.cvr = 0;
stm_systick.csr = ((1 << STM_SYSTICK_CSR_ENABLE) |