射出(3/29用)

Dependencies:   mbed ros_lib_kinetic

Fork of NHK_kaida_ros0322_4 by ROBOSTEP4期

Revision:
19:06246ffe0235
Parent:
18:0184238dccc3
Child:
20:81a956eaf4ae
--- a/main.cpp	Thu Mar 22 06:36:35 2018 +0000
+++ b/main.cpp	Thu Mar 22 07:42:29 2018 +0000
@@ -69,7 +69,7 @@
 
 void messageCallback2(const std_msgs::Int32 &msg)
 {
-    ball_judgement=msg.data;
+    if((act==1)||(act==3)||(act==5)||(act==10)||(act==11))ball_judgement=msg.data;
 }
 
 void messageCallback3(const std_msgs::Int32 &msg)
@@ -339,7 +339,7 @@
     ///射出///
         if((act==2)&&(count==0)) {
             int f_i=0;
-            throw_cock(0.243); //TZ1
+            throw_cock(0.257); //TZ1
  
             ready_action=0;
             count=1;
@@ -354,7 +354,7 @@
  
          if(((act==4)||(act==6))&&(count==0)) {
              int f_i=0;
-            throw_cock(0.243); //TZ2
+            throw_cock(0.258); //TZ2
  
             ready_action=0;
             count=1;