andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lis3dsh: check WHO_AM_I

This commit is contained in:
Andrey Gusakov 2024-02-11 15:04:01 +03:00
parent 66ca8833c1
commit 354e29bb88
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
os/ex/devices/ST/lis3dsh.c
View File

@ -464,9 +464,10 @@ void lis3dshObjectInit(LIS3DSHDriver *devp) {
* *
* @api * @api
*/ */
void lis3dshStart(LIS3DSHDriver *devp, const LIS3DSHConfig *config) { msg_t lis3dshStart(LIS3DSHDriver *devp, const LIS3DSHConfig *config) {
uint32_t i; uint32_t i;
uint8_t cr; uint8_t cr;
uint8_t devid;
osalDbgCheck((devp != NULL) && (config != NULL)); osalDbgCheck((devp != NULL) && (config != NULL));
osalDbgAssert((devp->state == LIS3DSH_STOP) || osalDbgAssert((devp->state == LIS3DSH_STOP) ||
@ -475,6 +476,24 @@ void lis3dshStart(LIS3DSHDriver *devp, const LIS3DSHConfig *config) {
devp->config = config; devp->config = config;
#if LIS3DSH_USE_SPI
#if LIS3DSH_SHARED_SPI
spiAcquireBus(devp->config->spip);
#endif /* LIS3DSH_SHARED_SPI */
spiStart(devp->config->spip, devp->config->spicfg);
/* Check WHO_I_AM */
lis3dshSPIReadRegister(devp->config->spip, LIS3DSH_AD_WHO_AM_I,
1, &devid);
if (devid != 0x3f)
{
#if LIS3DSH_SHARED_SPI
spiReleaseBus(devp->config->spip);
#endif /* LIS3DSH_SHARED_SPI */
return MSG_RESET;
}
/* Control register 4 configuration block.*/ /* Control register 4 configuration block.*/
{ {
cr = LIS3DSH_CTRL_REG4_XEN | LIS3DSH_CTRL_REG4_YEN | LIS3DSH_CTRL_REG4_ZEN | cr = LIS3DSH_CTRL_REG4_XEN | LIS3DSH_CTRL_REG4_YEN | LIS3DSH_CTRL_REG4_ZEN |
@ -484,12 +503,6 @@ void lis3dshStart(LIS3DSHDriver *devp, const LIS3DSHConfig *config) {
#endif #endif
} }
#if LIS3DSH_USE_SPI
#if LIS3DSH_SHARED_SPI
spiAcquireBus(devp->config->spip);
#endif /* LIS3DSH_SHARED_SPI */
spiStart(devp->config->spip, devp->config->spicfg);
lis3dshSPIWriteRegister(devp->config->spip, LIS3DSH_AD_CTRL_REG4, 1, &cr); lis3dshSPIWriteRegister(devp->config->spip, LIS3DSH_AD_CTRL_REG4, 1, &cr);
#if LIS3DSH_SHARED_SPI #if LIS3DSH_SHARED_SPI
@ -601,6 +614,8 @@ void lis3dshStart(LIS3DSHDriver *devp, const LIS3DSHConfig *config) {
osalThreadSleepMilliseconds(10); osalThreadSleepMilliseconds(10);
devp->state = LIS3DSH_READY; devp->state = LIS3DSH_READY;
return MSG_OK;
} }
/** /**

2
os/ex/devices/ST/lis3dsh.h
View File

@ -696,7 +696,7 @@ struct LIS3DSHDriver {
extern "C" { extern "C" {
#endif #endif
void lis3dshObjectInit(LIS3DSHDriver *devp); void lis3dshObjectInit(LIS3DSHDriver *devp);
void lis3dshStart(LIS3DSHDriver *devp, const LIS3DSHConfig *config); msg_t lis3dshStart(LIS3DSHDriver *devp, const LIS3DSHConfig *config);
void lis3dshStop(LIS3DSHDriver *devp); void lis3dshStop(LIS3DSHDriver *devp);
#ifdef __cplusplus #ifdef __cplusplus
} }