Skip to content

[Cont'd] Improved ball placement from RoboCup 2024#3597

Draft
Apeiros-46B wants to merge 46 commits intoUBC-Thunderbots:masterfrom
Apeiros-46B:ball_placement
Draft

[Cont'd] Improved ball placement from RoboCup 2024#3597
Apeiros-46B wants to merge 46 commits intoUBC-Thunderbots:masterfrom
Apeiros-46B:ball_placement

Conversation

@Apeiros-46B
Copy link
Copy Markdown
Member

Description

Continuation of #3447

Ball placement play by @mkhlb from RoboCup 2024.
Comments regarding ball placement play from #3415 have been addressed.

Testing Done

Resolved Issues

Length Justification and Key Files to Review

Review Checklist

It is the reviewers responsibility to also make sure every item here has been covered

  • Function & Class comments: All function definitions (usually in the .h file) should have a javadoc style comment at the start of them. For examples, see the functions defined in thunderbots/software/geom. Similarly, all classes should have an associated Javadoc comment explaining the purpose of the class.
  • Remove all commented out code
  • Remove extra print statements: for example, those just used for testing
  • Resolve all TODO's: All TODO (or similar) statements should either be completed or associated with a github issue

mkhlb and others added 30 commits June 4, 2024 18:41
… ball placement go back to aligning when ball is lost
…_testing_june_4

# Conflicts:
#	src/software/ai/hl/stp/play/ball_placement/ball_placement_play_fsm.h
TryErr04 and others added 9 commits March 1, 2025 17:36
…into ball_placement

# Conflicts:
#	src/software/ai/hl/stp/play/ball_placement/ball_placement_play_fsm.cpp
#	src/software/ai/hl/stp/play/ball_placement/ball_placement_play_fsm.h
#	src/software/ai/hl/stp/play/ball_placement/ball_placement_play_fsm_test.cpp
#	src/software/ai/hl/stp/tactic/dribble/dribble_tactic.cpp
Comment on lines +16 to +17
// Subtract b from a, or return 0 if b is larger than a
static unsigned int subSat(unsigned int a, unsigned int b)
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Should this be moved to another file?

* Exclude goalie from placing robot selection
* Remember setup angle and check alignment in alignDone
* Add ballLost check
* Move friendly robots out of the way when setting up move tactics
* "fix" robot bumping ball when retreating
* check velocity in align guards
* remember placing robot ID to prevent oscillation
* temporary friendly robot safe zone logic (need to fix later since rn it goes into goals)
* The fix is slightly suboptimal and relies on a hardcoded fix, will
  investigate better options soon
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.

4 participants