Revision 39:69d5a5dd9163, committed 2019-06-17

Comitter:

roryhand

Date:

Mon Jun 17 20:54:09 2019 +0000

Parent:

38:3b4c05af5f36

Child:

40:ba34990514fa

Commit message:

WIP - added in vector tests (not working at all, probably a stupid hardware issue as per usual)

Changed in this revision

--- a/NotchingDemo.cpp	Sun Jun 02 19:12:56 2019 +0000
+++ b/NotchingDemo.cpp	Mon Jun 17 20:54:09 2019 +0000
@@ -387,7 +387,40 @@
 void Play_WaveFileLoop(classSoundFile Sounds[], Notch_STRUCT NotchingSet);
 int main()
 {
+    //std::vector<classSoundFile> v = {Sound1, Sound2, Sound3, Sound4};
+    classSoundFile Sound1,Sound2,Sound3,Sound4,Sound5;
+    Sound1.file_location = '1';
+    Sound2.file_location = '2';
+    Sound3.file_location = '3';
+    Sound4.file_location = '4';
+    Sound5.file_location = '5';
 
+    std::vector<classSoundFile> v;
+    v.push_back(Sound1);
+    v.push_back(Sound2);
+    v.push_back(Sound3);
+    v.push_back(Sound4);
+    v.push_back(Sound5);
+    for(int c = 1; c<6; c++) {
+        printf("This is Sound No.: %s\n\r",v.at(c));
+
+    }
+    v.erase(v.begin() + 1);
+    for(int c = 1; c<6; c++) {
+        printf("This is Sound No.: %s\n\r",v.at(c));
+
+    }
+
+    /*
+     int ArrayOfSounds[6];
+     ArrayOfSounds[1] = classSoundFile Sound1;
+     ArrayOfSounds[2] = classSoundFile Sound2;
+     ArrayOfSounds[3] = classSoundFile Sound3;
+     ArrayOfSounds[4] = classSoundFile Sound4;
+     ArrayOfSounds[5] = classSoundFile Sound5;
+     */
+
+    //ArrayOfSounds[1] = classSoundFile Sound1;
     NotchUp.mode(PullUp);
     NotchDown.mode(PullUp);
 
@@ -423,14 +456,15 @@
         sprintf(buf, "%d", a);
         Sound[aaa].file_location = RootFolder + "0" + buf + ".wav";
         FileName = Sound[aaa].file_location.c_str();
-        /*Sound[aaa].FileInfo.WavFile = fopen(FileName,"rb");
-        if(Sound[aaa].FileInfo.WavFile == NULL){
-                printf("Cannot Open Sound[%d].FileInfo.WavFile\n\r",aaa);
-                
-            }
-            */
+        Sound[aaa].FileInfo.WavFile = fopen(FileName,"rb");
+        if(Sound[aaa].FileInfo.WavFile == NULL) {
+            printf("Cannot Open Sound[%d].FileInfo.WavFile\n\r",aaa);
+
+        }
+
         printf("FileName: %s\n\r",Sound[aaa].file_location);
-        //fclose(Sound[aaa].FileInfo.WavFile);
+        fclose(Sound[aaa].FileInfo.WavFile);
+        free(Sound[aaa].FileInfo.WavFile);
         //wait(1);
     }
 
@@ -457,92 +491,92 @@
 
 
     printf("About to Start ReadFileInfo Operations\n\r");
-    
-        FILE* mywav1 = fopen("/sd/mydir/SoundDecoder_second/01.wav","rb");
-                if(mywav1 == NULL){
-                printf("Cannot Open mywav1\n\r");
-            }
-        fclose(mywav1);
-        
-        FILE* mywav2 = fopen("/sd/mydir/SoundDecoder_second/02.wav","rb");
-                if(mywav2 == NULL){
-                printf("Cannot Open mywav2\n\r");
-            }
-        fclose(mywav2);    
-            
-        FILE* mywav3 = fopen("/sd/mydir/SoundDecoder_second/03.wav","rb");
-                if(mywav3 == NULL){
-                printf("Cannot Open mywav3\n\r");
-            }
-        fclose(mywav3);    
-            
-        FILE* mywav4 = fopen("/sd/mydir/SoundDecoder_second/04.wav","rb");
-                if(mywav4 == NULL){
-                printf("Cannot Open mywav4\n\r");
-            }
-        fclose(mywav4);    
+
+    FILE* mywav1 = fopen("/sd/mydir/SoundDecoder_second/01.wav","rb");
+    if(mywav1 == NULL) {
+        printf("Cannot Open mywav1\n\r");
+    }
+    fclose(mywav1);
+
+    FILE* mywav2 = fopen("/sd/mydir/SoundDecoder_second/02.wav","rb");
+    if(mywav2 == NULL) {
+        printf("Cannot Open mywav2\n\r");
+    }
+    fclose(mywav2);
+
+    FILE* mywav3 = fopen("/sd/mydir/SoundDecoder_second/03.wav","rb");
+    if(mywav3 == NULL) {
+        printf("Cannot Open mywav3\n\r");
+    }
+    fclose(mywav3);
+
+    FILE* mywav4 = fopen("/sd/mydir/SoundDecoder_second/04.wav","rb");
+    if(mywav4 == NULL) {
+        printf("Cannot Open mywav4\n\r");
+    }
+    fclose(mywav4);
+
+    FILE* mywav5 = fopen("/sd/mydir/SoundDecoder_second/05.wav","rb");
+    if(mywav5 == NULL) {
+        printf("Cannot Open mywav5\n\r");
+    }
+    fclose(mywav5);
+
+    FILE* mywav6 = fopen("/sd/mydir/SoundDecoder_second/06.wav","rb");
+    if(mywav6 == NULL) {
+        printf("Cannot Open mywav6\n\r");
+    }
+    fclose(mywav6);
+
+    FILE* mywav7 = fopen("/sd/mydir/SoundDecoder_second/07.wav","rb");
+    if(mywav7 == NULL) {
+        printf("Cannot Open mywav7\n\r");
+    }
+    fclose(mywav7);
 
