clean up examples

Author: hathach

.travis.yml

@@ -30,7 +30,7 @@ install:
     - pip3 install --user adafruit-nrfutil
 
 script:
-    - build_m4_platforms
+    - build_samd_platforms
     - build_nrf5x_platforms
 
 # Generate and deploy documentation

examples/MassStorage/msc_external_flash/msc_external_flash.ino

@@ -3,17 +3,20 @@
 
 /* This example demo how to expose on-board external Flash as USB Mass Storage.
  * Following library is required
- *   https://github.com/adafruit/Adafruit_SPIFlash
+ *   - SdFat https://github.com/greiman/SdFat
+ *   - Adafruit_SPIFlash https://github.com/adafruit/Adafruit_SPIFlash
  */
 
-#include "Adafruit_TinyUSB.h"
+#include "SPI.h"
+#include "SdFat.h"
 #include "Adafruit_SPIFlash.h"
+#include "Adafruit_TinyUSB.h"
 
 #if defined(__SAMD51__) || defined(NRF52840_XXAA)
   Adafruit_FlashTransport_QSPI flashTransport(PIN_QSPI_SCK, PIN_QSPI_CS, PIN_QSPI_IO0, PIN_QSPI_IO1, PIN_QSPI_IO2, PIN_QSPI_IO3);
 #else
   #if (SPI_INTERFACES_COUNT == 1)
-    Adafruit_FlashTransport_SPI flashTransport(SS0, &SPI);
+    Adafruit_FlashTransport_SPI flashTransport(SS, &SPI);
   #else
     Adafruit_FlashTransport_SPI flashTransport(SS1, &SPI1);
   #endif

examples/MassStorage/msc_external_flash_sdfat/msc_external_flash_sdfat.ino

@@ -2,23 +2,23 @@
 // Copyright (c) 2019 Ha Thach for Adafruit Industries
 
 /* This example exposes both external flash and SD card as mass storage
- * using Adafruit_SPIFlash+Adafruit_QSPI and SdFat Library
+ * using Adafruit_SPIFlash and SdFat Library
+ *   - SdFat https://github.com/greiman/SdFat
+ *   - Adafruit_SPIFlash https://github.com/adafruit/Adafruit_SPIFlash
  */
 
 #include "SPI.h"
 #include "SdFat.h"
-
-#include "Adafruit_TinyUSB.h"
 #include "Adafruit_SPIFlash.h"
+#include "Adafruit_TinyUSB.h"
 
 const int chipSelect = 10;
-const int spi_freq_mhz = 50;
 
 #if defined(__SAMD51__) || defined(NRF52840_XXAA)
   Adafruit_FlashTransport_QSPI flashTransport(PIN_QSPI_SCK, PIN_QSPI_CS, PIN_QSPI_IO0, PIN_QSPI_IO1, PIN_QSPI_IO2, PIN_QSPI_IO3);
 #else
   #if (SPI_INTERFACES_COUNT == 1)
-    Adafruit_FlashTransport_SPI flashTransport(SS0, &SPI);
+    Adafruit_FlashTransport_SPI flashTransport(SS, &SPI);
   #else
     Adafruit_FlashTransport_SPI flashTransport(SS1, &SPI1);
   #endif
@@ -46,7 +46,7 @@ void setup()
   usb_msc.setID(1, "Adafruit", "SD Card", "1.0");
   usb_msc.setReadWriteCallback(1, sdcard_read_cb, sdcard_write_cb, sdcard_flush_cb);
 
-  if ( sd.cardBegin(chipSelect, SD_SCK_MHZ(spi_freq_mhz)) )
+  if ( sd.cardBegin(chipSelect, SD_SCK_MHZ(50)) )
   {
     uint32_t block_count = sd.card()->cardSize();
     usb_msc.setCapacity(1, block_count, 512);

examples/MassStorage/msc_sdfat/msc_sdfat.ino

@@ -11,7 +11,6 @@
 #include "Adafruit_TinyUSB.h"
 
 const int chipSelect = 10;
-const int spi_freq_mhz = 50;
 
 Adafruit_USBD_MSC usb_msc;
 
@@ -37,9 +36,9 @@ void setup()
   Serial.println("Adafruit TinyUSB Mass Storage SD Card example");
 
   Serial.print("\nInitializing SD card ... ");
-  Serial.print(" CS = "); Serial.println(chipSelect);
+  Serial.print("CS = "); Serial.println(chipSelect);
 
-  if ( !sd.cardBegin(chipSelect, SD_SCK_MHZ(spi_freq_mhz)) )
+  if ( !sd.cardBegin(chipSelect, SD_SCK_MHZ(50)) )
   {
     Serial.println("initialization failed. Things to check:");
     Serial.println("* is a card inserted?");