Skip to content

Commit

Permalink
Ignitionを使用するかのパラメタuse_ignition削除
Browse files Browse the repository at this point in the history
  • Loading branch information
mizonon committed Nov 27, 2024
1 parent 9359f4d commit af8dbaa
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ def __init__(self):
'crane_plus.urdf.xacro')
self.port_name = '/dev/ttyUSB0'
self.use_gazebo = 'false'
self.use_ignition = 'false'
self.use_camera = 'false'
self.gz_control_config_package = ''
self.gz_control_config_file_path = ''
Expand All @@ -38,7 +37,6 @@ def load(self):
self.robot_description_path,
' port_name:=', self.port_name,
' use_gazebo:=', self.use_gazebo,
' use_ignition:=', self.use_ignition,
' use_camera:=', self.use_camera,
' gz_control_config_package:=', self.gz_control_config_package,
' gz_control_config_file_path:=', self.gz_control_config_file_path
Expand Down
1 change: 0 additions & 1 deletion crane_plus_description/urdf/crane_plus.gazebo.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
name_link_3
name_link_4
name_link_hand
use_ignition
config_package
config_file_path
">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
joint_4_upper_limit
joint_hand_lower_limit
joint_hand_upper_limit
use_ignition
">

<ros2_control name="${name}" type="system">
Expand Down
5 changes: 1 addition & 4 deletions crane_plus_description/urdf/crane_plus.urdf.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<xacro:include filename="$(find crane_plus_description)/urdf/crane_plus.gazebo_ros2_control.xacro"/>

<xacro:arg name="use_gazebo" default="false" />
<xacro:arg name="use_ignition" default="false" />
<xacro:arg name="use_camera" default="false" />
<xacro:arg name="port_name" default="/dev/ttyUSB0" />
<xacro:arg name="baudrate" default="1000000" />
Expand Down Expand Up @@ -130,7 +129,6 @@
name_link_3="${NAME_LINK_3}"
name_link_4="${NAME_LINK_4}"
name_link_hand="${NAME_LINK_HAND}"
use_ignition="$(arg use_ignition)"
config_package="$(arg gz_control_config_package)"
config_file_path="$(arg gz_control_config_file_path)" />

Expand All @@ -150,8 +148,7 @@
joint_4_lower_limit="${JOINT_4_LOWER_LIMIT}"
joint_4_upper_limit="${JOINT_4_UPPER_LIMIT}"
joint_hand_lower_limit="${JOINT_HAND_LOWER_LIMIT}"
joint_hand_upper_limit="${JOINT_HAND_UPPER_LIMIT}"
use_ignition="$(arg use_ignition)" />
joint_hand_upper_limit="${JOINT_HAND_UPPER_LIMIT}"/>
</xacro:if>

</robot>
1 change: 0 additions & 1 deletion crane_plus_gazebo/launch/crane_plus_with_table.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ def generate_launch_description():

description_loader = RobotDescriptionLoader()
description_loader.use_gazebo = 'true'
description_loader.use_ignition = 'true'
description_loader.gz_control_config_package = 'crane_plus_control'
description_loader.gz_control_config_file_path = 'config/crane_plus_controllers.yaml'
description = description_loader.load()
Expand Down

0 comments on commit af8dbaa

Please sign in to comment.