j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

minor changes and typos

Browse source
This commit is contained in:
Gunar Schorcht 2017-12-30 16:12:56 +01:00
parent 85ad051e83
commit c54447e94c
3 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/l3gd20h/l3gd20h_example.c
View file

@ -33,9 +33,9 @@
// use following constants to define the example mode // use following constants to define the example mode
// #define SPI_USED // if defined SPI is used, otherwise I2C // #define SPI_USED // if defined SPI is used, otherwise I2C
// #define INT_EVENT // event interrupts used (axes movement and wake up)
// #define INT_DATA // data interrupts used (data ready and FIFO status)
// #define FIFO_MODE // multiple sample read mode // #define FIFO_MODE // multiple sample read mode
// #define INT_DATA // data interrupts used (data ready and FIFO status)
// #define INT_EVENT // event interrupts used (axis movement and wake up)
#if defined(INT_EVENT) || defined(INT_DATA) #if defined(INT_EVENT) || defined(INT_DATA)
#define INT_USED #define INT_USED

68
extras/l3gd20h/l3gd20h.c
View file

@ -252,8 +252,8 @@ bool l3gd20h_set_mode (l3gd20h_sensor_t* dev, l3gd20h_mode_t mode, uint8_t bw,
if (mode != l3gd20h_power_down) if (mode != l3gd20h_power_down)
{ {
// read current register values // read current register values
if (!l3gd20h_read_reg (dev, L3GD20H_REG_CTRL1, &reg1, 1) || if (!l3gd20h_reg_read (dev, L3GD20H_REG_CTRL1, &reg1, 1) ||
!l3gd20h_read_reg (dev, L3GD20H_REG_LOW_ODR, &reg2, 1)) !l3gd20h_reg_read (dev, L3GD20H_REG_LOW_ODR, &reg2, 1))
return false; return false;
// if sensor is in power mode it takes at least 100 ms to start in another mode // if sensor is in power mode it takes at least 100 ms to start in another mode
@ -279,13 +279,13 @@ bool l3gd20h_set_mode (l3gd20h_sensor_t* dev, l3gd20h_mode_t mode, uint8_t bw,
l3gd20h_set_reg_bit (&reg1, L3GD20H_Y_ENABLED, y); l3gd20h_set_reg_bit (&reg1, L3GD20H_Y_ENABLED, y);
l3gd20h_set_reg_bit (&reg1, L3GD20H_Z_ENABLED, z); l3gd20h_set_reg_bit (&reg1, L3GD20H_Z_ENABLED, z);
if (!l3gd20h_write_reg (dev, L3GD20H_REG_LOW_ODR, &reg2, 1)) if (!l3gd20h_reg_write (dev, L3GD20H_REG_LOW_ODR, &reg2, 1))
return false; return false;
} }
else else
l3gd20h_set_reg_bit (&reg1, L3GD20H_POWER_MODE, 0); l3gd20h_set_reg_bit (&reg1, L3GD20H_POWER_MODE, 0);
if (!l3gd20h_write_reg (dev, L3GD20H_REG_CTRL1, &reg1, 1)) if (!l3gd20h_reg_write (dev, L3GD20H_REG_CTRL1, &reg1, 1))
return false; return false;
return true; return true;
@ -357,7 +357,7 @@ bool l3gd20h_new_data (l3gd20h_sensor_t* dev)
if (dev->fifo_mode == l3gd20h_bypass) if (dev->fifo_mode == l3gd20h_bypass)
{ {
if (!l3gd20h_read_reg (dev, L3GD20H_REG_STATUS, &reg, 1)) if (!l3gd20h_reg_read (dev, L3GD20H_REG_STATUS, &reg, 1))
{ {
error_dev ("Could not get sensor status", __FUNCTION__, dev); error_dev ("Could not get sensor status", __FUNCTION__, dev);
return false; return false;
@ -366,7 +366,7 @@ bool l3gd20h_new_data (l3gd20h_sensor_t* dev)
} }
else else
{ {
if (!l3gd20h_read_reg (dev, L3GD20H_REG_FIFO_SRC, &reg, 1)) if (!l3gd20h_reg_read (dev, L3GD20H_REG_FIFO_SRC, &reg, 1))
{ {
error_dev ("Could not get fifo source register data", __FUNCTION__, dev); error_dev ("Could not get fifo source register data", __FUNCTION__, dev);
return false; return false;
@ -432,7 +432,7 @@ bool l3gd20h_get_raw_data (l3gd20h_sensor_t* dev, l3gd20h_raw_data_t* raw)
} }
// read raw data sample // read raw data sample
if (!l3gd20h_read_reg (dev, L3GD20H_REG_OUT_X_L, (uint8_t*)raw, 6)) if (!l3gd20h_reg_read (dev, L3GD20H_REG_OUT_X_L, (uint8_t*)raw, 6))
{ {
error_dev ("Could not get raw data", __FUNCTION__, dev); error_dev ("Could not get raw data", __FUNCTION__, dev);
dev->error_code |= L3GD20H_GET_RAW_DATA_FAILED; dev->error_code |= L3GD20H_GET_RAW_DATA_FAILED;
@ -455,7 +455,7 @@ uint8_t l3gd20h_get_raw_data_fifo (l3gd20h_sensor_t* dev, l3gd20h_raw_data_fifo_
uint8_t reg; uint8_t reg;
// read FIFO state // read FIFO state
if (!l3gd20h_read_reg (dev, L3GD20H_REG_FIFO_SRC, &reg, 1)) if (!l3gd20h_reg_read (dev, L3GD20H_REG_FIFO_SRC, &reg, 1))
{ {
error_dev ("Could not get fifo source register data", __FUNCTION__, dev); error_dev ("Could not get fifo source register data", __FUNCTION__, dev);
return 0; return 0;
@ -470,14 +470,14 @@ uint8_t l3gd20h_get_raw_data_fifo (l3gd20h_sensor_t* dev, l3gd20h_raw_data_fifo_
// read samples from FIFO // read samples from FIFO
for (int i = 0; i < samples; i++) for (int i = 0; i < samples; i++)
if (!l3gd20h_read_reg (dev, L3GD20H_REG_OUT_X_L, (uint8_t*)&raw[i], 6)) if (!l3gd20h_reg_read (dev, L3GD20H_REG_OUT_X_L, (uint8_t*)&raw[i], 6))
{ {
error_dev ("Could not get raw data", __FUNCTION__, dev); error_dev ("Could not get raw data", __FUNCTION__, dev);
dev->error_code |= L3GD20H_GET_RAW_DATA_FIFO_FAILED; dev->error_code |= L3GD20H_GET_RAW_DATA_FIFO_FAILED;
return i; return i;
} }
l3gd20h_read_reg (dev, L3GD20H_REG_FIFO_SRC, &reg, 1); l3gd20h_reg_read (dev, L3GD20H_REG_FIFO_SRC, &reg, 1);
if (reg & L3GD20H_FIFO_FFS) if (reg & L3GD20H_FIFO_FFS)
{ {
@ -564,13 +564,13 @@ bool l3gd20h_set_int_event_config (l3gd20h_sensor_t* dev,
ig_ths[5] = (config->z_threshold & 0xff); ig_ths[5] = (config->z_threshold & 0xff);
if (// write the thresholds to registers IG_THS_* if (// write the thresholds to registers IG_THS_*
!l3gd20h_write_reg (dev, L3GD20H_REG_IG_THS_XH, ig_ths, 6) || !l3gd20h_reg_write (dev, L3GD20H_REG_IG_THS_XH, ig_ths, 6) ||
// write duration configuration to IG_DURATION // write duration configuration to IG_DURATION
!l3gd20h_write_reg (dev, L3GD20H_REG_IG_DURATION, &ig_dur, 1) || !l3gd20h_reg_write (dev, L3GD20H_REG_IG_DURATION, &ig_dur, 1) ||
// write INT1 configuration to IG_CFG // write INT1 configuration to IG_CFG
!l3gd20h_write_reg (dev, L3GD20H_REG_IG_CFG, &ig_cfg, 1)) !l3gd20h_reg_write (dev, L3GD20H_REG_IG_CFG, &ig_cfg, 1))
{ {
error_dev ("Could not configure interrupt INT1", __FUNCTION__, dev); error_dev ("Could not configure interrupt INT1", __FUNCTION__, dev);
dev->error_code |= L3GD20H_CONFIG_INT1_FAILED; dev->error_code |= L3GD20H_CONFIG_INT1_FAILED;
@ -607,11 +607,11 @@ bool l3gd20h_get_int_event_config (l3gd20h_sensor_t* dev,
uint8_t ctrl3; uint8_t ctrl3;
uint8_t ctrl5; uint8_t ctrl5;
if (!l3gd20h_read_reg (dev, L3GD20H_REG_IG_THS_XH, ig_ths, 6) || if (!l3gd20h_reg_read (dev, L3GD20H_REG_IG_THS_XH, ig_ths, 6) ||
!l3gd20h_read_reg (dev, L3GD20H_REG_IG_CFG, &ig_cfg, 1) || !l3gd20h_reg_read (dev, L3GD20H_REG_IG_CFG, &ig_cfg, 1) ||
!l3gd20h_read_reg (dev, L3GD20H_REG_IG_DURATION, &ig_dur, 1) || !l3gd20h_reg_read (dev, L3GD20H_REG_IG_DURATION, &ig_dur, 1) ||
!l3gd20h_read_reg (dev, L3GD20H_REG_CTRL3, &ctrl3, 1) || !l3gd20h_reg_read (dev, L3GD20H_REG_CTRL3, &ctrl3, 1) ||
!l3gd20h_read_reg (dev, L3GD20H_REG_CTRL5, &ctrl5, 1)) !l3gd20h_reg_read (dev, L3GD20H_REG_CTRL5, &ctrl5, 1))
{ {
dev->error_code |= L3GD20H_CONFIG_INT1_FAILED; dev->error_code |= L3GD20H_CONFIG_INT1_FAILED;
error_dev ("Could not read configuration for interrupt INT1 from sensor", error_dev ("Could not read configuration for interrupt INT1 from sensor",
@ -655,8 +655,8 @@ bool l3gd20h_get_int_event_source (l3gd20h_sensor_t* dev, l3gd20h_int_event_sour
l3gd20h_int_event_source_t ig_cfg; l3gd20h_int_event_source_t ig_cfg;
l3gd20h_int_event_source_t ig_src; l3gd20h_int_event_source_t ig_src;
if (!l3gd20h_read_reg (dev, L3GD20H_REG_IG_CFG, (uint8_t*)&ig_cfg, 1) || if (!l3gd20h_reg_read (dev, L3GD20H_REG_IG_CFG, (uint8_t*)&ig_cfg, 1) ||
!l3gd20h_read_reg (dev, L3GD20H_REG_IG_SRC, (uint8_t*)&ig_src, 1)) !l3gd20h_reg_read (dev, L3GD20H_REG_IG_SRC, (uint8_t*)&ig_src, 1))
{ {
error_dev ("Could not read source of interrupt INT1 from sensor", __FUNCTION__, dev); error_dev ("Could not read source of interrupt INT1 from sensor", __FUNCTION__, dev);
dev->error_code |= L3GD20H_INT1_SOURCE_FAILED; dev->error_code |= L3GD20H_INT1_SOURCE_FAILED;
@ -684,8 +684,8 @@ bool l3gd20h_get_int_data_source (l3gd20h_sensor_t* dev, l3gd20h_int_data_source
uint8_t fifo_src; uint8_t fifo_src;
uint8_t status; uint8_t status;
if (!l3gd20h_read_reg (dev, L3GD20H_REG_STATUS, &status, 1) || if (!l3gd20h_reg_read (dev, L3GD20H_REG_STATUS, &status, 1) ||
!l3gd20h_read_reg (dev, L3GD20H_REG_FIFO_SRC, &fifo_src, 1)) !l3gd20h_reg_read (dev, L3GD20H_REG_FIFO_SRC, &fifo_src, 1))
{ {
error_dev ("Could not read source of interrupt INT2 from sensor", __FUNCTION__, dev); error_dev ("Could not read source of interrupt INT2 from sensor", __FUNCTION__, dev);
dev->error_code |= L3GD20H_INT2_SOURCE_FAILED; dev->error_code |= L3GD20H_INT2_SOURCE_FAILED;
@ -747,7 +747,7 @@ bool l3gd20h_set_hpf_ref (l3gd20h_sensor_t* dev, int8_t ref)
dev->error_code = L3GD20H_OK; dev->error_code = L3GD20H_OK;
if (!l3gd20h_write_reg (dev, L3GD20H_REG_REFERENCE, (uint8_t*)&ref, 1)) if (!l3gd20h_reg_write (dev, L3GD20H_REG_REFERENCE, (uint8_t*)&ref, 1))
{ {
error_dev ("Could not set high pass filter reference", __FUNCTION__, dev); error_dev ("Could not set high pass filter reference", __FUNCTION__, dev);
dev->error_code |= L3GD20H_CONFIG_HPF_FAILED; dev->error_code |= L3GD20H_CONFIG_HPF_FAILED;
@ -765,7 +765,7 @@ int8_t l3gd20h_get_hpf_ref (l3gd20h_sensor_t* dev)
int8_t ref = 0; int8_t ref = 0;
if (!l3gd20h_read_reg (dev, L3GD20H_REG_REFERENCE, (uint8_t*)&ref, 1)) if (!l3gd20h_reg_read (dev, L3GD20H_REG_REFERENCE, (uint8_t*)&ref, 1))
{ {
error_dev ("Could not get high pass filter reference", __FUNCTION__, dev); error_dev ("Could not get high pass filter reference", __FUNCTION__, dev);
dev->error_code |= L3GD20H_CONFIG_HPF_FAILED; dev->error_code |= L3GD20H_CONFIG_HPF_FAILED;
@ -784,7 +784,7 @@ int8_t l3gd20h_get_temperature (l3gd20h_sensor_t* dev)
int8_t reg; int8_t reg;
if (!l3gd20h_read_reg (dev, L3GD20H_REG_OUT_TEMP, (uint8_t*)(&reg), 1)) if (!l3gd20h_reg_read (dev, L3GD20H_REG_OUT_TEMP, (uint8_t*)(&reg), 1))
{ {
error_dev ("Could not get temperature", __FUNCTION__, dev); error_dev ("Could not get temperature", __FUNCTION__, dev);
return false; return false;
@ -807,7 +807,7 @@ static bool l3gd20h_is_available (l3gd20h_sensor_t* dev)
dev->error_code = L3GD20H_OK; dev->error_code = L3GD20H_OK;
if (!l3gd20h_read_reg (dev, L3GD20H_REG_WHO_AM_I, &chip_id, 1)) if (!l3gd20h_reg_read (dev, L3GD20H_REG_WHO_AM_I, &chip_id, 1))
return false; return false;
if (chip_id != L3GD20H_CHIP_ID && if (chip_id != L3GD20H_CHIP_ID &&
@ -838,10 +838,10 @@ static bool l3gd20h_reset (l3gd20h_sensor_t* dev)
uint8_t reg[6] = { 0 }; uint8_t reg[6] = { 0 };
// initialize sensor completely including setting in power down mode // initialize sensor completely including setting in power down mode
l3gd20h_write_reg (dev, L3GD20H_REG_CTRL1 , reg, 6); l3gd20h_reg_write (dev, L3GD20H_REG_CTRL1 , reg, 6);
l3gd20h_write_reg (dev, L3GD20H_REG_FIFO_CTRL, reg, 1); l3gd20h_reg_write (dev, L3GD20H_REG_FIFO_CTRL, reg, 1);
l3gd20h_write_reg (dev, L3GD20H_REG_IG_CFG , reg, 1); l3gd20h_reg_write (dev, L3GD20H_REG_IG_CFG , reg, 1);
l3gd20h_write_reg (dev, L3GD20H_REG_IG_THS_XH, reg, 6); l3gd20h_reg_write (dev, L3GD20H_REG_IG_THS_XH, reg, 6);
return true; return true;
} }
@ -857,20 +857,20 @@ static bool l3gd20h_update_reg(l3gd20h_sensor_t* dev, uint8_t reg, uint8_t mask,
while (!((mask >> shift) & 0x01)) shift++; while (!((mask >> shift) & 0x01)) shift++;
// read current register value // read current register value
if (!l3gd20h_read_reg (dev, reg, &reg_val, 1)) if (!l3gd20h_reg_read (dev, reg, &reg_val, 1))
return false; return false;
// set masked bits to the given value // set masked bits to the given value
reg_val = (reg_val & ~mask) | ((val << shift) & mask); reg_val = (reg_val & ~mask) | ((val << shift) & mask);
// write back new register value // write back new register value
if (!l3gd20h_write_reg (dev, reg, &reg_val, 1)) if (!l3gd20h_reg_write (dev, reg, &reg_val, 1))
return false; return false;
return true; return true;
} }
bool l3gd20h_read_reg(l3gd20h_sensor_t* dev, uint8_t reg, uint8_t *data, uint16_t len) bool l3gd20h_reg_read(l3gd20h_sensor_t* dev, uint8_t reg, uint8_t *data, uint16_t len)
{ {
if (!dev || !data) return false; if (!dev || !data) return false;
@ -879,7 +879,7 @@ bool l3gd20h_read_reg(l3gd20h_sensor_t* dev, uint8_t reg, uint8_t *data, uint16_
} }
bool l3gd20h_write_reg(l3gd20h_sensor_t* dev, uint8_t reg, uint8_t *data, uint16_t len) bool l3gd20h_reg_write(l3gd20h_sensor_t* dev, uint8_t reg, uint8_t *data, uint16_t len)
{ {
if (!dev || !data) return false; if (!dev || !data) return false;

4
extras/l3gd20h/l3gd20h.h
View file

@ -380,7 +380,7 @@ int8_t l3gd20h_get_temperature (l3gd20h_sensor_t* dev);
* @param len number of bytes to be written to the register * @param len number of bytes to be written to the register
* @return true on success, false on error * @return true on success, false on error
*/ */
bool l3gd20h_write_reg (l3gd20h_sensor_t* dev, bool l3gd20h_reg_write (l3gd20h_sensor_t* dev,
uint8_t reg, uint8_t *data, uint16_t len); uint8_t reg, uint8_t *data, uint16_t len);
/** /**
@ -397,7 +397,7 @@ bool l3gd20h_write_reg (l3gd20h_sensor_t* dev,
* @param len number of bytes to be read from the register * @param len number of bytes to be read from the register
* @return true on success, false on error * @return true on success, false on error
*/ */
bool l3gd20h_read_reg (l3gd20h_sensor_t* dev, bool l3gd20h_reg_read (l3gd20h_sensor_t* dev,
uint8_t reg, uint8_t *data, uint16_t len); uint8_t reg, uint8_t *data, uint16_t len);
#ifdef __cplusplus #ifdef __cplusplus