Browse Source

update code

corvin 5 years ago
parent
commit
f948398ddf

+ 0 - 1
mkr2018_mrc/robot_coordination/launch/startup_robots_control.launch

@@ -19,6 +19,5 @@ History:
         <node pkg="robot_coordination" type="robot_node" name="robot1_control" output="screen" required="true">
         </node>
     </group>
-    
 </launch>
 

+ 1 - 1
mkr2018_mrc/robot_coordination/scripts/robot_control_0.py

@@ -18,7 +18,7 @@ g_trajectory = (
     (3.8, 2.6, 10),
     (4.8, 3.6, 10),
 #    (3.8, 2.6, 10),
-#    (1.8, 1.6, 12)
+    (1.8, 1.6, 12)
 )
 
 

+ 1 - 1
mkr2018_mrc/robot_coordination/scripts/robot_control_1.py

@@ -16,7 +16,7 @@ import sys
 # Trajectory as a tuple of (x, y, time)
 g_trajectory = (
 #    (1.8, 1.6, 12),
-#    (4.8, 3.6, 10),
+    (4.8, 3.6, 10),
     (5.6, 1.9, 10),
     (3.8, 2.6, 10)
 )

+ 2 - 1
mkr2018_mrc/robot_coordination/src/robot.cpp

@@ -200,7 +200,8 @@ bool Robot::followTheCarrot()
     command.angular.z = 0;
     command.linear.x = 0;
     command_publisher_->publish(command);
-    
+    ROS_WARN_STREAM("All Plan Dest reached!");
+
     return true;
   } 
   else