sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/sensors: Fix more naming of configurations to be compliant for two more drivers. Still a few more to go.

Browse Source
This commit is contained in:
Gregory Nutt 2017-08-24 10:26:53 -06:00
parent 1f023fa31a
commit dc8f3778a9
55 changed files with 108 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/stm32/Make.defs
View File

@ -249,7 +249,7 @@ ifeq ($(CONFIG_PWM),y)
CHIP_CSRCS += stm32_pwm.c CHIP_CSRCS += stm32_pwm.c
endif endif
ifeq ($(CONFIG_QENCODER),y) ifeq ($(CONFIG_SENSORS_QENCODER),y)
CHIP_CSRCS += stm32_qencoder.c CHIP_CSRCS += stm32_qencoder.c
endif endif

4
arch/arm/src/stm32/stm32_qencoder.c
View File

@ -60,7 +60,7 @@
#include "stm32_tim.h" #include "stm32_tim.h"
#include "stm32_qencoder.h" #include "stm32_qencoder.h"
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
/************************************************************************************ /************************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@ -1219,4 +1219,4 @@ int stm32_qeinitialize(FAR const char *devpath, int tim)
return OK; return OK;
} }
#endif /* CONFIG_QENCODER */ #endif /* CONFIG_SENSORS_QENCODER */

4
arch/arm/src/stm32/stm32_qencoder.h
View File

@ -44,7 +44,7 @@
#include "chip.h" #include "chip.h"
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
/************************************************************************************ /************************************************************************************
* Included Files * Included Files
@ -137,6 +137,6 @@
int stm32_qeinitialize(FAR const char *devpath, int tim); int stm32_qeinitialize(FAR const char *devpath, int tim);
#endif /* CONFIG_QENCODER */ #endif /* CONFIG_SENSORS_QENCODER */
#endif /* __ARCH_ARM_SRC_STM32_STM32_QENCODER_H */ #endif /* __ARCH_ARM_SRC_STM32_STM32_QENCODER_H */

2
arch/arm/src/stm32l4/Make.defs
View File

@ -208,7 +208,7 @@ ifeq ($(CONFIG_PWM),y)
CHIP_CSRCS += stm32l4_pwm.c CHIP_CSRCS += stm32l4_pwm.c
endif endif
ifeq ($(CONFIG_QENCODER),y) ifeq ($(CONFIG_SENSORS_QENCODER),y)
CHIP_CSRCS += stm32l4_qencoder.c CHIP_CSRCS += stm32l4_qencoder.c
endif endif

4
arch/arm/src/stm32l4/stm32l4_qencoder.c
View File

@ -60,7 +60,7 @@
#include "stm32l4_tim.h" #include "stm32l4_tim.h"
#include "stm32l4_qencoder.h" #include "stm32l4_qencoder.h"
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
/************************************************************************************ /************************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@ -1154,4 +1154,4 @@ int stm32l4_qeinitialize(FAR const char *devpath, int tim)
return OK; return OK;
} }
#endif /* CONFIG_QENCODER */ #endif /* CONFIG_SENSORS_QENCODER */

4
arch/arm/src/stm32l4/stm32l4_qencoder.h
View File

@ -44,7 +44,7 @@
#include "chip.h" #include "chip.h"
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
/************************************************************************************ /************************************************************************************
* Included Files * Included Files
@ -136,6 +136,6 @@
int stm32l4_qeinitialize(FAR const char *devpath, int tim); int stm32l4_qeinitialize(FAR const char *devpath, int tim);
#endif /* CONFIG_QENCODER */ #endif /* CONFIG_SENSORS_QENCODER */
#endif /* __ARCH_ARM_SRC_STM32L4_STM32L4_QENCODER_H */ #endif /* __ARCH_ARM_SRC_STM32L4_STM32L4_QENCODER_H */

2
configs/freedom-kl25z/src/Makefile
View File

@ -74,7 +74,7 @@ ifeq ($(CONFIG_PWM),y)
CSRCS += kl_pwm.c CSRCS += kl_pwm.c
endif endif
ifeq ($(CONFIG_QENCODER),y) ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += kl_qencoder.c CSRCS += kl_qencoder.c
endif endif

2
configs/mikroe-stm32f4/src/Makefile
View File

@ -54,7 +54,7 @@ ifeq ($(CONFIG_PWM),y)
CSRCS += stm32_pwm.c CSRCS += stm32_pwm.c
endif endif
ifeq ($(CONFIG_QENCODER),y) ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c CSRCS += stm32_qencoder.c
endif endif

