Diff: main.cpp

Revision:

18:191d9868effe

Parent:

17:904bcb46a48d

Child:

21:0d70132497a2

diff -r 904bcb46a48d -r 191d9868effe main.cpp
--- a/main.cpp	Fri Sep 08 17:58:11 2017 +0000
+++ b/main.cpp	Tue Sep 12 08:16:42 2017 +0000
@@ -7,11 +7,12 @@
 SDFileSystem sd(p5, p6, p7, p8, "sd");
 HeptaXbee xbee(p9,p10);
 HeptaTemp temper(p17);
+Timer tt;
 
 int main()
 {
     int rcmd=0,cmdflag=0;
-    float voltage;
+    float voltage,timer,temp;
     mkdir("/sd/mydir", 0777);
     while(1) {
         wait(1.0);
@@ -20,17 +21,40 @@
         if (cmdflag == 1) {
             pc.printf("Command Get %d\r\n",rcmd);
             if(rcmd == 'a') {
-                while(1) {
-                    FILE *fp = fopen("/sd/mydir/test_thermal.txt", "a");
+                FILE *fp = fopen("/sd/mydir/test_thermal_10_deg.csv", "w");
+                for(int i = 0; i<120; i++) {
+                    tt.start();
                     temper.temp_sensing_vol(&voltage);
-                    pc.printf("Volt = %f\r\n",voltage);
-                    fprintf(fp,"%f\r\n",voltage);
-                    fclose(fp);
+                    temper.temp_sense(&temp);
+                    xbee.printf("Volt = %f,Temp = %f\r\n",voltage,&temp);
                     wait(0.5);
+                    timer = tt.read();
+                    fprintf(fp,"%f,%f,%f\r\n",timer,voltage,temp);
+                    tt.stop();
+                    tt.reset();
                 }
+                fclose(fp);
                 xbee.initialize();
             }
+
             if(rcmd == 'b') {
+                FILE *fp = fopen("/sd/mydir/test_thermal_40_deg.csv", "w");
+                for(int i = 0; i<120; i++) {
+                    tt.start();
+                    temper.temp_sensing_vol(&voltage);
+                    temper.temp_sense(&temp);
+                    xbee.printf("Volt = %f,Temp = %f\r\n",voltage,&temp);
+                    wait(0.5);
+                    timer = tt.read();
+                    fprintf(fp,"%f,%f,%f\r\n",timer,voltage,temp);
+                    tt.stop();
+                    tt.reset();
+                }
+                fclose(fp);
+                xbee.initialize();
+            }
+
+            if(rcmd == 'c') {
                 pc.printf("SD test Mode\r\n");
                 FILE *fp = fopen("/sd/mydir/myfile.txt", "w");
                 if(fp == NULL) {
@@ -42,6 +66,18 @@
                 }
                 xbee.initialize();
             }
-        }
-    }
-}
\ No newline at end of file
+
+            if(rcmd == 'd') {
+                ///////////////////////////
+                //For user's mission
+
+
+
+
+                ///////////////////////////
+                xbee.initialize();
+            }
+
+        }//cmdflag = 1
+    }//while
+}//main
\ No newline at end of file