Merge pull request #255 from adafruit/minor-update

update msc_external_flash to tell user where to format spiflash.

Author: hathach

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -52,11 +52,20 @@ body:
 
   - type: textarea
     attributes:
-      label: Sketch & compiled Log (as attached txt files)
+      label: Sketch as ATTACHED TXT
       placeholder: |
         e.g examples/MassStorage/msc_ramdisk.
         If it is custom sketch, please provide it as **ATTACHED** files or link to it.
-        Compiled log must be attached as txt files for readability
+        Pasting raw long code that hurts readability can get your issue **closed**
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Compiled Log as ATTACHED TXT
+      placeholder: |
+        Compiled log from Arduino IDE as **ATTACHED** txt.
+        Pasting raw long log that hurts readability can get your issue **closed**
     validations:
       required: true
 

examples/MassStorage/msc_external_flash/msc_external_flash.ino

@@ -42,10 +42,10 @@ FatFile file;
 Adafruit_USBD_MSC usb_msc;
 
 // Check if flash is formatted
-bool fs_formatted;
+bool fs_formatted = false;
 
 // Set to true when PC write to flash
-bool fs_changed;
+bool fs_changed = true;;
 
 // the setup function runs once when you press reset or power the board
 void setup()
@@ -74,32 +74,33 @@ void setup()
   Serial.begin(115200);
   //while ( !Serial ) delay(10);   // wait for native usb
 
-  if ( !fs_formatted )
-  {
-    Serial.println("Failed to init files system, flash may not be formatted");
-  }
-
   Serial.println("Adafruit TinyUSB Mass Storage External Flash example");
   Serial.print("JEDEC ID: 0x"); Serial.println(flash.getJEDECID(), HEX);
   Serial.print("Flash size: "); Serial.print(flash.size() / 1024); Serial.println(" KB");
-
-  fs_changed = true; // to print contents initially
 }
 
 void loop()
 {
-  if ( fs_changed )
+  // check if formatted
+  if ( !fs_formatted )
   {
-    fs_changed = false;
+    fs_formatted = fatfs.begin(&flash);
 
-    // check if host formatted disk
     if (!fs_formatted)
     {
-      fs_formatted = fatfs.begin(&flash);
+      Serial.println("Failed to init files system, flash may not be formatted");
+      Serial.println("Please format it as FAT12 with your PC or using Adafruit_SPIFlash's SdFat_format example:");
+      Serial.println("- https://github.com/adafruit/Adafruit_SPIFlash/tree/master/examples/SdFat_format");
+      Serial.println();
+
+      delay(1000);
+      return;
     }
+  }
 
-    // skip if still not formatted
-    if (!fs_formatted) return;
+  if ( fs_changed )
+  {
+    fs_changed = false;
 
     Serial.println("Opening root");
 

examples/MassStorage/msc_external_flash_sdcard/msc_external_flash_sdcard.ino

@@ -17,6 +17,9 @@
  * Note: Adafruit fork of SdFat enabled ENABLE_EXTENDED_TRANSFER_CLASS and FAT12_SUPPORT
  * in SdFatConfig.h, which is needed to run SdFat on external flash. You can use original
  * SdFat library and manually change those macros
+ *
+ * Note2: If your flash is not formatted as FAT12 previously, you could format it using
+ * follow sketch https://github.com/adafruit/Adafruit_SPIFlash/tree/master/examples/SdFat_format
  */
 
 #include "SPI.h"

src/arduino/cdc/Adafruit_USBH_CDC.cpp

@@ -47,7 +47,7 @@ void Adafruit_USBH_CDC::begin(unsigned long baud) {
 
 void Adafruit_USBH_CDC::begin(unsigned long baudrate, uint16_t config) {
   (void)config; // TODO support line coding later
-  begin(115200);
+  begin(baudrate);
 }
 
 void Adafruit_USBH_CDC::end(void) { _idx = TUSB_INDEX_INVALID; }