2
configs/mikroe-stm32f4/src/mikroe-stm32f4.h
View File

@ -260,7 +260,7 @@ int stm32_pwm_setup(void);
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
int stm32_qencoder_initialize(FAR const char *devpath, int timer); int stm32_qencoder_initialize(FAR const char *devpath, int timer);
#endif #endif

2
configs/mikroe-stm32f4/src/stm32_appinit.c
View File

@ -373,7 +373,7 @@ int board_app_initialize(uintptr_t arg)
#endif #endif
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
/* Initialize and register the qencoder driver */ /* Initialize and register the qencoder driver */
ret = stm32_qencoder_initialize("/dev/qe0", CONFIG_MIKROE_QETIMER); ret = stm32_qencoder_initialize("/dev/qe0", CONFIG_MIKROE_QETIMER);

2
configs/nucleo-f4x1re/src/Makefile
View File

@ -62,7 +62,7 @@ CSRCS += stm32_ajoystick.c
endif endif
endif endif
ifeq ($(CONFIG_QENCODER),y) ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c CSRCS += stm32_qencoder.c
endif endif

2
configs/nucleo-f4x1re/src/nucleo-f4x1re.h
View File

@ -328,7 +328,7 @@ int stm32_adc_setup(void);
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
int stm32_qencoder_initialize(FAR const char *devpath, int timer); int stm32_qencoder_initialize(FAR const char *devpath, int timer);
#endif #endif

2
configs/nucleo-f4x1re/src/stm32_appinit.c
View File

@ -143,7 +143,7 @@ int board_app_initialize(uintptr_t arg)
} }
#endif #endif
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
/* Initialize and register the qencoder driver */ /* Initialize and register the qencoder driver */
ret = stm32_qencoder_initialize("/dev/qe0", CONFIG_NUCLEO_F401RE_QETIMER); ret = stm32_qencoder_initialize("/dev/qe0", CONFIG_NUCLEO_F401RE_QETIMER);

2
configs/nucleo-l432kc/src/Makefile
View File

@ -52,7 +52,7 @@ ifeq ($(CONFIG_ADC),y)
CSRCS += stm32_adc.c CSRCS += stm32_adc.c
endif endif
ifeq ($(CONFIG_QENCODER),y) ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c CSRCS += stm32_qencoder.c
endif endif

2
configs/nucleo-l432kc/src/nucleo-l432kc.h
View File

@ -182,7 +182,7 @@ int board_timer_driver_initialize(FAR const char *devpath, int timer);
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
int stm32l4_qencoder_initialize(FAR const char *devpath, int timer); int stm32l4_qencoder_initialize(FAR const char *devpath, int timer);
#endif #endif

4
configs/nucleo-l432kc/src/stm32_appinit.c
View File

@ -112,7 +112,7 @@ int board_app_initialize(uintptr_t arg)
#ifdef HAVE_RTC_DRIVER #ifdef HAVE_RTC_DRIVER
FAR struct rtc_lowerhalf_s *rtclower; FAR struct rtc_lowerhalf_s *rtclower;
#endif #endif
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
int index; int index;
char buf[9]; char buf[9];
#endif #endif
@ -223,7 +223,7 @@ int board_app_initialize(uintptr_t arg)
} }
#endif #endif
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
/* Initialize and register the qencoder driver */ /* Initialize and register the qencoder driver */

2
configs/nucleo-l476rg/src/Makefile
View File

@ -62,7 +62,7 @@ CSRCS += stm32_ajoystick.c
endif endif
endif endif
ifeq ($(CONFIG_QENCODER),y) ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c CSRCS += stm32_qencoder.c
endif endif

2
configs/nucleo-l476rg/src/nucleo-l476rg.h
View File

@ -383,7 +383,7 @@ int board_timer_driver_initialize(FAR const char *devpath, int timer);
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
int stm32l4_qencoder_initialize(FAR const char *devpath, int timer); int stm32l4_qencoder_initialize(FAR const char *devpath, int timer);
#endif #endif

4
configs/nucleo-l476rg/src/stm32_appinit.c
View File

@ -112,7 +112,7 @@ int board_app_initialize(uintptr_t arg)
#ifdef HAVE_RTC_DRIVER #ifdef HAVE_RTC_DRIVER
FAR struct rtc_lowerhalf_s *rtclower; FAR struct rtc_lowerhalf_s *rtclower;
#endif #endif
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
int index; int index;
char buf[9]; char buf[9];
#endif #endif
@ -236,7 +236,7 @@ int board_app_initialize(uintptr_t arg)
} }
#endif #endif
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
/* Initialize and register the qencoder driver */ /* Initialize and register the qencoder driver */

2
configs/nutiny-nuc120/src/Makefile
View File

@ -54,7 +54,7 @@ ifeq ($(CONFIG_PWM),y)
CSRCS += nuc_pwm.c CSRCS += nuc_pwm.c
endif endif
ifeq ($(CONFIG_QENCODER),y) ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += nuc_qencoder.c CSRCS += nuc_qencoder.c
endif endif

2
configs/stm3240g-eval/src/Makefile
View File

@ -81,7 +81,7 @@ ifeq ($(CONFIG_INPUT_STMPE811),y)
CSRCS += stm32_stmpe811.c CSRCS += stm32_stmpe811.c
endif endif
ifeq ($(CONFIG_QENCODER),y) ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c CSRCS += stm32_qencoder.c
endif endif

2
configs/stm32f0discovery/src/Makefile
View File

@ -57,7 +57,7 @@ ifeq ($(CONFIG_PWM),y)
CSRCS += stm32_pwm.c CSRCS += stm32_pwm.c
endif endif
ifeq ($(CONFIG_QENCODER),y) ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c CSRCS += stm32_qencoder.c
endif endif

2
configs/stm32f103-minimum/README.txt
View File

@ -255,7 +255,7 @@ Quadrature Encoder:
- These setting enable support for the common QEncode upper half driver: - These setting enable support for the common QEncode upper half driver:
CONFIG_SENSORS=y CONFIG_SENSORS=y
CONFIG_QENCODER=y CONFIG_SENSORS_QENCODER=y
- This is a board setting that selected timer 4 for use with the - This is a board setting that selected timer 4 for use with the
quadrature encode: quadrature encode:

4
configs/stm32f103-minimum/src/Makefile
View File

@ -97,11 +97,11 @@ ifeq ($(CONFIG_LCD_PCD8544),y)
CSRCS += stm32_pcd8544.c CSRCS += stm32_pcd8544.c
endif endif
ifeq ($(CONFIG_QENCODER),y) ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c CSRCS += stm32_qencoder.c
endif endif
ifeq ($(CONFIG_VEML6070),y) ifeq ($(CONFIG_SENSORS_VEML6070),y)
CSRCS += stm32_veml6070.c CSRCS += stm32_veml6070.c
endif endif

4
configs/stm32f103-minimum/src/stm32_bringup.c
View File

@ -250,7 +250,7 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
/* Initialize and register the qencoder driver */ /* Initialize and register the qencoder driver */
ret = stm32_qencoder_initialize("/dev/qe0", CONFIG_STM32F103MINIMUM_QETIMER); ret = stm32_qencoder_initialize("/dev/qe0", CONFIG_STM32F103MINIMUM_QETIMER);
@ -272,7 +272,7 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_VEML6070 #ifdef CONFIG_SENSORS_VEML6070
/* Register the UV-A light sensor */ /* Register the UV-A light sensor */
ret = stm32_veml6070initialize("/dev/uvlight0"); ret = stm32_veml6070initialize("/dev/uvlight0");

4
configs/stm32f103-minimum/src/stm32_veml6070.c
View File

@ -49,7 +49,7 @@
#include "stm32_i2c.h" #include "stm32_i2c.h"
#include "stm32f103_minimum.h" #include "stm32f103_minimum.h"
#if defined(CONFIG_I2C) && defined(CONFIG_VEML6070) #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_VEML6070)
/************************************************************************************ /************************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@ -102,4 +102,4 @@ int stm32_veml6070initialize(FAR const char *devpath)
return ret; return ret;
} }
#endif /* CONFIG_I2C && CONFIG_VEML6070 && CONFIG_STM32_I2C1 */ #endif /* CONFIG_I2C && CONFIG_SENSORS_VEML6070 && CONFIG_STM32_I2C1 */

4
configs/stm32f103-minimum/src/stm32f103_minimum.h
View File

