aigamozu / Mbed 2 deprecated Aigamozu_collect_data_1

2015/05/16

Dependencies:   ADXL345 AigamozuControlPackets HMC5843 ITG3200 MBed_Adafruit-GPS-Library XBee agzIDLIST agz_common mbed

Fork of Aigamozu_collect_data by aigamozu

Files at this revision

API Documentation at this revision

Revision 2:ed97da657b4b, committed 2015-05-15

Comitter:
s1200058
Date:
Fri May 15 08:41:36 2015 +0000
Parent:
1:b684ee7d282a
Child:
3:b7b30e73cae0
Commit message:
2015/05/15

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/main.cpp	Fri May 15 08:22:51 2015 +0000
+++ b/main.cpp	Fri May 15 08:41:36 2015 +0000
@@ -37,7 +37,7 @@
 #define SIGMA_MIN 0.0001
 
 //************ID Number*****************
-const char MyID = 'e';
+const char MyID = 'h';
 //************ID Number*****************
 
 /////////////////////////////////////////
@@ -295,9 +295,9 @@
     const int refresh_Time = 1000; //refresh time in ms
     myGPS.begin(GPS_BAUD_RATE);
     Timer collect_Timer;
- /*   const int collect_Time = 2000; //when we collect 4 GPS point, we use 
+    const int collect_Time = 2000; //when we collect 4 GPS point, we use 
     int collect_flag = 0;
-    char collect_state = 'a';*/
+    char collect_state = 'a';
     
     char SenderIDc;
     //GPS Send Command
@@ -355,7 +355,7 @@
                 continue;   
             }       
         }
-  /*      
+      
         if( collect_Timer.read_ms() >= collect_Time){
             collect_Timer.reset();   
                      
@@ -370,7 +370,7 @@
             }    
          } 
         
-*/        
+      
         if (refresh_Timer.read_ms() >= refresh_Time) {
             refresh_Timer.reset();
             Get_GPS(&myGPS);