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.

Sign up for GitHub

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

Fix namespace to avoid duplication and node name empty #35 #40

Merged
merged 1 commit into from
Feb 12, 2018
Merged

Fix namespace to avoid duplication and node name empty #35 #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pepper_bringup/launch/pepper_full.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
<arg name="roscore_ip" default="127.0.0.1" />
<arg name="network_interface" default="eth0" />

<arg name="namespace" default="pepper_robot" />
<arg name="namespace" default="$(optenv ROS_NAMESPACE pepper_robot)" />

<!-- naoqi driver -->
<include file="$(find naoqi_driver)/launch/naoqi_driver.launch" ns="$(arg namespace)" >
<include file="$(find naoqi_driver)/launch/naoqi_driver.launch">
<arg name="nao_ip" value="$(arg nao_ip)" />
<arg name="nao_port" value="$(arg nao_port)" />
<arg name="roscore_ip" value="$(arg roscore_ip)" />
<arg name="network_interface" value="$(arg network_interface)" />
<arg name="namespace" value="$(arg namespace)" />
</include>

<!-- launch pose manager -->
Expand Down