@ -225,7 +225,7 @@ int stm32_w25initialize(int minor);
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
int stm32_qencoder_initialize(FAR const char *devpath, int timer); int stm32_qencoder_initialize(FAR const char *devpath, int timer);
#endif #endif
@ -334,7 +334,7 @@ int stm32_tone_setup(void);
* *
***********************************************************************************/ ***********************************************************************************/
#ifdef CONFIG_VEML6070 #ifdef CONFIG_SENSORS_VEML6070
int stm32_veml6070initialize(FAR const char *devpath); int stm32_veml6070initialize(FAR const char *devpath);
#endif #endif

2
configs/stm32f103-minimum/veml6070/defconfig
View File

@ -53,5 +53,5 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VEML6070=y CONFIG_SENSORS_VEML6070=y
CONFIG_WDOG_INTRESERVE=0 CONFIG_WDOG_INTRESERVE=0

2
configs/stm32f3discovery/src/Makefile
View File

@ -56,7 +56,7 @@ ifeq ($(CONFIG_PWM),y)
CSRCS += stm32_pwm.c CSRCS += stm32_pwm.c
endif endif
ifeq ($(CONFIG_QENCODER),y) ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c CSRCS += stm32_qencoder.c
endif endif

2
configs/stm32f3discovery/src/stm32_appinit.c
View File

@ -137,7 +137,7 @@ int board_app_initialize(uintptr_t arg)
} }
#endif #endif
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
/* Initialize and register the qencoder driver */ /* Initialize and register the qencoder driver */
ret = stm32_qencoder_initialize("/dev/qe0", CONFIG_STM32F3DISCO_QETIMER); ret = stm32_qencoder_initialize("/dev/qe0", CONFIG_STM32F3DISCO_QETIMER);

2
configs/stm32f3discovery/src/stm32f3discovery.h
View File

@ -181,7 +181,7 @@ int stm32_pwm_setup(void);
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
int stm32_qencoder_initialize(FAR const char *devpath, int timer); int stm32_qencoder_initialize(FAR const char *devpath, int timer);
#endif #endif

2
configs/stm32f429i-disco/README.txt
View File

@ -726,7 +726,7 @@ Where <subdir> is one of the following:
CONFIG_EXAMPLES_QENCODER=y : Enable the apps/examples/qencoder CONFIG_EXAMPLES_QENCODER=y : Enable the apps/examples/qencoder
CONFIG_SENSORS=y : Enable support for sensors CONFIG_SENSORS=y : Enable support for sensors
CONFIG_QENCODER=y : Enable the generic Quadrature Encoder infrastructure CONFIG_SENSORS_QENCODER=y : Enable the generic Quadrature Encoder infrastructure
CONFIG_STM32_TIM8=y : Enable TIM8 CONFIG_STM32_TIM8=y : Enable TIM8
CONFIG_STM32_TIM2=n : (Or optionally TIM2) CONFIG_STM32_TIM2=n : (Or optionally TIM2)
CONFIG_STM32_TIM8_QE=y : Use TIM8 as the quadrature encoder CONFIG_STM32_TIM8_QE=y : Use TIM8 as the quadrature encoder

4
configs/stm32f4discovery/README.txt
View File

@ -458,7 +458,7 @@ Quadrature Encoder:
CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_INITIALIZE=y
CONFIG_SENSORS=y CONFIG_SENSORS=y
CONFIG_QENCODER=y CONFIG_SENSORS_QENCODER=y
- The timer 2 needs to be enabled: - The timer 2 needs to be enabled:
@ -1691,7 +1691,7 @@ Where <subdir> is one of the following:
CONFIG_EXAMPLES_QENCODER=y : Enable the apps/examples/qencoder CONFIG_EXAMPLES_QENCODER=y : Enable the apps/examples/qencoder
CONFIG_SENSORS=y : Enable support for sensors CONFIG_SENSORS=y : Enable support for sensors
CONFIG_QENCODER=y : Enable the generic Quadrature Encoder infrastructure CONFIG_SENSORS_QENCODER=y : Enable the generic Quadrature Encoder infrastructure
CONFIG_STM32_TIM8=y : Enable TIM8 CONFIG_STM32_TIM8=y : Enable TIM8
CONFIG_STM32_TIM2=n : (Or optionally TIM2) CONFIG_STM32_TIM2=n : (Or optionally TIM2)
CONFIG_STM32_TIM8_QE=y : Use TIM8 as the quadrature encoder CONFIG_STM32_TIM8_QE=y : Use TIM8 as the quadrature encoder

6
configs/stm32f4discovery/src/Makefile
View File

@ -96,11 +96,11 @@ ifeq ($(CONFIG_PWM),y)
CSRCS += stm32_pwm.c CSRCS += stm32_pwm.c
endif endif
ifeq ($(CONFIG_QENCODER),y) ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c CSRCS += stm32_qencoder.c
endif endif
ifeq ($(CONFIG_XEN1210),y) ifeq ($(CONFIG_SENSORS_XEN1210),y)
CSRCS += stm32_xen1210.c CSRCS += stm32_xen1210.c
endif endif
@ -116,7 +116,7 @@ ifeq ($(CONFIG_PM_BUTTONS),y)
CSRCS += stm32_pmbuttons.c CSRCS += stm32_pmbuttons.c
endif endif
ifeq ($(CONFIG_ZEROCROSS),y) ifeq ($(CONFIG_SENSORS_ZEROCROSS),y)
CSRCS += stm32_zerocross.c CSRCS += stm32_zerocross.c
endif endif

6
configs/stm32f4discovery/src/stm32_bringup.c
View File

@ -110,7 +110,7 @@ int stm32_bringup(void)
stm32_bh1750initialize("/dev/light0"); stm32_bh1750initialize("/dev/light0");
#endif #endif
#ifdef CONFIG_ZEROCROSS #ifdef CONFIG_SENSORS_ZEROCROSS
/* Configure the zero-crossing driver */ /* Configure the zero-crossing driver */
stm32_zerocross_initialize(); stm32_zerocross_initialize();
@ -197,7 +197,7 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
/* Initialize and register the qencoder driver */ /* Initialize and register the qencoder driver */
ret = stm32_qencoder_initialize("/dev/qe0", CONFIG_STM32F4DISCO_QETIMER); ret = stm32_qencoder_initialize("/dev/qe0", CONFIG_STM32F4DISCO_QETIMER);
@ -283,7 +283,7 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_XEN1210 #ifdef CONFIG_SENSORS_XEN1210
ret = xen1210_archinitialize(0); ret = xen1210_archinitialize(0);
#endif #endif

14
configs/stm32f4discovery/src/stm32_xen1210.c
View File

@ -65,15 +65,15 @@
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
#ifdef CONFIG_XEN1210 #ifdef CONFIG_SENSORS_XEN1210
#ifndef CONFIG_STM32_SPI1 #ifndef CONFIG_STM32_SPI1
# error "XEN1210 support requires CONFIG_STM32_SPI1" # error "XEN1210 support requires CONFIG_STM32_SPI1"
#endif #endif
#define CONFIG_XEN1210_SPIDEV 1 #define BOARD_XEN1210_SPIDEV 1
#ifndef CONFIG_XEN1210_DEVMINOR #ifndef BOARD_XEN1210_DEVMINOR
# define CONFIG_XEN1210_DEVMINOR 0 # define BOARD_XEN1210_DEVMINOR 0
#endif #endif
#ifndef CONFIG_STM32_TIM1 #ifndef CONFIG_STM32_TIM1
@ -323,10 +323,10 @@ int xen1210_archinitialize(int minor)
/* Get an instance of the I2C interface */ /* Get an instance of the I2C interface */
dev = stm32_spibus_initialize(CONFIG_XEN1210_SPIDEV); dev = stm32_spibus_initialize(BOARD_XEN1210_SPIDEV);
if (!dev) if (!dev)
{ {
snerr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_XEN1210_SPIDEV); snerr("ERROR: Failed to initialize SPI bus %d\n", BOARD_XEN1210_SPIDEV);
return -ENODEV; return -ENODEV;
} }
@ -342,7 +342,7 @@ int xen1210_archinitialize(int minor)
/* Initialize and register the XEN1210 driver */ /* Initialize and register the XEN1210 driver */
ret = xen1210_register(g_xen1210config.handle, CONFIG_XEN1210_DEVMINOR); ret = xen1210_register(g_xen1210config.handle, BOARD_XEN1210_DEVMINOR);
if (ret < 0) if (ret < 0)
{ {
snerr("ERROR: Failed to register XEN1210 driver: %d\n", ret); snerr("ERROR: Failed to register XEN1210 driver: %d\n", ret);

4
configs/stm32f4discovery/src/stm32_zerocross.c
View File

@ -49,7 +49,7 @@
#include "stm32_gpio.h" #include "stm32_gpio.h"
#include "stm32f4discovery.h" #include "stm32f4discovery.h"
#ifdef CONFIG_ZEROCROSS #ifdef CONFIG_SENSORS_ZEROCROSS
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@ -202,4 +202,4 @@ int stm32_zerocross_initialize(void)
return zc_register("/dev/zc0", &g_zcrosslower); return zc_register("/dev/zc0", &g_zcrosslower);
} }
#endif /* CONFIG_ZEROCROSS */ #endif /* CONFIG_SENSORS_ZEROCROSS */

