Skip to content

Commit e9a045c

Browse files
committed
update readme
1 parent 32f4288 commit e9a045c

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

Diff for: rofunc/README.md

-20
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import rofunc as rf
2525

2626
## Available functions
2727

28-
<<<<<<< HEAD
2928
| Classes | Types | Functions | Description | Status |
3029
|----------------|-------------|-----------------------|------------------------------------------------------|--------|
3130
| **Devices** | Xsens | `xsens.record` | Record the human motion via network streaming | |
@@ -45,25 +44,6 @@ import rofunc as rf
4544
| | 3D with ori | `visualab.3dori` | 3-dim trajectory visualization with orientation | |
4645
| **Planning** | LQT | `lqt.uni` | LQT for one agent | |
4746
| | | `lqt.bi` | LQT for two agent with constraints | |
48-
=======
49-
| Classes | Types | Functions | Description | Status |
50-
|----------------|-------------|-----------------------|-------------------------------------------------------|--------|
51-
| **Devices** | Xsens | `xsens.process` | Decoding the .mvnx file ||
52-
| | | `xsens.visualize` | Show or save gif about the motion ||
53-
| | Optitrack | `optitrack.process` | Process the output .csv data ||
54-
| | | `optitrack.visualize` | Show or save gif about the motion | |
55-
| | ZED | `zed.record` | Record with multiple cameras ||
56-
| | | `zed.playback` | Playback the recording and save snapshots ||
57-
| | Multi-modal | `mmodal.record` | Capture multi-modal demonstration data simultaneously | |
58-
| **Logger** | | `logger.write` | Custom tensorboard-based logger | |
59-
| **Coordinate** | | `coord.custom_class` | Define the custom class of `Pose` | |
60-
| | | `coord.transform` | Useful functions about coordinate transformation | |
61-
| **VisuaLab** | 2D | `visualab.2d` | 2-dim trajectory visualization | |
62-
| | 3D | `visualab.3d` | 3-dim trajectory visualization | |
63-
| | 3D with ori | `visualab.3dori` | 3-dim trajectory visualization with orientation | |
64-
| **Planning** | LQT | `lqt.uni` | LQT for one agent | |
65-
| | | `lqt.bi` | LQT for two agent with constraints | |
66-
>>>>>>> main
6747

6848
### Xsens
6949

0 commit comments

Comments
 (0)