diff options
| author | Perry Hung <iperry@alum.mit.edu> | 2010-03-25 19:50:13 -0400 |
|---|---|---|
| committer | Perry Hung <iperry@alum.mit.edu> | 2010-03-25 19:50:13 -0400 |
| commit | ca8033c92a382be789d9bb325b03165004cd0bb2 (patch) | |
| tree | c107b0245ef5b51ea4858116cc8f4711dfed878c /src/lib/adc.c | |
| parent | 8d6bf3b196c2a0bc1adda4a04669e54fdc5b65cb (diff) | |
| download | librambutan-ca8033c92a382be789d9bb325b03165004cd0bb2.tar.gz librambutan-ca8033c92a382be789d9bb325b03165004cd0bb2.zip | |
Started removing STM32 STD RCC code. Compiles but doesn't run yet.
Diffstat (limited to 'src/lib/adc.c')
| -rw-r--r-- | src/lib/adc.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/adc.c b/src/lib/adc.c index 7169824..ee2b17a 100644 --- a/src/lib/adc.c +++ b/src/lib/adc.c @@ -23,7 +23,6 @@ * @brief Analog to digital converter routines */ -#include "stm32f10x_rcc.h" #include "adc.h" #include <stdio.h> #include <inttypes.h> @@ -60,14 +59,14 @@ void adc_init(void) { /* PCLK2 is the APB2 clock */ - RCC_ADCCLKConfig(RCC_PCLK2_Div6); +// RCC_ADCCLKConfig(RCC_PCLK2_Div6); /* Enable ADC1 clock so that we can talk to it */ - RCC_APB2PeriphClockCmd(RCC_APB2Periph_ADC1, ENABLE); +// RCC_APB2PeriphClockCmd(RCC_APB2Periph_ADC1, ENABLE); /* Put everything back to power-on defaults */ - RCC_APB2PeriphResetCmd(RCC_APB2Periph_ADC1, ENABLE); - RCC_APB2PeriphResetCmd(RCC_APB2Periph_ADC1, DISABLE); +// RCC_APB2PeriphResetCmd(RCC_APB2Periph_ADC1, ENABLE); +// RCC_APB2PeriphResetCmd(RCC_APB2Periph_ADC1, DISABLE); ADC_CR1 = 0; ADC_CR2 = CR2_EXTSEL_SWSTART | CR2_EXTTRIG; // Software triggers conversions |