6
configs/stm32f4discovery/src/stm32f4discovery.h
View File

@ -614,7 +614,7 @@ void weak_function stm32_netinitialize(void);
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
int stm32_qencoder_initialize(FAR const char *devpath, int timer); int stm32_qencoder_initialize(FAR const char *devpath, int timer);
#endif #endif
@ -626,7 +626,7 @@ int stm32_qencoder_initialize(FAR const char *devpath, int timer);
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_ZEROCROSS #ifdef CONFIG_SENSORS_ZEROCROSS
int stm32_zerocross_initialize(void); int stm32_zerocross_initialize(void);
#endif #endif
@ -740,7 +740,7 @@ int stm32_timer_driver_setup(FAR const char *devpath, int timer);
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_XEN1210 #ifdef CONFIG_SENSORS_XEN1210
int xen1210_archinitialize(int minor); int xen1210_archinitialize(int minor);
#endif #endif

2
configs/stm32f4discovery/xen1210/defconfig
View File

@ -55,4 +55,4 @@ CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXBUFSIZE=128 CONFIG_USART2_TXBUFSIZE=128
CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_XEN1210=y CONFIG_SENSORS_XEN1210=y

2
configs/stm32ldiscovery/src/Makefile
View File

@ -56,7 +56,7 @@ ifeq ($(CONFIG_PWM),y)
CSRCS += stm32_pwm.c CSRCS += stm32_pwm.c
endif endif
ifeq ($(CONFIG_QENCODER),y) ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c CSRCS += stm32_qencoder.c
endif endif

2
configs/stm32ldiscovery/src/stm32_appinit.c
View File

@ -101,7 +101,7 @@ int board_app_initialize(uintptr_t arg)
} }
#endif #endif
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
/* Initialize and register the qencoder driver */ /* Initialize and register the qencoder driver */
ret = stm32_qencoder_initialize("/dev/qe0", CONFIG_STM32LDISCO_QETIMER); ret = stm32_qencoder_initialize("/dev/qe0", CONFIG_STM32LDISCO_QETIMER);

2
configs/stm32ldiscovery/src/stm32ldiscovery.h
View File

@ -263,7 +263,7 @@ int stm32_pwm_setup(void);
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
int stm32_qencoder_initialize(FAR const char *devpath, int timer); int stm32_qencoder_initialize(FAR const char *devpath, int timer);
#endif #endif

21
drivers/sensors/Kconfig
View File

@ -343,7 +343,7 @@ config LM75_I2C_FREQUENCY
range 1 100000 range 1 100000
depends on LM75_I2C depends on LM75_I2C
config LM92 config SENSORS_LM92
bool "TI LM92 Temperature Sensor support" bool "TI LM92 Temperature Sensor support"
default n default n
select I2C select I2C
@ -356,24 +356,35 @@ config LM92_I2C_FREQUENCY
range 1 400000 range 1 400000
depends on LM92 depends on LM92
config QENCODER config SENSORS_QENCODER
bool "Qencoder" bool "Qencoder"
default n default n
config VEML6070 config SENSORS_VEML6070
bool "Vishay VEML6070 UV-A Light Sensor support" bool "Vishay VEML6070 UV-A Light Sensor support"
default n default n
select I2C select I2C
---help--- ---help---
Enable driver support for the Vishay VEML6070 UV-A light sensor. Enable driver support for the Vishay VEML6070 UV-A light sensor.
config XEN1210 config VEML6070_I2C_FREQUENCY
int "VEML6070 I2C frequency"
default 100000
depends on SENSORS_VEML6070
config SENSORS_XEN1210
bool "Sensixs XEN1210 Magnetometer" bool "Sensixs XEN1210 Magnetometer"
default n default n
select SPI select SPI
---help--- ---help---
Enable driver support for the Sensixs XEN1210 Magnetometer. Enable driver support for the Sensixs XEN1210 Magnetometer.
config ZEROCROSS config XEN1210_REGDBUG
bool "Debug support for the XEN1210"
default n
---help---
Enables register level debug features for the XEN1210
config SENSORS_ZEROCROSS
bool "Zero Cross Sensor" bool "Zero Cross Sensor"
default n default n

