diff --git a/sciurus17_description/robot_description_loader.py b/sciurus17_description/robot_description_loader.py index 2ded91e..e555f0b 100755 --- a/sciurus17_description/robot_description_loader.py +++ b/sciurus17_description/robot_description_loader.py @@ -20,6 +20,7 @@ def __init__(self): self.use_gazebo = 'false' self.use_gazebo_head_camera = 'false' self.use_gazebo_chest_camera = 'false' + self.use_mock_components = 'false' self.gz_control_config_package = '' self.gz_control_config_file_path = '' @@ -34,6 +35,7 @@ def load(self): ' use_gazebo:=', self.use_gazebo, ' use_gazebo_head_camera:=', self.use_gazebo_head_camera, ' use_gazebo_chest_camera:=', self.use_gazebo_chest_camera, + ' use_mock_components:=', self.use_mock_components, ' gz_control_config_package:=', self.gz_control_config_package, ' gz_control_config_file_path:=', self.gz_control_config_file_path ]) diff --git a/test/test_robot_description_loader.py b/test/test_robot_description_loader.py index 02ab11b..7e92da3 100644 --- a/test/test_robot_description_loader.py +++ b/test/test_robot_description_loader.py @@ -79,3 +79,12 @@ def test_use_gazebo_chest_camera(): rdl.gz_control_config_package = 'sciurus17_description' rdl.gz_control_config_file_path = 'config/dummy_controllers.yaml' assert 'reference="chest_camera_link"' in exec_load(rdl) + + +def test_use_mock_components(): + # use_gazeboが変更され、xacroにgz_ros2_controlがセットされることを期待 + rdl = RobotDescriptionLoader() + rdl.use_mock_components = 'true' + rdl.gz_control_config_package = 'sciurus17_description' + rdl.gz_control_config_file_path = 'config/dummy_controllers.yaml' + assert 'mock_components/GenericSystem' in exec_load(rdl) diff --git a/urdf/sciurus17.ros2_control.xacro b/urdf/sciurus17.ros2_control.xacro index 98df3d3..bf68e23 100644 --- a/urdf/sciurus17.ros2_control.xacro +++ b/urdf/sciurus17.ros2_control.xacro @@ -5,11 +5,16 @@ - sciurus17_hardware/Sciurus17Hardware - ${PORT_NAME} - ${BAUDRATE} - ${TIMEOUT_SECONDS} - ${MANIPULATOR_CONFIG_FILE_PATH} + + mock_components/GenericSystem + + + sciurus17_hardware/Sciurus17Hardware + ${PORT_NAME} + ${BAUDRATE} + ${TIMEOUT_SECONDS} + ${MANIPULATOR_CONFIG_FILE_PATH} + diff --git a/urdf/sciurus17.urdf.xacro b/urdf/sciurus17.urdf.xacro index 26dc666..73945ba 100644 --- a/urdf/sciurus17.urdf.xacro +++ b/urdf/sciurus17.urdf.xacro @@ -20,6 +20,7 @@ + @@ -28,6 +29,7 @@ +