summaryrefslogtreecommitdiff
path: root/nuttx/configs
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-12-16 08:16:53 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-12-16 08:16:53 -0600
commit08be24e16d857b79c0e3ac7e3f6beb6c114d0662 (patch)
treec150c40575cf68ac8795019a9cf04dd7bbed2d45 /nuttx/configs
parent8db1b5542eade3ec3f0e20fd8ab1fd748cb2886c (diff)
downloadnuttx-08be24e16d857b79c0e3ac7e3f6beb6c114d0662.tar.gz
nuttx-08be24e16d857b79c0e3ac7e3f6beb6c114d0662.tar.bz2
nuttx-08be24e16d857b79c0e3ac7e3f6beb6c114d0662.zip
Add ADXL345 accelerometer driver. From Alan Carvalho de Assis
Diffstat (limited to 'nuttx/configs')
-rw-r--r--nuttx/configs/freedom-kl25z/src/Makefile2
-rw-r--r--nuttx/configs/freedom-kl25z/src/kl_adxl345.c8
-rw-r--r--nuttx/configs/freedom-kl25z/src/kl_nsh.c2
3 files changed, 4 insertions, 8 deletions
diff --git a/nuttx/configs/freedom-kl25z/src/Makefile b/nuttx/configs/freedom-kl25z/src/Makefile
index f9fffab87..42d583488 100644
--- a/nuttx/configs/freedom-kl25z/src/Makefile
+++ b/nuttx/configs/freedom-kl25z/src/Makefile
@@ -86,7 +86,7 @@ ifeq ($(CONFIG_NSH_LIBRARY),y)
CSRCS += kl_nsh.c
endif
-ifeq ($(CONFIG_INPUT_ADXL345),y)
+ifeq ($(CONFIG_SENSORS_ADXL345),y)
CSRCS += kl_adxl345.c
endif
diff --git a/nuttx/configs/freedom-kl25z/src/kl_adxl345.c b/nuttx/configs/freedom-kl25z/src/kl_adxl345.c
index ef9f0a295..a75658357 100644
--- a/nuttx/configs/freedom-kl25z/src/kl_adxl345.c
+++ b/nuttx/configs/freedom-kl25z/src/kl_adxl345.c
@@ -57,11 +57,7 @@
****************************************************************************/
/* Configuration ************************************************************/
-#ifdef CONFIG_INPUT_ADXL345
-#ifndef CONFIG_INPUT
-# error "ADXL345 support requires CONFIG_INPUT"
-#endif
-
+#ifdef CONFIG_SENSORS_ADXL345
#ifndef CONFIG_KL_SPI0
# error "ADXL345 support requires CONFIG_KL_SPI0"
#endif
@@ -286,4 +282,4 @@ int adxl345_archinitialize(int minor)
return OK;
}
-#endif /* CONFIG_INPUT_ADXL345 */
+#endif /* CONFIG_SENSORS_ADXL345 */
diff --git a/nuttx/configs/freedom-kl25z/src/kl_nsh.c b/nuttx/configs/freedom-kl25z/src/kl_nsh.c
index f17f52307..a191eba53 100644
--- a/nuttx/configs/freedom-kl25z/src/kl_nsh.c
+++ b/nuttx/configs/freedom-kl25z/src/kl_nsh.c
@@ -70,7 +70,7 @@
int nsh_archinitialize(void)
{
-#if defined(CONFIG_INPUT_ADXL345)
+#if defined(CONFIG_SENSORS_ADXL345)
int ret;
ret = adxl345_archinitialize(0);