test

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

Fork of aigamozu_auto_ver3_1 by aigamozu

Files at this revision

API Documentation at this revision

Comitter:
s1200058
Date:
Sat Apr 25 01:28:11 2015 +0000
Parent:
0:68d27eee9a6c
Child:
2:5f329b4ea269
Commit message:
yoko

Changed in this revision

AigamozuControlPackets.lib Show annotated file Show diff for this revision Revisions of this file
agzIDLIST.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/AigamozuControlPackets.lib	Sat Apr 25 01:06:06 2015 +0000
+++ b/AigamozuControlPackets.lib	Sat Apr 25 01:28:11 2015 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/teams/aigamozu/code/AigamozuControlPackets/#e441331aa4a1
+http://mbed.org/teams/aigamozu/code/AigamozuControlPackets/#bbe73c728ecb
--- a/agzIDLIST.lib	Sat Apr 25 01:06:06 2015 +0000
+++ b/agzIDLIST.lib	Sat Apr 25 01:28:11 2015 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/teams/aigamozu/code/agzIDLIST/#f9411e7b89a6
+http://mbed.org/teams/aigamozu/code/agzIDLIST/#3f90a1c00a72
--- a/main.cpp	Sat Apr 25 01:06:06 2015 +0000
+++ b/main.cpp	Sat Apr 25 01:28:11 2015 +0000
@@ -129,8 +129,8 @@
     const int collect_Time = 200; //when we collect 4 GPS point, we use 
     int collect_flag = 0;
     char collect_state = 'a';
-    XBeeAddress64 collect_Address[4] = {XBeeAddress64(BASE1_32H,BASE1_32L), XBeeAddress64(BASE2_32H,BASE2_32L), 
-                                        XBeeAddress64(BASE3_32H,BASE3_32L), XBeeAddress64(BASE4_32H,BASE4_32L)};
+    XBeeAddress64 collect_Address[5] = {XBeeAddress64(BASE1_32H,BASE1_32L), XBeeAddress64(BASE2_32H,BASE2_32L), 
+                                        XBeeAddress64(BASE3_32H,BASE3_32L), XBeeAddress64(BASE4_32H,BASE4_32L), XBeeAddress64(BASE5_32H,BASE5_32L)};
     XBeeAddress64 robot_Address = XBeeAddress64(ROBOT1_32H, ROBOT1_32L);
     int id;
     bool flag = true;
@@ -301,7 +301,7 @@
             collect_flag++;
             collect_state++;
 
-            if(collect_flag == 4){
+            if(collect_flag == 5){
                 collect_state = 'a';
                 collect_flag = 0;
             }