From: drowe67 Date: Sun, 9 Jun 2013 23:17:03 +0000 (+0000) Subject: adc UT partially coded X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=73dc6d158b5ca1dcc41579c7d1a90d695e4e9505;p=freetel-svn-tracking.git adc UT partially coded git-svn-id: https://svn.code.sf.net/p/freetel/code@1313 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/codec2-dev/stm32/Makefile b/codec2-dev/stm32/Makefile index b5bc9801..9fa38861 100644 --- a/codec2-dev/stm32/Makefile +++ b/codec2-dev/stm32/Makefile @@ -110,7 +110,7 @@ OBJS = $(SRCS:.c=.o) ################################################### -all: libstm32f4.a $(PROJ_NAME).elf fft_test.elf dac_ut.elf dac_play.elf +all: libstm32f4.a $(PROJ_NAME).elf fft_test.elf dac_ut.elf dac_play.elf adc_ut.elf dl/$(PERIPHLIBZIP): mkdir -p dl @@ -155,6 +155,16 @@ src/init.c dac_play.elf: $(DAC_PLAY_SRCS) $(CC) $(CFLAGS) -O0 $^ -o $@ $(LIBPATHS) $(LIBS) +ADC_UT_SRCS=\ +gdb_stdio.c \ +src/stm32f4_adc.c \ +src/system_stm32f4xx.c \ +src/startup_stm32f4xx.s \ +src/init.c + +adc_ut.elf: $(ADC_UT_SRCS) + $(CC) $(CFLAGS) -O0 $^ -o $@ $(LIBPATHS) $(LIBS) + clean: rm -f *.o rm -f *.elf diff --git a/codec2-dev/stm32/src/stm32f4_adc.c b/codec2-dev/stm32/src/stm32f4_adc.c index e0fb5e99..bebd157f 100644 --- a/codec2-dev/stm32/src/stm32f4_adc.c +++ b/codec2-dev/stm32/src/stm32f4_adc.c @@ -56,13 +56,26 @@ TIM_TimeBaseInitTypeDef TIM_TimeBaseStructure; TIM_OCInitTypeDef TIM_OCInitStructure; +unsigned short uhADCxConvertedValue; + static void ADC_Config(void); void Timer1Config(); static void TIM_Config(void); int main(void) { + /* check ADC value changes with GND and VCC sampled */ + /* look for 17kHz (ish) on timer pins */ + ADC_Config(); + Timer1Config(); + + /* todo: that start up cmd here */ + + while(1) { + printf("ADC; %d\n", uhADCxConvertedValue); + } + } /** @@ -133,7 +146,7 @@ static void ADC_Config(void) /* ADC3 regular channel7 configuration *************************************/ ADC_RegularChannelConfig(ADCx, ADC_CHANNEL, 1, ADC_SampleTime_3Cycles); - /* Enable DMA request after last transfer (Single-ADC mode) */ + /* Enable DMA request after last transfer (Single-ADC mode) */ ADC_DMARequestAfterLastTransferCmd(ADCx, ENABLE); /* Enable ADC3 DMA */