Skip to content

Commit 8288056

Browse files
authored
Merge pull request #329 from ROBOTIS-GIT/feature-omx-rename
Rename omx to open_manipulator_x
2 parents a81430d + a87d64c commit 8288056

File tree

59 files changed

+161
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+161
-104
lines changed

open_manipulator/CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package open_manipulator
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
4.0.6 (2025-07-15)
6+
------------------
7+
* Renamed omx to open_manipulator_x
8+
* Contributors: Wonho Yun
9+
510
4.0.5 (2025-07-02)
611
------------------
712
* Added init_position_file argument to launch files

open_manipulator/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>open_manipulator</name>
5-
<version>4.0.5</version>
5+
<version>4.0.6</version>
66
<description>
77
OpenMANIPULATOR meta ROS 2 package.
88
</description>

open_manipulator_bringup/CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package open_manipulator_bringup
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
4.0.6 (2025-07-15)
6+
------------------
7+
* Renamed omx to open_manipulator_x
8+
* Contributors: Wonho Yun
9+
510
4.0.5 (2025-07-02)
611
------------------
712
* Added init_position_file argument to launch files

open_manipulator_bringup/launch/omx.launch.py renamed to open_manipulator_bringup/launch/open_manipulator_x.launch.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def generate_launch_description():
6868
),
6969
DeclareLaunchArgument(
7070
'ros2_control_type',
71-
default_value='omx',
71+
default_value='open_manipulator_x',
7272
description='Type of ros2_control',
7373
),
7474
DeclareLaunchArgument(
@@ -96,8 +96,8 @@ def generate_launch_description():
9696
PathJoinSubstitution([
9797
FindPackageShare('open_manipulator_description'),
9898
'urdf',
99-
'omx',
100-
'omx.urdf.xacro',
99+
'open_manipulator_x',
100+
'open_manipulator_x.urdf.xacro',
101101
]),
102102
' ',
103103
'prefix:=',
@@ -123,7 +123,7 @@ def generate_launch_description():
123123
controller_manager_config = PathJoinSubstitution([
124124
FindPackageShare('open_manipulator_bringup'),
125125
'config',
126-
'omx',
126+
'open_manipulator_x',
127127
'hardware_controller_manager.yaml',
128128
])
129129

@@ -136,7 +136,7 @@ def generate_launch_description():
136136
trajectory_params_file = PathJoinSubstitution([
137137
FindPackageShare('open_manipulator_bringup'),
138138
'config',
139-
'omx',
139+
'open_manipulator_x',
140140
init_position_file,
141141
])
142142

open_manipulator_bringup/launch/omx_gazebo.launch.py renamed to open_manipulator_bringup/launch/open_manipulator_x_gazebo.launch.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ def generate_launch_description():
7070
xacro_file = os.path.join(
7171
open_manipulator_description_path,
7272
'urdf',
73-
'omx',
74-
'omx.urdf.xacro',
73+
'open_manipulator_x',
74+
'open_manipulator_x.urdf.xacro',
7575
)
7676

7777
doc = xacro.process_file(xacro_file, mappings={'use_sim': 'true'})

open_manipulator_bringup/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>open_manipulator_bringup</name>
5-
<version>4.0.5</version>
5+
<version>4.0.6</version>
66
<description>OpenMANIPULATOR bringup ROS 2 package.</description>
77
<maintainer email="[email protected]">Pyo</maintainer>
88
<license>Apache 2.0</license>

open_manipulator_bringup/setup.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,22 @@
88

99
setup(
1010
name=package_name,
11-
version='4.0.5',
11+
version='4.0.6',
1212
packages=find_packages(exclude=['test']),
1313
data_files=[
1414
('share/ament_index/resource_index/packages', ['resource/' + package_name]),
1515
('share/' + package_name, ['package.xml']),
1616
(os.path.join('share', package_name, 'launch'), glob('launch/*.py')),
17-
(os.path.join('share', package_name, 'config/omx'), glob('config/omx/*')),
17+
(os.path.join('share', package_name, 'config/open_manipulator_x'),
18+
glob('config/open_manipulator_x/*')),
1819
(os.path.join('share', package_name, 'config/omy_3m'), glob('config/omy_3m/*')),
1920
(os.path.join('share', package_name, 'config/omy_f3m'), glob('config/omy_f3m/*')),
2021
(os.path.join('share', package_name, 'config/omy_f3m_follower_ai'),
2122
glob('config/omy_f3m_follower_ai/*')),
2223
(os.path.join('share', package_name, 'config/omy_l100_leader_ai'),
2324
glob('config/omy_l100_leader_ai/*')),
24-
(os.path.join('share', package_name, 'config/omx'), glob('config/omx/*')),
25+
(os.path.join('share', package_name, 'config/open_manipulator_x'),
26+
glob('config/open_manipulator_x/*')),
2527
(os.path.join('share', package_name, 'worlds'), glob('worlds/*')),
2628
(os.path.join('share', package_name), ['open-manipulator-cdc.rules']),
2729

open_manipulator_collision/CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Changelog for package open_manipulator_collision
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
4.0.6 (2025-07-15)
6+
------------------
7+
* None
8+
59
4.0.5 (2025-07-02)
610
------------------
711
* Updated urdf file path for OMY

0 commit comments

Comments
 (0)