From ca08ac22269b1fe54d9d959d5facf27e6ca322b5 Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 16 Dec 2011 19:56:47 +0000 Subject: Fix the data format used in apps/examples/adc git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4193 42af7a65-404d-4744-a932-0658087f49c3 --- apps/examples/adc/adc.h | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) (limited to 'apps/examples/adc/adc.h') diff --git a/apps/examples/adc/adc.h b/apps/examples/adc/adc.h index e6d9dd7bd..901f84940 100755 --- a/apps/examples/adc/adc.h +++ b/apps/examples/adc/adc.h @@ -56,8 +56,6 @@ * indefinitely. * CONFIG_EXAMPLES_ADC_GROUPSIZE - The number of samples to read at once. * Default: 4 - * CONFIG_EXAMPLES_ADC_SAMPLEWIDTH - The width (in bits) of the on ADC sample. - * Default: 16 */ #ifndef CONFIG_ADC @@ -72,39 +70,6 @@ # define CONFIG_EXAMPLES_ADC_GROUPSIZE 4 #endif -#ifndef CONFIG_EXAMPLES_ADC_SAMPLEWIDTH -# define CONFIG_EXAMPLES_ADC_SAMPLEWIDTH 16 -#endif - -/* Sample characteristics ***************************************************/ - -#undef ADC_SAMPLE_BYTEWIDTH -#if CONFIG_EXAMPLES_ADC_SAMPLEWIDTH <= 8 -# undef CONFIG_EXAMPLES_ADC_SAMPLEWIDTH -# define CONFIG_EXAMPLES_ADC_SAMPLEWIDTH 8 -# define ADC_SAMPLE_BYTEWIDTH 1 -# define SAMPLE_FMT "%02x" -#elif CONFIG_EXAMPLES_ADC_SAMPLEWIDTH <= 16 -# undef CONFIG_EXAMPLES_ADC_SAMPLEWIDTH -# define CONFIG_EXAMPLES_ADC_SAMPLEWIDTH 16 -# define ADC_SAMPLE_BYTEWIDTH 2 -# define SAMPLE_FMT "%04x" -#elif CONFIG_EXAMPLES_ADC_SAMPLEWIDTH <= 24 -# undef CONFIG_EXAMPLES_ADC_SAMPLEWIDTH -# define CONFIG_EXAMPLES_ADC_SAMPLEWIDTH 24 -# define ADC_SAMPLE_BYTEWIDTH 3 -# define SAMPLE_FMT "%06x" -#elif CONFIG_EXAMPLES_ADC_SAMPLEWIDTH <= 32 -# undef CONFIG_EXAMPLES_ADC_SAMPLEWIDTH -# define CONFIG_EXAMPLES_ADC_SAMPLEWIDTH 32 -# define ADC_SAMPLE_BYTEWIDTH 4 -# define SAMPLE_FMT "%08x" -#else -# error "Unsupported sample width" -#endif - -#undef ADC_SAMPLE_SIZE (CONFIG_EXAMPLES_ADC_GROUPSIZE * ADC_SAMPLE_BYTEWIDTH) - /* Debug ********************************************************************/ #ifdef CONFIG_CPP_HAVE_VARARGS @@ -129,18 +94,6 @@ * Public Types ****************************************************************************/ -#if CONFIG_EXAMPLES_ADC_SAMPLEWIDTH == 8 -typedef uint8_t adc_sample_t; -#elif CONFIG_EXAMPLES_ADC_SAMPLEWIDTH == 16 -typedef uint16_t adc_sample_t; -#elif CONFIG_EXAMPLES_ADC_SAMPLEWIDTH == 24 -typedef uint32_t adc_sample_t; -#elif CONFIG_EXAMPLES_ADC_SAMPLEWIDTH == 32 -typedef uint32_t adc_sample_t; -#else -# error "Unsupported sample width" -#endif - /**************************************************************************** * Public Variables ****************************************************************************/ -- cgit v1.2.3