vhad/RIOT
1
0
Fork 0
mirror of https://github.com/gosticks/RIOT.git synced 2025-10-16 12:05:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8689 from aabadie/pr/drivers/params/lsm6dsl

Browse Source 
drivers/lsm6dsl: apply unified params definition scheme
This commit is contained in:
Martine Lenders 2018-03-07 15:24:43 +01:00 committed by GitHub
commit a9e30e1844
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/lsm6dsl/include/lsm6dsl_params.h
View File

@ -58,7 +58,8 @@ extern "C" {
#define LSM6DSL_PARAM_GYRO_FIFO_DEC (LSM6DSL_DECIMATION_NO) #define LSM6DSL_PARAM_GYRO_FIFO_DEC (LSM6DSL_DECIMATION_NO)
#endif #endif
#define LSM6DSL_PARAMS_DEFAULT { .i2c = LSM6DSL_PARAM_I2C, \ #ifndef LSM6DSL_PARAMS
#define LSM6DSL_PARAMS { .i2c = LSM6DSL_PARAM_I2C, \
.addr = LSM6DSL_PARAM_ADDR, \ .addr = LSM6DSL_PARAM_ADDR, \
.acc_odr = LSM6DSL_PARAM_ACC_ODR, \ .acc_odr = LSM6DSL_PARAM_ACC_ODR, \
.gyro_odr = LSM6DSL_PARAM_GYRO_ODR, \ .gyro_odr = LSM6DSL_PARAM_GYRO_ODR, \
@ -66,6 +67,10 @@ extern "C" {
.gyro_fs = LSM6DSL_PARAM_GYRO_FS, \ .gyro_fs = LSM6DSL_PARAM_GYRO_FS, \
.acc_decimation = LSM6DSL_PARAM_ACC_FIFO_DEC, \ .acc_decimation = LSM6DSL_PARAM_ACC_FIFO_DEC, \
.gyro_decimation = LSM6DSL_PARAM_GYRO_FIFO_DEC } .gyro_decimation = LSM6DSL_PARAM_GYRO_FIFO_DEC }
#endif
#ifndef LSM6DSL_SAUL_INFO
#define LSM6DSL_SAUL_INFO { .name = "lsm6dsl" }
#endif
/** @} */ /** @} */
/** /**
@ -73,11 +78,7 @@ extern "C" {
*/ */
static const lsm6dsl_params_t lsm6dsl_params[] = static const lsm6dsl_params_t lsm6dsl_params[] =
{ {
#ifdef LSM6DSL_PARAMS_CUSTOM LSM6DSL_PARAMS
LSM6DSL_PARAMS_CUSTOM,
#else
LSM6DSL_PARAMS_DEFAULT,
#endif
}; };
/** /**
@ -85,7 +86,7 @@ static const lsm6dsl_params_t lsm6dsl_params[] =
*/ */
static const saul_reg_info_t lsm6dsl_saul_info[] = static const saul_reg_info_t lsm6dsl_saul_info[] =
{ {
{ .name = "lsm6dsl" } LSM6DSL_SAUL_INFO
}; };
#ifdef __cplusplus #ifdef __cplusplus

12
sys/auto_init/saul/auto_init_lsm6dsl.c
View File

@ -42,7 +42,12 @@ static lsm6dsl_t lsm6dsl_devs[LSM6DSL_NUM];
static saul_reg_t saul_entries[LSM6DSL_NUM * 3]; static saul_reg_t saul_entries[LSM6DSL_NUM * 3];
/** /**
* @brief Reference the driver structs * @brief Define the number of saul info
*/
#define LSM6DSL_INFO_NUM (sizeof(lsm6dsl_saul_info) / sizeof(lsm6dsl_saul_info[0]))
/**
* @name Reference the driver structs
* @{ * @{
*/ */
extern saul_driver_t lsm6dsl_saul_acc_driver; extern saul_driver_t lsm6dsl_saul_acc_driver;
@ -53,11 +58,12 @@ extern saul_driver_t lsm6dsl_saul_temp_driver;
void auto_init_lsm6dsl(void) void auto_init_lsm6dsl(void)
{ {
assert(LSM6DSL_NUM == LSM6DSL_INFO_NUM);
for (unsigned int i = 0; i < LSM6DSL_NUM; i++) { for (unsigned int i = 0; i < LSM6DSL_NUM; i++) {
LOG_DEBUG("[auto_init_saul] initializing lsm6dsl #%u\n", i); LOG_DEBUG("[auto_init_saul] initializing lsm6dsl #%u\n", i);
int res = lsm6dsl_init(&lsm6dsl_devs[i], &lsm6dsl_params[i]); if (lsm6dsl_init(&lsm6dsl_devs[i], &lsm6dsl_params[i]) < 0) {
if (res < 0) {
LOG_ERROR("[auto_init_saul] error initializing lsm6dsl #%u\n", i); LOG_ERROR("[auto_init_saul] error initializing lsm6dsl #%u\n", i);
continue; continue;
} }