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

minor changes

Browse source
This commit is contained in:
Gunar Schorcht 2018-01-04 17:32:34 +01:00
parent c57aca2800
commit 4e629af5cd
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/lis3dh/lis3dh_example.c
View file

@ -346,7 +346,7 @@ void user_init(void)
lis3dh_enable_adc (sensor, true, true); lis3dh_enable_adc (sensor, true, true);
// LAST STEP: Finally set scale and mode to start measurements // LAST STEP: Finally set scale and mode to start measurements
lis3dh_set_scale(sensor, lis3dh_scale_2g); lis3dh_set_scale(sensor, lis3dh_scale_2_g);
lis3dh_set_mode (sensor, lis3dh_odr_10, lis3dh_high_res, true, true, true); lis3dh_set_mode (sensor, lis3dh_odr_10, lis3dh_high_res, true, true, true);
// -- SENSOR CONFIGURATION PART --- // -- SENSOR CONFIGURATION PART ---

12
extras/lis3dh/README.md
View file

@ -89,15 +89,15 @@ Raw **output data** (**raw data**) are given as 16-bit signed integer values in
Full Scale | Driver symbol | Resolution 12 bit <br>```lis3dh_high_res``` | Resolution 10 bit<br>```lis3dh_normal``` | Resolution 8 bit <br>```lis3dh_low_power``` Full Scale | Driver symbol | Resolution 12 bit <br>```lis3dh_high_res``` | Resolution 10 bit<br>```lis3dh_normal``` | Resolution 8 bit <br>```lis3dh_low_power```
---------------------:|:-----------:|-----------:|---------------:|-----: ---------------------:|:-----------:|-----------:|---------------:|-----:
±2 g | ```lis3dh_scale_2g``` | 1 mg | 4 mg | 16 mg ±2 g | ```lis3dh_scale_2_g``` | 1 mg | 4 mg | 16 mg
±4 g | ```lis3dh_scale_4g``` | 2 mg | 8 mg | 32 mg ±4 g | ```lis3dh_scale_4_g``` | 2 mg | 8 mg | 32 mg
±8 g | ```lis3dh_scale_8g``` | 4 mg | 16 mg | 64 mg ±8 g | ```lis3dh_scale_8_g``` | 4 mg | 16 mg | 64 mg
±16 g | ```lis3dh_scale_16g``` | 12 mg | 48 mg | 192 mg ±16 g | ```lis3dh_scale_16_g``` | 12 mg | 48 mg | 192 mg
By default, a full scale of ±2 g is used. Function ```lis3dh_set_scale``` can be used to change it. By default, a full scale of ±2 g is used. Function ```lis3dh_set_scale``` can be used to change it.
``` ```
lis3dh_set_scale(sensor, lis3dh_scale_4g); lis3dh_set_scale(sensor, lis3dh_scale_4_g);
``` ```
### Fetching output data ### Fetching output data
@ -1013,7 +1013,7 @@ void user_init(void)
lis3dh_enable_adc (sensor, true, true); lis3dh_enable_adc (sensor, true, true);
// LAST STEP: Finally set scale and mode to start measurements // LAST STEP: Finally set scale and mode to start measurements
lis3dh_set_scale(sensor, lis3dh_scale_2g); lis3dh_set_scale(sensor, lis3dh_scale_2_g);
lis3dh_set_mode (sensor, lis3dh_odr_10, lis3dh_high_res, true, true, true); lis3dh_set_mode (sensor, lis3dh_odr_10, lis3dh_high_res, true, true, true);
// -- SENSOR CONFIGURATION PART --- // -- SENSOR CONFIGURATION PART ---

4
extras/lis3dh/lis3dh.c
View file

@ -278,7 +278,7 @@ lis3dh_sensor_t* lis3dh_init_sensor (uint8_t bus, uint8_t addr, uint8_t cs)
dev->cs = cs; dev->cs = cs;
dev->error_code = LIS3DH_OK; dev->error_code = LIS3DH_OK;
dev->scale = lis3dh_scale_2g; dev->scale = lis3dh_scale_2_g;
dev->fifo_mode = lis3dh_bypass; dev->fifo_mode = lis3dh_bypass;
dev->fifo_first = true; dev->fifo_first = true;
@ -306,7 +306,7 @@ lis3dh_sensor_t* lis3dh_init_sensor (uint8_t bus, uint8_t addr, uint8_t cs)
return NULL; return NULL;
} }
lis3dh_update_reg (dev, LIS3DH_REG_CTRL4, lis3dh_reg_ctrl4, FS, lis3dh_scale_2g); lis3dh_update_reg (dev, LIS3DH_REG_CTRL4, lis3dh_reg_ctrl4, FS, lis3dh_scale_2_g);
lis3dh_update_reg (dev, LIS3DH_REG_CTRL4, lis3dh_reg_ctrl4, BDU, 1); lis3dh_update_reg (dev, LIS3DH_REG_CTRL4, lis3dh_reg_ctrl4, BDU, 1);
return dev; return dev;

8
extras/lis3dh/lis3dh_types.h
View file

@ -86,10 +86,10 @@ typedef enum {
*/ */
typedef enum { typedef enum {
lis3dh_scale_2g = 0, // default lis3dh_scale_2_g = 0, // default
lis3dh_scale_4g, lis3dh_scale_4_g,
lis3dh_scale_8g, lis3dh_scale_8_g,
lis3dh_scale_16g lis3dh_scale_16_g
} lis3dh_scale_t; } lis3dh_scale_t;