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

Update robot state if time since last command exceeds timeout (backport #3251) #3334

Merged
merged 1 commit into from
Feb 11, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 11, 2025

Description

When starting both move_group and moveit_servo simultaneously, controlling the arm with move_group first and then performing jog operations with moveit_servo resulted in the jog operations being executed from the arm's initial pose, without considering the results of the previous control.

To address this issue, the robot's state is now updated synchronously, halting other processes if no control commands are received for a duration exceeding the incoming_command_timeout, which indicates that no jog operations are being executed.

Checklist

  • Required by CI: Code is auto formatted using clang-format
  • Extend the tutorials / documentation reference
  • Document API changes relevant to the user in the MIGRATION.md notes
  • Create tests, which fail without this PR reference
  • Include a screenshot if changing a GUI
  • While waiting for someone to review your request, please help review another open pull request to support the maintainers

This is an automatic backport of pull request #3251 done by [Mergify](https://mergify.com).

* Update robot state if time since last command exceeds timeout

* update last_commanded_state_, when the command is staled

* resolve conflicts

* delete space

* chore: add new line

* refactor: if next_joint_state is nullopt, update robot state with blocking

* non-blocking update of robot status

* remove unused include file

(cherry picked from commit 09a654f)
@codecov-commenter
Copy link

codecov-commenter commented Feb 11, 2025

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 44.50%. Comparing base (6c5e6ec) to head (df1c22d).
Report is 1 commits behind head on jazzy.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##            jazzy    #3334      +/-   ##
==========================================
+ Coverage   44.14%   44.50%   +0.36%     
==========================================
  Files         700      700              
  Lines       61727    61748      +21     
  Branches     7487     7487              
==========================================
+ Hits        27245    27474     +229     
+ Misses      34314    34107     -207     
+ Partials      168      167       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sea-bass sea-bass merged commit 969db71 into jazzy Feb 11, 2025
6 of 7 checks passed
@sea-bass sea-bass deleted the mergify/bp/jazzy/pr-3251 branch February 11, 2025 13:43
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.

3 participants