pair: working mux

Author: brentru

src/components/i2c/controller.cpp

@@ -581,6 +581,8 @@ bool I2cController::InitMux(const char *name, uint32_t address,
   } else {
     if (!_i2c_bus_default->HasMux()) {
       WS_DEBUG_PRINTLN("[i2c] Initializing MUX driver on default bus...");
+      WS_DEBUG_PRINT("[i2c] addr: ");
+      WS_DEBUG_PRINT(address, HEX);
       if (!_i2c_bus_default->AddMuxToBus(address, name)) {
         return false;
       }
@@ -690,7 +692,7 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
   if ((strcmp(device_name, "pca9546") == 0) ||
       (strcmp(device_name, "pca9548") == 0)) {
     WS_DEBUG_PRINT("[i2c] Initializing MUX driver...");
-    if (!InitMux(device_name, device_descriptor.i2c_mux_address, use_alt_bus)) {
+    if (!InitMux(device_name, device_descriptor.i2c_device_address, use_alt_bus)) {
       // TODO [Online]: Publish back out to IO here!
       WsV2.haltErrorV2("[i2c] Failed to initialize MUX driver!",
                        WS_LED_STATUS_ERROR_RUNTIME, false);
@@ -703,6 +705,8 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
   // I2cDeviceAddorReplace message
   if (device_descriptor.i2c_mux_address != 0x00) {
     if (_i2c_bus_alt->HasMux() || _i2c_bus_default->HasMux()) {
+      WS_DEBUG_PRINTLN("[i2c] Scanning MUX!");
+      _i2c_bus_default->ScanMux();
       WS_DEBUG_PRINT("[i2c] Configuring MUX channel: ");
       WS_DEBUG_PRINTLN(device_descriptor.i2c_mux_channel);
       WS_DEBUG_PRINT("[i2c] use_alt_bus: ");
@@ -768,7 +772,7 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
     // Create new driver
     WS_DEBUG_PRINT("[i2c] Creating driver: ");
     WS_DEBUG_PRINTLN(device_name);
-    WS_DEBUG_PRINTLN(device_descriptor.i2c_device_address);
+    WS_DEBUG_PRINTLN(device_descriptor.i2c_device_address, HEX);
     WS_DEBUG_PRINTLN(device_descriptor.i2c_mux_channel);
     WS_DEBUG_PRINTLN(device_status);
 

src/components/i2c/hardware.cpp

@@ -260,23 +260,46 @@ bool I2cHardware::AddMuxToBus(uint32_t address_register, const char *name) {
     return false;
   }
 
-  _mux_address_register = address_register;
+  _mux_address = address_register;
+  WS_DEBUG_PRINT("mux_addr: ");
+  WS_DEBUG_PRINTLN(_mux_address);
   _has_mux = true;
   // Put MUX in back into its default state cuz we don't know if we're about to
   // use it again
   ClearMuxChannel();
   return true;
 }
 
+
+void I2cHardware::ScanMux() {
+  for (uint8_t t=0; t<_mux_max_channels; t++) {
+    _bus->beginTransmission(_mux_address);
+    _bus->write(1 << t);
+    _bus->endTransmission();
+
+    Serial.print("PCA Port #"); Serial.println(t);
+    for (uint8_t addr = 0; addr<=127; addr++) {
+      if (addr == _mux_address) continue;
+      _bus->beginTransmission(addr);
+      if (!_bus->endTransmission()) {
+        Serial.print("Found I2C 0x");  Serial.println(addr,HEX);
+      }
+    }
+  }
+}
+
 /***********************************************************************/
 /*!
     @brief  Clears the enabled MUX channel.
 */
 /***********************************************************************/
 void I2cHardware::ClearMuxChannel() {
-  if (!_has_mux)
+  WS_DEBUG_PRINT("has_mux: ");
+  WS_DEBUG_PRINTLN(_has_mux);
+  if (!_has_mux) {
     return;
-  _bus->beginTransmission(_mux_address_register);
+  }
+  _bus->beginTransmission(_mux_address);
   if (_mux_max_channels == 4)
     _bus->write(0b0000);
   else if (_mux_max_channels == 8)
@@ -292,9 +315,14 @@ void I2cHardware::ClearMuxChannel() {
 */
 /***********************************************************************/
 void I2cHardware::SelectMuxChannel(uint32_t channel) {
-  if (channel > _mux_max_channels - 1)
+  WS_DEBUG_PRINT("SelectMuxChannel: ");
+  WS_DEBUG_PRINTLN(channel);
+  WS_DEBUG_PRINT("max_channels: ");
+  WS_DEBUG_PRINTLN(_mux_max_channels);
+  if (channel > _mux_max_channels - 1) {
     return;
-  _bus->beginTransmission(_mux_address_register);
+  }
+  _bus->beginTransmission(_mux_address);
   _bus->write(1 << channel);
   _bus->endTransmission();
 }

src/components/i2c/hardware.h

@@ -41,12 +41,13 @@ class I2cHardware {
   void SelectMuxChannel(uint32_t channel);
   bool HasMux();
   void ClearMuxChannel();
+  void ScanMux();
 private:
   void TogglePowerPin();
   wippersnapper_i2c_I2cBusStatus _bus_status; ///< I2C bus status
   TwoWire *_bus = nullptr;                    ///< I2C bus
   bool _has_mux;                              ///< Is a MUX present on the bus?
-  uint32_t _mux_address_register;             ///< I2C address for the MUX
+  uint32_t _mux_address;             ///< I2C address for the MUX
   int _mux_max_channels;                      ///< Maximum possible number of MUX channels
   char *_sda;                                 ///< SDA pin
   char *_scl;                                ///< SCL pin

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -381,8 +381,8 @@ void Wippersnapper_FS::CreateFileConfig() {
     File32 file_cfg = wipperFatFs_v2.open("/config.json", FILE_READ);
     if (file_cfg) {
       DeserializationError error = deserializeJson(_doc_cfg, file_cfg);
-      if (error)
-        HaltFilesystem("Error unable to parse config.json on WIPPER drive!");
+      //  if (error)
+        //  HaltFilesystem("Error unable to parse config.json on WIPPER drive!");
       // Remove config from the filesystem
       file_cfg.close();
       wipperFatFs_v2.remove("/config.json");