-
Notifications
You must be signed in to change notification settings - Fork 12
Bump 1.4.8 #56
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
Merged
Merged
Bump 1.4.8 #56
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
eb407cb
add rosdep ci
GyuH13 98be8ba
Merge pull request #53 from ROBOTIS-GIT/feature-rosdep-ci
robotpilot 39ec66e
feat: Add new model configuration for omy_end_rh_p12_rn and update dy…
Woojin-Crive 820bd44
feat: Enhance data handling in SetDxlValueToSyncWrite and SetDxlValue…
Woojin-Crive 6e9a7bc
feat: Add indirect data handling to omy_hat model with new read and w…
Woojin-Crive e4e8544
refactor: Remove unused parameters from omy_end model configuration
Woojin-Crive d7f8428
feat: Update joint synchronization process by adding prior goal posit…
Woojin-Crive 710eab9
chore: Bump version to 1.4.8 and update changelog with new OMY model …
Woojin-Crive f519f98
Merge pull request #54 from ROBOTIS-GIT/feature-omy-end
Woojin-Crive 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 |
|---|---|---|
|
|
@@ -49,6 +49,23 @@ jobs: | |
| with: | ||
| required-ros-distributions: ${{ matrix.ros_distribution }} | ||
|
|
||
| - name: Check and Install ROS dependencies | ||
| shell: bash | ||
| run: | | ||
| set -e | ||
| source /opt/ros/${{ matrix.ros_distribution }}/setup.bash | ||
| echo "--- Updating rosdep definitions ---" | ||
| rosdep update | ||
| echo "--- Installing system dependencies for ROS 2 ${{ matrix.ros_distribution }} ---" | ||
| rosdep install --from-paths ros_ws/src --ignore-src -y -r --rosdistro ${{ matrix.ros_distribution }} | ||
| echo "--- Performing rosdep check for ROS 2 ${{ matrix.ros_distribution }} ---" | ||
| if rosdep check --from-paths ros_ws/src --ignore-src --rosdistro ${{ matrix.ros_distribution }}; then | ||
| echo "--- rosdep check passed ---" | ||
| else | ||
| echo "--- rosdep check failed: Missing system dependencies or unresolvable keys. ---" | ||
| exit 1 | ||
| fi | ||
|
|
||
| - name: Build and Test | ||
| uses: ros-tooling/[email protected] | ||
| with: | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| [type info] | ||
| name value | ||
| value_of_zero_radian_position 0 | ||
| value_of_max_radian_position 740 | ||
| value_of_min_radian_position -740 | ||
| min_radian -1.099 | ||
| max_radian 1.099 | ||
| velocity_unit 0.114 | ||
|
|
||
| [control table] | ||
| Address Size Data Name | ||
| 72 1 Hardware Error Status | ||
| 73 1 Moving | ||
| 74 2 Present Current | ||
| 76 4 Present Velocity | ||
| 80 4 Present Position | ||
| 84 4 Position Trajectory | ||
| 200 1 Torque Enable | ||
| 202 2 Goal Current | ||
| 204 4 Goal Velocity | ||
| 208 4 Goal Position |
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
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -1834,6 +1834,20 @@ DxlError Dynamixel::SetDxlValueToSyncWrite() | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| int16_t goal_current = dxl_info_.ConvertEffortToCurrent(ID, data); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 0] = DXL_LOBYTE(goal_current); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 1] = DXL_HIBYTE(goal_current); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } else { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| if (indirect_info_write_[comm_id].item_size.at(item_index) == 4) { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| int32_t value = static_cast<int32_t>(data); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 0] = DXL_LOBYTE(DXL_LOWORD(value)); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 1] = DXL_HIBYTE(DXL_LOWORD(value)); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 2] = DXL_LOBYTE(DXL_HIWORD(value)); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 3] = DXL_HIBYTE(DXL_HIWORD(value)); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } else if (indirect_info_write_[comm_id].item_size.at(item_index) == 2) { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| int16_t value = static_cast<int16_t>(data); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 0] = DXL_LOBYTE(value); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 1] = DXL_HIBYTE(value); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } else if (indirect_info_write_[comm_id].item_size.at(item_index) == 1) { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte] = static_cast<uint8_t>(data); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| added_byte += indirect_info_write_[comm_id].item_size.at(item_index); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
@@ -2053,6 +2067,20 @@ DxlError Dynamixel::SetDxlValueToBulkWrite() | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| int16_t goal_current = dxl_info_.ConvertEffortToCurrent(ID, data); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 0] = DXL_LOBYTE(goal_current); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 1] = DXL_HIBYTE(goal_current); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } else { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| if (indirect_info_write_[comm_id].item_size.at(item_index) == 4) { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| int32_t value = static_cast<int32_t>(data); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 0] = DXL_LOBYTE(DXL_LOWORD(value)); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 1] = DXL_HIBYTE(DXL_LOWORD(value)); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 2] = DXL_LOBYTE(DXL_HIWORD(value)); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 3] = DXL_HIBYTE(DXL_HIWORD(value)); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } else if (indirect_info_write_[comm_id].item_size.at(item_index) == 2) { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| int16_t value = static_cast<int16_t>(data); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 0] = DXL_LOBYTE(value); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte + 1] = DXL_HIBYTE(value); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } else if (indirect_info_write_[comm_id].item_size.at(item_index) == 1) { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| param_write_value[added_byte] = static_cast<uint8_t>(data); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+2070
to
2084
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. Consider adding a default case to the
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| added_byte += indirect_info_write_[comm_id].item_size.at(item_index); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
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.
Consider adding a default case to the
if/else ifblock to handle unexpecteditem_sizevalues. This can help prevent unexpected behavior if a new item size is introduced in the future.