nam/Esp32WeatherStation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Nam Tran
2020-09-13 19:34:32 -05:00
parent 85cbe5836b
commit cb803caadf
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/bme280/bme280_sup.c
View File

@@ -17,7 +17,7 @@ void user_delay_ms(uint32_t ms);
struct bme280_dev bme280; struct bme280_dev bme280;
void my_i2c_setup(void) void setup_i2c(void)
{ {
i2c_config_t conf; i2c_config_t conf;
conf.mode = I2C_MODE_MASTER; conf.mode = I2C_MODE_MASTER;
@@ -30,9 +30,8 @@ void my_i2c_setup(void)
i2c_driver_install(I2C_NUM_0, I2C_MODE_MASTER, 0, 0, 0); i2c_driver_install(I2C_NUM_0, I2C_MODE_MASTER, 0, 0, 0);
} }
void my_bme280_init(void) int8_t init_bme280(void)
{ {
int8_t rslt = BME280_OK;
uint8_t settings_sel; uint8_t settings_sel;
bme280.dev_id = BME280_I2C_ADDR_PRIM; bme280.dev_id = BME280_I2C_ADDR_PRIM;
@@ -40,17 +39,19 @@ void my_bme280_init(void)
bme280.read = (void *)user_i2c_read; bme280.read = (void *)user_i2c_read;
bme280.write = (void *)user_i2c_write; bme280.write = (void *)user_i2c_write;
bme280.delay_ms = (void *)user_delay_ms; bme280.delay_ms = (void *)user_delay_ms;
printf("calling bme280_init\r\n"); printf("calling bme280_init\n");
rslt = bme280_init(&bme280); int8_t rslt0 = bme280_init(&bme280);
printf("bme280 init result %d\r\n", rslt); printf("bme280 init result %d\n", rslt0);
bme280.settings.osr_h = BME280_OVERSAMPLING_1X; bme280.settings.osr_h = BME280_OVERSAMPLING_1X;
bme280.settings.osr_p = BME280_OVERSAMPLING_4X; bme280.settings.osr_p = BME280_OVERSAMPLING_4X;
bme280.settings.osr_t = BME280_OVERSAMPLING_4X; bme280.settings.osr_t = BME280_OVERSAMPLING_4X;
bme280.settings.filter = BME280_FILTER_COEFF_OFF; bme280.settings.filter = BME280_FILTER_COEFF_OFF;
settings_sel = BME280_OSR_PRESS_SEL | BME280_OSR_TEMP_SEL | BME280_OSR_HUM_SEL | BME280_FILTER_SEL; settings_sel = BME280_OSR_PRESS_SEL | BME280_OSR_TEMP_SEL | BME280_OSR_HUM_SEL | BME280_FILTER_SEL;
rslt = bme280_set_sensor_settings(settings_sel, &bme280); int8_t rslt1 = bme280_set_sensor_settings(settings_sel, &bme280);
printf("bme280 settings config result %d\r\n", rslt); printf("bme280 settings config result %d\n", rslt1);
return rslt0 & rslt1;
} }
#define SUCCESS 0 #define SUCCESS 0

9
main/main.c
View File

@@ -30,8 +30,8 @@ static const httpd_uri_t root = {
void my_i2c_setup(void); void setup_i2c(void);
void my_bme280_init(void); int8_t init_bme280(void);
extern struct bme280_dev bme280; // from bme280_sup.c extern struct bme280_dev bme280; // from bme280_sup.c
void app_main(void) void app_main(void)
@@ -61,8 +61,9 @@ void app_main(void)
*/ */
ESP_ERROR_CHECK(example_connect()); ESP_ERROR_CHECK(example_connect());
my_i2c_setup(); setup_i2c();
my_bme280_init(); int8_t ret = init_bme280();
printf("BME init result %d\n", ret);
int8_t rslt; int8_t rslt;
uint32_t count = 0; uint32_t count = 0;