Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port to VORC #19

Merged
merged 7 commits into from
Nov 20, 2020
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
199 changes: 82 additions & 117 deletions README.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions generate_trial_video.bash
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ is_gzclient_running()
fi
}

# Wait until the gazebo world stats topic (eg. /gazebo/robotx_example_course/world_stats /gazebo/<world>/world_stats)
# Wait until the gazebo world stats topic (eg. /gazebo/<world>/world_stats)
# tells us that the playback has been paused. This event will trigger the end of the recording.
wait_until_playback_ends()
{
Expand Down Expand Up @@ -108,14 +108,14 @@ x=$x
y=$y" > ~/.gazebo/gui.ini

# Start Gazebo in playback mode
roslaunch vrx_gazebo playback.launch log_file:=$GZ_LOG_FILE paused:=true verbose:=true \
roslaunch vorc_gazebo playback.launch log_file:=$GZ_LOG_FILE paused:=true verbose:=true \
> $OUTPUT.playback_output.txt 2>&1 &
sleep 1s

# Check if the log file has errors, likely forgot to source ws
if grep -Fq "RLException" $OUTPUT.playback_output.txt
then
echo "Failed to find playback launch file. Did you source your vrx_ws?"
echo "Failed to find playback launch file. Did you source your vorc_ws?"
exit 1
fi

Expand Down
35 changes: 0 additions & 35 deletions generated/task_generated/dock/world_xacros/dock0.world.xacro

This file was deleted.

35 changes: 0 additions & 35 deletions generated/task_generated/dock/world_xacros/dock1.world.xacro

This file was deleted.

35 changes: 0 additions & 35 deletions generated/task_generated/dock/world_xacros/dock2.world.xacro

This file was deleted.

Loading