Merge pull request #185 from kike-canaries/av_fix_184_bme280

Av fix 184 bme280
kike-canaries · Nov 19, 2023 · 449fc0c · 449fc0c
2 parents d298cb9 + 2ed621d
commit 449fc0c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/examples/advanced_multivariable/src/main.cpp b/examples/advanced_multivariable/src/main.cpp
@@ -18,6 +18,8 @@
 #include <Arduino.h>
 #include <Sensors.hpp>
 
+#define MAIN_HW_EN_PIN 27 // Only for setup with booster board with enable pin
+
 void printSensorsDetected() {
     uint16_t sensors_count =  sensors.getSensorsRegisteredCount();
     uint16_t units_count   =  sensors.getUnitsRegisteredCount();
@@ -56,9 +58,18 @@ void onSensorDataError(const char * msg){
 *  M A I N
 ******************************************************************************/
 
+void powerEnableSensors() {
+    // init all sensors (step-up to 5V with enable pin)
+    Serial.println("-->[POWR] == enable sensors ==");
+    pinMode(MAIN_HW_EN_PIN, OUTPUT);
+    digitalWrite(MAIN_HW_EN_PIN, HIGH);  // step-up on
+}
+
 void setup() {
     Serial.begin(115200);
     delay(200);
+    // powerEnableSensors(); // Only for special setup hardware with enable
+    delay(100);
     Serial.println("\n== Sensor test setup ==\n");
     Serial.println("-->[SETUP] Detecting sensors..");
 
@@ -73,4 +84,4 @@ void setup() {
 
 void loop() {
     sensors.loop();  // read sensor data and showed it
-}
+}
diff --git a/src/Sensors.cpp b/src/Sensors.cpp
@@ -1561,13 +1561,16 @@ void Sensors::sht31Init() {
 }
 
 void Sensors::bme280Init() {
-    sensorAnnounce(SENSORS::SBME280);
-    #ifndef Wire1
-    if (!bme280.begin()) return;
-    #else
-    if (!bme280.begin() && !bme280.begin(BME280_ADDRESS,&Wire1)) return; 
-    #endif
-    sensorRegister(SENSORS::SBME280);
+  sensorAnnounce(SENSORS::SBME280);
+  #ifndef Wire1
+  if (!bme280.begin() && !bme280.begin(BME280_ADDRESS_ALTERNATE)) return;
+  #else
+  if (!bme280.begin() && 
+      !bme280.begin(BME280_ADDRESS_ALTERNATE) && 
+      !bme280.begin(BME280_ADDRESS, &Wire1) && 
+      !bme280.begin(BME280_ADDRESS_ALTERNATE, &Wire1)) return;
+  #endif
+  sensorRegister(SENSORS::SBME280);
 }
 
 /// Environment BMP280 sensor init

diff --git a/unified-lib-deps.ini b/unified-lib-deps.ini
@@ -1,11 +1,11 @@
 [commonlibs]
 lib_deps = 
-  adafruit/Adafruit Unified [email protected].13
-  adafruit/Adafruit BME280 [email protected].2
+  adafruit/Adafruit Unified [email protected].14
+  adafruit/Adafruit BME280 [email protected].4
   adafruit/Adafruit BMP280 [email protected]
-  adafruit/Adafruit BME680 [email protected].2
+  adafruit/Adafruit BME680 [email protected].4
   adafruit/Adafruit SHT31 [email protected]
-  adafruit/Adafruit [email protected].9
+  adafruit/Adafruit [email protected].11
   adafruit/Adafruit [email protected]
   robtillaart/[email protected]
   paulvha/[email protected]