diff --git a/.gitignore b/.gitignore index 03eb9b2..0239be1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,9 @@ *.log *.bag.active *.bag +*.bag.orig.active +*.bag.orig.orig.active + the_fucking_map_bug.bag eurobot/bag last_time \ No newline at end of file diff --git a/eurobot/ctd_multimaster b/eurobot/ctd_multimaster new file mode 100755 index 0000000..3d9fee6 --- /dev/null +++ b/eurobot/ctd_multimaster @@ -0,0 +1,8 @@ +#!/bin/bash +source /opt/ros/kinetic/setup.bash +source ~/catkin_ws/devel/setup.bash +sleep 1s +while true; do + roslaunch eurobot central_tracking_device.launch color:=$1 + sleep 1s +done diff --git a/eurobot/secondary_robot_multimaster b/eurobot/secondary_robot_multimaster index fb3d29f..4d81838 100755 --- a/eurobot/secondary_robot_multimaster +++ b/eurobot/secondary_robot_multimaster @@ -1,5 +1,6 @@ #!/bin/bash - +date1=`python2 /home/odroid/catkin_ws/src/ros-eurobot-2018/scripts/make_older.py` +date +%Y%m%d%T -s $date1 source /opt/ros/kinetic/setup.bash source ~/catkin_ws/devel/setup.bash #export ROS_IP=192.168.88.242