20141105

Dependencies:   MotorDriver_SU mbed

Fork of tracer by Naoki Hasegawa

Files at this revision

API Documentation at this revision

Comitter:
12F2041G
Date:
Thu Nov 06 11:02:28 2014 +0000
Parent:
2:078d6c4bf9ee
Commit message:
20141106

Changed in this revision

tracer.cpp Show annotated file Show diff for this revision Revisions of this file
diff -r 078d6c4bf9ee -r cd48c06fac88 tracer.cpp
--- a/tracer.cpp	Wed Nov 05 07:30:35 2014 +0000
+++ b/tracer.cpp	Thu Nov 06 11:02:28 2014 +0000
@@ -70,21 +70,22 @@
                     motor.Drive(0, STOP, 0);
                     motor.Drive(1, STOP, 0);
             
-                    lift.Drive(0, CW, 2000); //リフトアップ
-                    wait(2);
+                    lift.Drive(0, CW, 4000); //リフトアップ
+                    wait(1);
                     lift.Drive(0, STOP, 0);
-                    height = 1;//lift位置
                     wait(0.2);
                      //再スタート
                     motor.Drive(0, CW, 1000);
                     motor.Drive(1, CW, 1000);
+                    height = 1;//lift位置
+                    wait(0.2);
                     }
             else if(sensor4 == 0 && sensor5 == 0, height == 1){
                     motor.Drive(0, STOP, 0);
                     motor.Drive(1, STOP, 0);
             
                     lift.Drive(0, CCW, 2000);//リフトダウン
-                    wait(2);
+                    wait(1);
                     lift.Drive(0, STOP, 0);
                     motor.Drive(0, CCW, 4000);
                     motor.Drive(1, CCW, 4000);