Diff: NotchingDemo.cpp

Revision:

38:3b4c05af5f36

Parent:

37:a563899ac0df

Child:

39:69d5a5dd9163

--- a/NotchingDemo.cpp	Mon May 27 21:15:45 2019 +0000
+++ b/NotchingDemo.cpp	Sun Jun 02 19:12:56 2019 +0000
@@ -23,6 +23,7 @@
 DigitalOut led2(LED2);
 DigitalOut led3(LED3);
 DigitalIn  NotchUp(p16);
+DigitalIn  NotchDown(p17);//check the pin!!! Dont know if this will actually work...
 InterruptIn Horn(p16);
 Ticker sampletick;
 Ticker fileswitch_tick;
@@ -167,7 +168,7 @@
     FileInfo.num_slices = FileInfo.FileData.subchunk2_size/FileInfo.FileFormat.block_align;
 }*/
 
-
+int notch_flag = 0;
 int i = 0;
 int h = 0;
 short bufflen = 1;
@@ -316,6 +317,25 @@
     fseek(FlangeWav,44,SEEK_SET);
 
 }
+/*
+void filenotch_isr()
+{
+    if(up) {
+        notch = notch+1;
+        notchtrans_up = notch + 8;
+
+    } else if(down) {
+        notch = notch-1;
+        notchtrans_down = notch + 15;
+    }
+    notch_flag = 1;
+
+
+}
+*/
+
+
+
 
 classFade FadeDataInitialise(classFade FadeData);
 
@@ -369,7 +389,7 @@
 {
 
     NotchUp.mode(PullUp);
-
+    NotchDown.mode(PullUp);
 
     WAV_FILE_STRUCT WavInfo_Startup;
     WAV_FILE_STRUCT WavInfo_Idle;
@@ -397,13 +417,23 @@
 
     classSoundFile Sound[22];
     string file_names[22];
+    const char* FileName;
     for(int aaa = 0; aaa < 20; aaa ++) {
         a = aaa+1;
         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);
+                
+            }
+            */
         printf("FileName: %s\n\r",Sound[aaa].file_location);
+        //fclose(Sound[aaa].FileInfo.WavFile);
+        //wait(1);
     }
-    
+
     /*
     string RootFolder = "sd/mydir/SoundDecoder_second/";
     string folder = RootFolder + "01.wav";
@@ -427,66 +457,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* mywav5 = fopen("/sd/mydir/SoundDecoder_second/01.wav","rb");
+        FILE* mywav5 = fopen("/sd/mydir/SoundDecoder_second/05.wav","rb");
                 if(mywav5 == NULL){
                 printf("Cannot Open mywav5\n\r");
             }
-        FILE* mywav6 = fopen("/sd/mydir/SoundDecoder_second/01.wav","rb");
+        fclose(mywav5);
+        
+        FILE* mywav6 = fopen("/sd/mydir/SoundDecoder_second/06.wav","rb");
                 if(mywav6 == NULL){
                 printf("Cannot Open mywav6\n\r");
             }
-        FILE* mywav7 = fopen("/sd/mydir/SoundDecoder_second/01.wav","rb");
+        fclose(mywav6);    
+            
+        FILE* mywav7 = fopen("/sd/mydir/SoundDecoder_second/07.wav","rb");
                 if(mywav7 == NULL){
                 printf("Cannot Open mywav7\n\r");
             }
-        FILE* mywav8 = fopen("/sd/mydir/SoundDecoder_second/01.wav","rb");
+        fclose(mywav7);    
+            
+        FILE* mywav8 = fopen("/sd/mydir/SoundDecoder_second/08.wav","rb");
                 if(mywav8 == NULL){
                 printf("Cannot Open mywav8\n\r");
             }
-        FILE* mywav9 = fopen("/sd/mydir/SoundDecoder_second/01.wav","rb");
+        fclose(mywav8);    
+            
+        FILE* mywav9 = fopen("/sd/mydir/SoundDecoder_second/09.wav","rb");
                 if(mywav9 == NULL){
                 printf("Cannot Open mywav9\n\r");
             }
-        FILE* mywav10 = fopen("/sd/mydir/SoundDecoder_second/01.wav","rb");
+        fclose(mywav9);    
+            
+        FILE* mywav10 = fopen("/sd/mydir/SoundDecoder_second/10.wav","rb");
                 if(mywav10 == NULL){
                 printf("Cannot Open mywav10\n\r");
             }
-        FILE* mywav11= fopen("/sd/mydir/SoundDecoder_second/01.wav","rb");
+        fclose(mywav10);    
+            
+        FILE* mywav11= fopen("/sd/mydir/SoundDecoder_second/11.wav","rb");
                 if(mywav11 == NULL){
                 printf("Cannot Open mywav11\n\r");
             }
-        FILE* mywav12 = fopen("/sd/mydir/SoundDecoder_second/01.wav","rb");
+        fclose(mywav11);    
+        
+        FILE* mywav12 = fopen("/sd/mydir/SoundDecoder_second/12.wav","rb");
                 if(mywav12 == NULL){
                 printf("Cannot Open mywav12\n\r");
             }
-        FILE* mywav13 = fopen("/sd/mydir/SoundDecoder_second/01.wav","rb");
+        fclose(mywav12);     
+            
+        FILE* mywav13 = fopen("/sd/mydir/SoundDecoder_second/13.wav","rb");
                 if(mywav13 == NULL){
                 printf("Cannot Open mywav13\n\r");
             }
-        FILE* mywav14 = fopen("/sd/mydir/SoundDecoder_second/01.wav","rb");
+        fclose(mywav13);    
+            
+        FILE* mywav14 = fopen("/sd/mydir/SoundDecoder_second/14.wav","rb");
                 if(mywav14 == NULL){
                 printf("Cannot Open mywav14\n\r");
             }
+        fclose(mywav14);
 
-    */
+    
 
 
 
