Fix SAMD bug with tinyUSB attach being called second time

Author: tyeth

src/Wippersnapper.cpp

@@ -2500,8 +2500,12 @@ void Wippersnapper::runNetFSM() {
 */
 /**************************************************************************/
 void Wippersnapper::haltError(String error, ws_led_status_t ledStatusColor) {
-  WS.enableWDT(5000);
-  for (;;) {
+  #ifdef USE_TINYUSB
+    if (!TinyUSBDevice.mounted()) {
+      TinyUSBDevice.attach(); // calling when already attached breaks SAMD
+    }
+  #endif
+  for (int i=0;;i++) {
     WS_DEBUG_PRINT("ERROR [WDT RESET]: ");
     WS_DEBUG_PRINTLN(error);
     // let the WDT fail out and reset!
@@ -2513,6 +2517,12 @@ void Wippersnapper::haltError(String error, ws_led_status_t ledStatusColor) {
     // hardware and software watchdog timers, delayMicroseconds does not.
     delayMicroseconds(1000000);
 #endif
+    if (i < 20) {
+      yield();
+      WS.feedWDT();  // feed the WDT for the first 20 seconds
+    } else if (i == 20) {
+      WS.enableWDT(5000);
+    }
   }
 }
 
@@ -2712,8 +2722,10 @@ void print_reset_reason(int reason) {
 */
 /**************************************************************************/
 void printDeviceInfo() {
+  WS_PRINTER.flush();
   WS_DEBUG_PRINTLN("-------Device Information-------");
   WS_DEBUG_PRINT("Firmware Version: ");
+  WS_PRINTER.flush();
   WS_DEBUG_PRINTLN(WS_VERSION);
   WS_DEBUG_PRINT("Board ID: ");
   WS_DEBUG_PRINTLN(BOARD_ID);

src/network_interfaces/Wippersnapper_AIRLIFT.h

@@ -181,14 +181,12 @@ class Wippersnapper_AIRLIFT : public Wippersnapper {
     // User-set network not found, print scan results to serial console
     WS_DEBUG_PRINTLN("ERROR: Your requested WiFi network was not found!");
     WS_DEBUG_PRINTLN("WipperSnapper found these WiFi networks:");
-    for (uint8_t i = 0; i < n; ++i)
-    {
+    for (uint8_t i = 0; i < n; ++i) {
       WS_DEBUG_PRINT(WiFi.SSID(i));
       WS_DEBUG_PRINT(" (");
       uint8_t BSSID[WL_MAC_ADDR_LENGTH];
       WiFi.BSSID(i, BSSID);
-      for (int m = 0; m < WL_MAC_ADDR_LENGTH; m++)
-      {
+      for (int m = 0; m < WL_MAC_ADDR_LENGTH; m++) {
         if (m != 0)
           WS_DEBUG_PRINT(":");
         WS_DEBUG_PRINTHEX(BSSID[m]);

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -217,7 +217,12 @@ void Wippersnapper_FS::initUSBMSC() {
 
   // init MSC
   usb_msc.begin();
+
   // Attach MSC and wait for enumeration
+  if (TinyUSBDevice.mounted()) {
+    TinyUSBDevice.detach();
+    delay(10);
+  }
   TinyUSBDevice.attach();
   delay(500);
 }