-        FILE* mywav5 = fopen("/sd/mydir/SoundDecoder_second/05.wav","rb");
-                if(mywav5 == NULL){
-                printf("Cannot Open mywav5\n\r");
-            }
-        fclose(mywav5);
-        
-        FILE* mywav6 = fopen("/sd/mydir/SoundDecoder_second/06.wav","rb");
-                if(mywav6 == NULL){
-                printf("Cannot Open mywav6\n\r");
-            }
-        fclose(mywav6);    
-            
-        FILE* mywav7 = fopen("/sd/mydir/SoundDecoder_second/07.wav","rb");
-                if(mywav7 == NULL){
-                printf("Cannot Open mywav7\n\r");
-            }
-        fclose(mywav7);    
-            
-        FILE* mywav8 = fopen("/sd/mydir/SoundDecoder_second/08.wav","rb");
-                if(mywav8 == NULL){
-                printf("Cannot Open mywav8\n\r");
-            }
-        fclose(mywav8);    
-            
-        FILE* mywav9 = fopen("/sd/mydir/SoundDecoder_second/09.wav","rb");
-                if(mywav9 == NULL){
-                printf("Cannot Open mywav9\n\r");
-            }
-        fclose(mywav9);    
-            
-        FILE* mywav10 = fopen("/sd/mydir/SoundDecoder_second/10.wav","rb");
-                if(mywav10 == NULL){
-                printf("Cannot Open mywav10\n\r");
-            }
-        fclose(mywav10);    
-            
-        FILE* mywav11= fopen("/sd/mydir/SoundDecoder_second/11.wav","rb");
-                if(mywav11 == NULL){
-                printf("Cannot Open mywav11\n\r");
-            }
-        fclose(mywav11);    
-        
-        FILE* mywav12 = fopen("/sd/mydir/SoundDecoder_second/12.wav","rb");
-                if(mywav12 == NULL){
-                printf("Cannot Open mywav12\n\r");
-            }
-        fclose(mywav12);     
-            
-        FILE* mywav13 = fopen("/sd/mydir/SoundDecoder_second/13.wav","rb");
-                if(mywav13 == NULL){
-                printf("Cannot Open mywav13\n\r");
-            }
-        fclose(mywav13);    
-            
-        FILE* mywav14 = fopen("/sd/mydir/SoundDecoder_second/14.wav","rb");
-                if(mywav14 == NULL){
-                printf("Cannot Open mywav14\n\r");
-            }
-        fclose(mywav14);
+    FILE* mywav8 = fopen("/sd/mydir/SoundDecoder_second/08.wav","rb");
+    if(mywav8 == NULL) {
+        printf("Cannot Open mywav8\n\r");
+    }
+    fclose(mywav8);
+
+    FILE* mywav9 = fopen("/sd/mydir/SoundDecoder_second/09.wav","rb");
+    if(mywav9 == NULL) {
+        printf("Cannot Open mywav9\n\r");
+    }
+    fclose(mywav9);
+
+    FILE* mywav10 = fopen("/sd/mydir/SoundDecoder_second/10.wav","rb");
+    if(mywav10 == NULL) {
+        printf("Cannot Open mywav10\n\r");
+    }
+    fclose(mywav10);
 
-    
+    FILE* mywav11= fopen("/sd/mydir/SoundDecoder_second/11.wav","rb");
+    if(mywav11 == NULL) {
+        printf("Cannot Open mywav11\n\r");
+    }
+    fclose(mywav11);
+
+    FILE* mywav12 = fopen("/sd/mydir/SoundDecoder_second/12.wav","rb");
+    if(mywav12 == NULL) {
+        printf("Cannot Open mywav12\n\r");
+    }
+    fclose(mywav12);
+
+    FILE* mywav13 = fopen("/sd/mydir/SoundDecoder_second/13.wav","rb");
+    if(mywav13 == NULL) {
+        printf("Cannot Open mywav13\n\r");
+    }
+    fclose(mywav13);
+
+    FILE* mywav14 = fopen("/sd/mydir/SoundDecoder_second/14.wav","rb");
+    if(mywav14 == NULL) {
+        printf("Cannot Open mywav14\n\r");
+    }
+    fclose(mywav14);
+
+