8
drivers/sensors/Make.defs
View File

@ -158,25 +158,25 @@ endif # CONFIG_SPI
# Quadrature encoder upper half # Quadrature encoder upper half
ifeq ($(CONFIG_QENCODER),y) ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += qencoder.c CSRCS += qencoder.c
endif endif
# Vishay VEML6070 # Vishay VEML6070
ifeq ($(CONFIG_VEML6070),y) ifeq ($(CONFIG_SENSORS_VEML6070),y)
CSRCS += veml6070.c CSRCS += veml6070.c
endif endif
# Sensixs XEN1210 # Sensixs XEN1210
ifeq ($(CONFIG_XEN1210),y) ifeq ($(CONFIG_SENSORS_XEN1210),y)
CSRCS += xen1210.c CSRCS += xen1210.c
endif endif
# Zero Cross upper half # Zero Cross upper half
ifeq ($(CONFIG_ZEROCROSS),y) ifeq ($(CONFIG_SENSORS_ZEROCROSS),y)
CSRCS += zerocross.c CSRCS += zerocross.c
endif endif

4
drivers/sensors/as5048b.c
View File

@ -52,7 +52,7 @@
#include <nuttx/i2c/i2c_master.h> #include <nuttx/i2c/i2c_master.h>
#include <nuttx/sensors/as5048b.h> #include <nuttx/sensors/as5048b.h>
#if defined(CONFIG_I2C) && defined(CONFIG_QENCODER) && defined(CONFIG_SENSORS_AS5048B) #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_QENCODER) && defined(CONFIG_SENSORS_AS5048B)
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
@ -619,4 +619,4 @@ FAR struct qe_lowerhalf_s *as5048b_initialize(FAR struct i2c_master_s *i2c,
return &priv->lower; return &priv->lower;
} }
#endif /* CONFIG_I2C && CONFIG_QENCODER && CONFIG_SENSORS_AS5048B */ #endif /* CONFIG_I2C && CONFIG_SENSORS_QENCODER && CONFIG_SENSORS_AS5048B */

4
drivers/sensors/qencoder.c
View File

@ -58,7 +58,7 @@
#include <arch/irq.h> #include <arch/irq.h>
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@ -385,4 +385,4 @@ int qe_register(FAR const char *devpath, FAR struct qe_lowerhalf_s *lower)
return register_driver(devpath, &g_qeops, 0666, upper); return register_driver(devpath, &g_qeops, 0666, upper);
} }
#endif /* CONFIG_QENCODER */ #endif /* CONFIG_SENSORS_QENCODER */

4
drivers/sensors/veml6070.c
View File

@ -50,7 +50,7 @@
#include <nuttx/sensors/veml6070.h> #include <nuttx/sensors/veml6070.h>
#include <nuttx/random.h> #include <nuttx/random.h>
#if defined(CONFIG_I2C) && defined(CONFIG_VEML6070) #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_VEML6070)
/**************************************************************************** /****************************************************************************
* Pre-process Definitions * Pre-process Definitions
@ -354,4 +354,4 @@ int veml6070_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
return ret; return ret;
} }
#endif /* CONFIG_I2C && CONFIG_VEML6070 */ #endif /* CONFIG_I2C && CONFIG_SENSORS_VEML6070 */

2
drivers/sensors/xen1210.c
View File

@ -53,7 +53,7 @@
#include "xen1210.h" #include "xen1210.h"
#if defined(CONFIG_XEN1210) #if defined(CONFIG_SENSORS_XEN1210)
/**************************************************************************** /****************************************************************************
* Private Function Prototypes * Private Function Prototypes

2
drivers/sensors/xen1210.h
View File

@ -49,7 +49,7 @@
#include <nuttx/wqueue.h> #include <nuttx/wqueue.h>
#include <nuttx/sensors/xen1210.h> #include <nuttx/sensors/xen1210.h>
#if defined(CONFIG_XEN1210) #if defined(CONFIG_SENSORS_XEN1210)
/******************************************************************************************** /********************************************************************************************
* Pre-processor Definitions * Pre-processor Definitions

4
drivers/sensors/zerocross.c
View File

@ -58,7 +58,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#ifdef CONFIG_ZEROCROSS #ifdef CONFIG_SENSORS_ZEROCROSS
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@ -541,4 +541,4 @@ int zc_register(FAR const char *devname, FAR struct zc_lowerhalf_s *lower)
return ret; return ret;
} }
#endif /* CONFIG_ZEROCROSS */ #endif /* CONFIG_SENSORS_ZEROCROSS */

