diff --git a/examples/lis3dh/lis3dh_example.c b/examples/lis3dh/lis3dh_example.c index 079b1b7..bdd3bfd 100644 --- a/examples/lis3dh/lis3dh_example.c +++ b/examples/lis3dh/lis3dh_example.c @@ -346,7 +346,7 @@ void user_init(void) lis3dh_enable_adc (sensor, true, true); // 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); // -- SENSOR CONFIGURATION PART --- diff --git a/extras/lis3dh/README.md b/extras/lis3dh/README.md index bd59be6..c43edbf 100644 --- a/extras/lis3dh/README.md +++ b/extras/lis3dh/README.md @@ -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
```lis3dh_high_res``` | Resolution 10 bit
```lis3dh_normal``` | Resolution 8 bit
```lis3dh_low_power``` ---------------------:|:-----------:|-----------:|---------------:|-----: - ±2 g | ```lis3dh_scale_2g``` | 1 mg | 4 mg | 16 mg - ±4 g | ```lis3dh_scale_4g``` | 2 mg | 8 mg | 32 mg - ±8 g | ```lis3dh_scale_8g``` | 4 mg | 16 mg | 64 mg -±16 g | ```lis3dh_scale_16g``` | 12 mg | 48 mg | 192 mg + ±2 g | ```lis3dh_scale_2_g``` | 1 mg | 4 mg | 16 mg + ±4 g | ```lis3dh_scale_4_g``` | 2 mg | 8 mg | 32 mg + ±8 g | ```lis3dh_scale_8_g``` | 4 mg | 16 mg | 64 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. ``` -lis3dh_set_scale(sensor, lis3dh_scale_4g); +lis3dh_set_scale(sensor, lis3dh_scale_4_g); ``` ### Fetching output data @@ -1013,7 +1013,7 @@ void user_init(void) lis3dh_enable_adc (sensor, true, true); // 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); // -- SENSOR CONFIGURATION PART --- diff --git a/extras/lis3dh/lis3dh.c b/extras/lis3dh/lis3dh.c index 7742024..b9def12 100644 --- a/extras/lis3dh/lis3dh.c +++ b/extras/lis3dh/lis3dh.c @@ -278,7 +278,7 @@ lis3dh_sensor_t* lis3dh_init_sensor (uint8_t bus, uint8_t addr, uint8_t cs) dev->cs = cs; dev->error_code = LIS3DH_OK; - dev->scale = lis3dh_scale_2g; + dev->scale = lis3dh_scale_2_g; dev->fifo_mode = lis3dh_bypass; 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; } - 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); return dev; diff --git a/extras/lis3dh/lis3dh_types.h b/extras/lis3dh/lis3dh_types.h index b90b042..122075e 100644 --- a/extras/lis3dh/lis3dh_types.h +++ b/extras/lis3dh/lis3dh_types.h @@ -86,10 +86,10 @@ typedef enum { */ typedef enum { - lis3dh_scale_2g = 0, // default - lis3dh_scale_4g, - lis3dh_scale_8g, - lis3dh_scale_16g + lis3dh_scale_2_g = 0, // default + lis3dh_scale_4_g, + lis3dh_scale_8_g, + lis3dh_scale_16_g } lis3dh_scale_t;