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

Adds the 'transmission' arg to the 'panda_arm.urdf.xacro' file #157

Conversation

rickstaa
Copy link
Contributor

@rickstaa rickstaa commented Aug 23, 2021

This commit gives users the ability to set the hardware_interface that is used in the panda arm joints when loading the panda_arm.urdf.xacro file.

@rickstaa
Copy link
Contributor Author

Closed since it is replaced by #181.

@rickstaa rickstaa closed this Oct 20, 2021
rhaschke added a commit to rhaschke/franka_ros that referenced this pull request Oct 27, 2021
@rickstaa rickstaa reopened this Oct 28, 2021
@rickstaa
Copy link
Contributor Author

@rhaschke I applied your changes and reopened this pull request. I will rebase #181 such that #157 and #181 can be merged independently.

@rickstaa rickstaa force-pushed the add_interface_arg_robot_description branch from 1b12b6d to 22abcf3 Compare October 28, 2021 12:15
rhaschke added a commit to rhaschke/franka_ros that referenced this pull request Oct 28, 2021
@rickstaa rickstaa force-pushed the add_interface_arg_robot_description branch 2 times, most recently from 45824e1 to 966ab00 Compare November 23, 2021 08:55
@rickstaa
Copy link
Contributor Author

@marcbone I rebased all my pull requests on the new develop branch. I will now apply the changes you requested in #177.

@rickstaa rickstaa force-pushed the add_interface_arg_robot_description branch from 966ab00 to b814001 Compare November 23, 2021 16:49
falfab added a commit that referenced this pull request Nov 25, 2021
…dency to develop

* commit '38b8584dc6eac66cd44d8532a238c745d5b1b6c3':
  Add: missing dependency in package.xml of franka_control
rickstaa added a commit to rickstaa/franka_ros that referenced this pull request Nov 25, 2021
This commit fixes a unhandeled conflict that is created when both frankaemika#181
and frankaemika#157 are merged.
rickstaa pushed a commit to rickstaa/franka_ros that referenced this pull request Dec 3, 2021
…ssing-dependency to develop

* commit '38b8584dc6eac66cd44d8532a238c745d5b1b6c3':
  Add: missing dependency in package.xml of franka_control
rickstaa added a commit to rickstaa/franka_ros that referenced this pull request Jan 22, 2022
This commit fixes a unhandeled conflict that is created when both frankaemika#181
and frankaemika#157 are merged.
@rickstaa rickstaa force-pushed the add_interface_arg_robot_description branch from e1619f2 to c5e9e9d Compare January 22, 2022 15:40
@rickstaa
Copy link
Contributor Author

rickstaa commented Jan 22, 2022

@fwalch, @marcbone I'm not sure why the gh-action seems to fail after my last rebase onto the develop branch. Before the rebase the gh-action passed without any errors. Looks like you added extra tests which is a good thing. I think it is because #181 needs to be merged first as on my PC when I merge both pull requests everything works fine.

This commit gives users the ability to set the hardware_interface that
is used in the panda arm joints when loading the 'panda_arm.urdf.xacro'
file.
rhaschke and others added 3 commits February 15, 2022 10:25
Automatically translate into full name, e.g. hardware_interface/PositionJointInterface
This commit fixes a unhandeled conflict that is created when both frankaemika#181
and frankaemika#157 are merged.
@rickstaa rickstaa force-pushed the add_interface_arg_robot_description branch from c5e9e9d to 1cc9431 Compare February 15, 2022 09:25
@rickstaa
Copy link
Contributor Author

@gollth Similar to #181, I rebased this pr on the develop branch. I will also create a combined pull request for ease of review since they are closely related.

marcbone pushed a commit that referenced this pull request Mar 10, 2022
This commit fixes a unhandeled conflict that is created when both #181
and #157 are merged.
@marcbone marcbone closed this Mar 10, 2022
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