@@ -752,6 +808,67 @@
     }
 }
 
+//***************************************************************************//
+/*
+void Play_WaveFileNotchTest(FILE * my_wav, WAV_FILE_STRUCT FileInfo)
+{
+    while(slice<FileInfo.num_slices) {
+        if(notch_flag == 1) {
+
+            if(temp == 1) {
+                //printf("Does it go to this point\n\r");
+                SoundFile[notch].FileInfo.WavFile = fopen(Sound[aaa].file_location,"rb");
+                if(SoundFile[notch].FileInfo.WavFile == NULL) {
+                    printf("Cannot Open testwav\n\r");
+                }
+                fclose(StartupWav);
+                temp = 0;
+            }
+            fread(WavInfo_N3.slice_buf,WavInfo_N3.FileFormat.block_align,1,N3Wav);
+            data_sptr=(short*)WavInfo_N3.slice_buf;
+        } else {
+            fread(FileInfo.slice_buf,FileInfo.FileFormat.block_align,1,my_wav);
+            data_sptr=(short *)FileInfo.slice_buf;     // 16 bit samples
+        }
+        for (channel=0; channel<FileInfo.FileFormat.num_channels; channel++) {
+            if(flag1 == 1) {
+                Buffer1[place_hold1] = data_sptr[channel];
+                place_hold1 = place_hold1 + 1;
+                if(place_hold1 >= BufferLen) {
+                    while(1) {
+                        if(flag1 == 0) {
+
+                            break;
+                        }
+
+                    }
+                }
+
+            } else if(flag2 == 1) {
+                Buffer2[place_hold2] = data_sptr[channel];
+                place_hold2 = place_hold2 + 1;
+                if(place_hold2 >= BufferLen) {
+
+                    while(1) {
+                        if(flag2 == 0) {
+
+                            break;
+                        }
+                    }
+                }
+            }
+
+        }
+        slice = slice + 1;
+    }
+}
+*/
+//**************************************************************************//
+
+
+
+
+
 //void Play_WaveFileLoop(FILE * my_wav, WAV_FILE_STRUCT FileInfo)//(classSoundFile Sounds)
 
 void Play_WaveFileLoop(classSoundFile Sounds[], Notch_STRUCT NotchingSet)