change to "SdFat_Adafruit_Fork.h" and revert to build sdfat examples

hathach · hathach · commit 41bde22a7c32 · 2025-03-05T22:52:39.000+07:00
diff --git a/examples/DualRole/MassStorage/msc_data_logger/msc_data_logger.ino b/examples/DualRole/MassStorage/msc_data_logger/msc_data_logger.ino
@@ -38,7 +38,7 @@
 #endif
 
 // SdFat is required for using Adafruit_USBH_MSC_SdFatDevice
-#include "SdFat.h"
+#include "SdFat_Adafruit_Fork.h"
 
 // USBHost is defined in usbh_helper.h
 #include "usbh_helper.h"
diff --git a/examples/DualRole/MassStorage/msc_file_explorer/msc_file_explorer.ino b/examples/DualRole/MassStorage/msc_file_explorer/msc_file_explorer.ino
@@ -27,7 +27,7 @@
  */
 
 // SdFat is required for using Adafruit_USBH_MSC_SdFatDevice
-#include "SdFat.h"
+#include "SdFat_Adafruit_Fork.h"
 
 // USBHost is defined in usbh_helper.h
 #include "usbh_helper.h"
diff --git a/examples/MassStorage/msc_esp32_file_browser/msc_esp32_file_browser.ino b/examples/MassStorage/msc_esp32_file_browser/msc_esp32_file_browser.ino
@@ -32,7 +32,7 @@
  */
 
 #include "SPI.h"
-#include "SdFat.h"
+#include "SdFat_Adafruit_Fork.h"
 #include "Adafruit_SPIFlash.h"
 #include "Adafruit_TinyUSB.h"
 
diff --git a/examples/MassStorage/msc_external_flash/.skip.txt b/examples/MassStorage/msc_external_flash/.skip.txt
@@ -1,3 +1,2 @@
 pico_rp2040_tinyusb_host
 CH32V20x_EVT
-feather_rp2040_tinyusb
diff --git a/examples/MassStorage/msc_external_flash/msc_external_flash.ino b/examples/MassStorage/msc_external_flash/msc_external_flash.ino
@@ -23,7 +23,7 @@
  */
 
 #include "SPI.h"
-#include "SdFat.h"
+#include "SdFat_Adafruit_Fork.h"
 #include "Adafruit_SPIFlash.h"
 #include "Adafruit_TinyUSB.h"
 
diff --git a/examples/MassStorage/msc_external_flash_sdcard/.skip.txt b/examples/MassStorage/msc_external_flash_sdcard/.skip.txt
@@ -1,3 +1,2 @@
 pico_rp2040_tinyusb_host
 CH32V20x_EVT
-feather_rp2040_tinyusb
diff --git a/examples/MassStorage/msc_external_flash_sdcard/msc_external_flash_sdcard.ino b/examples/MassStorage/msc_external_flash_sdcard/msc_external_flash_sdcard.ino
@@ -23,7 +23,7 @@
  */
 
 #include "SPI.h"
-#include "SdFat.h"
+#include "SdFat_Adafruit_Fork.h"
 #include "Adafruit_SPIFlash.h"
 #include "Adafruit_TinyUSB.h"
 
diff --git a/examples/MassStorage/msc_internal_flash_samd/msc_internal_flash_samd.ino b/examples/MassStorage/msc_internal_flash_samd/msc_internal_flash_samd.ino
@@ -10,7 +10,7 @@
 *********************************************************************/
 
 #include "SPI.h"
-#include "SdFat.h"
+#include "SdFat_Adafruit_Fork.h"
 #include "Adafruit_InternalFlash.h"
 #include "Adafruit_TinyUSB.h"
 
diff --git a/examples/MassStorage/msc_sdfat/.skip.txt b/examples/MassStorage/msc_sdfat/.skip.txt
@@ -1,2 +1 @@
 pico_rp2040_tinyusb_host
-feather_rp2040_tinyusb
diff --git a/examples/MassStorage/msc_sdfat/msc_sdfat.ino b/examples/MassStorage/msc_sdfat/msc_sdfat.ino
@@ -14,7 +14,7 @@
  */
 
 #include "SPI.h"
-#include "SdFat.h"
+#include "SdFat_Adafruit_Fork.h"
 #include "Adafruit_TinyUSB.h"
 
 const int chipSelect = 10;
diff --git a/src/arduino/msc/Adafruit_USBH_MSC.cpp b/src/arduino/msc/Adafruit_USBH_MSC.cpp
@@ -34,7 +34,7 @@
 #include "Adafruit_USBH_MSC.h"
 #include "tusb.h"
 
-#if __has_include("SdFat.h")
+#if __has_include("SdFat_Adafruit_Fork.h")
 
 Adafruit_USBH_MSC_BlockDevice::Adafruit_USBH_MSC_BlockDevice() {
   _daddr = _lun = 0;
diff --git a/src/arduino/msc/Adafruit_USBH_MSC.h b/src/arduino/msc/Adafruit_USBH_MSC.h
@@ -28,9 +28,9 @@
 #include "tusb.h"
 
 // define SdFat host helper class if SdFat library is available
-#if __has_include("SdFat.h")
+#if __has_include("SdFat_Adafruit_Fork.h")
 
-#include "SdFat.h"
+#include "SdFat_Adafruit_Fork.h"
 
 class Adafruit_USBH_MSC_BlockDevice : public FsBlockDeviceInterface {
 public:

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`pico_rp2040_tinyusb_host`
`2`	`2`	`CH32V20x_EVT`
`3`		`-feather_rp2040_tinyusb`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`pico_rp2040_tinyusb_host`
`2`		`-feather_rp2040_tinyusb`