File tree Expand file tree Collapse file tree 2 files changed +5
-9
lines changed
Expand file tree Collapse file tree 2 files changed +5
-9
lines changed Original file line number Diff line number Diff line change @@ -2500,13 +2500,10 @@ void Wippersnapper::runNetFSM() {
25002500*/
25012501/* *************************************************************************/
25022502void Wippersnapper::haltError (String error, ws_led_status_t ledStatusColor) {
2503- #ifdef USE_TINYUSB
2504- if (!TinyUSBDevice.mounted ()) {
2505- TinyUSBDevice.attach (); // calling when already attached breaks SAMD
2506- }
2507- #endif
25082503 for (int i=0 ;;i++) {
2509- WS_DEBUG_PRINT (" ERROR [WDT RESET]: " );
2504+ WS_DEBUG_PRINT (" ERROR [WDT RESET IN " );
2505+ WS_DEBUG_PRINT (25 - i);
2506+ WS_DEBUG_PRINTLN (" ]: " );
25102507 WS_DEBUG_PRINTLN (error);
25112508 // let the WDT fail out and reset!
25122509 statusLEDSolid (ledStatusColor);
Original file line number Diff line number Diff line change @@ -106,6 +106,7 @@ Wippersnapper_FS::Wippersnapper_FS() {
106106 // If a filesystem does not already exist - attempt to initialize a new
107107 // filesystem
108108 if (!initFilesystem () && !initFilesystem (true )) {
109+ TinyUSBDevice.attach ();
109110 setStatusLEDColor (RED);
110111 fsHalt (" ERROR Initializing Filesystem" );
111112 }
@@ -222,8 +223,8 @@ void Wippersnapper_FS::initUSBMSC() {
222223 if (TinyUSBDevice.mounted ()) {
223224 TinyUSBDevice.detach ();
224225 delay (10 );
226+ TinyUSBDevice.attach ();
225227 }
226- TinyUSBDevice.attach ();
227228 delay (500 );
228229}
229230
@@ -493,8 +494,6 @@ void Wippersnapper_FS::writeToBootOut(PGM_P str) {
493494*/
494495/* *************************************************************************/
495496void Wippersnapper_FS::fsHalt (String msg) {
496- TinyUSBDevice.attach ();
497- delay (500 );
498497 statusLEDSolid (WS_LED_STATUS_FS_WRITE);
499498 while (1 ) {
500499 WS_DEBUG_PRINTLN (" Fatal Error: Halted execution!" );
You can’t perform that action at this time.
0 commit comments