Skip to content

Commit

Permalink
Merge pull request #1721 from ROBOTIS-GIT/hotfix-tb3-eof-files
Browse files Browse the repository at this point in the history
OM-X archive & TB3 content issue fix
  • Loading branch information
ROBOTIS-Yang authored Dec 17, 2024
2 parents c021e38 + d38d04f commit 0ad46ba
Show file tree
Hide file tree
Showing 28 changed files with 559 additions and 553 deletions.
5 changes: 5 additions & 0 deletions docs/en/platform/openmanipulator_x/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ page_number: 1

ROS compatible OpenMANIPULATOR-X (RM-X52-TNM) is a robot platform consisting of **Open Source Software**​, **Open Source Hardware** and is compatible with **OpenCR(Embedded controller)​**.

**Other ROS/ROS2 Distro manuals**
Download archived OpenMANIPULATOR-X emanual as of Dec 2024.
[Download](https://drive.google.com/file/d/1LLDGkGQYzVRr7LKFGqiWBP591Eg3CHV9/view?usp=drive_link)
{: .notice--warning}

## [Open Source Software](#open-source-software)
OpenMANIPULATOR-X supports ROS. The official ROS platform TurtleBot series has been supporting "TurtleBot Arm". The OpenMANIPULATOR-X is fullly compatibile with TurtleBot3​. Users can easily control it through the `MoveIt!` ROS package. Even if you do not have an actual robot, you can control the robot in the Gazebo simulator​.

Expand Down
66 changes: 33 additions & 33 deletions docs/en/platform/openmanipulator_x/quick_start_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ share: true
author_profile: false
permalink: /docs/en/platform/openmanipulator_x/quick_start_guide/
tabs: "ROS"
tab_title1: Kinetic
#tab_title1: Kinetic
tab_title2: Noetic
tab_title3: Dashing
tab_title4: Foxy
#tab_title3: Dashing
#tab_title4: Foxy
tab_title5: Humble
tab_title6: Arduino
sidebar:
Expand All @@ -26,21 +26,21 @@ page_number: 4

# [Quick Start Guide](#quick-start-guide)

<section data-id="{{ page.tab_title1 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title1 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/ros_intro.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title2 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/ros_intro.md %}
</section>

<section data-id="{{ page.tab_title3 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title3 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/ros_intro.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title4 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title4 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/ros_intro.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title5 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/ros_intro.md %}
Expand All @@ -58,21 +58,21 @@ page_number: 4

### [Install Ubuntu on PC](#install-ubuntu-on-pc)

<section data-id="{{ page.tab_title1 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title1 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_kinetic.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title2 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_noetic.md %}
</section>

<section data-id="{{ page.tab_title3 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title3 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_dashing.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title4 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title4 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_foxy.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title5 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_humble.md %}
Expand All @@ -85,21 +85,21 @@ Not required.

### [Install ROS on PC](#install-ros-on-pc)

<section data-id="{{ page.tab_title1 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title1 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_kinetic_ros.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title2 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_noetic_ros.md %}
</section>

<section data-id="{{ page.tab_title3 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title3 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_dashing_ros.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title4 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title4 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_foxy_ros.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title5 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_humble_ros.md %}
Expand All @@ -112,21 +112,21 @@ Not required.

### [Install ROS Packages](#install-ros-packages)

<section data-id="{{ page.tab_title1 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title1 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_kinetic_ros_packages.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title2 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_noetic_ros_packages.md %}
</section>

<section data-id="{{ page.tab_title3 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title3 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_dashing_ros_packages.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title4 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title4 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_foxy_ros_packages.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title5 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_humble_ros_packages.md %}
Expand All @@ -139,21 +139,21 @@ Not required.

### [Communication Interface](#communication-interface)

<section data-id="{{ page.tab_title1 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title1 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_comm_interface.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title2 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_comm_interface.md %}
</section>

<section data-id="{{ page.tab_title3 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title3 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_comm_interface.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title4 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title4 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_comm_interface_foxy.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title5 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/quickstart_comm_interface_humble.md %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ share: true
author_profile: false
permalink: /docs/en/platform/openmanipulator_x/quick_start_guide_basic_operation/
tabs: "ROS"
tab_title1: Kinetic
#tab_title1: Kinetic
tab_title2: Noetic
tab_title3: Dashing
tab_title4: Foxy
#tab_title3: Dashing
#tab_title4: Foxy
tab_title5: Humble
tab_title6: Arduino
sidebar:
Expand Down Expand Up @@ -49,21 +49,21 @@ Please note that this instruction is written for the **ROBOTIS official OpenMANI

### [Launch Controller](#launch-controller)

<section data-id="{{ page.tab_title1 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title1 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/launch_controller_kinetic.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title2 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/launch_controller_noetic.md %}
</section>

<section data-id="{{ page.tab_title3 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title3 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/launch_controller_dashing.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title4 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title4 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/launch_controller_foxy.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title5 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/launch_controller_humble.md %}
Expand All @@ -75,21 +75,21 @@ Please note that this instruction is written for the **ROBOTIS official OpenMANI

### [Keyboard Teleoperation](#keyboard-teleoperation)

<section data-id="{{ page.tab_title1 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title1 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/keyboard_teleop_kinetic.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title2 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/keyboard_teleop_noetic.md %}
</section>

<section data-id="{{ page.tab_title3 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title3 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/keyboard_teleop_dashing.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title4 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title4 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/keyboard_teleop_foxy.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title5 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/quick_start_guide/keyboard_teleop_humble.md %}
Expand Down
42 changes: 21 additions & 21 deletions docs/en/platform/openmanipulator_x/ros_applications.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ share: true
author_profile: false
permalink: /docs/en/platform/openmanipulator_x/ros_applications/
tabs: "ROS"
tab_title1: Kinetic
#tab_title1: Kinetic
tab_title2: Noetic
tab_title3: Dashing
tab_title4: Foxy
#tab_title3: Dashing
#tab_title4: Foxy
tab_title5: Humble
tab_title6: Arduino
sidebar:
Expand All @@ -28,28 +28,28 @@ page_number: 13

## [Master and Slave](#master-and-slave)

<section data-id="{{ page.tab_title1 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title1 }}" class="tab_contents">
In this example, if the user is holding the master OpenMANIPULATOR, the slave OpenMANIPULATOR-X moves like master robot. Recording mode allows you to save the trajectory as you move the master OpenMANIPULATOR-X and play it back to the slave OpenMANIPULATOR.
<iframe width="560" height="315" src="https://www.youtube.com/embed/kTS3Yx75mLo" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
</section>
</section> -->

<section data-id="{{ page.tab_title2 }}" class="tab_contents">
In this example, if the user is holding the master OpenMANIPULATOR, the slave OpenMANIPULATOR-X moves like master robot. Recording mode allows you to save the trajectory as you move the master OpenMANIPULATOR-X and play it back to the slave OpenMANIPULATOR.

<iframe width="560" height="315" src="https://www.youtube.com/embed/kTS3Yx75mLo" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
</section>

<section data-id="{{ page.tab_title3 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title3 }}" class="tab_contents">
In this example, if the user is holding the master OpenMANIPULATOR, the slave OpenMANIPULATOR-X moves like master robot. Recording mode allows you to save the trajectory as you move the master OpenMANIPULATOR-X and play it back to the slave OpenMANIPULATOR.
<iframe width="560" height="315" src="https://www.youtube.com/embed/kTS3Yx75mLo" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
</section>
</section> -->

<section data-id="{{ page.tab_title4 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title4 }}" class="tab_contents">
Not supported
{: .notice--warning}
</section>
</section> -->

<section data-id="{{ page.tab_title5 }}" class="tab_contents">
Not supported
Expand All @@ -63,51 +63,51 @@ Master and Slave is not supported in Arduino

### [Setup OpenMANIPULATOR-X](#setup-openmanipulator-x)

<section data-id="{{ page.tab_title1 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title1 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/applications/setup_kinetic.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title2 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/applications/setup_kinetic.md %}
</section>

<section data-id="{{ page.tab_title3 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title3 }}" class="tab_contents">
Since you need to control two OpenManipulators on one PC, use two U2D2s and two OpenManipulators to connect as shown below.
![](/assets/images/platform/openmanipulator_x/OpenManipulator_master_slave_connection.png)
![](/assets/images/platform/openmanipulator_x/OpenManipulator_master_slave.png)
{% include en/platform/openmanipulator_x/applications/setup_dashing.md %}
</section>
</section> -->

### [Install Package](#install-package)

<section data-id="{{ page.tab_title1 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title1 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/applications/install_kinetic.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title2 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/applications/install_kinetic.md %}
</section>

<section data-id="{{ page.tab_title3 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title3 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/applications/install_dashing.md %}
</section>
</section> -->

### [Execute Example](#execute-example)

<section data-id="{{ page.tab_title1 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title1 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/applications/execute_kinetic.md %}
</section>
</section> -->

<section data-id="{{ page.tab_title2 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/applications/execute_noetic.md %}
</section>

<section data-id="{{ page.tab_title3 }}" class="tab_contents">
<!-- <section data-id="{{ page.tab_title3 }}" class="tab_contents">
{% include en/platform/openmanipulator_x/applications/execute_dashing.md %}
</section>
</section> -->

## [OpenCR Teaching](#opencr-teaching)

Expand Down
Loading

0 comments on commit 0ad46ba

Please sign in to comment.