Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 14:27:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

sensors/adxl372: add support for the new sensor framework

Browse Source 
adxl372 can be used with the new sensor framework
This commit is contained in:
raiden00pl
2024-03-09 10:31:40 +01:00
committed by Xiang Xiao
parent d0820acbbb
commit 3d765616ea
7 changed files with 692 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/sensors/CMakeLists.txt
+5 -1
View File
@@ -277,7 +277,11 @@ if(CONFIG_SENSORS)
endif() endif()
if(CONFIG_SENSORS_ADXL372) if(CONFIG_SENSORS_ADXL372)
list(APPEND SRCS adxl372.c) if(CONFIG_SENSORS_ADXL372_UORB)
list(APPEND SRCS adxl372_uorb.c)
else()
list(APPEND SRCS adxl372.c)
endif()
endif() endif()
if(CONFIG_LIS3DSH) if(CONFIG_LIS3DSH)
drivers/sensors/Kconfig
+33
View File
@@ -962,6 +962,39 @@ config SENSORS_ADXL372
---help--- ---help---
Enable driver support for the Analog Devices ADXL372 Sensor. Enable driver support for the Analog Devices ADXL372 Sensor.
if SENSORS_ADXL372
config SENSORS_ADXL372_UORB
bool "ADXL372 UORB interface"
default n
if SENSORS_ADXL372_UORB
config SENSORS_ADXL372_POLL
bool "Enables polling sensor data"
default n
---help---
Enables polling of sensor.
config SENSORS_ADXL372_POLL_INTERVAL
int "Polling interval in microseconds, default 1 sec"
depends on SENSORS_ADXL372_POLL
default 1000000
range 0 4294967295
---help---
The interval until a new sensor measurement will be triggered.
config SENSORS_ADXL372_THREAD_STACKSIZE
int "Worker thread stack size"
depends on SENSORS_ADXL372_POLL
default 1024
---help---
The stack size for the worker thread.
endif #SENSORS_ADXL372_UORB
endif # SENSORS_ADXL372
config SENSORS_MPU60X0 config SENSORS_MPU60X0
bool "Invensense MPU60x0 Sensor support" bool "Invensense MPU60x0 Sensor support"
default n default n
drivers/sensors/Make.defs
+4
View File
@@ -298,8 +298,12 @@ ifeq ($(CONFIG_SENSORS_ADXL362),y)
endif endif
ifeq ($(CONFIG_SENSORS_ADXL372),y) ifeq ($(CONFIG_SENSORS_ADXL372),y)
ifeq ($(CONFIG_SENSORS_ADXL372_UORB),y)
CSRCS += adxl372_uorb.c
else
CSRCS += adxl372.c CSRCS += adxl372.c
endif endif
endif
ifeq ($(CONFIG_LIS3DSH),y) ifeq ($(CONFIG_LIS3DSH),y)
CSRCS += lis3dsh.c CSRCS += lis3dsh.c
drivers/sensors/adxl372.c
+4 -4
View File
@@ -225,7 +225,7 @@ static uint8_t adxl372_read_register(FAR struct adxl372_dev_s *dev,
/* Transmit the register address from where we want to read. */ /* Transmit the register address from where we want to read. */
SPI_SEND(dev->spi, reg_addr | ADXL372_READ); SPI_SEND(dev->spi, (reg_addr << 1) | ADXL372_READ);
/* Write an idle byte while receiving the requested data */ /* Write an idle byte while receiving the requested data */
@@ -266,7 +266,7 @@ static void adxl372_read_registerblk(FAR struct adxl372_dev_s *dev,
/* Transmit the register address from where we want to start reading */ /* Transmit the register address from where we want to start reading */
SPI_SEND(dev->spi, reg_addr | ADXL372_READ); SPI_SEND(dev->spi, (reg_addr << 1) | ADXL372_READ);
/* Write idle bytes while receiving the requested data */ /* Write idle bytes while receiving the requested data */
@@ -306,7 +306,7 @@ static void adxl372_write_register(FAR struct adxl372_dev_s *dev,
/* Transmit the register address to where we want to write */ /* Transmit the register address to where we want to write */
SPI_SEND(dev->spi, reg_addr | ADXL372_WRITE); SPI_SEND(dev->spi, (reg_addr << 1) | ADXL372_WRITE);
/* Transmit the content which should be written into the register */ /* Transmit the content which should be written into the register */
@@ -345,7 +345,7 @@ static void adxl372_write_registerblk(FAR struct adxl372_dev_s *dev,
/* Transmit the register address to where we want to start writing */ /* Transmit the register address to where we want to start writing */
SPI_SEND(dev->spi, reg_addr | ADXL372_WRITE); SPI_SEND(dev->spi, (reg_addr << 1) | ADXL372_WRITE);
/* Transmit the content which should be written in the register block */ /* Transmit the content which should be written in the register block */
drivers/sensors/adxl372_uorb.c
+611
View File
File diff suppressed because it is too large Load Diff
drivers/sensors/bmi160_uorb.c
+4
View File
@@ -716,6 +716,10 @@ static int bmi160_register_gyro(int devno,
return ret; return ret;
} }
/****************************************************************************
* Public Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: bmi160_register * Name: bmi160_register
* *
include/nuttx/sensors/adxl372.h
+31 -24
View File
@@ -95,54 +95,54 @@
/* ADXL372 Accelerometer Register definitions */ /* ADXL372 Accelerometer Register definitions */
#define ADXL372_DEVID_AD (0x00 << 1) #define ADXL372_DEVID_AD 0x00
# define ADXL372_DEVID_AD_VALUE 0xad # define ADXL372_DEVID_AD_VALUE 0xad
#define ADXL372_DEVID_MST (0x01 << 1) #define ADXL372_DEVID_MST 0x01
# define ADXL372_DEVID_MST_VALUE 0x1D # define ADXL372_DEVID_MST_VALUE 0x1d
#define ADXL372_PARTID (0x02 << 1) #define ADXL372_PARTID 0x02
# define ADXL372_PARTID_VALUE 0xfa # define ADXL372_PARTID_VALUE 0xfa
#define ADXL372_REVID (0x03 << 1) #define ADXL372_REVID 0x03
#define ADXL372_STATUS (0x04 << 1) #define ADXL372_STATUS 0x04
#define ADXL372_STATUS2 (0x05 << 1) #define ADXL372_STATUS2 0x05
#define ADXL372_FIFO_ENTRIES2 (0x06 << 1) #define ADXL372_FIFO_ENTRIES2 0x06
#define ADXL372_FIFO_ENTRIES (0x07 << 1) #define ADXL372_FIFO_ENTRIES 0x07
#define ADXL372_XDATA_H (0x08 << 1) #define ADXL372_XDATA_H 0x08
#define ADXL372_XDATA_L (0x09 << 1) #define ADXL372_XDATA_L 0x09
#define ADXL372_YDATA_H (0x0a << 1) #define ADXL372_YDATA_H 0x0a
#define ADXL372_YDATA_L (0x0b << 1) #define ADXL372_YDATA_L 0x0b
#define ADXL372_ZDATA_H (0x0c << 1) #define ADXL372_ZDATA_H 0x0c
#define ADXL372_ZDATA_L (0x0d << 1) #define ADXL372_ZDATA_L 0x0d
#define ADXL372_THRESH_ACT_X_H (0x23 << 1) #define ADXL372_THRESH_ACT_X_H 0x23
#define ADXL372_FIFO_CTL (0x3a << 1) #define ADXL372_FIFO_CTL 0x3a
# define ADXL372_FIFO_BYPASSED 0x00 # define ADXL372_FIFO_BYPASSED 0x00
# define ADXL372_FIFO_STREAMED 0x02 # define ADXL372_FIFO_STREAMED 0x02
#define ADXL372_INT1_MAP (0x3b << 1) #define ADXL372_INT1_MAP 0x3b
# define ADXL372_INT1_MAP_DR 0x01 # define ADXL372_INT1_MAP_DR 0x01
# define ADXL372_INT1_MAP_FRDY 0x02 # define ADXL372_INT1_MAP_FRDY 0x02
# define ADXL372_INT1_MAP_FFULL 0x04 # define ADXL372_INT1_MAP_FFULL 0x04
#define ADXL372_TIMING (0x3d << 1) #define ADXL372_TIMING 0x3d
# define ADXL372_TIMING_ODR400 (0x0 << 5) /* 400 Hz ODR */ # define ADXL372_TIMING_ODR400 (0x0 << 5) /* 400 Hz ODR */
# define ADXL372_TIMING_ODR800 (0x1 << 5) /* 800 Hz ODR */ # define ADXL372_TIMING_ODR800 (0x1 << 5) /* 800 Hz ODR */
# define ADXL372_TIMING_ODR1600 (0x2 << 5) /* 1600 Hz ODR */ # define ADXL372_TIMING_ODR1600 (0x2 << 5) /* 1600 Hz ODR */
# define ADXL372_TIMING_ODR3200 (0x3 << 5) /* 3200 Hz ODR */ # define ADXL372_TIMING_ODR3200 (0x3 << 5) /* 3200 Hz ODR */
# define ADXL372_TIMING_ODR6400 (0x4 << 5) /* 6400 Hz ODR */ # define ADXL372_TIMING_ODR6400 (0x4 << 5) /* 6400 Hz ODR */
#define ADXL372_MEASURE (0x3e << 1) #define ADXL372_MEASURE 0x3e
# define ADXL372_MEAS_BW200 0x0 /* 200 Hz Bandwidth */ # define ADXL372_MEAS_BW200 0x0 /* 200 Hz Bandwidth */
# define ADXL372_MEAS_BW400 0x1 /* 400 Hz Bandwidth */ # define ADXL372_MEAS_BW400 0x1 /* 400 Hz Bandwidth */
# define ADXL372_MEAS_BW800 0x2 /* 800 Hz Bandwidth */ # define ADXL372_MEAS_BW800 0x2 /* 800 Hz Bandwidth */
# define ADXL372_MEAS_BW1600 0x3 /* 1600 Hz Bandwidth */ # define ADXL372_MEAS_BW1600 0x3 /* 1600 Hz Bandwidth */
# define ADXL372_MEAS_BW3200 0x4 /* 3200 Hz Bandwidth */ # define ADXL372_MEAS_BW3200 0x4 /* 3200 Hz Bandwidth */
#define ADXL372_POWER_CTL (0x3f << 1) #define ADXL372_POWER_CTL 0x3f
# define ADXL372_POWER_LPF_DISABLE (1 << 3) # define ADXL372_POWER_LPF_DISABLE (1 << 3)
# define ADXL372_POWER_HPF_DISABLE (1 << 2) # define ADXL372_POWER_HPF_DISABLE (1 << 2)
# define ADXL372_POWER_MODE_STANDBY 0x0 # define ADXL372_POWER_MODE_STANDBY 0x0
# define ADXL372_POWER_MODE_WAKEUP 0x1 # define ADXL372_POWER_MODE_WAKEUP 0x1
# define ADXL372_POWER_MODE_INSTON 0x2 # define ADXL372_POWER_MODE_INSTON 0x2
# define ADXL372_POWER_MODE_MEASURE 0x3 # define ADXL372_POWER_MODE_MEASURE 0x3
#define ADXL372_RESET (0x41 << 1) #define ADXL372_RESET 0x41
# define ADXL372_RESET_VALUE 0x52 # define ADXL372_RESET_VALUE 0x52
#define ADXL372_FIFO_DATA (0x42 << 1) #define ADXL372_FIFO_DATA 0x42
#define ADXL372_LAST (0x42 << 1) #define ADXL372_LAST 0x42
#define ADXL372_SCRATCH ADXL372_THRESH_ACT_X_H #define ADXL372_SCRATCH ADXL372_THRESH_ACT_X_H
/* SPI Bus Parameters */ /* SPI Bus Parameters */
@@ -154,6 +154,8 @@
* Public Types * Public Types
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_SENSORS_ADXL372_UORB
/* A reference to a structure of this type must be passed to the ADXL372 /* A reference to a structure of this type must be passed to the ADXL372
* driver. This structure provides information about the configuration * driver. This structure provides information about the configuration
* of the sensor and provides some board-specific hooks. * of the sensor and provides some board-specific hooks.
@@ -227,6 +229,7 @@ struct adxl372_config_s
FAR const struct adxl372_dvr_entry_vector_s *sc_ops; FAR const struct adxl372_dvr_entry_vector_s *sc_ops;
}; };
#endif
/**************************************************************************** /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
@@ -258,9 +261,13 @@ extern "C"
* *
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_SENSORS_ADXL372_UORB
int adxl372_register(FAR const char *devpath, int adxl372_register(FAR const char *devpath,
FAR struct spi_dev_s *spi, FAR struct spi_dev_s *spi,
FAR struct adxl372_config_s *config); FAR struct adxl372_config_s *config);
#else
int adxl372_register_uorb(int devno, FAR struct spi_dev_s *spi);
#endif
#undef EXTERN #undef EXTERN
#ifdef __cplusplus #ifdef __cplusplus