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

changes for cob4-13 #756

Merged
merged 5 commits into from Apr 27, 2018
Merged

Conversation

@HannesBachter
Copy link
Contributor

HannesBachter commented Apr 23, 2018

No description provided.

cob4-13
Copy link
Member

fmessmer left a comment

as the head is fixed, plz remove all head_*.yaml in cob_hardware_config/robots/cob4-13/config

@@ -134,14 +134,14 @@
<include file="$(find cob_bringup)/components/canopen_generic.launch">
<arg name="robot" value="$(arg robot)"/>
<arg name="component_name" value="arm_left"/>
<arg name="can_device" value="can2"/>
<arg name="can_device" value="can3"/>

This comment has been minimized.

Copy link
@fmessmer

fmessmer Apr 23, 2018

Member

cob4-16 has been shipped
thus, please undo these changes

@@ -30,6 +30,7 @@
<!-- sensors -->
<xacro:include filename="$(find cob_description)/urdf/sensors/realsense.urdf.xacro" />
<xacro:include filename="$(find cob_description)/urdf/sensors/realsense_zr300.urdf.xacro" />
<xacro:include filename="$(find cob_description)/urdf/sensors/kinect.urdf.xacro" />

This comment has been minimized.

Copy link
@fmessmer

fmessmer Apr 23, 2018

Member

remove this line - there is no kinect mounted to the robot

Copy link
Member

fmessmer left a comment

@HannesBachter
I added a few commits to fix my remarks...I also tested the simulation (had to add the gripper part again for cob4-13 and cob4-16)

Please test again on HW after @ipa-tif fixed the HW-Issues

@HannesBachter

This comment has been minimized.

Copy link
Contributor Author

HannesBachter commented Apr 27, 2018

tested on HW - works as expected

@fmessmer fmessmer merged commit 4a05b6c into ipa320:indigo_dev Apr 27, 2018
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@fmessmer

This comment has been minimized.

Copy link
Member

fmessmer commented Apr 27, 2018

I merged in order to start playing back the config improvements from unity_robots

@HannesBachter HannesBachter deleted the HannesBachter:add_cob4-13_cardiff branch May 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.