-
Notifications
You must be signed in to change notification settings - Fork 74
Ligx/us/t100154 #85
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
StartAgainAgain
wants to merge
17
commits into
enactic:main
Choose a base branch
from
openvmi:ligx/us/t100154
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
Ligx/us/t100154 #85
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
9332ce6
update .gitignore
StartAgainAgain 9e28f50
add oy motor hardware interface
StartAgainAgain ae335da
add oy motor hardware interface
StartAgainAgain 89fe3fe
complete oy_hardware
StartAgainAgain 5a001e3
change class name
StartAgainAgain 7d4eb5b
更新 oy硬件接口,並配置插件“
StartAgainAgain 2245d10
add oy related files including controllers urdf and so on
StartAgainAgain 61a674b
update srdf config and add some comments
StartAgainAgain c0b7ac6
update calling function
StartAgainAgain 8d61c61
modify kp kd value
StartAgainAgain 069941e
update kp kd value
StartAgainAgain e104e92
update kp value
StartAgainAgain efbd450
Update repository URL and version for openarm_can
StartAgainAgain 3ad5a5b
decrease kp to 2 kd to 0.2 for end motor
StartAgainAgain 6a8ec46
Merge branch 'oy_openarm_ros2' of github.com:openvmi/openarm_ros2 int…
StartAgainAgain 57e2629
給joint_trajectory controller 添加 愛速度控制參數,防止抖動
StartAgainAgain bb7b88e
update launch config
StartAgainAgain 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,5 @@ | |
| .DS_Store | ||
| .vscode/ | ||
| __pycache__/ | ||
| .github/ | ||
| openarm_description/ | ||
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,59 @@ | ||
| # 註冊新硬件接口 | ||
| openarm_hardware.xml | ||
| ``` | ||
| class name="openarm_hardware/OpenArm_OYHW" | ||
| ``` | ||
|
|
||
|
|
||
| ## Markdown 內容樣式範例 | ||
|
|
||
| ### 標題 | ||
| ```markdown | ||
| # 一級標題 | ||
| ## 二級標題 | ||
| ### 三級標題 | ||
| ``` | ||
|
|
||
| ### 列表 | ||
| ```markdown | ||
| - 無序列表項目 1 | ||
| - 無序列表項目 2 | ||
|
|
||
| 1. 有序列表項目 1 | ||
| 2. 有序列表項目 2 | ||
| ``` | ||
|
|
||
| ### 程式碼區塊 | ||
| ```markdown | ||
| `行內程式碼` | ||
|
|
||
| ```python | ||
| def hello(): | ||
| print("Hello World") | ||
| ``` | ||
| ``` | ||
|
|
||
| ### 連結與圖片 | ||
| ```markdown | ||
| [連結文字](https://example.com) | ||
|  | ||
| ``` | ||
|
|
||
| ### 表格 | ||
| ```markdown | ||
| | 欄位1 | 欄位2 | 欄位3 | | ||
| |-------|-------|-------| | ||
| | 內容1 | 內容2 | 內容3 | | ||
| ``` | ||
|
|
||
| ### 引用 | ||
| ```markdown | ||
| > 這是一段引用文字 | ||
| ``` | ||
|
|
||
| ### 強調 | ||
| ```markdown | ||
| **粗體文字** | ||
| *斜體文字* | ||
| ~~刪除線~~ | ||
| ``` |
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
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
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
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
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
179 changes: 179 additions & 0 deletions
179
openarm_bringup/config/oy_controllers/openarm_oy_bimanual_controllers.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,179 @@ | ||
| # Copyright 2025 Enactic, Inc. | ||
| # Copyright 2024 Stogl Robotics Consulting UG (haftungsbeschränkt) | ||
| # | ||
| # 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. | ||
|
|
||
| controller_manager: | ||
| ros__parameters: | ||
| update_rate: 100 # Hz | ||
|
|
||
| joint_state_broadcaster: | ||
| type: joint_state_broadcaster/JointStateBroadcaster | ||
|
|
||
| left_forward_position_controller: | ||
| type: forward_command_controller/ForwardCommandController | ||
|
|
||
| left_forward_velocity_controller: | ||
| type: forward_command_controller/ForwardCommandController | ||
|
|
||
| left_joint_trajectory_controller: | ||
| type: joint_trajectory_controller/JointTrajectoryController | ||
|
|
||
| left_gripper_controller: | ||
| type: position_controllers/GripperActionController | ||
|
|
||
| right_forward_position_controller: | ||
| type: forward_command_controller/ForwardCommandController | ||
|
|
||
| right_forward_velocity_controller: | ||
| type: forward_command_controller/ForwardCommandController | ||
|
|
||
| right_joint_trajectory_controller: | ||
| type: joint_trajectory_controller/JointTrajectoryController | ||
|
|
||
| right_gripper_controller: | ||
| type: position_controllers/GripperActionController | ||
|
|
||
|
|
||
| left_forward_position_controller: | ||
| ros__parameters: | ||
| joints: | ||
| - openarm_left_joint1 | ||
| - openarm_left_joint2 | ||
| - openarm_left_joint3 | ||
| - openarm_left_joint4 | ||
| - openarm_left_joint5 | ||
| - openarm_left_joint6 | ||
| - openarm_left_joint7 | ||
| interface_name: position | ||
| command_interfaces: | ||
| - position | ||
| state_interfaces: | ||
| - position | ||
|
|
||
| left_forward_velocity_controller: | ||
| ros__parameters: | ||
| joints: | ||
| - openarm_left_joint1 | ||
| - openarm_left_joint2 | ||
| - openarm_left_joint3 | ||
| - openarm_left_joint4 | ||
| - openarm_left_joint5 | ||
| - openarm_left_joint6 | ||
| - openarm_left_joint7 | ||
| interface_name: velocity | ||
| command_interfaces: | ||
| - velocity | ||
| state_interfaces: | ||
| - velocity | ||
|
|
||
| left_joint_trajectory_controller: | ||
| ros__parameters: | ||
| joints: | ||
| - openarm_left_joint1 | ||
| - openarm_left_joint2 | ||
| - openarm_left_joint3 | ||
| - openarm_left_joint4 | ||
| - openarm_left_joint5 | ||
| - openarm_left_joint6 | ||
| - openarm_left_joint7 | ||
| interface_name: position | ||
| command_interfaces: | ||
| - position | ||
| - velocity | ||
| state_interfaces: | ||
| - position | ||
| - velocity | ||
|
|
||
| state_publish_rate: 50.0 # Defaults to 50 | ||
| action_monitor_rate: 50.0 # Defaults to 20 | ||
|
|
||
| allow_partial_joints_goal: false # Defaults to false | ||
| constraints: | ||
| stopped_velocity_tolerance: 0.05 # Relaxed for real motor velocity jitter | ||
| goal_time: 0.0 # Defaults to 0.0 (start immediately) | ||
|
|
||
| left_gripper_controller: | ||
| ros__parameters: | ||
| joint: openarm_left_finger_joint1 | ||
| command_interfaces: | ||
| - position | ||
| state_interfaces: | ||
| - position | ||
|
|
||
|
|
||
| right_forward_position_controller: | ||
| ros__parameters: | ||
| joints: | ||
| - openarm_right_joint1 | ||
| - openarm_right_joint2 | ||
| - openarm_right_joint3 | ||
| - openarm_right_joint4 | ||
| - openarm_right_joint5 | ||
| - openarm_right_joint6 | ||
| - openarm_right_joint7 | ||
| interface_name: position | ||
| command_interfaces: | ||
| - position | ||
| state_interfaces: | ||
| - position | ||
|
|
||
| right_forward_velocity_controller: | ||
| ros__parameters: | ||
| joints: | ||
| - openarm_right_joint1 | ||
| - openarm_right_joint2 | ||
| - openarm_right_joint3 | ||
| - openarm_right_joint4 | ||
| - openarm_right_joint5 | ||
| - openarm_right_joint6 | ||
| - openarm_right_joint7 | ||
| interface_name: velocity | ||
| command_interfaces: | ||
| - velocity | ||
| state_interfaces: | ||
| - velocity | ||
|
|
||
| right_joint_trajectory_controller: | ||
| ros__parameters: | ||
| joints: | ||
| - openarm_right_joint1 | ||
| - openarm_right_joint2 | ||
| - openarm_right_joint3 | ||
| - openarm_right_joint4 | ||
| - openarm_right_joint5 | ||
| - openarm_right_joint6 | ||
| - openarm_right_joint7 | ||
| interface_name: position | ||
| command_interfaces: | ||
| - position | ||
| - velocity | ||
| state_interfaces: | ||
| - position | ||
| - velocity | ||
|
|
||
| state_publish_rate: 50.0 # Defaults to 50 | ||
| action_monitor_rate: 50.0 # Defaults to 20 | ||
|
|
||
| allow_partial_joints_goal: false # Defaults to false | ||
| constraints: | ||
| stopped_velocity_tolerance: 0.05 # Relaxed for real motor velocity jitter | ||
| goal_time: 0.0 # Defaults to 0.0 (start immediately) | ||
|
|
||
| right_gripper_controller: | ||
| ros__parameters: | ||
| joint: openarm_right_finger_joint1 | ||
| command_interfaces: | ||
| - position | ||
| state_interfaces: | ||
| - position |
Oops, something went wrong.
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.
Switching the
.reposentry to an SSH URL (git@github.com:...) makesvcs importfail for users/CI without GitHub SSH keys configured. Prefer an HTTPS URL, and consider pinning to a tag/commit SHA instead of a moving branch to keep builds reproducible.