Diff: main.cpp

Revision:

16:85746e242e49

Parent:

15:c27950efe96f

Child:

17:df95c0fb7b87

--- a/main.cpp	Wed Mar 21 15:31:50 2018 +0000
+++ b/main.cpp	Wed Mar 21 15:55:23 2018 +0000
@@ -134,9 +134,6 @@
         ledw=0;
         }
     else if (act==7) {
-        led1=1;
-        led2=1;
-        led3=1;
         fuck=1;
         s_grab=0;
         wait(2);
@@ -147,7 +144,20 @@
         grab=0;
         wait(1);
         ledw=0;
-        
+        }
+    else if (act==8) {
+        fuck=1;
+        s_grab2=0;
+        wait(2);
+        ledw=1;
+        wait(1);
+        snap2=0;
+        wait(waittime); 
+        grab2=0;
+        wait(1);
+        ledw=0;
+        }
+    else if (act==9) {
         fuck=1;
         s_grab2=0;
         wait(2);
@@ -229,7 +239,7 @@
         //pc.printf("%d",red); ///カラーセンサー閾値
         
     ///装填///
-        if(((act==1)||(act==3)||(act==5)||(act==8))&&(ready_action==0)) { //TZ3
+        if(((act==1)||(act==3)||(act==5)||(act==10)||(act==11))&&(ready_action==0)) { //TZ3
                  /*if(act==1) {
                     led1=1;
                 }
@@ -356,7 +366,7 @@
             }
         }
         
-         if((act==7)&&(count==0)) {
+         if(((act==7)||(act==8)||(act==9))&&(count==0))  {
             int f_i=0;
             throw_cock(0.172); //TZ3