Diff: main.cpp

Revision:

5:5bc32d021025

Parent:

4:dfa8d9858dfb

--- a/main.cpp	Sat Feb 20 04:02:21 2016 +0000
+++ b/main.cpp	Sun Feb 21 07:27:54 2016 +0000
@@ -1,4 +1,3 @@
-#include "mbed.h"
 #include "SDFileSystem.h"
 #include "MPU9250.h"
 #include "InterruptManager.h"
@@ -29,8 +28,8 @@
 #endif
 
 /*      Un/comment to determine which tests will be run     */
-//#define IMU_TEST
-#define MIC_TEST
+#define IMU_TEST
+//#define MIC_TEST
 //#define LOAD_TEST
 
 /*      Parameters for sampling     */
@@ -72,8 +71,8 @@
         fclose(fp);    
     }
     
-    snprintf(file_name, sizeof(file_name), "/sd/%s_%02d.txt", FILE_NAME, ++file_count); 
-    FILE *fp = fopen(file_name, "w");
+    snprintf(file_name, sizeof(file_name), "/sd/%s_%02d.txt", FILE_NAME, file_count++); 
+    fp = fopen(file_name, "w");
     fprintf(fp, "Sample Rate: %d Hz\n", SAMPLE_RATE);
     
 }
@@ -123,23 +122,12 @@
     #endif
     
     //set up button as active low to trigger file creation
-//    #ifndef BLENANO
-//    button.mode(PullUp);
-//    #endif
     button.fall(&button_interrupt);
     timer.attach(&timer_interrupt, sample_rate );
     led.write(0);
     
-    snprintf(file_name, sizeof(file_name), "/sd/%s_%02d.txt", FILE_NAME, ++file_count); 
-    FILE *fp = fopen(file_name, "w");
-    
-    do {
-        
-        wait(0.5);
-        led.write(!led.read());
-        
-    } while ( fp == NULL );
-    
+    snprintf(file_name, sizeof(file_name), "/sd/%s_%02d.txt", FILE_NAME, file_count++); 
+    fp = fopen(file_name, "w");
     fprintf(fp, "Sample Rate: %d Hz\n", SAMPLE_RATE);
     
     while(1){
@@ -173,6 +161,7 @@
         
         #ifdef MIC_TEST
         if ( status & MIC_FLAG ){
+            led.write(!led.read());
             
             #ifndef IMU_TEST
             fprintf(fp, "%d\n", mic.read_u16());