Skip to content

Commit ac43497

Browse files
Cleaning up mm_run
1 parent e797bf6 commit ac43497

26 files changed

+769
-1433
lines changed

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ A ROS-based framework for mobile manipulation research, featuring MPC-based cont
99
- **mm_simulator**: PyBullet simulation interface
1010
- **mm_utils**: Utility functions for math, parsing, logging, etc.
1111

12+
Configuration parameters are documented in [configuration.md](./mm_run/config/configuration.md).
13+
1214
## Installation
1315
### Prerequisites
1416
Ensure you have ROS Noetic installed on your system. Follow the [ROS Noetic installation guide](http://wiki.ros.org/noetic/Installation/Ubuntu) if it's not already set up.
@@ -51,18 +53,18 @@ python3 -m pip install -r requirements.txt
5153
## Usage
5254
### Compile MPC Controller
5355
```bash
54-
rosrun mm_control mpc_generate_c_code.py --config $(rospack find mm_run)/config/self_collision_avoidance.yaml
56+
rosrun mm_control mpc_generate_c_code.py --config $(rospack find mm_run)/config/simple_experiment.yaml
5557
```
5658

5759
### Run Controller with PyBullet Simulation (Synchronous)
5860
```bash
5961
roscd mm_run/scripts
60-
python3 experiments.py --config $(rospack find mm_run)/config/self_collision_avoidance.yaml --GUI
62+
python3 experiment.py --config $(rospack find mm_run)/config/simple_experiment.yaml --GUI
6163
```
6264

6365
### Run Controller and Simulation Asynchronously (ROS Nodes)
6466
```bash
65-
roslaunch mm_run run_pybullet_sim.launch config:=$(rospack find mm_run)/config/simple_experiment.yaml use_mpc:=True
67+
roslaunch mm_run run_pybullet_sim.launch config:=$(rospack find mm_run)/config/simple_experiment.yaml
6668
```
6769

6870
### Visualize Results

mm_run/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ catkin_package()
1111
## Mark executable scripts (Python etc.) for installation
1212
## in contrast to setup.py, you can choose the destination
1313
catkin_install_python(PROGRAMS
14-
scripts/experiments.py
15-
scripts/simple_sim.py
14+
scripts/experiment.py
1615
nodes/sim_ros.py
1716
nodes/isaac_sim_ros.py
1817
nodes/mpc_ros.py

mm_run/config/2d_collision.yaml

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

mm_run/config/2d_collision_sdf.yaml

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

mm_run/config/3d_collision_sdf.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ include:
4848
path: "config/robot/thing.yaml"
4949
- package: "mm_run"
5050
path: "config/controller/MPC.yaml"
51-
- package: "mm_run"
52-
path: "config/controller/NavMPC.yaml"
5351
- package: "mm_run"
5452
path: "config/sim/isaac_sim.yaml"
5553
- package: "mm_run"

mm_run/config/3d_collision_sdf_planner_sim.yaml

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

0 commit comments

Comments
 (0)