pair 2: remove debug code

Author: brentru

src/components/i2c/controller.cpp

@@ -705,12 +705,6 @@ 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: ");
-      WS_DEBUG_PRINTLN(use_alt_bus);
       ConfigureMuxChannel(device_descriptor.i2c_mux_channel, use_alt_bus);
       did_set_mux_ch = true;
     } else {
@@ -772,31 +766,24 @@ 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, HEX);
-    WS_DEBUG_PRINTLN(device_descriptor.i2c_mux_channel);
-    WS_DEBUG_PRINTLN(device_status);
-
     drv = CreateI2CDriverByName(
         device_name, bus, device_descriptor.i2c_device_address,
         device_descriptor.i2c_mux_channel, device_status);
     if (drv == nullptr) {
       WS_DEBUG_PRINTLN("[i2c] ERROR: I2C driver type not found or unsupported!");
+      return false;
     }
 
     // Configure MUX and bus
     if (did_set_mux_ch) {
-      WS_DEBUG_PRINT("Configuring driver's MUX address: ");
-      WS_DEBUG_PRINTLN(device_descriptor.i2c_mux_address);
       drv->SetMuxAddress(device_descriptor.i2c_mux_address);
-      WS_DEBUG_PRINTLN("[i2c] Set driver to use MUX");
     }
 
     if (use_alt_bus) {
       drv->EnableAltI2CBus(_i2c_model->GetI2cDeviceAddOrReplaceMsg()
                                ->i2c_device_description.i2c_bus_scl,
                            _i2c_model->GetI2cDeviceAddOrReplaceMsg()
                                ->i2c_device_description.i2c_bus_sda);
-      WS_DEBUG_PRINTLN("[i2c] Set driver to use Alt I2C bus");
     }
     // Configure the driver
     drv->SetSensorTypes(
@@ -919,7 +906,6 @@ void I2cController::ConfigureMuxChannel(uint32_t mux_channel, bool is_alt_bus) {
     _i2c_bus_alt->SelectMuxChannel(mux_channel);
     return;
   }
-  WS_DEBUG_PRINTLN("[i2c] ConfigureMuxChannel() normal bus");
   _i2c_bus_default->ClearMuxChannel(); // sanity-check
   _i2c_bus_default->SelectMuxChannel(mux_channel);
 }

src/components/i2c/hardware.cpp

@@ -261,41 +261,19 @@ bool I2cHardware::AddMuxToBus(uint32_t address_register, const char *name) {
   }
 
   _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() {
-  WS_DEBUG_PRINT("has_mux: ");
-  WS_DEBUG_PRINTLN(_has_mux);
   if (!_has_mux) {
     return;
   }
@@ -315,10 +293,6 @@ void I2cHardware::ClearMuxChannel() {
 */
 /***********************************************************************/
 void I2cHardware::SelectMuxChannel(uint32_t channel) {
-  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;
   }

src/components/i2c/hardware.h

@@ -41,7 +41,6 @@ class I2cHardware {
   void SelectMuxChannel(uint32_t channel);
   bool HasMux();
   void ClearMuxChannel();
-  void ScanMux();
 private:
   void TogglePowerPin();
   wippersnapper_i2c_I2cBusStatus _bus_status; ///< I2C bus status