Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7949 from aabadie/pr/lis3dml_update
drivers/lis3mdl: adopt new parameters scheme and provide SAUL adaption
- Loading branch information
Showing
12 changed files
with
298 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ifneq (,$(filter saul_default,$(USEMODULE))) | ||
| USEMODULE += lis3mdl | ||
| endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * Copyright (C) 2017 Inria | ||
| * | ||
| * This file is subject to the terms and conditions of the GNU Lesser | ||
| * General Public License v2.1. See the file LICENSE in the top level | ||
| * directory for more details. | ||
| */ | ||
|
|
||
| /** | ||
| * @ingroup drivers_lis3mdl | ||
| * | ||
| * @{ | ||
| * @file | ||
| * @brief Default configuration for LIS3MDL devices | ||
| * | ||
| * @author Alexandre Abadie <alexandre.abadie@inria.fr> | ||
| */ | ||
|
|
||
| #ifndef LIS3MDL_PARAMS_H | ||
| #define LIS3MDL_PARAMS_H | ||
|
|
||
| #include "board.h" | ||
| #include "lis3mdl.h" | ||
| #include "saul_reg.h" | ||
|
|
||
| #ifdef __cplusplus | ||
| extern "C" { | ||
| #endif | ||
|
|
||
| /** | ||
| * @name Set default configuration parameters | ||
| * @{ | ||
| */ | ||
| #ifndef LIS3MDL_PARAM_I2C | ||
| #define LIS3MDL_PARAM_I2C (I2C_DEV(0)) | ||
| #endif | ||
| #ifndef LIS3MDL_PARAM_ADDR | ||
| #define LIS3MDL_PARAM_ADDR (0x1E) | ||
| #endif | ||
| #ifndef LIS3MDL_PARAM_XYMODE | ||
| #define LIS3MDL_PARAM_XYMODE (LIS3MDL_XY_MODE_HIGH) | ||
| #endif | ||
| #ifndef LIS3MDL_PARAM_ZMODE | ||
| #define LIS3MDL_PARAM_ZMODE (LIS3MDL_Z_MODE_HIGH) | ||
| #endif | ||
| #ifndef LIS3MDL_PARAM_ODR | ||
| #define LIS3MDL_PARAM_ODR (LIS3MDL_ODR_10Hz) | ||
| #endif | ||
| #ifndef LIS3MDL_PARAM_SCALE | ||
| #define LIS3MDL_PARAM_SCALE (4) | ||
| #endif | ||
| #ifndef LIS3MDL_PARAM_OPMODE | ||
| #define LIS3MDL_PARAM_OPMODE (LIS3MDL_OP_CONT_CONV) | ||
| #endif | ||
|
|
||
| #ifndef LIS3MDL_PARAMS | ||
| #define LIS3MDL_PARAMS { .i2c = LIS3MDL_PARAM_I2C, \ | ||
| .addr = LIS3MDL_PARAM_ADDR, \ | ||
| .xy_mode = LIS3MDL_PARAM_XYMODE, \ | ||
| .z_mode = LIS3MDL_PARAM_ZMODE, \ | ||
| .odr = LIS3MDL_PARAM_SCALE, \ | ||
| .scale = LIS3MDL_PARAM_ODR, \ | ||
| .op_mode = LIS3MDL_PARAM_OPMODE } | ||
| #endif | ||
| #ifndef LIS3MDL_SAUL_INFO | ||
| #define LIS3MDL_SAUL_INFO { .name = "lis3mdl" } | ||
| #endif | ||
| /**@}*/ | ||
|
|
||
| /** | ||
| * @brief Allocate some memory to store the actual configuration | ||
| */ | ||
| static const lis3mdl_params_t lis3mdl_params[] = | ||
| { | ||
| LIS3MDL_PARAMS | ||
| }; | ||
|
|
||
| /** | ||
| * @brief Additional meta information to keep in the SAUL registry | ||
| */ | ||
| static const saul_reg_info_t lis3mdl_saul_info[] = | ||
| { | ||
| LIS3MDL_SAUL_INFO | ||
| }; | ||
|
|
||
| #ifdef __cplusplus | ||
| } | ||
| #endif | ||
|
|
||
| #endif /* LIS3MDL_PARAMS_H */ | ||
| /** @} */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * Copyright (C) 2017 Inria | ||
| * | ||
| * This file is subject to the terms and conditions of the GNU Lesser | ||
| * General Public License v2.1. See the file LICENSE in the top level | ||
| * directory for more details. | ||
| */ | ||
|
|
||
| /** | ||
| * @ingroup drivers_lis3mdl | ||
| * @{ | ||
| * | ||
| * @file | ||
| * @brief LIS3MDL adaption to the RIOT actuator/sensor interface | ||
| * | ||
| * @author Alexandre Abadie <alexandre.abadie@inria.fr> | ||
| * | ||
| * @} | ||
| */ | ||
|
|
||
| #include <string.h> | ||
|
|
||
| #include "saul.h" | ||
| #include "lis3mdl.h" | ||
|
|
||
| static int read_mag(const void *dev, phydat_t *res) | ||
| { | ||
| const lis3mdl_t *d = (const lis3mdl_t *)dev; | ||
|
|
||
| lis3mdl_read_mag(d, (lis3mdl_3d_data_t *)res); | ||
|
|
||
| res->unit = UNIT_GS; | ||
| res->scale = -3; | ||
| return 3; | ||
| } | ||
|
|
||
| const saul_driver_t lis3mdl_saul_mag_driver = { | ||
| .read = read_mag, | ||
| .write = saul_notsup, | ||
| .type = SAUL_SENSE_MAG, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.