Revision 1:8604a6be9da1, committed 2014-03-14

Comitter:

avnisha

Date:

Fri Mar 14 03:41:37 2014 +0000

Parent:

0:1a515b688b8c

Commit message:

ok

Changed in this revision

diff -r 1a515b688b8c -r 8604a6be9da1 MSCFileSystem.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MSCFileSystem.lib	Fri Mar 14 03:41:37 2014 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/chris/code/MSCFileSystem/#dcc326e4d358

diff -r 1a515b688b8c -r 8604a6be9da1 main.cpp
--- a/main.cpp	Sat Apr 14 02:25:17 2012 +0000
+++ b/main.cpp	Fri Mar 14 03:41:37 2014 +0000
@@ -1,47 +1,53 @@
-/*
- * ===============================================================
- *  A simple wave recorder & player on mbed
- * ===============================================================
- * Copyright (c) 2011-2012 Shinichiro Nakamura
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- * ===============================================================
- */
+
 
 #include "mbed.h"
-#include "SDHCFileSystem.h"
+#include "MSCFileSystem.h"
 #include "wavfile.h"
 
+DigitalIn       record(p13);
+DigitalIn       playback(p16);
+AnalogOut       Aout(p18);
+AnalogIn        pot1(p19);
+Timeout         genTime;
+int             genOn;
+ 
+ 
+float   i = 0;
+void    tickgen(void)
+{
+    Aout = i;    
+    i = i + 0.1;
+    if (i > 1.0) i = 0.0;
+} 
+
+
+void genTimeout() {
+    genOn = 0;
+}
+
+void generate()
+{
+    while(genOn) {
+        for(float i=0.0; i<1.0; i+=0.1) {
+            Aout = i;
+            wait(0.00001+(0.0001*pot1.read()));
+        }
+    }
+}
+
+
 #define RAM_TOTAL   0x1000
 
 AnalogOut dacout(p18);
-AnalogIn adcin(p20);
+AnalogIn adcin(p17);
 DigitalOut led_play_ok(LED1);
 DigitalOut led_rec_ok(LED2);
 
 Timer timer;
 Timer iometer;
 Ticker ticker;
-SDFileSystem sdc(p5, p6, p7, p8, "sdc");
+Ticker tickgenerate;
+MSCFileSystem fs("fs");
 
 float buffer[RAM_TOTAL];
 int rp = 0;
@@ -102,13 +108,13 @@
     WAVFILE_ERROR_PRINT(result);
     WAVFILE_ERROR_PRINT(wavfile_read_info(wf, &info));
 
-    printf("[PLAY:%s]\r\n", filename);
-    printf("\tWAVFILE_INFO_AUDIO_FORMAT(&info)    = %d\r\n", WAVFILE_INFO_AUDIO_FORMAT(&info));
-    printf("\tWAVFILE_INFO_NUM_CHANNELS(&info)    = %d\r\n", WAVFILE_INFO_NUM_CHANNELS(&info));
-    printf("\tWAVFILE_INFO_SAMPLE_RATE(&info)     = %d\r\n", WAVFILE_INFO_SAMPLE_RATE(&info));
-    printf("\tWAVFILE_INFO_BYTE_RATE(&info)       = %d\r\n", WAVFILE_INFO_BYTE_RATE(&info));
-    printf("\tWAVFILE_INFO_BLOCK_ALIGN(&info)     = %d\r\n", WAVFILE_INFO_BLOCK_ALIGN(&info));
-    printf("\tWAVFILE_INFO_BITS_PER_SAMPLE(&info) = %d\r\n", WAVFILE_INFO_BITS_PER_SAMPLE(&info));
+    //printf("[PLAY:%s]\r\n", filename);
+    //printf("\tWAVFILE_INFO_AUDIO_FORMAT(&info)    = %d\r\n", WAVFILE_INFO_AUDIO_FORMAT(&info));
+    //printf("\tWAVFILE_INFO_NUM_CHANNELS(&info)    = %d\r\n", WAVFILE_INFO_NUM_CHANNELS(&info));
+    //printf("\tWAVFILE_INFO_SAMPLE_RATE(&info)     = %d\r\n", WAVFILE_INFO_SAMPLE_RATE(&info));
+    //printf("\tWAVFILE_INFO_BYTE_RATE(&info)       = %d\r\n", WAVFILE_INFO_BYTE_RATE(&info));
+    //printf("\tWAVFILE_INFO_BLOCK_ALIGN(&info)     = %d\r\n", WAVFILE_INFO_BLOCK_ALIGN(&info));
+    //printf("\tWAVFILE_INFO_BITS_PER_SAMPLE(&info) = %d\r\n", WAVFILE_INFO_BITS_PER_SAMPLE(&info));
 
     const int interval_us =  1000000 / WAVFILE_INFO_SAMPLE_RATE(&info);
 
