Diff: main.cpp

Revision:

2:3176040a4777

Parent:

1:1817e9243a6e

Child:

3:7bd1afb46094

--- a/main.cpp	Tue Sep 11 04:18:28 2018 +0000
+++ b/main.cpp	Tue Sep 11 04:39:47 2018 +0000
@@ -36,7 +36,7 @@
 double new_dist=0;
 double old_dist=0;
 double d_dist=0;
-double x=250;
+double x=185;
 double y=150;//start point//keisann wo sinaosu hitsuyouga arimasu
 Timer t;
 int i=0;
@@ -277,9 +277,18 @@
                     i++;
                 }
             }
+            if(reset_a.read()==1) {
+                wait(0.05);
+                if(reset_a.read()==1) {
+                    denjiben=0;
+                    x=70;
+                    y=2500;
+                    i=14;
+                }
+            }
         }
         if(i==1) {
-            susumu_y(1,1,472);
+            susumu_y(1,1,407);
         }
         if(i==2) {
             susumu_ang(1/3,1,45);
@@ -347,7 +356,7 @@
                 susumu_y(1,1,2200);
             }
             if(i==11) {
-                susumu_y(1/3,1,2500);
+                susumu_ang(1/3,1,90);
             }
             if(i==12) {
                 motorR.stop();