use TwoWire

Author: thijstriemstra

BH1750_LightSensor_Mux/BH1750_LightSensor_Mux.cpp

@@ -1,4 +1,4 @@
-/*  Copyright (c) 2020-2021, Collab
+/*  Copyright (c) 2020-2023, Collab
  *  All rights reserved
 */
 /*
@@ -8,6 +8,7 @@
 
 BH1750_LightSensor_Mux::BH1750_LightSensor_Mux(
   MultiPlexer_TCA9548A* expander,
+  TwoWire* wire,
   uint8_t expander_channel,
   int address,
   BH1750Mode modus
@@ -17,7 +18,7 @@ BH1750_LightSensor_Mux::BH1750_LightSensor_Mux(
   _modus = modus;
   _address = address;
 
-  _lightMeter = new BH1750_WE(&Wire1, _address);
+  _lightMeter = new BH1750_WE(wire, _address);
 }
 
 void BH1750_LightSensor_Mux::begin() {

BH1750_LightSensor_Mux/BH1750_LightSensor_Mux.h

@@ -1,4 +1,4 @@
-/*  Copyright (c) 2020-2021, Collab
+/*  Copyright (c) 2020-2023, Collab
  *  All rights reserved
 */
 /*
@@ -16,6 +16,7 @@ class BH1750_LightSensor_Mux {
   public:
     BH1750_LightSensor_Mux(
       MultiPlexer_TCA9548A* expander,
+      TwoWire* wire,
       uint8_t expander_channel,
       int address = 0x23,
       BH1750Mode modus = BH1750Mode::CHM

BME280_BarometerSensor/BME280_BarometerSensor.cpp

@@ -1,4 +1,4 @@
-/*  Copyright (c) 2020-2021, Collab
+/*  Copyright (c) 2020-2023, Collab
  *  All rights reserved
 */
 /*
@@ -23,14 +23,16 @@ BME280_BarometerSensor::BME280_BarometerSensor(
   _sensor = new Adafruit_BME280();
 }
 
-void BME280_BarometerSensor::begin() {
+bool BME280_BarometerSensor::begin() {
   _i2c->begin(_sdaPin, _sclPin, _clockSpeed);
 
   bool status;
   status = _sensor->begin(_address, _i2c);
   if (!status) {
     Log.warning(F("Could not find a valid BME280 sensor, check wiring!" CR));
   }
+
+  return status;
 }
 
 void BME280_BarometerSensor::loop() {

BME280_BarometerSensor/BME280_BarometerSensor.h

@@ -1,4 +1,4 @@
-/*  Copyright (c) 2020-2021, Collab
+/*  Copyright (c) 2020-2023, Collab
  *  All rights reserved
 */
 /*
@@ -30,7 +30,7 @@ class BME280_BarometerSensor
       float sea_level_pressure = 1013,
       long clock_speed = 100000
     );
-    void begin();
+    bool begin();
     void loop();
     float getTemperature();
     float getPressure();

BME280_BarometerSensor_Mux/BME280_BarometerSensor_Mux.cpp

@@ -1,4 +1,4 @@
-/*  Copyright (c) 2020-2021, Collab
+/*  Copyright (c) 2020-2023, Collab
  *  All rights reserved
 */
 /*
@@ -8,12 +8,14 @@
 
 BME280_BarometerSensor_Mux::BME280_BarometerSensor_Mux(
     MultiPlexer_TCA9548A* expander,
+    TwoWire* wire,
     uint8_t expander_channel,
     int address,
     float sea_level_pressure,
     int clock_speed
 ) {
   _expander = expander;
+  _wire = wire;
   _expanderChannel = expander_channel;
   _address = address;
   _clockSpeed = clock_speed;
@@ -22,15 +24,14 @@ BME280_BarometerSensor_Mux::BME280_BarometerSensor_Mux(
   _sensor = new Adafruit_BME280();
 }
 
-void BME280_BarometerSensor_Mux::begin() {
+bool BME280_BarometerSensor_Mux::begin() {
   _expander->openChannel(_expanderChannel);
 
-  bool status = _sensor->begin(_address, &Wire1);
-  if (!status) {
-    Log.warning(F("Error initialising BME280 sensor" CR));
-  }
+  working = _sensor->begin(_address, _wire);
 
   _expander->closeChannel(_expanderChannel);
+
+  return working;
 }
 
 float BME280_BarometerSensor_Mux::getTemperature() {

BME280_BarometerSensor_Mux/BME280_BarometerSensor_Mux.h

@@ -1,4 +1,4 @@
-/*  Copyright (c) 2020-2021, Collab
+/*  Copyright (c) 2020-2023, Collab
  *  All rights reserved
 */
 /*
@@ -10,7 +10,6 @@
 #include <Arduino.h>
 #include <Wire.h>
 #include <SPI.h>
-#include <ArduinoLog.h>
 #include <Adafruit_Sensor.h>
 #include <Adafruit_BME280.h>
 #include <MultiPlexer_TCA9548A.h>
@@ -26,24 +25,28 @@ class BME280_BarometerSensor_Mux {
   public:
     BME280_BarometerSensor_Mux(
         MultiPlexer_TCA9548A* expander,
+        TwoWire* wire,
         uint8_t expander_channel = 0,
         int address = 0x76,
         float sea_level_pressure = 1013,
         int clock_speed = 100000
     );
-    void begin();
+    bool begin();
     float getTemperature();
     float getPressure();
     float getAltitude();
     float getHumidity();
     BME280_Result readAll();
 
+    bool working = false;
+
   private:
     uint8_t _expanderChannel;
     int _address;
     int _clockSpeed;
     float _seaLevelPressure;
 
+    TwoWire* _wire;
     Adafruit_BME280* _sensor;
     MultiPlexer_TCA9548A* _expander;
 };