riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drivers/mma8x5x: remove use of type param

Browse Source 
Driver now accepts all variants of the driver
This commit is contained in:
Alexandre Abadie 2018-10-29 17:06:48 +01:00
parent e0e02c04c8
commit a63d76b346
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/include/mma8x5x.h
View File

@ -95,7 +95,6 @@ enum {
typedef struct { typedef struct {
i2c_t i2c; /**< I2C bus the device is connected to */ i2c_t i2c; /**< I2C bus the device is connected to */
uint8_t addr; /**< I2C bus address of the device */ uint8_t addr; /**< I2C bus address of the device */
uint8_t type; /**< device type */
uint8_t rate; /**< sampling rate to use */ uint8_t rate; /**< sampling rate to use */
uint8_t range; /**< scale range to use */ uint8_t range; /**< scale range to use */
uint8_t offset[3]; /**< data offset in X, Y, and Z direction */ uint8_t offset[3]; /**< data offset in X, Y, and Z direction */

6
drivers/mma8x5x/include/mma8x5x_params.h
View File

@ -37,9 +37,6 @@ extern "C" {
#ifndef MMA8X5X_PARAM_ADDR #ifndef MMA8X5X_PARAM_ADDR
#define MMA8X5X_PARAM_ADDR (MMA8X5X_I2C_ADDRESS) #define MMA8X5X_PARAM_ADDR (MMA8X5X_I2C_ADDRESS)
#endif #endif
#ifndef MMA8X5X_PARAM_TYPE
#define MMA8X5X_PARAM_TYPE (MMA8X5X_TYPE_MMA8652)
#endif
#ifndef MMA8X5X_PARAM_RATE #ifndef MMA8X5X_PARAM_RATE
#define MMA8X5X_PARAM_RATE (MMA8X5X_RATE_200HZ) #define MMA8X5X_PARAM_RATE (MMA8X5X_RATE_200HZ)
#endif #endif
@ -53,13 +50,12 @@ extern "C" {
#ifndef MMA8X5X_PARAMS #ifndef MMA8X5X_PARAMS
#define MMA8X5X_PARAMS { .i2c = MMA8X5X_PARAM_I2C, \ #define MMA8X5X_PARAMS { .i2c = MMA8X5X_PARAM_I2C, \
.addr = MMA8X5X_PARAM_ADDR, \ .addr = MMA8X5X_PARAM_ADDR, \
.type = MMA8X5X_PARAM_TYPE, \
.rate = MMA8X5X_PARAM_RATE, \ .rate = MMA8X5X_PARAM_RATE, \
.range = MMA8X5X_PARAM_RANGE, \ .range = MMA8X5X_PARAM_RANGE, \
.offset = MMA8X5X_PARAM_OFFSET } .offset = MMA8X5X_PARAM_OFFSET }
#endif #endif
#ifndef MMA8X5X_SAUL_INFO #ifndef MMA8X5X_SAUL_INFO
#define MMA8X5X_SAUL_INFO { .name = "mma8652" } #define MMA8X5X_SAUL_INFO { .name = "mma8x5x" }
#endif #endif
/**@}*/ /**@}*/

17
drivers/mma8x5x/mma8x5x.c
View File

@ -51,11 +51,18 @@ int mma8x5x_init(mma8x5x_t *dev, const mma8x5x_params_t *params)
/* test if the target device responds */ /* test if the target device responds */
i2c_read_reg(BUS, ADDR, MMA8X5X_WHO_AM_I, &reg, 0); i2c_read_reg(BUS, ADDR, MMA8X5X_WHO_AM_I, &reg, 0);
if (reg != dev->params.type) { switch (reg) {
i2c_release(BUS); case MMA8X5X_TYPE_MMA8451:
DEBUG("[mma8x5x] init - error: invalid WHO_AM_I value [0x%02x]\n", case MMA8X5X_TYPE_MMA8452:
(int)reg); case MMA8X5X_TYPE_MMA8453:
return MMA8X5X_NODEV; case MMA8X5X_TYPE_MMA8652:
case MMA8X5X_TYPE_MMA8653:
break;
default: /* invalid device type */
i2c_release(BUS);
DEBUG("[mma8x5x] init - error: invalid WHO_AM_I value [0x%02x]\n",
(int)reg);
return MMA8X5X_NODEV;
} }
/* reset the device */ /* reset the device */