use ArduinoLog

Author: thijstriemstra

MultiPlexer_TCA9548A/MultiPlexer_TCA9548A.cpp

@@ -1,4 +1,4 @@
-/*  Copyright (c) 2021, Collab
+/*  Copyright (c) 2021-2023, Collab
  *  All rights reserved
 */
 /*
@@ -8,10 +8,12 @@
 #include <MultiPlexer_TCA9548A.h>
 
 MultiPlexer_TCA9548A::MultiPlexer_TCA9548A(int i2c_addr) {
+  _address = i2c_addr;
   _mux = new TCA9548A(i2c_addr);
 }
 
 void MultiPlexer_TCA9548A::begin() {
+  // XXX: don't hardcode Wire instance
   _mux->begin(Wire1);
 
   // set a base state which we know (also the default state on power on)
@@ -35,32 +37,39 @@ void MultiPlexer_TCA9548A::closeAll() {
   _mux->closeAll();
 }
 
-void MultiPlexer_TCA9548A::scan() {
+void MultiPlexer_TCA9548A::scan(bool ignoreMultiplexer) {
   byte error, address;
-  int nDevices;
-  int delayTime = 5000;
-  nDevices = 0;
+  int nDevices = 0;
+
   for (address = 1; address < 127; address++) {
     Wire1.beginTransmission(address);
     error = Wire1.endTransmission();
     if (error == 0) {
-      Serial.print(F("I2C device found at address 0x"));
-      if (address < 16) {
-        Serial.print(F("0"));
+      if (!(ignoreMultiplexer && address == _address)) {
+        if (address < 16) {
+          Log.info(F("TCA9548A - I2C device found at address 0x0%x" CR), address);
+        } else {
+          Log.info(F("TCA9548A - I2C device found at address 0x%x" CR), address);
+        }
+        nDevices++;
       }
-      Serial.println(address, HEX);
-      nDevices++;
-    }
-    else if (error == 4) {
-      Serial.print(F("Unknow error at address 0x"));
+    } else if (error == 4) {
       if (address < 16) {
-        Serial.print(F("0"));
+        Log.info(F("TCA9548A - Unknown error at address 0x0%x" CR), address);
+      } else {
+        Log.info(F("TCA9548A - Unknown error at address 0x%x" CR), address);
       }
-      Serial.println(address, HEX);
     }
   }
+
   if (nDevices == 0) {
-    Serial.println(F("No I2C devices found\n"));
+    Log.warning(F("TCA9548A - No I2C devices found" CR));
+  }
+}
+
+void MultiPlexer_TCA9548A::scanAll() {
+  // see https://github.com/WifWaf/TCA9548A/issues/6
+  for (int channel = 0; channel < 8; channel++) {
+
   }
-  delay(delayTime);
 }

MultiPlexer_TCA9548A/MultiPlexer_TCA9548A.h

@@ -1,4 +1,4 @@
-/*  Copyright (c) 2021, Collab
+/*  Copyright (c) 2021-2023, Collab
  *  All rights reserved
 */
 /*
@@ -10,20 +10,23 @@
 #include <Arduino.h>
 #include <Wire.h>
 #include <TCA9548A.h>
+#include <ArduinoLog.h>
 
 class MultiPlexer_TCA9548A
 {
   public:
     MultiPlexer_TCA9548A(int i2c_addr = 0x70);
     void begin();
-    void scan();
+    void scan(bool ignoreMultiplexer = true);
+    void scanAll();
     void closeAll();
     void openChannel(uint8_t channel_nr);
     void closeChannel(uint8_t channel_nr);
     void switchChannel(uint8_t channel_nr);
 
   private:
     TCA9548A* _mux;
+    int _address;
 };
 
 #endif