-
Notifications
You must be signed in to change notification settings - Fork 80
add v20 support #87
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
Open
tokirobot
wants to merge
23
commits into
enactic:main
Choose a base branch
from
tokirobot:feature/v2.0
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
add v20 support #87
Changes from 18 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
f762e03
add v20 support
tokirobot 770aa68
run precommit
tokirobot e57b42e
add version arg
tokirobot de066f4
add fake hardware in moveit
tokirobot 439c3ab
fix pilz file path
tokirobot e46249c
modify moveit config
tokirobot fc7ad23
feat: add dora ros2 node and camera integration
tokirobot ea6ead5
modify moveit config
tokirobot 2970090
bring up per version
tokirobot 2ad0c06
add moveit robot version config
tokirobot 3ec23a7
modify controller param
tokirobot 492b307
delete teleop setting
tokirobot 67342fe
add init interpolate in hardware
tokirobot 9fc599d
pre commmit
tokirobot 1c3b287
modify package.xml
tokirobot 3179ced
add place holder
tokirobot 4d9de18
modify 20 to 2.0
tokirobot 225c612
Merge remote-tracking branch 'upstream/main' into feature/v2.0
tokirobot e9f579b
modify bimanual controller
tokirobot a7a92b7
modify bimanual_controllers.yaml bug
tokirobot 85418cb
chore: remove openarm_dora_ros2 from tracking
tokirobot 54adc31
add camera config
tokirobot 9ed74d8
modify gripper
tokirobot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,3 +2,6 @@ | |
| .DS_Store | ||
| .vscode/ | ||
| __pycache__/ | ||
| **/out/ | ||
| .venv/ | ||
| venv/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
252 changes: 0 additions & 252 deletions
252
openarm_bimanual_moveit_config/config/openarm_bimanual.srdf
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
143 changes: 143 additions & 0 deletions
143
openarm_bimanual_moveit_config/config/openarm_v1.0/openarm_bimanual.srdf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Copyright 2025 Enactic, Inc. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
|
|
||
| <!--This does not replace URDF, and is not an extension of URDF. | ||
| This is a format for representing semantic information about the robot structure. | ||
| A URDF file must exist for this robot as well, where the joints and the links that are referenced are defined | ||
| --> | ||
| <robot name="openarm"> | ||
| <!--GROUPS: Representation of a set of joints and links. This can be useful for specifying DOF to plan for, defining arms, end effectors, etc--> | ||
| <!--LINKS: When a link is specified, the parent joint of that link (if it exists) is automatically included--> | ||
| <!--JOINTS: When a joint is specified, the child link of that joint (which will always exist) is automatically included--> | ||
| <!--CHAINS: When a chain is specified, all the links along the chain (including endpoints) are included in the group. Additionally, all the joints that are parents to included links are also included. This means that joints along the chain and the parent joint of the base link are included in the group--> | ||
| <!--SUBGROUPS: Groups can also be formed by referencing to already defined group names--> | ||
| <group name="left_arm"> | ||
| <joint name="openarm_left_joint1"/> | ||
| <joint name="openarm_left_joint2"/> | ||
| <joint name="openarm_left_joint3"/> | ||
| <joint name="openarm_left_joint4"/> | ||
| <joint name="openarm_left_joint5"/> | ||
| <joint name="openarm_left_joint6"/> | ||
| <joint name="openarm_left_joint7"/> | ||
| </group> | ||
| <group name="right_arm"> | ||
| <joint name="openarm_right_joint1"/> | ||
| <joint name="openarm_right_joint2"/> | ||
| <joint name="openarm_right_joint3"/> | ||
| <joint name="openarm_right_joint4"/> | ||
| <joint name="openarm_right_joint5"/> | ||
| <joint name="openarm_right_joint6"/> | ||
| <joint name="openarm_right_joint7"/> | ||
| </group> <!--GROUP STATES: Purpose: Define a named state for a particular group, in terms of joint values. This is useful to define states like 'folded arms'--> | ||
| <group name="left_gripper"> | ||
| <joint name="openarm_left_finger_joint1"/> | ||
| </group> | ||
| <group name="right_gripper"> | ||
| <joint name="openarm_right_finger_joint1"/> | ||
| </group> | ||
| <group_state name="home" group="left_arm"> | ||
| <joint name="openarm_left_joint1" value="0"/> | ||
| <joint name="openarm_left_joint2" value="0"/> | ||
| <joint name="openarm_left_joint3" value="0"/> | ||
| <joint name="openarm_left_joint4" value="0"/> | ||
| <joint name="openarm_left_joint5" value="0"/> | ||
| <joint name="openarm_left_joint6" value="0"/> | ||
| <joint name="openarm_left_joint7" value="0"/> | ||
| </group_state> | ||
| <group_state name="home" group="right_arm"> | ||
| <joint name="openarm_right_joint1" value="0"/> | ||
| <joint name="openarm_right_joint2" value="0"/> | ||
| <joint name="openarm_right_joint3" value="0"/> | ||
| <joint name="openarm_right_joint4" value="0"/> | ||
| <joint name="openarm_right_joint5" value="0"/> | ||
| <joint name="openarm_right_joint6" value="0"/> | ||
| <joint name="openarm_right_joint7" value="0"/> | ||
| </group_state> | ||
| <group_state name="hands_up" group="left_arm"> | ||
| <joint name="openarm_left_joint1" value="0"/> | ||
| <joint name="openarm_left_joint2" value="0"/> | ||
| <joint name="openarm_left_joint3" value="0"/> | ||
| <joint name="openarm_left_joint4" value="2"/> | ||
| <joint name="openarm_left_joint5" value="0"/> | ||
| <joint name="openarm_left_joint6" value="0"/> | ||
| <joint name="openarm_left_joint7" value="0"/> | ||
| </group_state> | ||
| <group_state name="hands_up" group="right_arm"> | ||
| <joint name="openarm_right_joint1" value="0"/> | ||
| <joint name="openarm_right_joint2" value="0"/> | ||
| <joint name="openarm_right_joint3" value="0"/> | ||
| <joint name="openarm_right_joint4" value="2"/> | ||
| <joint name="openarm_right_joint5" value="0"/> | ||
| <joint name="openarm_right_joint6" value="0"/> | ||
| <joint name="openarm_right_joint7" value="0"/> | ||
| </group_state> | ||
| <group_state name="closed" group="left_gripper"> | ||
| <joint name="openarm_left_finger_joint1" value="0"/> | ||
| </group_state> | ||
| <group_state name="closed" group="right_gripper"> | ||
| <joint name="openarm_right_finger_joint1" value="0"/> | ||
| </group_state> | ||
| <group_state name="half closed" group="left_gripper"> | ||
| <joint name="openarm_left_finger_joint1" value="0.022"/> | ||
| </group_state> | ||
| <group_state name="half_closed" group="right_gripper"> | ||
| <joint name="openarm_right_finger_joint1" value="0.022"/> | ||
| </group_state> | ||
| <group_state name="open" group="left_gripper"> | ||
| <joint name="openarm_left_finger_joint1" value="0.044"/> | ||
| </group_state> | ||
| <group_state name="open" group="right_gripper"> | ||
| <joint name="openarm_right_finger_joint1" value="0.044"/> | ||
| </group_state> | ||
| <!--END EFFECTOR: Purpose: Represent information about an end effector.--> | ||
| <end_effector name="left_ee" parent_link="openarm_left_hand" group="left_gripper"/> | ||
| <end_effector name="right_ee" parent_link="openarm_right_hand" group="right_gripper"/> | ||
| <!--PASSIVE JOINT: Purpose: this element is used to mark joints that are not actuated--> | ||
| <passive_joint name="openarm_left_finger_joint2"/> | ||
| <passive_joint name="openarm_right_finger_joint2"/> | ||
|
|
||
| <!--DISABLE COLLISIONS: By default it is assumed that any link of the robot could potentially come into collision with any other link in the robot. This tag disables collision checking between a specified pair of links. --> | ||
| <disable_collisions link1="openarm_body_link0" link2="openarm_left_link0" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_body_link0" link2="openarm_right_link0" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_left_hand" link2="openarm_left_left_finger" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_left_hand" link2="openarm_left_link7" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_left_hand" link2="openarm_left_right_finger" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_left_left_finger" link2="openarm_left_right_finger" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_left_link0" link2="openarm_left_link1" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_left_link1" link2="openarm_left_link2" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_left_link2" link2="openarm_left_link3" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_left_link3" link2="openarm_left_link4" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_left_link4" link2="openarm_left_link5" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_left_link5" link2="openarm_left_link6" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_left_link6" link2="openarm_left_link7" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_right_hand" link2="openarm_right_left_finger" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_right_hand" link2="openarm_right_link7" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_right_hand" link2="openarm_right_right_finger" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_right_left_finger" link2="openarm_right_right_finger" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_right_link0" link2="openarm_right_link1" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_right_link1" link2="openarm_right_link2" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_right_link2" link2="openarm_right_link3" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_right_link3" link2="openarm_right_link4" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_right_link4" link2="openarm_right_link5" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_right_link5" link2="openarm_right_link6" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_right_link6" link2="openarm_right_link7" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_left_link7" link2="openarm_left_left_finger" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_left_link7" link2="openarm_left_right_finger" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_right_link7" link2="openarm_right_left_finger" reason="Adjacent"/> | ||
| <disable_collisions link1="openarm_right_link7" link2="openarm_right_right_finger" reason="Adjacent"/> | ||
|
|
||
| </robot> | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This file doesn't appear to be referenced anywhere in the repo. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
104 changes: 104 additions & 0 deletions
104
openarm_bimanual_moveit_config/config/openarm_v2.0/joint_limits.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| # Copyright 2025 Enactic, Inc. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # joint_limits.yaml allows the dynamics properties specified in the URDF to be overwritten or augmented as needed | ||
|
|
||
| # For beginners, we downscale velocity and acceleration limits. | ||
| # You can always specify higher scaling factors (<= 1.0) in your motion requests. # Increase the values below to 1.0 to always move at maximum speed. | ||
| default_velocity_scaling_factor: 0.1 | ||
| default_acceleration_scaling_factor: 0.1 | ||
|
|
||
| # Specific joint properties can be changed with the keys [max_position, min_position, max_velocity, max_acceleration] | ||
| # Joint limits can be turned off with [has_velocity_limits, has_acceleration_limits] | ||
| joint_limits: | ||
| openarm_left_finger_joint1: | ||
| has_velocity_limits: true | ||
| max_velocity: 10.0 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 | ||
| openarm_left_joint1: | ||
| has_velocity_limits: true | ||
| max_velocity: 16.754666 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 | ||
| openarm_left_joint2: | ||
| has_velocity_limits: true | ||
| max_velocity: 16.754666 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 | ||
| openarm_left_joint3: | ||
| has_velocity_limits: true | ||
| max_velocity: 5.445426 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 | ||
| openarm_left_joint4: | ||
| has_velocity_limits: true | ||
| max_velocity: 5.445426 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 | ||
| openarm_left_joint5: | ||
| has_velocity_limits: true | ||
| max_velocity: 20.943946 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 | ||
| openarm_left_joint6: | ||
| has_velocity_limits: true | ||
| max_velocity: 20.943946 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 | ||
| openarm_left_joint7: | ||
| has_velocity_limits: true | ||
| max_velocity: 20.943946 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 | ||
| openarm_right_finger_joint1: | ||
| has_velocity_limits: true | ||
| max_velocity: 10.0 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 | ||
| openarm_right_joint1: | ||
| has_velocity_limits: true | ||
| max_velocity: 16.754666 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 | ||
| openarm_right_joint2: | ||
| has_velocity_limits: true | ||
| max_velocity: 16.754666 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 | ||
| openarm_right_joint3: | ||
| has_velocity_limits: true | ||
| max_velocity: 5.445426 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 | ||
| openarm_right_joint4: | ||
| has_velocity_limits: true | ||
| max_velocity: 5.445426 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 | ||
| openarm_right_joint5: | ||
| has_velocity_limits: true | ||
| max_velocity: 20.943946 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 | ||
| openarm_right_joint6: | ||
| has_velocity_limits: true | ||
| max_velocity: 20.943946 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 | ||
| openarm_right_joint7: | ||
| has_velocity_limits: true | ||
| max_velocity: 20.943946 | ||
| has_acceleration_limits: false | ||
| max_acceleration: 0.0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
<disable_collisions ... reason="Never"/>entries that existed in the originalopenarm_bimanual_moveit_config/config/openarm_bimanual.srdf(https://github.com/enactic/openarm_ros2/pull/87/files#diff-1fb394c194aa822f4b5be059252b7e7490957bfb127f7ec4298de263b1da53c4) have been dropped in the renamed file.Is this intentional?