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

[Garden] Port scan, dock, deliver - Part 2 #541

Merged
merged 16 commits into from
Nov 23, 2022
Merged

Conversation

caguero
Copy link
Contributor

@caguero caguero commented Nov 17, 2022

This pull request partially ports the ScanDockScoringPlugin from Gazebo classic. In particular, it ports the functionality related with the dock checker.

How to test it?

  • Launch the scan_dock_deliver_task world:
ros2 launch vrx_gz competition.launch.py world:=scan_dock_deliver_task

When the simulation transitions to the ready state (~10secs), you should see how the placards update their symbols to the ones specified in SDF (yellow circle, blue triangle and red rectangle).

  • On a new terminal launch the joystick teleop node:
ros2 launch vrx_gz usv_joy_teleop.py
  • On a new terminal check the /vrx/task/info topic:
ros2 topic  echo /vrx/task/info
  • Now, teleop the WAM-V to a bay. A successful docking maneuver consists on staying for around <min_dock_time> (10 seconds) in a docking bay, and then, leave. Verify that you get 15 points for docking in any bay and 5 extra points if you dock in the correct bay (the central one). Keep also in mind that the simulation will terminate after any successful docking.

Bonus: I reduced the sensitivity of the joystick teleoperation.

Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Carlos Agüero <[email protected]>
Base automatically changed from caguero/scan_dock to gazebosim November 18, 2022 21:23
Copy link
Collaborator

@M1chaelM M1chaelM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made some minor superficial changes to variable names to align with the fact that docking in the wrong bay is still "allowed" but just doesn't get extra points.

Everything is working correctly but because the simulation exits so quickly the score in /vrx/task/info does not have time to update. Maybe another reason to allow the simulation to stay up for a bit after the task is over?

@caguero
Copy link
Contributor Author

caguero commented Nov 23, 2022

os2 topic echo /vrx/task/info

I just verified that the score is correct and it seems so:

[ruby $(which gz) sim-1] [Msg] [ScanDockScoringPlugin.cc:720] Score: 20

I'm not opposed to delay the termination, we can consider it in a separate PR.

@caguero caguero merged commit b147cf4 into gazebosim Nov 23, 2022
@caguero caguero deleted the caguero/scan_dock_2 branch November 23, 2022 20:37
@caguero caguero mentioned this pull request Nov 29, 2022
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants