From 43d024fe429c5f519fb50f80fe75c8d184c64aea Mon Sep 17 00:00:00 2001
From: Michael Bisbjerg <michael@mbwarez.dk>
Date: Fri, 10 May 2024 22:43:55 +0200
Subject: [PATCH] Make BME280 usermod i2c address changeable

---
 usermods/BME280_v2/README.md        |  1 +
 usermods/BME280_v2/usermod_bme280.h | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/usermods/BME280_v2/README.md b/usermods/BME280_v2/README.md
index 0a4afbf1f4..51e93336d4 100644
--- a/usermods/BME280_v2/README.md
+++ b/usermods/BME280_v2/README.md
@@ -7,6 +7,7 @@ This Usermod is designed to read a `BME280` or `BMP280` sensor and output the fo
 - Dew Point (`BME280` only)
 
 Configuration is performed via the Usermod menu.  There are no parameters to set in code!  The following settings can be configured in the Usermod Menu:
+- The i2c address in decimal. Set it to either 118 (0x76, the default) or 119 (0x77). **Requires reboot**.
 - Temperature Decimals (number of decimal places to output)
 - Humidity Decimals
 - Pressure Decimals
diff --git a/usermods/BME280_v2/usermod_bme280.h b/usermods/BME280_v2/usermod_bme280.h
index ae6eba89d6..0040c5efa8 100644
--- a/usermods/BME280_v2/usermod_bme280.h
+++ b/usermods/BME280_v2/usermod_bme280.h
@@ -28,6 +28,7 @@ class UsermodBME280 : public Usermod
   bool UseCelsius = true;                 // Use Celsius for Reporting
   bool HomeAssistantDiscovery = false;    // Publish Home Assistant Device Information
   bool enabled = true;
+  BME280I2C::I2CAddr i2cAddress = BME280I2C::I2CAddr_0x76;  // Default i2c address for BME280
 
   // set the default pins based on the architecture, these get overridden by Usermod menu settings
   #ifdef ESP8266
@@ -48,7 +49,7 @@ class UsermodBME280 : public Usermod
       BME280I2C::I2CAddr_0x76 // I2C address. I2C specific. Default 0x76
   };
 
-  BME280I2C bme{settings};
+  BME280I2C bme;
 
   uint8_t sensorType;
 
@@ -186,6 +187,9 @@ class UsermodBME280 : public Usermod
   {
     if (i2c_scl<0 || i2c_sda<0) { enabled = false; sensorType = 0; return; }
     
+    settings.bme280Addr = i2cAddress;
+    bme = BME280I2C(settings);
+
     if (!bme.begin())
     {
       sensorType = 0;
@@ -399,6 +403,7 @@ class UsermodBME280 : public Usermod
   {
     JsonObject top = root.createNestedObject(FPSTR(_name));
     top[FPSTR(_enabled)] = enabled;
+    top[F("I2CAddress")] = i2cAddress;
     top[F("TemperatureDecimals")] = TemperatureDecimals;
     top[F("HumidityDecimals")] = HumidityDecimals;
     top[F("PressureDecimals")] = PressureDecimals;
@@ -426,6 +431,10 @@ class UsermodBME280 : public Usermod
 
     configComplete &= getJsonValue(top[FPSTR(_enabled)], enabled);
     // A 3-argument getJsonValue() assigns the 3rd argument as a default value if the Json value is missing
+    uint8_t tmpI2cAddress;
+    configComplete &= getJsonValue(top[F("I2CAddress")], tmpI2cAddress, 0x76);
+    i2cAddress = static_cast<BME280I2C::I2CAddr>(tmpI2cAddress);
+
     configComplete &= getJsonValue(top[F("TemperatureDecimals")], TemperatureDecimals, 1);
     configComplete &= getJsonValue(top[F("HumidityDecimals")], HumidityDecimals, 0);
     configComplete &= getJsonValue(top[F("PressureDecimals")], PressureDecimals, 0);