audio commit
This commit is contained in:
@@ -1,73 +1,73 @@
|
||||
#include "storage.h"
|
||||
|
||||
Sd2Card card;
|
||||
SdFatFs fatFs;
|
||||
// Sd2Card card;
|
||||
// SdFatFs fatFs;
|
||||
|
||||
void initStorage(void)
|
||||
{
|
||||
bool disp = false;
|
||||
// Open serial communications and wait for port to open:
|
||||
Serial.begin(9600);
|
||||
// bool disp = false;
|
||||
// // Open serial communications and wait for port to open:
|
||||
// Serial.begin(9600);
|
||||
|
||||
while (!Serial);
|
||||
Serial.print("\nInitializing SD card...");
|
||||
while(!card.init(SD_DETECT_PIN)) {
|
||||
if (!disp) {
|
||||
Serial.println("initialization failed. Is a card inserted?");
|
||||
disp = true;
|
||||
}
|
||||
delay(10);
|
||||
}
|
||||
// while (!Serial);
|
||||
// Serial.print("\nInitializing SD card...");
|
||||
// while(!card.init(SD_DETECT_PIN)) {
|
||||
// if (!disp) {
|
||||
// Serial.println("initialization failed. Is a card inserted?");
|
||||
// disp = true;
|
||||
// }
|
||||
// delay(10);
|
||||
// }
|
||||
|
||||
Serial.println("A card is present.");
|
||||
// Serial.println("A card is present.");
|
||||
|
||||
// print the type of card
|
||||
Serial.print("\nCard type: ");
|
||||
switch (card.type()) {
|
||||
case SD_CARD_TYPE_SD1:
|
||||
Serial.println("SD1");
|
||||
break;
|
||||
case SD_CARD_TYPE_SD2:
|
||||
Serial.println("SD2");
|
||||
break;
|
||||
case SD_CARD_TYPE_SDHC:
|
||||
Serial.println("SDHC");
|
||||
break;
|
||||
default:
|
||||
Serial.println("Unknown");
|
||||
}
|
||||
// // print the type of card
|
||||
// Serial.print("\nCard type: ");
|
||||
// switch (card.type()) {
|
||||
// case SD_CARD_TYPE_SD1:
|
||||
// Serial.println("SD1");
|
||||
// break;
|
||||
// case SD_CARD_TYPE_SD2:
|
||||
// Serial.println("SD2");
|
||||
// break;
|
||||
// case SD_CARD_TYPE_SDHC:
|
||||
// Serial.println("SDHC");
|
||||
// break;
|
||||
// default:
|
||||
// Serial.println("Unknown");
|
||||
// }
|
||||
|
||||
// Now we will try to open the 'volume'/'partition' - it should be FAT16 or FAT32
|
||||
if (!fatFs.init()) {
|
||||
Serial.println("Could not find FAT16/FAT32 partition.\nMake sure you've formatted the card");
|
||||
return;
|
||||
}
|
||||
// // Now we will try to open the 'volume'/'partition' - it should be FAT16 or FAT32
|
||||
// if (!fatFs.init()) {
|
||||
// Serial.println("Could not find FAT16/FAT32 partition.\nMake sure you've formatted the card");
|
||||
// return;
|
||||
// }
|
||||
|
||||
// print the type and size of the first FAT-type volume
|
||||
uint64_t volumesize;
|
||||
Serial.print("\nVolume type is FAT");
|
||||
Serial.println(fatFs.fatType(), DEC);
|
||||
Serial.println();
|
||||
// // print the type and size of the first FAT-type volume
|
||||
// uint64_t volumesize;
|
||||
// Serial.print("\nVolume type is FAT");
|
||||
// Serial.println(fatFs.fatType(), DEC);
|
||||
// Serial.println();
|
||||
|
||||
volumesize = fatFs.blocksPerCluster(); // clusters are collections of blocks
|
||||
volumesize *= fatFs.clusterCount(); // we'll have a lot of clusters
|
||||
volumesize *= 512; // SD card blocks are always 512 bytes
|
||||
Serial.print("Volume size (bytes): ");
|
||||
Serial.println(volumesize);
|
||||
Serial.print("Volume size (Kbytes): ");
|
||||
volumesize /= 1024;
|
||||
Serial.println(volumesize);
|
||||
Serial.print("Volume size (Mbytes): ");
|
||||
volumesize /= 1024;
|
||||
Serial.println(volumesize);
|
||||
// volumesize = fatFs.blocksPerCluster(); // clusters are collections of blocks
|
||||
// volumesize *= fatFs.clusterCount(); // we'll have a lot of clusters
|
||||
// volumesize *= 512; // SD card blocks are always 512 bytes
|
||||
// Serial.print("Volume size (bytes): ");
|
||||
// Serial.println(volumesize);
|
||||
// Serial.print("Volume size (Kbytes): ");
|
||||
// volumesize /= 1024;
|
||||
// Serial.println(volumesize);
|
||||
// Serial.print("Volume size (Mbytes): ");
|
||||
// volumesize /= 1024;
|
||||
// Serial.println(volumesize);
|
||||
|
||||
|
||||
Serial.println("\nFiles found on the card (name, date and size in bytes): ");
|
||||
File root = SD.openRoot();
|
||||
// Serial.println("\nFiles found on the card (name, date and size in bytes): ");
|
||||
// File root = SD.openRoot();
|
||||
|
||||
// list all files in the card with date and size
|
||||
root.ls(LS_R | LS_DATE | LS_SIZE);
|
||||
Serial.println("###### End of the SD tests ######");
|
||||
// // list all files in the card with date and size
|
||||
// root.ls(LS_R | LS_DATE | LS_SIZE);
|
||||
// Serial.println("###### End of the SD tests ######");
|
||||
}
|
||||
|
||||
void handleStorage(void) {
|
||||
|
||||
Reference in New Issue
Block a user