Browse Source

sys/auto_init: adapted to mma8x5x changes

pr/spi.typo
Hauke Petersen 6 years ago
parent
commit
96180a61b2
  1. 6
      sys/auto_init/auto_init.c
  2. 2
      sys/auto_init/saul/auto_init_hdc1000.c
  3. 79
      sys/auto_init/saul/auto_init_mma8652.c
  4. 70
      sys/auto_init/saul/auto_init_mma8x5x.c

6
sys/auto_init/auto_init.c

@ -282,9 +282,9 @@ void auto_init(void)
extern void auto_init_lis3dh(void);
auto_init_lis3dh();
#endif
#ifdef MODULE_MMA8652
extern void auto_init_mma8652(void);
auto_init_mma8652();
#ifdef MODULE_MMA8X5X
extern void auto_init_mma8x5x(void);
auto_init_mma8x5x();
#endif
#ifdef MODULE_SI70XX
extern void auto_init_si70xx(void);

2
sys/auto_init/saul/auto_init_hdc1000.c

@ -21,7 +21,9 @@
#ifdef MODULE_HDC1000
#include "log.h"
#include "saul_reg.h"
#include "hdc1000.h"
#include "hdc1000_params.h"

79
sys/auto_init/saul/auto_init_mma8652.c

@ -1,79 +0,0 @@
/*
* Copyright (C) 2016 Freie Universität Berlin
*
* 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 auto_init_saul
* @{
*
* @file
* @brief Auto initialization of MMA8652 accelerometer
*
* @author Cenk Gündoğan <mail@cgundogan.de>
*
* @}
*/
#ifdef MODULE_MMA8652
#include "saul_reg.h"
#include "mma8652.h"
#include "mma8652_params.h"
#define ENABLE_DEBUG (0)
#include "debug.h"
/**
* @brief Define the number of configured sensors
*/
#define MMA8652_NUM (sizeof(mma8652_params)/sizeof(mma8652_params[0]))
/**
* @brief Allocate memory for the device descriptors
*/
static mma8652_t mma8652_devs[MMA8652_NUM];
/**
* @brief Memory for the SAUL registry entries
*/
static saul_reg_t saul_entries[MMA8652_NUM];
/**
* @brief Reference the driver struct
* @{
*/
extern saul_driver_t mma8652_saul_driver;
/** @} */
void auto_init_mma8652(void)
{
for (unsigned int i = 0; i < MMA8652_NUM; i++) {
const mma8652_params_t *p = &mma8652_params[i];
DEBUG("[auto_init_saul] initializing mma8652 acc sensor\n");
if (mma8652_init(&mma8652_devs[i], p->i2c, p->addr, p->rate, p->scale, p->type) < 0) {
DEBUG("[auto_init_saul] error during initialization\n");
return;
}
if (mma8652_set_active(&mma8652_devs[i]) < 0) {
DEBUG("[auto_init_saul] error activating mma8652\n");
return;
}
saul_entries[i].dev = &(mma8652_devs[i]);
saul_entries[i].name = mma8652_saul_info[i].name;
saul_entries[i].driver = &mma8652_saul_driver;
saul_reg_add(&(saul_entries[i]));
}
}
#else
typedef int dont_be_pedantic;
#endif /* MODULE_MMA8652 */

70
sys/auto_init/saul/auto_init_mma8x5x.c

@ -0,0 +1,70 @@
/*
* Copyright (C) 2016 Freie Universität Berlin
*
* 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 auto_init_saul
* @{
*
* @file
* @brief Auto initialization of MMA8x5x accelerometers
*
* @author Cenk Gündoğan <mail@cgundogan.de>
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*
* @}
*/
#ifdef MODULE_MMA8X5X
#include "log.h"
#include "saul_reg.h"
#include "mma8x5x.h"
#include "mma8x5x_params.h"
/**
* @brief Define the number of configured sensors
*/
#define MMA8X5X_NUM (sizeof(mma8x5x_params) / sizeof(mma8x5x_params[0]))
/**
* @brief Allocate memory for the device descriptors
*/
static mma8x5x_t mma8x5x_devs[MMA8X5X_NUM];
/**
* @brief Memory for the SAUL registry entries
*/
static saul_reg_t saul_entries[MMA8X5X_NUM];
/**
* @brief Reference the driver struct
* @{
*/
extern saul_driver_t mma8x5x_saul_driver;
/** @} */
void auto_init_mma8x5x(void)
{
for (unsigned i = 0; i < MMA8X5X_NUM; i++) {
if (mma8x5x_init(&mma8x5x_devs[i], &mma8x5x_params[i]) != MMA8X5X_OK) {
LOG_ERROR("Unable to initialize MMA8x5x sensor #%i\n", i);
return;
}
saul_entries[i].dev = &(mma8x5x_devs[i]);
saul_entries[i].name = mma8x5x_saul_info[i].name;
saul_entries[i].driver = &mma8x5x_saul_driver;
saul_reg_add(&(saul_entries[i]));
}
}
#else
typedef int dont_be_pedantic;
#endif /* MODULE_MMA8X5X */
Loading…
Cancel
Save