Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 0 additions & 105 deletions .gitlab-ci.yml

This file was deleted.

13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ docker compose exec dev bash
Once you're attached to the container, you can use it as a regular colcon workspace.
The contents of the `src/` directory will be mounted into `/home/er4-user/ws/src`.

<<<<<<< HEAD
For example:

```bash
Expand Down Expand Up @@ -111,7 +110,7 @@ ros2 launch clr_mujoco_config clr_mujoco.launch.py
ros2 launch clr_moveit_config clr_moveit.launch.py include_mockups_in_description:=true use_sim_time:=true
```

More information about the dynamic simulation is available in the [project](https://github.com/NASA-JSC-Robotics/chonkur_l_raile) and [drivers](https://github.com/NASA-JSC-Robotics/mujoco_ros2_simulation) packages.
More information about the dynamic simulation is available in the [project](https://github.com/NASA-JSC-Robotics/chonkur_l_raile) and [drivers](https://github.com/ros-controls/mujoco_ros2_control) packages.

## Using the Hardware Image

Expand Down Expand Up @@ -157,10 +156,18 @@ pixi run setup-colcon
# Build and test
pixi run build
pixi run test
```

Alternatively, launch an interactive shell and do things "normally":

# Or launch an interactive shell and do things "normally"
```bash
# Launch the shell and compile the workspace
pixi shell
colcon build

# Source the workspace and launch an application
source install/setup.bash
ros2 launch clr_mujoco_config clr_mujoco.launch.py
```

## Important Notes
Expand Down
Loading