Skip to content

Commit f96f242

Browse files
committed
Change IPs to match the ones from the compose files
1 parent ce040e9 commit f96f242

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

my_dual_robot_cell/my_dual_robot_cell_control/launch/start_robots.launch.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ def launch_setup():
5252

5353
alice_dashboard_client_node = Node(
5454
package="ur_robot_driver",
55-
condition=IfCondition(alice_launch_dashboard_client) and UnlessCondition(alice_use_mock_hardware),
55+
condition=IfCondition(alice_launch_dashboard_client)
56+
and UnlessCondition(alice_use_mock_hardware),
5657
executable="dashboard_client",
5758
name="dashboard_client",
5859
namespace="alice",
@@ -63,7 +64,8 @@ def launch_setup():
6364

6465
bob_dashboard_client_node = Node(
6566
package="ur_robot_driver",
66-
condition=IfCondition(bob_launch_dashboard_client) and UnlessCondition(bob_use_mock_hardware),
67+
condition=IfCondition(bob_launch_dashboard_client)
68+
and UnlessCondition(bob_use_mock_hardware),
6769
executable="dashboard_client",
6870
name="dashboard_client",
6971
namespace="bob",
@@ -306,14 +308,14 @@ def generate_launch_description():
306308
declared_arguments.append(
307309
DeclareLaunchArgument(
308310
"alice_robot_ip",
309-
default_value="192.168.0.101",
311+
default_value="192.168.57.101",
310312
description="IP address by which alice can be reached.",
311313
)
312314
)
313315
declared_arguments.append(
314316
DeclareLaunchArgument(
315317
"bob_robot_ip",
316-
default_value="192.168.0.100",
318+
default_value="192.168.57.100",
317319
description="IP address by which bob can be reached.",
318320
)
319321
)
@@ -420,9 +422,7 @@ def generate_launch_description():
420422
)
421423
)
422424
declared_arguments.append(
423-
DeclareLaunchArgument(
424-
"launch_rviz", default_value="true", description="Launch RViz?"
425-
)
425+
DeclareLaunchArgument("launch_rviz", default_value="true", description="Launch RViz?")
426426
)
427427
declared_arguments.append(
428428
DeclareLaunchArgument(

my_dual_robot_cell/my_dual_robot_cell_control/urdf/my_dual_robot_cell_controlled.urdf.xacro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222

2323
<xacro:arg name="alice_use_mock_hardware" default="false" />
2424
<xacro:arg name="alice_mock_sensor_commands" default="false" />
25-
<xacro:arg name="alice_robot_ip" default="192.168.0.101" />
25+
<xacro:arg name="alice_robot_ip" default="192.168.57.101" />
2626
<xacro:arg name="alice_reverse_port" default="50006" />
2727
<xacro:arg name="alice_script_sender_port" default="50007" />
2828
<xacro:arg name="alice_script_command_port" default="50010" />
2929
<xacro:arg name="alice_trajectory_port" default="50009" />
3030

3131
<xacro:arg name="bob_use_mock_hardware" default="false" />
3232
<xacro:arg name="bob_mock_sensor_commands" default="false" />
33-
<xacro:arg name="bob_robot_ip" default="192.168.0.100" />
33+
<xacro:arg name="bob_robot_ip" default="192.168.57.100" />
3434
<xacro:arg name="bob_reverse_port" default="50001" />
3535
<xacro:arg name="bob_script_sender_port" default="50002" />
3636
<xacro:arg name="bob_script_command_port" default="50004" />
@@ -94,4 +94,4 @@
9494
trajectory_port="$(arg bob_trajectory_port)"
9595
/>
9696

97-
</robot>
97+
</robot>

0 commit comments

Comments
 (0)