Skip to content

Commit 73eb5b0

Browse files
authored
Merge pull request #26 from eholum/eholum-sanity-check
Minor Updates to README post jazzy migration
2 parents 8775498 + 96dce90 commit 73eb5b0

File tree

2 files changed

+10
-108
lines changed

2 files changed

+10
-108
lines changed

.gitlab-ci.yml

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

README.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ docker compose exec dev bash
8080
Once you're attached to the container, you can use it as a regular colcon workspace.
8181
The contents of the `src/` directory will be mounted into `/home/er4-user/ws/src`.
8282
83-
<<<<<<< HEAD
8483
For example:
8584
8685
```bash
@@ -111,7 +110,7 @@ ros2 launch clr_mujoco_config clr_mujoco.launch.py
111110
ros2 launch clr_moveit_config clr_moveit.launch.py include_mockups_in_description:=true use_sim_time:=true
112111
```
113112
114-
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.
113+
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.
115114
116115
## Using the Hardware Image
117116
@@ -157,10 +156,18 @@ pixi run setup-colcon
157156
# Build and test
158157
pixi run build
159158
pixi run test
159+
```
160+
161+
Alternatively, launch an interactive shell and do things "normally":
160162

161-
# Or launch an interactive shell and do things "normally"
163+
```bash
164+
# Launch the shell and compile the workspace
162165
pixi shell
163166
colcon build
167+
168+
# Source the workspace and launch an application
169+
source install/setup.bash
170+
ros2 launch clr_mujoco_config clr_mujoco.launch.py
164171
```
165172

166173
## Important Notes

0 commit comments

Comments
 (0)