Diff: NotchingDemo.cpp

Revision:

22:706e86dc0d45

Parent:

21:1aacd67d19c1

Child:

23:49c10427a1cd

--- a/NotchingDemo.cpp	Mon Apr 01 20:58:39 2019 +0000
+++ b/NotchingDemo.cpp	Mon Apr 22 11:53:32 2019 +0000
@@ -30,6 +30,8 @@
 Timer t2;
 Timer NotchTimer;
 
+vector <string> VectorFilenames;
+
 Serial pc(USBTX, USBRX); // tx, rx //FOR DEBUGGING PROGRAM USING GNU SCREEN
 DigitalOut cs(p8);
 I2S i2s(I2S_TRANSMIT, p5, p6, p7);
@@ -369,7 +371,7 @@
 
 
     DIR *dir;
-    dirent *ent;
+    struct dirent *ent;
     int iterator = 0;
 
 
@@ -383,7 +385,7 @@
         while ((ent = readdir (dir)) != NULL) {
             //printf("%s\r\n",string(ent->d_name));
             filename[iterator] = (ent->d_name);
-            printf("Filename: %s\n\r",filename[iterator]);
+            printf("Filename: %s\n\r",filename[iterator].c_str());
             //printf("%s\r\n",filename[iterator]);
             iterator  = iterator + 1;
             //printf("%s\r\n", ent->d_name);
@@ -511,12 +513,14 @@
 
     aaa = aaa+1;
 
-    folder =  RootFolder + filename[3];
+    /*folder =  RootFolder + filename[3];
     FOLDER = folder.c_str();
     FILE* mywav3 = fopen(FOLDER,"rb");
-
+    if(mywav3 == NULL){
+        printf("CANNOT OPEN mywav 3\n\r");
+    }
 
-    printf("we opened This file %d\n\r",aaa);
+    printf("we opened This file %d\n\r",aaa);*/
 
 
 
@@ -524,10 +528,14 @@
 
     aaa = aaa+1;
 
-    folder =  RootFolder + filename[4];
-    FOLDER = folder.c_str();
-    FILE* mywav4 = fopen(FOLDER,"rb");
-
+    string folder4 =  RootFolder + filename[4].c_str();
+    printf("filename[4]: %s\n\r", filename[4].c_str());
+    FOLDER = folder4.c_str();
+    FILE * mywav4 = fopen(FOLDER,"rb");
+    //FILE* mywav4 = fopen("sd/mydir/SoundDecoder_second/07.wav","rb");
+    if(mywav4 == NULL){
+        printf("Cannot Open mywav4\n\r");
+    }
 
     printf("we opened This file %d\n\r",aaa);
 
@@ -539,11 +547,13 @@
 
     folder =  RootFolder + filename[5];
     FOLDER = folder.c_str();
-
+    printf("filename[5]: %s\n\r", filename[5]);
     FILE* mywav5 = fopen(FOLDER,"rb");
 
     printf("we opened This file %d\n\r",aaa);
-
+    if(mywav5 == NULL){
+        printf("Cannot Open mywav5\n\r");
+    }
 
 
     aaa = aaa+1;
@@ -634,7 +644,7 @@
 
 
     aaa = aaa+1;
-
+/*
     folder =  RootFolder + filename[15];
     FOLDER = folder.c_str();
     FILE* mywav15 = fopen(FOLDER,"rb");
@@ -675,7 +685,7 @@
 
     printf("We performed all ReadFileInfo Operations!\n\r");
     aaa = aaa+1;
-
+*/
 
     printf("DO WE GET PAST THE ALLOCATION POINT\n\r");
 
@@ -708,8 +718,8 @@
     WavStruct0 = ReadFileInfo(WavStruct0,mywav0);
     WavStruct1 = ReadFileInfo(WavStruct1,mywav1);
     WavStruct2 = ReadFileInfo(WavStruct2,mywav2);
-    /*WavStruct3 = ReadFileInfo(WavStruct3,mywav3);
-    WavStruct4 = ReadFileInfo(WavStruct4,mywav4);
+    //WavStruct3 = ReadFileInfo(WavStruct3,mywav3);
+    /*WavStruct4 = ReadFileInfo(WavStruct4,mywav4);
     WavStruct5 = ReadFileInfo(WavStruct5,mywav5);
     WavStruct6 = ReadFileInfo(WavStruct6,mywav6);
     WavStruct7 = ReadFileInfo(WavStruct7,mywav7);
@@ -749,7 +759,10 @@
     WavInfo_IdleN2 = ReadFileInfo(WavInfo_IdleN2, IdleN2Wav);
     WavInfo_N2 = ReadFileInfo(WavInfo_N2,  N2Wav);
     WavInfo_Bell = ReadFileInfo(WavInfo_Bell, BellWav);
-    //WavInfo_Flange = ReadFileInfo(WavInfo_Flange, HeyWav);
+    printf("About to Read HeyWav\n\r");
+    printf("SizeOf mywav4: %d\n\r",sizeof(mywav4));
+    fseek(mywav4,1,SEEK_SET);
+    WavInfo_Flange = ReadFileInfo(WavInfo_Flange, HeyWav);
     //WavInfo_Hey = ReadFileInfo(WavInfo_Hey,HeyWav);
 //WAV_FILE_STRUCT WavInfo_Frustration;
 //FILE* FrustrationWav = fopen("/sd/mydir/645Engine/EX_FlangeJoint1_11k_minus12dB.wav","rb");
@@ -838,6 +851,7 @@
 WAV_FILE_STRUCT ReadFileInfo(WAV_FILE_STRUCT FileInfo, FILE * wav_file)
 {
     fseek(wav_file,20,SEEK_SET);
+    printf("We have just seeked through this file\n\r");
     fread(&FileInfo.FileFormat,sizeof(FileInfo.FileFormat),1,wav_file);
     //printf("wav_format.sample_rate: %d\n\r",FileInfo.FileFormat.sample_rate);