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

jazzy対応(MoveitConfigsBuilder) #78

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Conversation

mizonon
Copy link

@mizonon mizonon commented Aug 8, 2024

What does this implement/fix?

MoveitConfigsBuilderについてのJazzy対応です。

Does this close any currently open issues?

How has this been tested?

crane_prus_exampleのdemo.launchとサンプルプログラムを使って、humble環境と同じように動作するか確認しました。

Any other comments?

誤ってhumble_develブランチから本作業ブランチを切っていたため、改めてmasterブランチから作業ブランチを作成し、複数あったコミットを一つに集約した上でこちらのブランチにコピーし、PR作成しております。

Checklists

* MoveitCofigsBuilderを使ってmoveit_configの枠を作る

* planning_plugins, requesr_adaptorsの設定をompl_planning.yamlの先頭で行う

* ompl_planning.yamlにstart_state_max_bounds_errorの設定を追加

* 7/19ここまで

* MoveitConfigsBuilderを使うに伴った、yamlファイルの指定の項目追加

* 一通りMoveItConfigsBuilderに対応

* MoveIt Setup Assistantを使って設定ファイルを生成

* urdfの指定を追加

* crane_plus_configのrun_move_group.launchを呼ぶ

* Unable to parse SRDFのエラーが解決できない

* demo.launchが起動できるようになった

* 余計なコメントアウト部分削除

* 余計なコメントアウト削除

* rviz上でMottionPlanningができるようになった

* 余計なコメントアウト削除
@mizonon mizonon requested a review from Kuwamai August 8, 2024 06:04
Copy link
Contributor

@Kuwamai Kuwamai left a comment

Choose a reason for hiding this comment

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

動作確認は行っていないのですが、コードの構成等についてコメントしました。ご確認お願いします。

.gitignore Outdated Show resolved Hide resolved
.docker/README.md Outdated Show resolved Hide resolved
crane_plus_examples/launch/demo.launch.py Show resolved Hide resolved
crane_plus_examples/launch/demo.launch.py Outdated Show resolved Hide resolved
crane_plus_moveit_config/config/joint_limits.yaml Outdated Show resolved Hide resolved
crane_plus_moveit_config/package.xml Outdated Show resolved Hide resolved
crane_plus_moveit_config/package.xml Outdated Show resolved Hide resolved
crane_plus_moveit_config/package.xml Outdated Show resolved Hide resolved
crane_plus_moveit_config/launch/run_move_group.rviz Outdated Show resolved Hide resolved
@Kuwamai
Copy link
Contributor

Kuwamai commented Aug 14, 2024

CIに関してはSciurus17と同様に、こちらのenv内のhumbleをjazzyに変更お願いします
https://github.com/rt-net/sciurus17_ros/blob/e96d86a6d0f9097b55ea9a1461aa38f510cde478/.github/workflows/industrial_ci.yml#L20

Copy link
Contributor

@Kuwamai Kuwamai left a comment

Choose a reason for hiding this comment

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

主にSciurus17との共通化についてコメントしました。
まだ動作確認は行っていません。

@@ -56,5 +56,4 @@ docs/_build/
# PyBuilder
target/
.pytest_cache

Copy link
Contributor

Choose a reason for hiding this comment

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

不要な差分が生じているため削除お願いします。

@@ -30,7 +30,7 @@ def generate_launch_description():
default_value='/dev/ttyUSB0',
description='Set port name.'
)

Copy link
Contributor

Choose a reason for hiding this comment

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

不要な差分が生じているため削除お願いします。

Copy link
Contributor

Choose a reason for hiding this comment

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

<exec_depend>rviz_common</exec_depend>
<exec_depend>rviz_default_plugins</exec_depend>
<exec_depend>tf2_ros</exec_depend>
<exec_depend>warehouse_ros_mongo</exec_depend>
Copy link
Contributor

Choose a reason for hiding this comment

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

Setup assistantから生成されていると思うのですが、warehouse_ros_mongoがjazzyでリリースされておらず、CIでエラーが生じています。こちら消しちゃってください。

Copy link
Author

Choose a reason for hiding this comment

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

<exec_depend>warehouse_ros_mongo</exec_depend>を削除いたしました


<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>

Copy link
Contributor

Choose a reason for hiding this comment

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

Setup assistant由来かわかりませんが不要なスペースがあるので削除お願いします。

Comment on lines 29 to 39
def load_file(package_name, file_path):
package_path = get_package_share_directory(package_name)
absolute_file_path = os.path.join(package_path, file_path)

try:
with open(absolute_file_path, 'r') as file:
with open(absolute_file_path, "r") as file:
return file.read()
except EnvironmentError: # parent of IOError, OSError *and* WindowsError where available
except (
EnvironmentError
): # parent of IOError, OSError *and* WindowsError where available
return None
Copy link
Contributor

Choose a reason for hiding this comment

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

こちらの関数もう使ってないと思うので削除お願いします。

Comment on lines 44 to 52
absolute_file_path = os.path.join(package_path, file_path)

try:
with open(absolute_file_path, 'r') as file:
with open(absolute_file_path, "r") as file:
return yaml.safe_load(file)
except EnvironmentError: # parent of IOError, OSError *and* WindowsError where available
except (
EnvironmentError
): # parent of IOError, OSError *and* WindowsError where available
return None
Copy link
Contributor

Choose a reason for hiding this comment

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

こちらの関数ももう使っていないので削除お願いします。

Comment on lines -58 to -62
declare_rviz_config_file = DeclareLaunchArgument(
'rviz_config_file',
default_value=get_package_share_directory(
'crane_plus_moveit_config') + '/launch/run_move_group.rviz',
description='Set the path to rviz configuration file.'
Copy link
Contributor

Choose a reason for hiding this comment

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

これを削除してしまうとRVizのコンフィグファイルが変更できないかと思います。

@Kuwamai Kuwamai added the Type: Feature New Feature label Sep 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Feature New Feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants