Skip to content

Commit 59e685d

Browse files
committed
Address review comments
Signed-off-by: Gerardo Puga <glpuga@gmail.com>
1 parent 78a5b4f commit 59e685d

File tree

13 files changed

+70
-37
lines changed

13 files changed

+70
-37
lines changed

ar4_gazebo_bringup/README.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Description
2+
3+
Bringup package for the AR4 software stack on the Gazebo simulator.
4+
5+
```bash
6+
colcon build --packages-up-to ar4_gazebo_bringup
7+
. install/setup.bash
8+
```
9+
10+
To run the simulation, source and run:
11+
12+
```bash
13+
ros2 launch ar4_gazebo_bringup main.launch.py
14+
```
15+
16+
#### Launch file arguments
17+
18+
- 'rsp':
19+
- Run [`robot state publisher`](https://github.com/ros/robot_state_publisher) node. (default: 'false')
20+
- 'rviz':
21+
- Start RViz. (default: 'false')

ar4_gazebo_sim/README.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

ar4_gazebo_sim/launch/main.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def generate_launch_description():
9797
output="screen",
9898
)
9999

100-
# this nodes is launched with the HAL-specific nodes because we need to load
100+
# this node is launched with the HAL-specific nodes because we need to load
101101
# the simulation specific version
102102
robot_state_publisher_node = Node(
103103
package="robot_state_publisher",

ar4_isaac/package.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010

1111
<buildtool_depend>ament_cmake</buildtool_depend>
1212

13+
<exec_depend>ar4_moveit_config</exec_depend>
1314
<exec_depend>controller_manager</exec_depend>
14-
<exec_depend>topic_based_ros2_control</exec_depend>
1515
<exec_depend>ros2launch</exec_depend>
16+
<exec_depend>topic_based_ros2_control</exec_depend>
1617

1718
<export>
1819
<build_type>ament_cmake</build_type>
Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
11
# Description
22

3-
This package contains the simulation of the AR4 robot in Mujoco.
3+
Bringup package for the AR4 software stack on the MuJoCo simulator. To build the package, run
44

5-
## Instructions to import the model
5+
```bash
6+
colcon build --packages-up-to ar4_mujoco_bringup
7+
. install/setup.bash
8+
```
69

7-
The Mujoco model of the AR4 robot can be imported from the URDF description in the `ar4_description` package. The process requires running the two scripts in the `scripts/` folder in sequence.
10+
To run the simulation, source and run:
11+
12+
```bash
13+
ros2 launch ar4_mujoco_bringup main.launch.py
14+
```
15+
16+
## Instructions to update the MuJoCo robot model
17+
18+
The MuJoCo model of the AR4 robot can be imported from the URDF description in the `ar4_description` package. The process requires running the two scripts in the `scripts/` folder in sequence.
819

920
1. First run `stage1_create_urdf_from_xacro.sh` from **within** the development container. This script will generate the URDF file from the xacro description.
10-
1. Then run `stage2_create_mjcf_from_urdf.sh` from **outside** the development container (this script needs to create a new containerized environment running Ubuntu 24.04). This script will generate the Mujoco model from the URDF file.
21+
1. Then run `stage2_create_mjcf_from_urdf.sh` from **outside** the development container (this script needs to create a new containerized environment running Ubuntu 24.04). This script will generate the MuJoCo model from the URDF file.
1122

1223
At this point you'll see the `urdf/` and `mjcf/` folders in the `ar4_mujoco_sim` package as updated. Commit those changes.

ar4_mujoco_bringup/launch/main.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2929
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030

31-
"""launch file for integrating Gazebo with MoveIt for the AR4 robot."""
31+
"""launch file for integrating MuJoCo with MoveIt for the AR4 robot."""
3232

3333
from launch import LaunchDescription
3434
from launch_ros.actions import SetParameter

ar4_mujoco_bringup/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package format="3">
33
<name>ar4_mujoco_bringup</name>
44
<version>0.0.1</version>
5-
<description>Launch AR4 software against a Mujoco simulation of the robot</description>
5+
<description>Launch AR4 software against a MuJoCo simulation of the robot</description>
66
<author email="glpuga@ekumenlabs.com">Gerardo Puga</author>
77
<maintainer email="glpuga@ekumenlabs.com">Gerardo Puga</maintainer>
88
<license file="LICENSE">BSD-3-Clause</license>

ar4_mujoco_sim/launch/main.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def generate_launch_description():
9393
],
9494
)
9595

96-
# this nodes is launched with the HAL-specific nodes because we need to load
96+
# this node is launched with the HAL-specific nodes because we need to load
9797
# the simulation specific version
9898
robot_state_publisher_node = Node(
9999
package="robot_state_publisher",

ar4_mujoco_sim/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package format="3">
33
<name>ar4_mujoco_sim</name>
44
<version>0.0.1</version>
5-
<description>Launch Mujoco simulation of the AR4</description>
5+
<description>Launch MuJoCo simulation of the AR4</description>
66
<author email="glpuga@ekumenlabs.com">Gerardo Puga</author>
77
<maintainer email="glpuga@ekumenlabs.com">Gerardo Puga</maintainer>
88
<license file="LICENSE">BSD-3-Clause</license>

ar4_realbot_bringup/README.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
# Description
2-
A Gazebo simulation of the AR4 Package.
32

4-
To build the package, run
5-
`colcon build`
3+
Bringup package for the AR4 software stack on the real robot. To build the package, run
64

7-
To run the simulation, source and run
8-
`ros2 launch ar4_realbot_bringup ar4_sim.launch.py`
5+
```bash
6+
colcon build --packages-up-to ar4_realbot_bringup
7+
. install/setup.bash
8+
```
9+
10+
To run the simulation, source and run:
11+
12+
```bash
13+
ros2 launch ar4_realbot_bringup main.launch.py
14+
```
915

1016
#### Launch file arguments
17+
1118
- 'rsp':
1219
- Run [`robot state publisher`](https://github.com/ros/robot_state_publisher) node. (default: 'false')
1320
- 'rviz':

0 commit comments

Comments
 (0)