reenum adding cdc and msc doesnt reenum til the end

Author: brentru

src/components/i2c/controller.cpp

@@ -692,7 +692,8 @@ 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_device_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);
@@ -732,6 +733,13 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
     // Get all possible driver candidates for this address
     WS_DEBUG_PRINT("[i2c] Obtaining driver candidates @ 0x");
     WS_DEBUG_PRINTLN(device_descriptor.i2c_device_address);
+    if (device_descriptor.i2c_device_address == 0x68 ||
+        device_descriptor.i2c_device_address == 0x70) {
+      WS_DEBUG_PRINTLN("[i2c] Device address is shared with rtx/mux, can not "
+                       "auto-init, skipping!");
+      return true;
+    }
+
     std::vector<const char *> candidate_drivers =
         GetDriversForAddress(device_descriptor.i2c_device_address);
 
@@ -770,7 +778,8 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
         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!");
+      WS_DEBUG_PRINTLN(
+          "[i2c] ERROR: I2C driver type not found or unsupported!");
       return false;
     }
 

src/provisioning/sdcard/ws_sdcard.cpp

@@ -50,8 +50,8 @@ ws_sdcard::ws_sdcard() {
   _sz_cur_log_file = 0;
   _sd_cur_log_files = 0;
 
-  delay(4000); // TODO: Must enable this delay to debugging the ctor, serial
-  //  won't open otherwise
+  delay(4000); // TODO: This is for debugging, remove when ready for final
+               // version!
   bool did_init = false;
   // Case 1: Try to initialize the SD card with the pin from the config file
   if (WsV2.pin_sd_cs != SD_CS_CFG_NOT_FOUND) {

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -58,6 +58,7 @@ Adafruit_FlashTransport_RP2040 flashTransport_v2;
 Adafruit_SPIFlash flash_v2(&flashTransport_v2); ///< SPIFlash object
 FatVolume wipperFatFs_v2; ///< File system object from Adafruit SDFat library
 Adafruit_USBD_MSC usb_msc_v2; /*!< USB mass storage object */
+Adafruit_USBD_CDC usb_cdc;    /*!< USB CDC object */
 static bool _fs_changed = false;
 
 /**************************************************************************/
@@ -104,10 +105,15 @@ FRESULT format_fs_fat12(void) {
 /**************************************************************************/
 Wippersnapper_FS::Wippersnapper_FS() {
   _fs_changed = false;
-  // Detach USB device during init.
-  TinyUSBDevice.detach();
-  // Wait for detach
-  delay(500);
+
+  usb_cdc.begin(115200);
+  // If already enumerated, additional class driver begin() e.g msc, hid, midi
+  // won't take effect until re-enumeration
+  if (TinyUSBDevice.mounted()) {
+    TinyUSBDevice.detach();
+    delay(10);
+    TinyUSBDevice.attach();
+  }
 
   // Attempt to initialize the flash chip
   if (!flash_v2.begin()) {
@@ -282,22 +288,22 @@ void Wippersnapper_FS::InitUsbMsc() {
   usb_msc_v2.setCapacity(flash_v2.pageSize() * flash_v2.numPages() / 512, 512);
 
   // MSC is ready for read/write
-  usb_msc_v2.setUnitReady(true);
+  usb_msc_v2.setUnitReady(false);
 
   // Set callback when MSC ready
   _fs_changed = false;
   usb_msc_v2.setReadyCallback(0, msc_ready_callback);
 
   // init MSC
-  usb_msc_v2.begin();
+  // usb_msc_v2.begin();
 
-// If already enumerated, additional class driverr begin() e.g msc, hid, midi
-// won't take effect until re-enumeration
-// Attach MSC and wait for enumeration
-//#ifndef BUILD_OFFLINE_ONLY
+  // If already enumerated, additional class driverr begin() e.g msc, hid, midi
+  // won't take effect until re-enumeration
+  // Attach MSC and wait for enumeration
+  // #ifndef BUILD_OFFLINE_ONLY
   TinyUSBDevice.attach();
   delay(500);
-//#endif
+  // #endif
 }
 
 /**************************************************************************/
@@ -382,7 +388,7 @@ void Wippersnapper_FS::CreateFileConfig() {
     if (file_cfg) {
       DeserializationError error = deserializeJson(_doc_cfg, file_cfg);
       //  if (error)
-        //  HaltFilesystem("Error unable to parse config.json on WIPPER drive!");
+      //  HaltFilesystem("Error unable to parse config.json on WIPPER drive!");
       // Remove config from the filesystem
       file_cfg.close();
       wipperFatFs_v2.remove("/config.json");
@@ -488,8 +494,13 @@ bool Wippersnapper_FS::WriteFileConfig() {
   // Re-attach USB-MSC with updated filesystem
   // NOTE: This is required to ensure the filesystem is sync'd between host and
   // device
-  // TinyUSBDevice.attach();
-  delay(2500);
+  usb_msc_v2.begin();
+  usb_msc_v2.setUnitReady(true);
+  if (TinyUSBDevice.mounted()) {
+    TinyUSBDevice.detach();
+    delay(10);
+    TinyUSBDevice.attach();
+  }
   // TODO: This is debug, we can remove it!
   WS_DEBUG_PRINT("Bytes written to config.json: ");
   WS_DEBUG_PRINTLN(bytes_written);