Skip to content

Use time argument on update function instead of node time#296

Merged
destogl merged 2 commits intoros-controls:masterfrom
erickisos:issue#290
Mar 12, 2022
Merged

Use time argument on update function instead of node time#296
destogl merged 2 commits intoros-controls:masterfrom
erickisos:issue#290

Conversation

@erickisos
Copy link
Copy Markdown
Contributor

Closes #290

@peterdavidfagan
Copy link
Copy Markdown
Member

peterdavidfagan commented Feb 17, 2022

@bmagyar @erickisos @malapatiravi , I'll look to set some time aside this weekend to start taking a look at these changes.

Thanks @erickisos for opening this pull-request.

@erickisos
Copy link
Copy Markdown
Contributor Author

Let me check if is finished then, because I saw something about a bad comparison between vars

@peterdavidfagan
Copy link
Copy Markdown
Member

peterdavidfagan commented Feb 20, 2022

Hi @erickisos,

I am still getting up to speed with the codebase and the joint_trajectory_controller.cpp script as a result I have not as of yet completed my review but hope to do so in the coming days.

One note I came across was what looks like a typo in some of the variable names for instance here should read interface rather than inteface. While minor and somewhat inconsequential I'd be happy to open a separate pr to clean this up if you agree this looks like a simple naming typo.

Also it looks like certain tests/checks are currently failing as you mentioned above. Once I get up to speed I can take a look at these also.

Have a great start to the new week and hopefully we can get these changes merged by the end of the upcoming week.

@destogl destogl marked this pull request as draft February 21, 2022 08:33
@destogl destogl marked this pull request as ready for review February 21, 2022 08:33
Copy link
Copy Markdown
Member

@bmagyar bmagyar left a comment

Choose a reason for hiding this comment

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

looks good to me!

@bmagyar
Copy link
Copy Markdown
Member

bmagyar commented Feb 25, 2022

The error you see on the CI has to do with the time we use in the tests. The different time source error appears when you are trying ot mix ROS time with system time or simulated time. Probably we don't use the right one to compare values in the tests.

Copy link
Copy Markdown
Member

@malapatiravi malapatiravi left a comment

Choose a reason for hiding this comment

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

looks good to me. someone else should approve.

@peterdavidfagan
Copy link
Copy Markdown
Member

@bmagyar should we open a separate issue to review the CI tests? I haven't completely finished my review but in order to not slow things down (and since a maintainer already approved this pr) I will also approve this pr.

Copy link
Copy Markdown
Member

@peterdavidfagan peterdavidfagan left a comment

Choose a reason for hiding this comment

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

The pull request successfully uses the time argument within update function where node time was previously used.

Some CI tests cases are failing (see here) and there appears to be a minor typo in variable naming within joint_trajectory_controller.cpp script (see here). I will look to follow up on these points in subsequent issues.

Approving for now.

@erickisos
Copy link
Copy Markdown
Contributor Author

Just in case, the inteface problem is solved now, I didn't check the problem with the RHEL verifications, but if you need help with that I can check that later on.

@bmagyar
Copy link
Copy Markdown
Member

bmagyar commented Feb 28, 2022

Ignore the RHEL issue, focus on this instead:

  >>>
- joint_trajectory_controller.OnlyVelocityTrajectoryControllers/TrajectoryControllerTestParameterized test_ignore_partial_old_trajectory/0
  <<< failure message
    unknown file
    C++ exception with description "can't compare times with different time sources" thrown in the test body.
  >>>
- joint_trajectory_controller.OnlyVelocityTrajectoryControllers/TrajectoryControllerTestParameterized test_ignore_partial_old_trajectory/1
  <<< failure message
    unknown file
    C++ exception with description "can't compare times with different time sources" thrown in the test body.

@erickisos
Copy link
Copy Markdown
Contributor Author

Thanks @bmagyar let me check

Copy link
Copy Markdown
Member

@destogl destogl left a comment

Choose a reason for hiding this comment

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

Looking good thanks!

P.S. Thanks for the typo correction. Probably have introduced it 😄

@destogl destogl merged commit b201524 into ros-controls:master Mar 12, 2022
@peterdavidfagan
Copy link
Copy Markdown
Member

peterdavidfagan commented Mar 23, 2022

Looking good thanks!

P.S. Thanks for the typo correction. Probably have introduced it smile

Apologies I had exams so was away for a while, great to see this merged. Also happy to go through the codebase when I have the chance to, hopefully I'll be able to help out further at some point in the future when I'm more familiar with the codebase.

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.

joint_trajectory_controller should not use now() but rely on time passed in through the update() function

5 participants