4
include/nuttx/sensors/as5048b.h
View File

@ -43,7 +43,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/sensors/qencoder.h> #include <nuttx/sensors/qencoder.h>
#if defined(CONFIG_I2C) && defined(CONFIG_QENCODER) && defined(CONFIG_SENSORS_AS5048B) #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_QENCODER) && defined(CONFIG_SENSORS_AS5048B)
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@ -137,5 +137,5 @@ FAR struct qe_lowerhalf_s *as5048b_initialize(FAR struct i2c_master_s *i2c,
} }
#endif #endif
#endif /* CONFIG_I2C && CONFIG_QENCODER && CONFIG_SENSORS_AS5048B */ #endif /* CONFIG_I2C && CONFIG_SENSORS_QENCODER && CONFIG_SENSORS_AS5048B */
#endif /* __INCLUDE_NUTTX_SENSORS_AS5048B */ #endif /* __INCLUDE_NUTTX_SENSORS_AS5048B */

6
include/nuttx/sensors/qencoder.h
View File

@ -43,13 +43,13 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/fs/ioctl.h> #include <nuttx/fs/ioctl.h>
#ifdef CONFIG_QENCODER #ifdef CONFIG_SENSORS_QENCODER
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************ /* Configuration ************************************************************
* CONFIG_QENCODER - Enables support for the quadrature encoder upper half * CONFIG_SENSORS_QENCODER - Enables support for the quadrature encoder upper half
*/ */
/* IOCTL Commands ***********************************************************/ /* IOCTL Commands ***********************************************************/
@ -187,5 +187,5 @@ int qe_register(FAR const char *devpath, FAR struct qe_lowerhalf_s *lower);
} }
#endif #endif
#endif /* CONFIG_QENCODER */ #endif /* CONFIG_SENSORS_QENCODER */
#endif /* __INCLUDE_NUTTX_SENSORS_QENCODER_H */ #endif /* __INCLUDE_NUTTX_SENSORS_QENCODER_H */

4
include/nuttx/sensors/veml6070.h
View File

@ -45,7 +45,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/sensors/ioctl.h> #include <nuttx/sensors/ioctl.h>
#if defined(CONFIG_VEML6070) #if defined(CONFIG_SENSORS_VEML6070)
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@ -118,5 +118,5 @@ int veml6070_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
} }
#endif #endif
#endif /* CONFIG_VEML6070 */ #endif /* CONFIG_SENSORS_VEML6070 */
#endif /* __INCLUDE_NUTTX_SENSORS_VEML6070_H */ #endif /* __INCLUDE_NUTTX_SENSORS_VEML6070_H */

4
include/nuttx/sensors/xen1210.h
View File

@ -43,7 +43,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/irq.h> #include <nuttx/irq.h>
#if defined(CONFIG_XEN1210) #if defined(CONFIG_SENSORS_XEN1210)
/******************************************************************************************** /********************************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@ -56,7 +56,7 @@
* *
* Settings that effect the driver: CONFIG_DISABLE_POLL * Settings that effect the driver: CONFIG_DISABLE_POLL
* *
* CONFIG_XEN1210 * CONFIG_SENSORS_XEN1210
* Enables support for the XEN1210 driver * Enables support for the XEN1210 driver
*/ */

6
include/nuttx/sensors/zerocross.h
View File

@ -43,13 +43,13 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/fs/ioctl.h> #include <nuttx/fs/ioctl.h>
#ifdef CONFIG_ZEROCROSS #ifdef CONFIG_SENSORS_ZEROCROSS
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************ /* Configuration ************************************************************
* CONFIG_ZEROCROSS - Enables support for the zero cross AC detection upper * CONFIG_SENSORS_ZEROCROSS - Enables support for the zero cross AC detection upper
* half * half
*/ */
@ -147,5 +147,5 @@ int zc_register(FAR const char *devpath, FAR struct zc_lowerhalf_s *lower);
} }
#endif #endif
#endif /* CONFIG_ZEROCROSS */ #endif /* CONFIG_SENSORS_ZEROCROSS */
#endif /* __INCLUDE_NUTTX_SENSORS_ZEROCROSS_H */ #endif /* __INCLUDE_NUTTX_SENSORS_ZEROCROSS_H */