diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-10-25 14:17:29 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-10-25 14:17:29 -0600 |
| commit | 1038145bb042e8cd252595e5fe18d132349cb26d (patch) | |
| tree | 4449af8ae383b860fb7afd5d0667bdd1598a96de | |
| parent | 451eff8c4797c5d452e20464fe32f992bdad4c5d (diff) | |
| download | px4-nuttx-1038145bb042e8cd252595e5fe18d132349cb26d.tar.gz px4-nuttx-1038145bb042e8cd252595e5fe18d132349cb26d.tar.bz2 px4-nuttx-1038145bb042e8cd252595e5fe18d132349cb26d.zip | |
apps/examples/adc: Add support for software triggering
| -rw-r--r-- | apps/ChangeLog.txt | 2 | ||||
| -rw-r--r-- | apps/examples/adc/Kconfig | 11 | ||||
| -rw-r--r-- | apps/examples/adc/adc_main.c | 16 |
3 files changed, 27 insertions, 2 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 1e4ada3af..d553b7842 100644 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -697,4 +697,6 @@ some kruft removal (2013-10-24). * apps/examples/can/can_main.c: Correct an error in a debug statement. From Martin Lederhilger (2013-10-24). + * apps/examples/adc: Add support so that a ADC driven by + software triggering can be tested (2013-10-25). diff --git a/apps/examples/adc/Kconfig b/apps/examples/adc/Kconfig index 85c875deb..655427780 100644 --- a/apps/examples/adc/Kconfig +++ b/apps/examples/adc/Kconfig @@ -34,4 +34,15 @@ config EXAMPLES_ADC_GROUPSIZE ---help--- The number of samples to read at once. Default: 4 +config EXAMPLES_ADC_SWTRIG + bool "Use software trigger" + default n + ---help--- + Some ADCs may be configured so there is no automatic or periodic + conversion of samples. Rather, the ADC sampling must be trigger by + software via an ioctl command. Select this option only if + applicable for your ADC configuration. In this case, the test will + issue the software trigger ioctl before attempting to read from the + ADC. + endif diff --git a/apps/examples/adc/adc_main.c b/apps/examples/adc/adc_main.c index 553658fee..b0ed43897 100644 --- a/apps/examples/adc/adc_main.c +++ b/apps/examples/adc/adc_main.c @@ -40,6 +40,7 @@ #include <nuttx/config.h> #include <sys/types.h> +#include <sys/ioctl.h> #include <stdio.h> #include <stdlib.h> @@ -310,7 +311,18 @@ int adc_main(int argc, char *argv[]) msgflush(); - /* Read CONFIG_EXAMPLES_ADC_GROUPSIZE samples */ +#ifdef CONFIG_EXAMPLES_ADC_SWTRIG + /* Issue the software trigger to start ADC conversion */ + + ret = ioctl(fd, ANIOC_TRIGGER, 0); + if (ret < 0) + { + int errcode = errno; + message("adc_main: ANIOC_TRIGGER ioctl failed: %d\n", errcode); + } +#endif + + /* Read up to CONFIG_EXAMPLES_ADC_GROUPSIZE samples */ readsize = CONFIG_EXAMPLES_ADC_GROUPSIZE * sizeof(struct adc_msg_s); nbytes = read(fd, sample, readsize); @@ -351,7 +363,7 @@ int adc_main(int argc, char *argv[]) for (i = 0; i < nsamples ; i++) { message("%d: channel: %d value: %d\n", - i, sample[i].am_channel, sample[i].am_data); + i+1, sample[i].am_channel, sample[i].am_data); } } } |