Fix - automatic scan backing out incorrectly after candidate list exhausted'

Author: brentru

src/Wippersnapper_V2.cpp

@@ -1245,12 +1245,10 @@ void Wippersnapper_V2::connect() {
     WsV2._fileSystemV2->WriteFileConfig();
     WS_DEBUG_PRINTLN("[APP] Hardware configured!");
     // Blink status LED to green to indicate successful configuration
-    // setStatusLEDColor(0x00A300, 0.5 * 255.0);
-    // setStatusLEDColor(0x00A300, 150);
-    // delay(500);
-    // setStatusLEDColor(0x000000, 150);
-    // setStatusLEDColor(0x000000, 0.5 * 255.0);
-    WS_DEBUG_PRINTLN("[APP] begin loop");
+    setStatusLEDColor(0x00A300, WsV2.status_pixel_brightnessV2);
+    delay(500);
+    setStatusLEDColor(0x000000, WsV2.status_pixel_brightnessV2);
+    WS_DEBUG_PRINTLN("[APP] Begin loop()");
     return;
   } else {
     WS_DEBUG_PRINTLN("Running in online mode...");

src/components/i2c/controller.cpp

@@ -735,7 +735,7 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
     WS_DEBUG_PRINTLN("Attempting to autoconfig device found in scan...");
     // Get all possible driver candidates for this address
     WS_DEBUG_PRINT("[i2c] Obtaining driver candidates @ 0x");
-    WS_DEBUG_PRINTLN(device_descriptor.i2c_device_address);
+    WS_DEBUG_PRINTLN(device_descriptor.i2c_device_address, HEX);
     if (device_descriptor.i2c_device_address == 0x68 ||
         device_descriptor.i2c_device_address == 0x70) {
       WS_DEBUG_PRINTLN("[i2c] Device address is shared with RTC/MUX, can not "
@@ -747,6 +747,7 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
         GetDriversForAddress(device_descriptor.i2c_device_address);
 
     // Probe each candidate to see if it communicates
+    bool did_find_driver = false;
     for (const char *driverName : candidate_drivers) {
       WS_DEBUG_PRINT("[i2c] Attempting to initialize candidate: ");
       WS_DEBUG_PRINTLN(driverName);
@@ -769,11 +770,14 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
         WsV2._fileSystemV2->AddI2cDeviceToFileConfig(
             device_descriptor.i2c_device_address, driverName,
             drv->GetSensorTypeStrings(), drv->GetNumSensorTypes());
+        did_find_driver = true;
         break;
       }
     }
-    WS_DEBUG_PRINTLN("[i2c] ERROR - Candidates exhausted, driver not found!");
-    return true; // dont cause an error in the app
+    if (!did_find_driver) {
+      WS_DEBUG_PRINTLN("[i2c] ERROR - Candidates exhausted, driver not found!");
+      return true; // dont cause an error in the app
+    }
   } else {
     WS_DEBUG_PRINTLN("[i2c] Device in message/cfg file.");
     // Create new driver

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -60,6 +60,7 @@ 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;
+static bool _did_init_msc = false;
 
 /**************************************************************************/
 /*!
@@ -105,6 +106,7 @@ FRESULT format_fs_fat12(void) {
 /**************************************************************************/
 Wippersnapper_FS::Wippersnapper_FS() {
   _fs_changed = false;
+  _did_init_msc = false;
 
   usb_cdc.begin(115200);
   // Re-enumerate to allow cdc class begin() to take effect
@@ -121,7 +123,7 @@ Wippersnapper_FS::Wippersnapper_FS() {
   }
 
   // If we are not formatted, attempt to format the filesystem as fat12
-  if (! wipperFatFs_v2.begin(&flash_v2)) {
+  if (!wipperFatFs_v2.begin(&flash_v2)) {
     FRESULT rc = format_fs_fat12();
     if (rc != FR_OK) {
       setStatusLEDColor(RED);
@@ -141,10 +143,10 @@ Wippersnapper_FS::Wippersnapper_FS() {
     HaltFilesystem("FATAL ERROR: Could not write filesystem contents!");
   }
 
-  // Initialize USB-MSC
-  #ifndef BUILD_OFFLINE_ONLY
+// Initialize USB-MSC
+#ifndef BUILD_OFFLINE_ONLY
   InitUsbMsc();
-  #endif
+#endif
 
   // If we wrote a fresh secrets.json file, halt until user edits the file and
   // RESETs the device Signal to user that action must be taken (edit
@@ -300,6 +302,7 @@ void Wippersnapper_FS::InitUsbMsc() {
     delay(10);
     TinyUSBDevice.attach();
   }
+  _did_init_msc = true;
 }
 
 /**************************************************************************/
@@ -679,6 +682,9 @@ void Wippersnapper_FS::WriteFileBoot(PGM_P str) {
 */
 /**************************************************************************/
 void Wippersnapper_FS::HaltFilesystem(String msg) {
+  if (!_did_init_msc) {
+    InitUsbMsc();
+  }
   TinyUSBDevice.attach();
   delay(500);
   statusLEDSolid(WS_LED_STATUS_FS_WRITE);
@@ -699,6 +705,9 @@ void Wippersnapper_FS::HaltFilesystem(String msg) {
 /**************************************************************************/
 void Wippersnapper_FS::HaltFilesystem(String msg,
                                       ws_led_status_t ledStatusColor) {
+  if (!_did_init_msc) {
+    InitUsbMsc();
+  }
   TinyUSBDevice.attach();
   delay(500);
   statusLEDSolid(ledStatusColor);