@@ -154,13 +160,13 @@
     WAVFILE_ERROR_PRINT(result);
     WAVFILE_ERROR_PRINT(wavfile_write_info(wf, &info));
 
-    printf("[REC:%s]\r\n", filename);
-    printf("\tWAVFILE_INFO_AUDIO_FORMAT(&info)    = %d\r\n", WAVFILE_INFO_AUDIO_FORMAT(&info));
-    printf("\tWAVFILE_INFO_NUM_CHANNELS(&info)    = %d\r\n", WAVFILE_INFO_NUM_CHANNELS(&info));
-    printf("\tWAVFILE_INFO_SAMPLE_RATE(&info)     = %d\r\n", WAVFILE_INFO_SAMPLE_RATE(&info));
-    printf("\tWAVFILE_INFO_BYTE_RATE(&info)       = %d\r\n", WAVFILE_INFO_BYTE_RATE(&info));
-    printf("\tWAVFILE_INFO_BLOCK_ALIGN(&info)     = %d\r\n", WAVFILE_INFO_BLOCK_ALIGN(&info));
-    printf("\tWAVFILE_INFO_BITS_PER_SAMPLE(&info) = %d\r\n", WAVFILE_INFO_BITS_PER_SAMPLE(&info));
+    //printf("[REC:%s]\r\n", filename);
+    //printf("\tWAVFILE_INFO_AUDIO_FORMAT(&info)    = %d\r\n", WAVFILE_INFO_AUDIO_FORMAT(&info));
+    //printf("\tWAVFILE_INFO_NUM_CHANNELS(&info)    = %d\r\n", WAVFILE_INFO_NUM_CHANNELS(&info));
+    //printf("\tWAVFILE_INFO_SAMPLE_RATE(&info)     = %d\r\n", WAVFILE_INFO_SAMPLE_RATE(&info));
+    //printf("\tWAVFILE_INFO_BYTE_RATE(&info)       = %d\r\n", WAVFILE_INFO_BYTE_RATE(&info));
+    //printf("\tWAVFILE_INFO_BLOCK_ALIGN(&info)     = %d\r\n", WAVFILE_INFO_BLOCK_ALIGN(&info));
+    //printf("\tWAVFILE_INFO_BITS_PER_SAMPLE(&info) = %d\r\n", WAVFILE_INFO_BITS_PER_SAMPLE(&info));
 
     const int interval_us =  1000000 / WAVFILE_INFO_SAMPLE_RATE(&info);
     const unsigned int samples_for_nsec = WAVFILE_INFO_SAMPLE_RATE(&info) * nsec;
@@ -193,127 +199,47 @@
     return 0;
 }
 
-int perf_read(const char *filename, const int word_size, const int nsec)
-{
-    FILE *fp = fopen(filename, "rb");
-    if (fp == NULL) {
-        printf("File open failed.\r\n");
-        return 1;
-    }
 
-    printf("[Read performance checking...]\r\n");
-
-    unsigned int total_byte_size = 0;
-    int min_us = 0;
-    int max_us = 0;
-    timer.reset();
-    timer.start();
-    while (timer.read() < nsec) {
-        for (int i = 0; i < word_size; i++) {
-            iometer.reset();
-            iometer.start();
-            volatile int c = fgetc(fp);
-            iometer.stop();
-            int iomv = iometer.read_us();
-            if (iomv < min_us) {
-                min_us = iomv;
-            }
-            if (max_us < iomv) {
-                max_us = iomv;
-            }
-            total_byte_size++;
-        }
-    }
-    timer.stop();
-
-    printf("\tfilename(%s), word_size(%d)\r\n", filename, word_size);
-    printf("\ttime(%d[ms]), total_byte_size(%d)\r\n", timer.read_ms(), total_byte_size);
-    printf("\tThroughput=%f[Bytes/Sec]\r\n", (double)total_byte_size / timer.read_ms() * 1000.0);
-    printf("\tmin_us(%d), max_us(%d), average_us(%d)\r\n", min_us, max_us, timer.read_us() / total_byte_size);
-
-    fclose(fp);
-    return 0;
-}
-
-int perf_write(const char *filename, const int word_size, const int nsec)
-{
-    FILE *fp = fopen(filename, "wb");
-    if (fp == NULL) {
-        printf("File open failed.\r\n");
-        return 1;
-    }
-
-    printf("[Write performance checking...]\r\n");
-
-    unsigned int total_byte_size = 0;
-    int min_us = 0;
-    int max_us = 0;
-    timer.reset();
-    timer.start();
-    while (timer.read() < nsec) {
-        for (int i = 0; i < word_size; i++) {
-            volatile int c = 0x55;
-            iometer.reset();
-            iometer.start();
-            fputc(c, fp);
-            iometer.stop();
-            int iomv = iometer.read_us();
-            if (iomv < min_us) {
-                min_us = iomv;
-            }
-            if (max_us < iomv) {
-                max_us = iomv;
-            }
-            total_byte_size++;
-        }
-    }
-    timer.stop();
-
-    printf("\tfilename(%s), word_size(%d)\r\n", filename, word_size);
-    printf("\ttime(%d[ms]), total_byte_size(%d)\r\n", timer.read_ms(), total_byte_size);
-    printf("\tThroughput=%f[Bytes/Sec]\r\n", (double)total_byte_size / timer.read_ms() * 1000.0);
-    printf("\tmin_us(%d), max_us(%d), average_us(%d)\r\n", min_us, max_us, timer.read_us() / total_byte_size);
-
-    fclose(fp);
-    return 0;
-}
 
 int main(void)
 {
-    printf("\r\n\r\n");
-    printf("=======================================================\r\n");
-    printf(" A simple wave recorder & player on mbed               \r\n");
-    printf(" Copyright(C) 2012 Shinichiro Nakamura (CuBeatSystems) \r\n");
-    printf("=======================================================\r\n");
+    //printf("\r\n\r\n");
+    //printf("=======================================================\r\n");
+    //printf(" A simple wave recorder & player on mbed               \r\n");
+    //printf(" Copyright(C) 2012 Shinichiro Nakamura (CuBeatSystems) \r\n");
+    //printf("=======================================================\r\n");
 
     ticker.attach_us(tickdummy, 100);
     wait(1);
     ticker.detach();
 
-    {
-        const char *perf_filename = "/sdc/perf.bin";
-        const int word_size = 2;
-        const int nsec_write = 20;
-        const int nsec_read = 10;
-        perf_write(perf_filename, word_size, nsec_write);
-        perf_read(perf_filename, word_size, nsec_read);
-    }
-
-    {
-        static const char *target_filename = "/sdc/rec-test.wav";
-        while (1) {
-            /*
-             * 30 seconds recording.
+    static const char *target_filename = "/fs/rec-test.wav";
+    
+    while (1) {
+    
+        if (record == 1) {
+            /* 
+             * generate data 
              */
-            if (rec(target_filename, 30) != 0) {
-                break;
-            }
+             
+            genOn = 1;
+            printf("gen/rec on\n");
+            tickgenerate.attach_us(tickgen, 10);
+            rec(target_filename, 10);
+            tickgenerate.detach();
+            printf("gen/rec off\n");
+        }
+        
+        if (playback == 1) {
+        
             /*
              * Play it!
              */
+            printf("play on\n");
             if (play(target_filename) != 0) {
                 break;
             }
+            printf("play off\n");
         }
     }