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

Add dual_panda2 #1544

Merged
merged 139 commits into from
Dec 1, 2022
Merged

Add dual_panda2 #1544

merged 139 commits into from
Dec 1, 2022

Conversation

pazeshun
Copy link
Contributor

Includes #1543

This PR adds dual_panda2 robot, which is used in jsk-ros-pkg/jsk_demos#1363.

cc @haraduka

@pazeshun pazeshun mentioned this pull request Jul 22, 2022
@pazeshun
Copy link
Contributor Author

Either way is OK:

@pazeshun pazeshun mentioned this pull request Jul 22, 2022
2 tasks
@pazeshun
Copy link
Contributor Author

@k-okada
CI passed. Could you review this?

@pazeshun pazeshun added panda dual franka robot in JSK enhancement WaitForReview and removed WaitForCI labels Jul 25, 2022
jsk_panda_robot/panda_eus/euslisp/dual_panda-interface.l Outdated Show resolved Hide resolved
jsk_panda_robot/panda_eus/euslisp/dual_panda-interface.l Outdated Show resolved Hide resolved
jsk_panda_robot/panda_eus/models/dual_panda2.urdf Outdated Show resolved Hide resolved
@@ -0,0 +1,285 @@
<?xml version="1.0"?>
Copy link
Member

Choose a reason for hiding this comment

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

humm, is dual_panda and dual_panda2 different? do they have different gripper?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

They have different sensors.
dual_panda1: xtion camera on head, web cameras on both hands, microphone on right hand
dual_panda2: realsense d435 on both hands

@pazeshun pazeshun marked this pull request as draft November 19, 2022 08:00
@pazeshun pazeshun force-pushed the add_dual_panda2 branch 2 times, most recently from 11becfc to a8dcaf6 Compare November 24, 2022 04:49
…amera -> /*arm_camera) & enable to specify resolution correctly

Previously, specifying resolution failed because fps was not specified
@pazeshun pazeshun marked this pull request as ready for review November 24, 2022 07:21
@pazeshun
Copy link
Contributor Author

@k-okada
Maybe this PR was fixed.
Could you review this again?

Copy link
Member

@k-okada k-okada left a comment

Choose a reason for hiding this comment

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

mostly good. please check my comment

## Install ##
#############

install(DIRECTORY launch config
Copy link
Member

Choose a reason for hiding this comment

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

forget rviz directory?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

rviz directory is inside config directory, so I think it is installed by current CMakeLists.txt:

leus@dual-panda1:~/test_ws/install/share/jsk_panda_startup/config/rviz$ ls
dual_panda1_play.rviz  dual_panda2_play.rviz

jsk_panda_robot/README.md Show resolved Hide resolved

catkin_package()

install(DIRECTORY config launch python script
Copy link
Member

Choose a reason for hiding this comment

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

use catkin_install_python jsk-ros-pkg/jsk_recognition#2743 ? (you do not have to check on 20.04.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Maybe fixed

@pazeshun
Copy link
Contributor Author

@k-okada
Maybe fixed.
Could you review again?

@pazeshun
Copy link
Contributor Author

pazeshun commented Dec 1, 2022

@k-okada Kindly ping.

@k-okada k-okada merged commit 2614319 into jsk-ros-pkg:master Dec 1, 2022
@pazeshun pazeshun deleted the add_dual_panda2 branch December 13, 2022 05:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants