PR Feedback + lib_ignore: USBHost

Author: tyeth

platformio.ini

@@ -233,6 +233,12 @@ build_flags = -DUSE_TINYUSB=1
 [env:adafruit_pyportal_m4_titano]
 extends = common:atsamd
 board = adafruit_pyportal_m4_titano
+; build_type = debug
+; upload_protocol = jlink
+; debug_tool = jlink
+; monitor_port = jlink
+; debug_init_break =
+lib_ignore = USBHost
 build_flags = -DUSE_TINYUSB=1
               -DADAFRUIT_PYPORTAL_M4_TITANO
 

src/Wippersnapper.cpp

@@ -2306,7 +2306,6 @@ void Wippersnapper::errorWriteHang(String error) {
   WS_DEBUG_PRINTLN(error);
 #ifdef USE_TINYUSB
   _fileSystem->writeToBootOut(error.c_str());
-  delay(500);
   TinyUSBDevice.attach();
   delay(500);
 #endif

src/provisioning/littlefs/WipperSnapper_LittleFS.cpp

@@ -30,8 +30,6 @@ WipperSnapper_LittleFS::WipperSnapper_LittleFS() {
   if (!LittleFS.begin()) {
     setStatusLEDColor(RED);
     fsHalt("ERROR: Failure initializing LittleFS!");
-    while (1)
-      ;
   }
 }
 
@@ -94,11 +92,18 @@ void WipperSnapper_LittleFS::parseSecrets() {
   LittleFS.end();
 }
 
+/**************************************************************************/
+/*!
+    @brief    Halts execution and blinks the status LEDs yellow.
+    @param    msg
+                Error message to print to serial console.
+*/
+/**************************************************************************/
 void WipperSnapper_LittleFS::fsHalt(String msg) {
+  statusLEDSolid(WS_LED_STATUS_FS_WRITE);
   while (1) {
-    WS_DEBUG_PRINTLN("ERROR: Halted execution!");
+    WS_DEBUG_PRINTLN("Fatal Error: Halted execution!");
     WS_DEBUG_PRINTLN(msg.c_str());
-    statusLEDSolid(WS_LED_STATUS_FS_WRITE);
     delay(1000);
     yield();
   }

src/provisioning/littlefs/WipperSnapper_LittleFS.h

@@ -33,7 +33,7 @@ class WipperSnapper_LittleFS {
   WipperSnapper_LittleFS();
   ~WipperSnapper_LittleFS();
   void parseSecrets();
-  void fsHalt(String msg = "");
+  void fsHalt(String msg);
 };
 
 extern Wippersnapper WS;

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -98,16 +98,14 @@ Wippersnapper_FS::Wippersnapper_FS() {
   if (!initFilesystem() && !initFilesystem(true)) {
     setStatusLEDColor(RED);
     fsHalt("ERROR Initializing Filesystem");
-    while (1)
-      ;
   }
 
   // Initialize USB-MSD
   initUSBMSC();
 
   // If we created a new filesystem, halt until user RESETs device.
   if (_freshFS)
-    fsHalt("New filesystem created! Please RESET your board.");
+    fsHalt("New filesystem created! Press the reset button on your board.");
 }
 
 /************************************************************/
@@ -120,6 +118,8 @@ Wippersnapper_FS::~Wippersnapper_FS() {}
 /**************************************************************************/
 /*!
     @brief    Initializes the flash filesystem.
+    @param    force_format
+                If true, forces a new filesystem to be created. [DESTRUCTIVE]
     @return   True if filesystem initialized correctly, false otherwise.
 */
 /**************************************************************************/
@@ -407,11 +407,11 @@ void Wippersnapper_FS::writeToBootOut(PGM_P str) {
 /**************************************************************************/
 void Wippersnapper_FS::fsHalt(String msg) {
   TinyUSBDevice.attach();
-  delay(1500);
+  delay(500);
+  statusLEDSolid(WS_LED_STATUS_FS_WRITE);
   while (1) {
-    WS_DEBUG_PRINTLN("ERROR: Halted execution!");
+    WS_DEBUG_PRINTLN("Fatal Error: Halted execution!");
     WS_DEBUG_PRINTLN(msg.c_str());
-    // statusLEDSolid(WS_LED_STATUS_FS_WRITE);
     delay(1000);
     yield();
   }

src/provisioning/tinyusb/Wippersnapper_FS.h

@@ -54,7 +54,7 @@ class Wippersnapper_FS {
   void createSecretsFile();
   bool createBootFile();
   void writeToBootOut(PGM_P str);
-  void fsHalt(String msg = "");
+  void fsHalt(String msg);
 
   void parseSecrets();