Diff: main.cpp

Revision:

19:b835bfb61e35

Parent:

18:41ef98db0423

Child:

20:30a00cd18e21

--- a/main.cpp	Tue Mar 22 21:33:56 2016 +0000
+++ b/main.cpp	Thu Mar 24 19:26:25 2016 +0000
@@ -514,7 +514,7 @@
 }
      
     FILE *fp = fopen(filename, "a");
-    fprintf(fp, "%02d,%02d,%02d,%02d,%02d,%02d,",RTC_UPAS.year, RTC_UPAS.month,RTC_UPAS.date,RTC_UPAS.hour,RTC_UPAS.minutes,RTC_UPAS.seconds);
+    //fprintf(fp, "%02d,%02d,%02d,%02d,%02d,%02d,",RTC_UPAS.year, RTC_UPAS.month,RTC_UPAS.date,RTC_UPAS.hour,RTC_UPAS.minutes,RTC_UPAS.seconds);
     fprintf(fp, "%s,", timestr);
     fprintf(fp, "%1.3f,%1.3f,%2.2f,%4.2f,%2.1f,%1.3f,", omronVolt,massflow,temp,press,rh,atmoRho);
     fprintf(fp, "%1.3f,%5.1f,%1.1f,%1.1f,%1.1f,%1.1f,", volflow, sampledVol, accel_x, accel_y, accel_z, accel_comp);
@@ -591,8 +591,8 @@
 //////////////////////////////////////////////////////////////
 int main(){
     
-    gpsEN = 1;
-    wait(1);
+    //gpsEN = 1;
+    //wait(1);
     BT_SW = 1;
     wait(1);
     BT_IRST = 1;
@@ -601,8 +601,8 @@
     RGB_LED.set_led(0,0,1);
     STtime.tm_sec = 10;    // 0-59
     STtime.tm_min = 30;    // 0-59
-    STtime.tm_hour = 9;   // 0-23
-    STtime.tm_mday = 22;   // 1-31
+    STtime.tm_hour = 13;   // 0-23
+    STtime.tm_mday = 24;   // 1-31
     STtime.tm_mon = 2;     // 0-11
     STtime.tm_year = 116;  // year since 1900
     time_t seconds = mktime(&STtime);
@@ -754,8 +754,8 @@
     strftime(timestr, 32, "%y-%m-%d-%H=%M=%S", localtime(&seconds));
 
     //sprintf(filename, "/sd/UPAS%04dLOG_%02d-%02d-%02d_%02d=%02d=%02d_%c%c%c%c%c%c%c%c.txt",serial_num,RTC_UPAS.year,RTC_UPAS.month,RTC_UPAS.date,RTC_UPAS.hour,RTC_UPAS.minutes,RTC_UPAS.seconds,subjectLabelOriginal[0],subjectLabelOriginal[1],subjectLabelOriginal[2],subjectLabelOriginal[3],subjectLabelOriginal[4],subjectLabelOriginal[5],subjectLabelOriginal[6],subjectLabelOriginal[7]);
-    sprintf(filename, "/sd/UPAS_TboardtestLog_%s_%c%c%c%c%c%c%c%c.txt", timestr,subjectLabelOriginal[0],subjectLabelOriginal[1],subjectLabelOriginal[2],subjectLabelOriginal[3],subjectLabelOriginal[4],subjectLabelOriginal[5],subjectLabelOriginal[6],subjectLabelOriginal[7]);
-   // sprintf(filename, "/sd/UPAS_TboardtestLog_%s.txt", timestr);
+    //sprintf(filename, "/sd/UPAS_TboardtestLog_%s_%c%c%c%c%c%c%c%c.txt", timestr,subjectLabelOriginal[0],subjectLabelOriginal[1],subjectLabelOriginal[2],subjectLabelOriginal[3],subjectLabelOriginal[4],subjectLabelOriginal[5],subjectLabelOriginal[6],subjectLabelOriginal[7]);
+   sprintf(filename, "/sd/UPAS_TboardtestLog_%s.txt", timestr);
     FILE *fp = fopen(filename, "w");
     fclose(fp);