diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-09-05 20:59:11 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-09-05 20:59:11 -0600 |
| commit | c0ad087008856cfc2233b977abfc3f1dcbaccdcc (patch) | |
| tree | adc46abc430793112858ce5d1822d3fe0a395e71 /src/stmf0/ao_adc_fast.c | |
| parent | 148b013dd29c26920ddfb53449ed4d8cc5a4b5ee (diff) | |
| parent | 4fdf8ca9ca1cd5a84b03bd7a03c5806af64b413d (diff) | |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'src/stmf0/ao_adc_fast.c')
| -rw-r--r-- | src/stmf0/ao_adc_fast.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/stmf0/ao_adc_fast.c b/src/stmf0/ao_adc_fast.c index 0a2e2c5c..5ce3a396 100644 --- a/src/stmf0/ao_adc_fast.c +++ b/src/stmf0/ao_adc_fast.c @@ -3,7 +3,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -153,7 +154,7 @@ ao_adc_init(void) #endif /* Set the clock */ - stm_adc.cfgr2 = STM_ADC_CFGR2_CKMODE_PCLK_2 << STM_ADC_CFGR2_CKMODE; + stm_adc.cfgr2 = STM_ADC_CFGR2_CKMODE_ADCCLK << STM_ADC_CFGR2_CKMODE; /* Shortest sample time */ stm_adc.smpr = STM_ADC_SMPR_SMP_1_5 << STM_ADC_SMPR_SMP; |