Merge pull request #68 from hhk7734/master

Add alternate address to 'begfin(TwoWire)'

Author: caternuson

Adafruit_BME280.cpp

@@ -63,52 +63,50 @@ Adafruit_BME280::Adafruit_BME280(int8_t cspin, int8_t mosipin, int8_t misopin,
 
 /*!
  *   @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(TwoWire *theWire) {
+bool Adafruit_BME280::begin(uint8_t addr, TwoWire *theWire) {
+  bool status = false;
+  _i2caddr = addr;
   _wire = theWire;
-  _i2caddr = BME280_ADDRESS;
-  return init();
+  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 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) {
-  _i2caddr = addr;
-  _wire = &Wire;
-  return init();
+bool Adafruit_BME280::begin(TwoWire *theWire) {
+  return begin(BME280_ADDRESS, theWire);
 }
 
 /*!
  *   @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();
+bool Adafruit_BME280::begin(uint8_t addr) {
+  return begin(addr, &Wire);
 }
 
 /*!
  *   @brief  Initialise sensor with given parameters / settings
  *   @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);
 }
 
 /*!