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

Cob behaviour #321

Merged
merged 39 commits into from
Sep 24, 2015
Merged

Cob behaviour #321

merged 39 commits into from
Sep 24, 2015

Conversation

ipa-nhg
Copy link
Member

@ipa-nhg ipa-nhg commented Aug 5, 2015

Please, don't merge this pull request before cob_android is "released"

@@ -17,8 +17,10 @@

<run_depend>camera1394</run_depend>
<run_depend>canopen_motor_node</run_depend>
<run_depend>cob_android_script_server</run_depend>
Copy link
Member Author

Choose a reason for hiding this comment

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

cob_android is still not released!

<param name="/sound_controller/mode" value="cepstral" />
<include file="$(find cob_bringup)/drivers/sound.launch" />

<include file="$(find cob_bringup)/drivers/mimic.launch" />
Copy link
Member

Choose a reason for hiding this comment

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

can mimic now be launched from the current user?
is logging into the head display not required anymore?

Copy link
Member Author

Choose a reason for hiding this comment

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

It is fixed, now you can launch mimic with all the users.

Copy link
Member

Choose a reason for hiding this comment

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

sweeeet! 👍

@fmessmer
Copy link
Member

I think this PR needs to be cleaned up (preferably squashed) after the remaining remarks have been addressed....it currently contains quite a lot of changes not related to cob_behaviour/cob_default_robot_behaviour....

@fmessmer
Copy link
Member

This PR cannot be merged. Please update with latest ipa320 indigo_dev.
Also not all aspects have yet been considered....tbd

@ipa-nhg
Copy link
Member Author

ipa-nhg commented Aug 25, 2015

I can close this pull request, and open a new one with the actual robot working version.

We have also still the teleop problem , until we have a new teleop node we should not merge this pull request and the cob4-4 PR #307.

My suggestion is wait for teleop node, addapt the parameters and launch files , merge with ipa320, resolving merge conflicts, and test it on the robots. And then open pull request from ipa-cob4-X accounts.

@fmessmer
Copy link
Member

Keep this one open until there actually is a superseding PR!
The new PR for cob_default_robot_behavior 😉 should then contain changes only for that feature...

Features from this PR that are not related to cob_default_robot_behavior should be extracted from this one and send via a separate PR for those changes...

@@ -111,7 +117,7 @@
<arg name="robot" value="$(arg robot)"/>
<arg name="component_name" value="sensorring"/>
</include>

Copy link
Member

Choose a reason for hiding this comment

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

remove trailing white spaces

@fmessmer
Copy link
Member

please make sure the changes within cob_hardware_config from this PR do not overwrite/break the driver, controller or elmo configs....in the best case they should be removed from this PR

@fmessmer
Copy link
Member

LGTM

fmessmer added a commit that referenced this pull request Sep 24, 2015
@fmessmer fmessmer merged commit a6cf0bf into ipa320:indigo_dev Sep 24, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants