Diff: SDSave.cpp

Revision:

1:e0fc716e2394

Parent:

0:547856de255b

Child:

2:04c2f253ec87

diff -r 547856de255b -r e0fc716e2394 SDSave.cpp
--- a/SDSave.cpp	Fri Mar 11 23:43:27 2016 +0000
+++ b/SDSave.cpp	Sat Mar 12 00:01:03 2016 +0000
@@ -3,6 +3,7 @@
 #include "mbed.h"
 Serial pc(USBTX, USBRX);
 FILE *fp;
+SDFileSystem fs(PTE3,PTE1,PTE2,PTE4,"fs");//SDFileSystem object
 
 void createDataFile() {
     fp = fopen("/fs/dataLog.txt", "a");// open file and prepare to write
@@ -17,33 +18,27 @@
     if (fp == NULL) {
         pc.printf("Failed to open the file.\n\r");
     }
-    fprint(fp, "Time (s)\t red (mW/cm2)\t green (mW/cm2)\t blue (mW/cm2)");
+    fprintf(fp, "Time (s)\t red (mW/cm2)\t green (mW/cm2)\t blue (mW/cm2)");
 }
-void writeData(uint16_t time, uint16_t temp, uint16_t uv, uint16_t red, uint16_t green, uint16_t blue)
+void writeData(float time, float temp, float uv, uint16_t red, uint16_t green, uint16_t blue)
 {
-    fp = fopen("/fs/dataLog.txt", "w"); //open file and prepare to write
-    if (fp == NULL) {
-        pc.printf("Failed to open the file.\n\r");
-        }
-    if(time < .6) {//if it is the first time being called then output data title
-        fprint(fp, "Time (s)\t temperature (c)\t UV (mW/cm2)\t red (mW/cm2)\t green (mW/cm2)\t blue (mW/cm2)");
-        }
-    //output values for each
-    fprintf(fp, "%.2f \t %.2f\n\r", time, temp, uv, red, green, blue);
+    fprintf(fp, "%.2f \t %.2f \t %.2f \t %d \t %d \t %d\n\r", time, temp, uv, red, green, blue);
 }
 
 void writeData_testRGB(float time, uint16_t red, uint16_t green, uint16_t blue) {
     
     //output values for each
-    fprintf(fp, "%.2f \t %.2f\n\r", time, temp, uv, red, green, blue);
+    fprintf(fp, "%.2f \t %d \t %d \t %d\n\r", time, red, green, blue);
 }
+
 bool mountFailure(){
-    if (fs.mount !=0) return false;//if mount has been accomplished return false
-    //remember to change if statment's true to a correct mount failure input else return true;
-    //if mount has failed return true
+    if (fs.mount() !=0)
+        return false;//if mount has been accomplished return false
+    else
+        return true;
 }
 
 void closeDataFile() {
     fclose(fp);
-    sd.unmount();
+    fs.unmount();
 }
\ No newline at end of file