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

Split MoveToMouth Into Two Separate Actions #128

Merged
merged 15 commits into from
Nov 14, 2023

Conversation

amalnanavati
Copy link
Contributor

@amalnanavati amalnanavati commented Nov 13, 2023

Description

In service of #127 . This PR separates bite transfer into two separate actions, one to move to the staging configuration and the other to move to the mouth. It is coupled with feeding_web_interface#94.

Testing procedure

Run the code as documented in the README. Then, run the below sequence of actions and verify that they work as expected.

  • Sim:
    • ros2 action send_goal /MoveAbovePlate ada_feeding_msgs/action/MoveTo "{}" --feedback
    • ros2 action send_goal /MoveToRestingPosition ada_feeding_msgs/action/MoveTo "{}" --feedback
    • ros2 action send_goal /MoveToStagingConfiguration ada_feeding_msgs/action/MoveTo "{}" --feedback
    • ros2 action send_goal /MoveToMouth ada_feeding_msgs/action/MoveToMouth "{}" --feedback
    • ros2 action send_goal /MoveFromMouthToStagingConfiguration ada_feeding_msgs/action/MoveTo "{}" --feedback
    • ros2 action send_goal /MoveFromMouthToRestingPosition ada_feeding_msgs/action/MoveTo "{}" --feedback
    • ros2 action send_goal /MoveToStagingConfiguration ada_feeding_msgs/action/MoveTo "{}" --feedback
    • ros2 action send_goal /MoveToMouth ada_feeding_msgs/action/MoveToMouth "{}" --feedback
    • ros2 action send_goal /MoveFromMouthToAbovePlate ada_feeding_msgs/action/MoveTo "{}" --feedback
  • Real:
    • ros2 action send_goal /MoveAbovePlate ada_feeding_msgs/action/MoveTo "{}" --feedback
    • ros2 action send_goal /MoveToRestingPosition ada_feeding_msgs/action/MoveTo "{}" --feedback
    • ros2 action send_goal /MoveToStagingConfiguration ada_feeding_msgs/action/MoveTo "{}" --feedback
    • ros2 action send_goal /MoveToMouth ada_feeding_msgs/action/MoveToMouth "{}" --feedback
    • ros2 action send_goal /MoveFromMouthToStagingConfiguration ada_feeding_msgs/action/MoveTo "{}" --feedback
    • ros2 action send_goal /MoveFromMouthToRestingPosition ada_feeding_msgs/action/MoveTo "{}" --feedback
    • ros2 action send_goal /MoveToStagingConfiguration ada_feeding_msgs/action/MoveTo "{}" --feedback
    • ros2 action send_goal /MoveToMouth ada_feeding_msgs/action/MoveToMouth "{}" --feedback
    • ros2 action send_goal /MoveFromMouthToAbovePlate ada_feeding_msgs/action/MoveTo "{}" --feedback
  • Full test with web app: follow instructions in feeding_web_interface#94.

Before opening a pull request

  • Format your code using black formatter python3 -m black .
  • Run your code through pylint and address all warnings/errors. The only warnings that are acceptable to not address is TODOs that should be addressed in a future PR. From the top-level ada_feeding directory, run: pylint --recursive=y --rcfile=.pylintrc ..

Before Merging

  • Squash & Merge

ada_feeding/ada_feeding/behaviors/ros_utility.py Outdated Show resolved Hide resolved
ada_feeding/ada_feeding/behaviors/ros_utility.py Outdated Show resolved Hide resolved
ada_feeding/ada_feeding/behaviors/ros_utility.py Outdated Show resolved Hide resolved
ada_feeding/ada_feeding/behaviors/ros_utility.py Outdated Show resolved Hide resolved
@amalnanavati amalnanavati merged commit 7295169 into ros2-devel Nov 14, 2023
@amalnanavati amalnanavati deleted the amaln/move_to_mouth_split branch November 14, 2023 02:21
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.

[ROS2] Separate MoveToMouth into Two Actions
1 participant