mirror of https://github.com/rusefi/ChibiOS.git
Updated LSM303AGR demos in testex demos to be close to the pattern used in testhal demos. Minor changes to field names in LSM303AGR.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15442 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
parent
55b0d6d512
commit
184deb923d
|
@ -726,7 +726,7 @@ void lsm303agrStart(LSM303AGRDriver *devp, const LSM303AGRConfig *config) {
|
|||
|
||||
/* Control register 1 configuration block.*/
|
||||
{
|
||||
cr[1] = LSM303AGR_ACC_AE_XYZ | devp->config->accoutdatarate;
|
||||
cr[1] = LSM303AGR_ACC_AE_XYZ | devp->config->accodr;
|
||||
#if LSM303AGR_USE_ADVANCED || defined(__DOXYGEN__)
|
||||
if(devp->config->accmode == LSM303AGR_ACC_MODE_LPOW)
|
||||
cr[1] |= LSM303AGR_CTRL_REG1_A_LPEN;
|
||||
|
@ -748,7 +748,7 @@ void lsm303agrStart(LSM303AGRDriver *devp, const LSM303AGRConfig *config) {
|
|||
cr[4] = devp->config->accfullscale;
|
||||
#if LSM303AGR_USE_ADVANCED || defined(__DOXYGEN__)
|
||||
cr[4] |= devp->config->accendianess |
|
||||
devp->config->accblockdataupdate;
|
||||
devp->config->accbdu;
|
||||
if(devp->config->accmode == LSM303AGR_ACC_MODE_HRES)
|
||||
cr[4] |= LSM303AGR_CTRL_REG4_A_HR;
|
||||
#endif
|
||||
|
@ -819,7 +819,7 @@ void lsm303agrStart(LSM303AGRDriver *devp, const LSM303AGRConfig *config) {
|
|||
|
||||
/* Control register A configuration block.*/
|
||||
{
|
||||
cr[1] = devp->config->compoutputdatarate;
|
||||
cr[1] = devp->config->compodr;
|
||||
#if LSM303AGR_USE_ADVANCED || defined(__DOXYGEN__)
|
||||
cr[1] |= devp->config->compmode | devp->config->complp;
|
||||
#endif
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
/**
|
||||
* @brief LSM303AGR driver version string.
|
||||
*/
|
||||
#define EX_LSM303AGR_VERSION "1.0.1"
|
||||
#define EX_LSM303AGR_VERSION "1.0.2"
|
||||
|
||||
/**
|
||||
* @brief LSM303AGR driver version major number.
|
||||
|
@ -58,7 +58,7 @@
|
|||
/**
|
||||
* @brief LSM303AGR driver version patch number.
|
||||
*/
|
||||
#define EX_LSM303AGR_PATCH 1
|
||||
#define EX_LSM303AGR_PATCH 2
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
|
@ -539,7 +539,7 @@ typedef struct {
|
|||
/**
|
||||
* @brief LSM303AGR accelerometer subsystem output data rate.
|
||||
*/
|
||||
lsm303agr_acc_odr_t accoutdatarate;
|
||||
lsm303agr_acc_odr_t accodr;
|
||||
#if LSM303AGR_USE_ADVANCED || defined(__DOXYGEN__)
|
||||
/**
|
||||
* @brief LSM303AGR accelerometer subsystem mode.
|
||||
|
@ -548,7 +548,7 @@ typedef struct {
|
|||
/**
|
||||
* @brief LSM303AGR accelerometer subsystem block data update.
|
||||
*/
|
||||
lsm303agr_acc_bdu_t accblockdataupdate;
|
||||
lsm303agr_acc_bdu_t accbdu;
|
||||
/**
|
||||
* @brief LSM303AGR accelerometer endianness.
|
||||
*/
|
||||
|
@ -565,7 +565,7 @@ typedef struct {
|
|||
/**
|
||||
* @brief LSM303AGR compass subsystem output data rate.
|
||||
*/
|
||||
lsm303agr_comp_odr_t compoutputdatarate;
|
||||
lsm303agr_comp_odr_t compodr;
|
||||
#if LSM303AGR_USE_ADVANCED || defined(__DOXYGEN__)
|
||||
/**
|
||||
* @brief LSM303AGR compass subsystem working mode.
|
||||
|
|
|
@ -83,15 +83,15 @@ static const LPS22HBConfig lps22hbcfg = {
|
|||
static LSM303AGRDriver LSM303AGRD1;
|
||||
|
||||
static const LSM303AGRConfig lsm303agrcfg = {
|
||||
&I2CD1,
|
||||
&i2ccfg,
|
||||
NULL,
|
||||
NULL,
|
||||
LSM303AGR_ACC_FS_4G,
|
||||
LSM303AGR_ACC_ODR_100Hz,
|
||||
NULL,
|
||||
NULL,
|
||||
LSM303AGR_COMP_ODR_50HZ,
|
||||
.i2cp = &I2CD1,
|
||||
.i2ccfg = &i2ccfg,
|
||||
.accsensitivity = NULL,
|
||||
.accbias = NULL,
|
||||
.accfullscale = LSM303AGR_ACC_FS_4G,
|
||||
.accodr = LSM303AGR_ACC_ODR_100Hz,
|
||||
.compsensitivity = NULL,
|
||||
.compbias = NULL,
|
||||
.compodr = LSM303AGR_COMP_ODR_50HZ,
|
||||
};
|
||||
|
||||
/*===========================================================================*/
|
||||
|
|
|
@ -43,23 +43,23 @@ static const I2CConfig i2ccfg = {
|
|||
};
|
||||
|
||||
static const LSM303AGRConfig lsm303agrcfg = {
|
||||
&I2CD1,
|
||||
&i2ccfg,
|
||||
NULL,
|
||||
NULL,
|
||||
LSM303AGR_ACC_FS_4G,
|
||||
LSM303AGR_ACC_ODR_100Hz,
|
||||
.i2cp = &I2CD1,
|
||||
.i2ccfg = &i2ccfg,
|
||||
.accsensitivity = NULL,
|
||||
.accbias = NULL,
|
||||
.accfullscale = LSM303AGR_ACC_FS_4G,
|
||||
.accodr = LSM303AGR_ACC_ODR_100Hz,
|
||||
#if LSM303AGR_USE_ADVANCED
|
||||
LSM303AGR_ACC_MODE_LPOW,
|
||||
LSM303AGR_ACC_BDU_BLOCK,
|
||||
LSM303AGR_ACC_END_LITTLE,
|
||||
.accmode = LSM303AGR_ACC_MODE_LPOW,
|
||||
.accbdu = LSM303AGR_ACC_BDU_BLOCK,
|
||||
.accendianess = LSM303AGR_ACC_END_LITTLE,
|
||||
#endif
|
||||
NULL,
|
||||
NULL,
|
||||
LSM303AGR_COMP_ODR_50HZ,
|
||||
.compsensitivity = NULL,
|
||||
.compbias = NULL,
|
||||
.compodr = LSM303AGR_COMP_ODR_50HZ,
|
||||
#if LSM303AGR_USE_ADVANCED
|
||||
LSM303AGR_COMP_MODE_NORM,
|
||||
LSM303AGR_COMP_LPOW_EN
|
||||
.compmode = LSM303AGR_COMP_MODE_NORM,
|
||||
.complp = LSM303AGR_COMP_LPOW_EN
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue