Diff: main.cpp

Revision:

37:dcd5905ea56f

Parent:

36:dea444b493b7

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