Merge pull request #68 from electro-smith/libdaisy_update

updated libdaisy to v4.0.0
electro-smith · Dec 17, 2021 · ec635df · ec635df
2 parents feca4db + 30ae9ca
commit ec635df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/source/genlib_daisy.h b/source/genlib_daisy.h
@@ -49,6 +49,9 @@ static bool      update = false;
 static const uint32_t OOPSY_SRAM_SIZE = 512 * 1024; 
 static const uint32_t OOPSY_SDRAM_SIZE = 64 * 1024 * 1024;
 
+// Added dedicated global SDFile to replace old global from libDaisy
+FIL SDFile;
+
 namespace oopsy {
 
 	uint32_t sram_used = 0, sram_usable = 0;
@@ -278,6 +281,8 @@ namespace oopsy {
 		#define OOPSY_WAV_WORKSPACE_BYTES (256)
 
 		daisy::SdmmcHandler handler;
+		daisy::FatFSInterface fsi;
+
 		uint8_t workspace[OOPSY_WAV_WORKSPACE_BYTES];
 
 		void sdcard_init() {
@@ -287,8 +292,8 @@ namespace oopsy {
 			// sdconfig.speed           = daisy::SdmmcHandler::Speed::FAST;
 			sdconfig.width           = daisy::SdmmcHandler::BusWidth::BITS_1;
 			handler.Init(sdconfig);
-			dsy_fatfs_init();
-			f_mount(&SDFatFS, SDPath, 1);
+			fsi.Init(daisy::FatFSInterface::Config::MEDIA_SD);
+			f_mount(&fsi.GetSDFileSystem(), fsi.GetSDPath(), 1);
 		}
 
 		// TODO: resizing without wasting memory

diff --git a/source/libdaisy b/source/libdaisy