forward

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

Fork of Aigamozu_Robot_ver4_for_log by aigamozu

Files at this revision

API Documentation at this revision

Comitter:
s1200058
Date:
Fri Apr 22 09:35:42 2016 +0000
Parent:
36:dea444b493b7
Commit message:
for forward

Changed in this revision

AigamozuControlPackets.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
diff -r dea444b493b7 -r dcd5905ea56f AigamozuControlPackets.lib
--- a/AigamozuControlPackets.lib	Tue May 26 10:14:44 2015 +0000
+++ b/AigamozuControlPackets.lib	Fri Apr 22 09:35:42 2016 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/teams/aigamozu/code/AigamozuControlPackets/#b33b8b2a92b0
+https://developer.mbed.org/teams/aigamozu/code/AigamozuControlPackets_for_auto/#5599af7a8b4c
diff -r dea444b493b7 -r dcd5905ea56f main.cpp
--- a/main.cpp	Tue May 26 10:14:44 2015 +0000
+++ b/main.cpp	Fri Apr 22 09:35:42 2016 +0000
@@ -59,7 +59,7 @@
 //Base    ID: 'a' ~ 'a'
 //manager ID: '0'(数字のゼロ)
 //
-const char MyID = 'D';
+const char MyID = 'J';
 //************ID Number*****************
 
 /////////////////////////////////////////
@@ -414,7 +414,7 @@
     const int auto_Time = 2000; //refresh time in ms
     int count = 0;
     
-    const int straight = 30000, turning = 34000, wait = 31000;
+    const int straight = 2000, turning = 3500, wait = 3000;
     
     myGPS.begin(GPS_BAUD_RATE); 
     
@@ -519,7 +519,8 @@
         }
         
      if(agz.nowMode == AUTO_GPS_MODE){
-        if(agz.Move_Timer.read_ms() < straight){
+         agz.test_Auto(0); //straight
+ /*       if(agz.Move_Timer.read_ms() < straight){
            agz.test_Auto(0); //straight
         }
         if(agz.Move_Timer.read_ms() > straight && agz.Move_Timer.read_ms() < wait){
@@ -530,10 +531,11 @@
         }   
         if(agz.Move_Timer.read_ms() > turning){
             agz.test_Auto(3);
-            wait_ms(200);
+            wait_ms(500);
             agz.Move_Timer.reset();
-        }
+        }*/
     }
+    
     }
     
 }
\ No newline at end of file