From 156a0537d6b21aaab1d1f104a7001a38ca1ffce3 Mon Sep 17 00:00:00 2001
From: Hyeonki Hong <hhk7734@gmail.com>
Date: Tue, 12 Nov 2019 07:37:00 +0900
Subject: [PATCH] Correct 'begin()' to check basic I2C address

suggestion: Carter Nelson <caternuson@gmail.com>
---
 Adafruit_BME280.cpp | 52 ++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/Adafruit_BME280.cpp b/Adafruit_BME280.cpp
index 1e57b6f..0f85aba 100644
--- a/Adafruit_BME280.cpp
+++ b/Adafruit_BME280.cpp
@@ -61,15 +61,35 @@ Adafruit_BME280::Adafruit_BME280(int8_t cspin, int8_t mosipin, int8_t misopin,
                                  int8_t sckpin)
     : _cs(cspin), _mosi(mosipin), _miso(misopin), _sck(sckpin) {}
 
+/*!
+ *   @brief  Initialise sensor with given parameters / settings
+ *   @param addr the I2C address the device can be found on
+ *   @param theWire the I2C object to use
+ *   @returns true on success, false otherwise
+ */
+bool Adafruit_BME280::begin(uint8_t addr, TwoWire *theWire) {
+  bool status = false;
+  _i2caddr = addr;
+  _wire = theWire;
+  status = init();
+  if ((!status) && (addr != BME280_ADDRESS)) {
+    _i2caddr = BME280_ADDRESS;
+    status = init();
+  }
+  if ((!status) && (addr != BME280_ADDRESS_ALTERNATE)) {
+    _i2caddr = BME280_ADDRESS_ALTERNATE;
+    status = init();
+  }
+  return status;
+}
+
 /*!
  *   @brief  Initialise sensor with given parameters / settings
  *   @param theWire the I2C object to use
  *   @returns true on success, false otherwise
  */
 bool Adafruit_BME280::begin(TwoWire *theWire) {
-  _wire = theWire;
-  _i2caddr = BME280_ADDRESS;
-  return init();
+  return begin(BME280_ADDRESS, theWire);
 }
 
 /*!
@@ -78,21 +98,7 @@ bool Adafruit_BME280::begin(TwoWire *theWire) {
  *   @returns true on success, false otherwise
  */
 bool Adafruit_BME280::begin(uint8_t addr) {
-  _i2caddr = addr;
-  _wire = &Wire;
-  return init();
-}
-
-/*!
- *   @brief  Initialise sensor with given parameters / settings
- *   @param addr the I2C address the device can be found on
- *   @param theWire the I2C object to use
- *   @returns true on success, false otherwise
- */
-bool Adafruit_BME280::begin(uint8_t addr, TwoWire *theWire) {
-  _i2caddr = addr;
-  _wire = theWire;
-  return init();
+  return begin(addr, &Wire);
 }
 
 /*!
@@ -100,15 +106,7 @@ bool Adafruit_BME280::begin(uint8_t addr, TwoWire *theWire) {
  *   @returns true on success, false otherwise
  */
 bool Adafruit_BME280::begin(void) {
-  bool status = false;
-  _i2caddr = BME280_ADDRESS;
-  _wire = &Wire;
-  status = init();
-  if (!status) {
-    _i2caddr = BME280_ADDRESS_ALTERNATE;
-    status = init();
-  }
-  return status;
+  return begin(BME280_ADDRESS, &Wire);
 }
 
 /*!