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

Purge 'side' parameter #1083

Merged
merged 33 commits into from
Apr 24, 2021
Merged

Purge 'side' parameter #1083

merged 33 commits into from
Apr 24, 2021

Conversation

PetervDooren
Copy link
Contributor

@PetervDooren PetervDooren commented Feb 19, 2021

We dont want to refer to left or right arms because not every robot has two arms which are symetrical. For that reason we want to remove the parameter 'side' and replace it with something more general

Must be merged together with: tue-robotics/hero_description#11 and tue-robotics/hero_bridge#23

I think this should be tested on the real robot, just to be safe...

@PetervDooren PetervDooren self-assigned this Feb 19, 2021
@PetervDooren PetervDooren added maintenance Making existing code better in terms of style and setup requires robot This can only be worked on with access to the lab labels Feb 19, 2021
@PetervDooren PetervDooren linked an issue Feb 19, 2021 that may be closed by this pull request
@PetervDooren PetervDooren added this to the Generic robot interface milestone Feb 19, 2021
@PetervDooren PetervDooren marked this pull request as draft February 19, 2021 20:15
@PetervDooren PetervDooren marked this pull request as ready for review February 23, 2021 19:36
"""
def __init__(self, robot_name, tf_listener, get_joint_states, side):
def __init__(self, robot_name, tf_listener, get_joint_states, name):
Copy link
Contributor Author

Choose a reason for hiding this comment

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

To make this interface truly generic we should make it so that not all parameters, actions, tf_frames are linked via the arm name. Then we should allow these things as parameters to the interface. But that might be something for another day...

MatthijsBurgh
MatthijsBurgh previously approved these changes Feb 23, 2021
@PetervDooren
Copy link
Contributor Author

I don't think the the fact that we dont do this like that anywhere else is reason to change this.
I assume by 'this' you mean having a sensor topic as input?

@MatthijsBurgh
Copy link
Member

I don't mind having the sensor topic as argument. I only mind that we force a prefix of the robot name on the topic.

@PetervDooren
Copy link
Contributor Author

That is something we do with every topic/action/service. That is not something unusual in robot_skills

@MatthijsBurgh
Copy link
Member

No, we don't do this in robot_skills. Not for the ones that have the topic as the argument. I.E.

if image_topic is None:
self.image_topic = "/" + self.robot_name + "/top_kinect/rgb/image"
else:
self.image_topic = image_topic
if projection_srv is None:
projection_srv_name = '/' + robot_name + '/top_kinect/project_2d_to_3d'
else:
projection_srv_name = projection_srv

Copy link
Member

@MatthijsBurgh MatthijsBurgh left a comment

Choose a reason for hiding this comment

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

Please rebase before approval

robot_skills/package.xml Outdated Show resolved Hide resolved
MatthijsBurgh
MatthijsBurgh previously approved these changes Apr 6, 2021
Copy link
Member

@MatthijsBurgh MatthijsBurgh left a comment

Choose a reason for hiding this comment

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

Wait for CI before merging

@PetervDooren
Copy link
Contributor Author

All tests are passed when all repositories are checked out to fix/side_param
see https://dev.azure.com/tue-robotics/tue_robocup/_build/results?buildId=2494&view=results

@PetervDooren PetervDooren merged commit 83fdb1d into master Apr 24, 2021
@PetervDooren PetervDooren deleted the fix/side_param branch April 24, 2021 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance Making existing code better in terms of style and setup requires robot This can only be worked on with access to the lab
Projects
None yet
Development

Successfully merging this pull request may close these issues.

purge 'side' from robot_skills
3 participants