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

BME680 driver trailing whitespaces removed

Browse source
This commit is contained in:
Gunar Schorcht 2017-10-28 17:17:54 +02:00
parent 1af3f2e033
commit f431f831f6
8 changed files with 318 additions and 325 deletions
Download patch file Download diff file Expand all files Collapse all files

1
examples/bme680/bme680_heating_profiles/bme680_heating_profiles.c
View file

@ -123,4 +123,3 @@ void user_init(void)
bme680_set_heater_profile (sensor, 4, 400, 180); bme680_set_heater_profile (sensor, 4, 400, 180);
} }
} }

1
examples/bme680/bme680_one_sensor/bme680_one_sensor.c
View file

@ -128,4 +128,3 @@ void user_init(void)
bme680_set_ambient_temperature (sensor, 10); bme680_set_ambient_temperature (sensor, 10);
} }
} }

1
examples/bme680/bme680_two_sensors/bme680_two_sensors.c
View file

@ -153,4 +153,3 @@ void user_init(void)
bme680_use_heater_profile (sensor2, 0); bme680_use_heater_profile (sensor2, 0);
} }
} }

7
extras/bme680/README.md
View file

@ -234,8 +234,8 @@ else
switch (sensor->error_code & BME680_INT_ERROR_MASK) switch (sensor->error_code & BME680_INT_ERROR_MASK)
{ {
case BME680_I2C_BUSY: ... case BME680_INT_BUSY: ...
case BME680_I2C_READ_FAILED: ... case BME680_INT_READ_FAILED: ...
... ...
} }
switch (sensor->error_code & BME680_DRV_ERROR_MASK) switch (sensor->error_code & BME680_DRV_ERROR_MASK)
@ -332,7 +332,7 @@ Dependent on the hardware configuration, the communication interface settings ha
``` ```
### Main programm ### Main program
If I2C interfaces are used, they have to be initialized first. If I2C interfaces are used, they have to be initialized first.
@ -553,4 +553,3 @@ void user_init(void)
} }
} }
``` ```

2
extras/bme680/bme680.c
View file

@ -1481,5 +1481,3 @@ static bool bme680_i2c_write(bme680_sensor_t* dev, uint8_t reg, uint8_t *data, u
return true; return true;
} }

67
extras/bme680/bme680_types.h
View file

@ -108,14 +108,14 @@ typedef enum {
*/ */
typedef struct { typedef struct {
uint8_t osr_temperature; // T oversampling rate (default osr_1x) uint8_t osr_temperature; // T oversampling rate (default osr_1x)
uint8_t osr_pressure; // P oversampling rate (default osr_1x) uint8_t osr_pressure; // P oversampling rate (default osr_1x)
uint8_t osr_humidity; // H oversampling rate (default osr_1x) uint8_t osr_humidity; // H oversampling rate (default osr_1x)
uint8_t filter_size; // IIR filter size (default iir_size_3) uint8_t filter_size; // IIR filter size (default iir_size_3)
int8_t heater_profile; // Heater profile used (default 0) int8_t heater_profile; // Heater profile used (default 0)
uint16_t heater_temperature[10]; // Heater temperature for G (default 320) uint16_t heater_temperature[10]; // Heater temperature for G (default 320)
uint16_t heater_duration[10]; // Heater duration for G (default 150) uint16_t heater_duration[10]; // Heater duration for G (default 150)
int8_t ambient_temperature; // Ambient temperature for G (default 25) int8_t ambient_temperature; // Ambient temperature for G (default 25)
@ -129,37 +129,37 @@ typedef struct {
*/ */
typedef struct { typedef struct {
uint16_t par_t1; // calibration data for temperature compensation uint16_t par_t1; // calibration data for temperature compensation
int16_t par_t2; uit16_t par_t2;
int8_t par_t3; int8_t par_t3;
uint16_t par_p1; // calibration data for pressure compensation uint16_t par_p1; // calibration data for pressure compensation
int16_t par_p2; int16_t par_p2;
int8_t par_p3; int8_t par_p3;
int16_t par_p4; int16_t par_p4;
int16_t par_p5; int16_t par_p5;
int8_t par_p7; int8_t par_p7;
int8_t par_p6; int8_t par_p6;
int16_t par_p8; int16_t par_p8;
int16_t par_p9; int16_t par_p9;
uint8_t par_p10; uint8_t par_p10;
uint16_t par_h1; // calibration data for humidity compensation uint16_t par_h1; // calibration data for humidity compensation
uint16_t par_h2; uint16_t par_h2;
int8_t par_h3; int8_t par_h3;
int8_t par_h4; int8_t par_h4;
int8_t par_h5; int8_t par_h5;
uint8_t par_h6; uint8_t par_h6;
int8_t par_h7; int8_t par_h7;
int8_t par_gh1; // calibration data for gas compensation int8_t par_gh1; // calibration data for gas compensation
int16_t par_gh2; int16_t par_gh2;
int8_t par_gh3; int8_t par_gh3;
int32_t t_fine; // temperatur correction factor for P and G int32_t t_fine; // temperatur correction factor for P and G
uint8_t res_heat_range; uint8_t res_heat_range;
int8_t res_heat_val; int8_t res_heat_val;
int8_t range_sw_err; int8_t range_sw_err;
} bme680_calib_data_t; } bme680_calib_data_t;
@ -190,4 +190,3 @@ typedef struct {
#endif /* End of CPP guard */ #endif /* End of CPP guard */
#endif /* __BME680_TYPES_H__ */ #endif /* __BME680_TYPES_H__ */