From cb803caadf6c34b63f3c40682a5cd75289d8441f Mon Sep 17 00:00:00 2001
From: Nam Tran <thnam.me@gmail.com>
Date: Sun, 13 Sep 2020 19:34:32 -0500
Subject: [PATCH] refactor

---
 components/bme280/bme280_sup.c | 17 +++++++++--------
 main/main.c                    |  9 +++++----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/components/bme280/bme280_sup.c b/components/bme280/bme280_sup.c
index eb9145f..48ee3a6 100644
--- a/components/bme280/bme280_sup.c
+++ b/components/bme280/bme280_sup.c
@@ -17,7 +17,7 @@ void user_delay_ms(uint32_t ms);
 
 struct bme280_dev bme280;
 
-void my_i2c_setup(void)
+void setup_i2c(void)
 {
   i2c_config_t conf;
   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);
 } 
 
-void my_bme280_init(void)
+int8_t init_bme280(void)
 {
-  int8_t rslt = BME280_OK;
   uint8_t settings_sel;
   
   bme280.dev_id = BME280_I2C_ADDR_PRIM;
@@ -40,17 +39,19 @@ void my_bme280_init(void)
   bme280.read = (void *)user_i2c_read;
   bme280.write = (void *)user_i2c_write;
   bme280.delay_ms = (void *)user_delay_ms;
-  printf("calling bme280_init\r\n");
-  rslt = bme280_init(&bme280);
-  printf("bme280 init result %d\r\n", rslt);
+  printf("calling bme280_init\n");
+  int8_t rslt0 = bme280_init(&bme280);
+  printf("bme280 init result %d\n", rslt0);
 
   bme280.settings.osr_h = BME280_OVERSAMPLING_1X;
   bme280.settings.osr_p = BME280_OVERSAMPLING_4X;
   bme280.settings.osr_t = BME280_OVERSAMPLING_4X;
   bme280.settings.filter = BME280_FILTER_COEFF_OFF;
   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);
-  printf("bme280 settings config result %d\r\n", rslt);
+  int8_t rslt1 = bme280_set_sensor_settings(settings_sel, &bme280);
+  printf("bme280 settings config result %d\n", rslt1);
+
+  return rslt0 & rslt1;
 }
 
 #define SUCCESS 0
diff --git a/main/main.c b/main/main.c
index c7c0a38..52328ad 100644
--- a/main/main.c
+++ b/main/main.c
@@ -30,8 +30,8 @@ static const httpd_uri_t root = {
 
 
 
-void my_i2c_setup(void);
-void my_bme280_init(void);
+void setup_i2c(void);
+int8_t init_bme280(void);
 extern struct bme280_dev bme280; // from bme280_sup.c
 
 void app_main(void)
@@ -61,8 +61,9 @@ void app_main(void)
     */
    ESP_ERROR_CHECK(example_connect());
 
-   my_i2c_setup();
-   my_bme280_init();
+   setup_i2c();
+   int8_t ret = init_bme280();
+   printf("BME init result %d\n", ret);
 
    int8_t rslt;
    uint32_t count = 0;