michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sensors: lis2dh: support high resolution mode

Browse source 
So far we supported normal (10 bit) and low-power (8 bit) modes. Add
support for high-resolution mode as a third option.

Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
This commit is contained in:
Marcin Niestroj 2019-07-22 13:06:24 +02:00 • committed by Carles Cufí
commit 710f9e7b3e
3 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
drivers/sensor/lis2dh/Kconfig
View file

@ -76,16 +76,20 @@ config LIS2DH_ACCEL_RANGE_16G
endchoice endchoice
choice choice
prompt "Power mode" prompt "Operation mode"
default LIS2DH_POWER_MODE_NORMAL default LIS2DH_OPER_MODE_NORMAL
help help
Choose between normal or low power operation mode for chip at init. Choose between high resolution, normal or low power operation
mode for chip at init.
config LIS2DH_POWER_MODE_NORMAL config LIS2DH_OPER_MODE_HIGH_RES
bool "normal" bool "high resolution (12 bit)"
config LIS2DH_POWER_MODE_LOW config LIS2DH_OPER_MODE_NORMAL
bool "low" bool "normal (10 bit)"
config LIS2DH_OPER_MODE_LOW_POWER
bool "low power (8 bit)"
endchoice endchoice
@ -125,15 +129,15 @@ config LIS2DH_ODR_7
config LIS2DH_ODR_8 config LIS2DH_ODR_8
bool "1.6KHz" bool "1.6KHz"
depends on LIS2DH_POWER_MODE_LOW depends on LIS2DH_OPER_MODE_LOW_POWER
config LIS2DH_ODR_9_NORMAL config LIS2DH_ODR_9_NORMAL
bool "1.25KHz" bool "1.25KHz"
depends on LIS2DH_POWER_MODE_NORMAL depends on LIS2DH_OPER_MODE_NORMAL || LIS2DH_OPER_MODE_HIGH_RES
config LIS2DH_ODR_9_LOW config LIS2DH_ODR_9_LOW
bool "5KHz" bool "5KHz"
depends on LIS2DH_POWER_MODE_LOW depends on LIS2DH_OPER_MODE_LOW_POWER
endchoice endchoice

2
drivers/sensor/lis2dh/lis2dh.c
View file

@ -341,7 +341,7 @@ int lis2dh_init(struct device *dev)
/* set full scale range and store it for later conversion */ /* set full scale range and store it for later conversion */
lis2dh->scale = LIS2DH_ACCEL_SCALE(1 << (LIS2DH_FS_IDX + 1)); lis2dh->scale = LIS2DH_ACCEL_SCALE(1 << (LIS2DH_FS_IDX + 1));
status = lis2dh_reg_write_byte(dev, LIS2DH_REG_CTRL4, status = lis2dh_reg_write_byte(dev, LIS2DH_REG_CTRL4,
LIS2DH_FS_BITS); LIS2DH_FS_BITS | LIS2DH_HR_BIT);
if (status < 0) { if (status < 0) {
LOG_ERR("Failed to set full scale ctrl register."); LOG_ERR("Failed to set full scale ctrl register.");
return status; return status;

9
drivers/sensor/lis2dh/lis2dh.h
View file

@ -47,9 +47,9 @@
#define LIS2DH_ACCEL_XYZ_MASK BIT_MASK(3) #define LIS2DH_ACCEL_XYZ_MASK BIT_MASK(3)
#define LIS2DH_LP_EN_BIT_MASK BIT(3) #define LIS2DH_LP_EN_BIT_MASK BIT(3)
#if defined(CONFIG_LIS2DH_POWER_MODE_LOW) #if defined(CONFIG_LIS2DH_OPER_MODE_LOW_POWER)
#define LIS2DH_LP_EN_BIT BIT(3) #define LIS2DH_LP_EN_BIT BIT(3)
#elif defined(CONFIG_LIS2DH_POWER_MODE_NORMAL) #else
#define LIS2DH_LP_EN_BIT 0 #define LIS2DH_LP_EN_BIT 0
#endif #endif
@ -114,6 +114,11 @@
#define LIS2DH_FS_SELECT(fs) ((fs) << LIS2DH_FS_SHIFT) #define LIS2DH_FS_SELECT(fs) ((fs) << LIS2DH_FS_SHIFT)
#define LIS2DH_FS_BITS (LIS2DH_FS_SELECT(LIS2DH_FS_IDX)) #define LIS2DH_FS_BITS (LIS2DH_FS_SELECT(LIS2DH_FS_IDX))
#define LIS2DH_ACCEL_SCALE(range_g) ((SENSOR_G * 2 * (range_g)) / 65636LL) #define LIS2DH_ACCEL_SCALE(range_g) ((SENSOR_G * 2 * (range_g)) / 65636LL)
#if defined(CONFIG_LIS2DH_OPER_MODE_HIGH_RES)
#define LIS2DH_HR_BIT BIT(3)
#else
#define LIS2DH_HR_BIT 0
#endif
#define LIS2DH_REG_CTRL5 0x24 #define LIS2DH_REG_CTRL5 0x24
#define LIS2DH_LIR_INT2_SHIFT 1 #define LIS2DH_LIR_INT2_SHIFT 1