Skip to content

Commit 41a5a43

Browse files
Merge pull request #12 from CollaborativeRoboticsLab/prompt-tools-testing
Prompt tools testing
2 parents 20bb080 + d782d51 commit 41a5a43

52 files changed

Lines changed: 1704 additions & 875 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
fabric_client:
22
ros__parameters:
3-
plan_file_path: "install/capabilities2_fabric/share/capabilities2_fabric/plans/navigation_2.xml" # WaypointRunner Example 2
3+
plan_file_path: "install/capabilities2_fabric/share/capabilities2_fabric/plans/prompt_4.xml" # PromptPlanRunner Example
4+
# plan_file_path: "install/capabilities2_fabric/share/capabilities2_fabric/plans/prompt_3.xml" # PromptPoseRunner Example
5+
# plan_file_path: "install/capabilities2_fabric/share/capabilities2_fabric/plans/prompt_2.xml" # PromptOccupancyRunner Example
6+
# plan_file_path: "install/capabilities2_fabric/share/capabilities2_fabric/plans/prompt_1.xml" # PromptCapabilityRunner Example
7+
# plan_file_path: "install/capabilities2_fabric/share/capabilities2_fabric/plans/navigation_2.xml" # WaypointRunner Example 2
48
# plan_file_path: "install/capabilities2_fabric/share/capabilities2_fabric/plans/navigation_1.xml" # WaypointRunner Example 1
59
# plan_file_path: "install/capabilities2_fabric/share/capabilities2_fabric/plans/default.xml"
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
## PromptCapabilityRunner Example
2+
3+
### Dependencies
4+
5+
This example uses prompt tools stack. Follow instructions from [Propmt Tools Dependency Installation](../../docs/prompt_tools_setup.md) to setup Prompt tools stack.
6+
7+
### Plan selection
8+
9+
Uncomment the line related to `prompt_1.xml` in the `config/fabric,yaml` file
10+
11+
### Build the package to apply changes
12+
13+
In the workspace root run,
14+
15+
```bash
16+
colcon build
17+
```
18+
19+
### Start the Prompt Tools stack
20+
21+
```bash
22+
source install/setup.bash
23+
ros2 launch prompt_bridge prompt_bridge.launch.py
24+
```
25+
26+
### Start the Capabilities2 Server
27+
28+
```bash
29+
source install/setup.bash
30+
ros2 launch capabilities2_server server.launch.py
31+
```
32+
33+
### Start the Capabilities2 Fabric
34+
35+
```bash
36+
source install/setup.bash
37+
ros2 launch capabilities2_fabric fabric.launch.py
38+
```
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
## PromptOccupancyRunner Example
2+
3+
### Dependencies
4+
5+
This example uses prompt tools stack, nav2 stack and turtlebot3. Follow instructions from [Nav2 Dependency Installation](../../docs/nav2_setup.md) to setup nav stack and [Propmt Tools Dependency Installation](../../docs/prompt_tools_setup.md) to setup nav stack.
6+
7+
### Plan selection
8+
9+
Uncomment the line related to `prompt_2.xml` in the `config/fabric,yaml` file
10+
11+
### Build the package to apply changes
12+
13+
In the workspace root run,
14+
15+
```bash
16+
colcon build
17+
```
18+
19+
### Start the turtlebot simulation
20+
21+
```bash
22+
export TURTLEBOT3_MODEL=waffle
23+
ros2 launch turtlebot3_gazebo turtlebot3_world.launch.py
24+
```
25+
26+
### Start the Navigation2 stack
27+
28+
```bash
29+
source install/setup.bash
30+
ros2 launch nav_stack system.launch.py
31+
```
32+
33+
### Start the Prompt Tools stack
34+
35+
```bash
36+
source install/setup.bash
37+
ros2 launch prompt_bridge prompt_bridge.launch.py
38+
```
39+
40+
### Start the Capabilities2 Server
41+
42+
```bash
43+
source install/setup.bash
44+
ros2 launch capabilities2_server server.launch.py
45+
```
46+
47+
### Start the Capabilities2 Fabric
48+
49+
```bash
50+
source install/setup.bash
51+
ros2 launch capabilities2_fabric fabric.launch.py
52+
```
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
## PromptPlanRunner Example
2+
3+
### Dependencies
4+
5+
This example uses prompt tools stack, nav2 stack and turtlebot3. Follow instructions from [Nav2 Dependency Installation](../../docs/nav2_setup.md) to setup nav stack and [Propmt Tools Dependency Installation](../../docs/prompt_tools_setup.md) to setup nav stack.
6+
7+
### Plan selection
8+
9+
Uncomment the line related to `prompt_4.xml` in the `config/fabric,yaml` file
10+
11+
### Build the package to apply changes
12+
13+
In the workspace root run,
14+
15+
```bash
16+
colcon build
17+
```
18+
19+
### Start the turtlebot simulation
20+
21+
```bash
22+
export TURTLEBOT3_MODEL=waffle
23+
ros2 launch turtlebot3_gazebo turtlebot3_world.launch.py
24+
```
25+
26+
### Start the Navigation2 stack
27+
28+
```bash
29+
source install/setup.bash
30+
ros2 launch nav_stack system.launch.py
31+
```
32+
33+
### Start the Prompt Tools stack
34+
35+
```bash
36+
source install/setup.bash
37+
ros2 launch prompt_bridge prompt_bridge.launch.py
38+
```
39+
40+
### Start the Capabilities2 Server
41+
42+
```bash
43+
source install/setup.bash
44+
ros2 launch capabilities2_server server.launch.py
45+
```
46+
47+
### Start the Capabilities2 Fabric
48+
49+
```bash
50+
source install/setup.bash
51+
ros2 launch capabilities2_fabric fabric.launch.py
52+
```
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
## PromptPoseRunner Example
2+
3+
### Dependencies
4+
5+
This example uses prompt tools stack, nav2 stack and turtlebot3. Follow instructions from [Nav2 Dependency Installation](../../docs/nav2_setup.md) to setup nav stack and [Propmt Tools Dependency Installation](../../docs/prompt_tools_setup.md) to setup nav stack.
6+
7+
### Plan selection
8+
9+
Uncomment the line related to `prompt_3.xml` in the `config/fabric,yaml` file
10+
11+
### Build the package to apply changes
12+
13+
In the workspace root run,
14+
15+
```bash
16+
colcon build
17+
```
18+
19+
### Start the turtlebot simulation
20+
21+
```bash
22+
export TURTLEBOT3_MODEL=waffle
23+
ros2 launch turtlebot3_gazebo turtlebot3_world.launch.py
24+
```
25+
26+
### Start the Navigation2 stack
27+
28+
```bash
29+
source install/setup.bash
30+
ros2 launch nav_stack system.launch.py
31+
```
32+
33+
### Start the Prompt Tools stack
34+
35+
```bash
36+
source install/setup.bash
37+
ros2 launch prompt_bridge prompt_bridge.launch.py
38+
```
39+
40+
### Start the Capabilities2 Server
41+
42+
```bash
43+
source install/setup.bash
44+
ros2 launch capabilities2_server server.launch.py
45+
```
46+
47+
### Start the Capabilities2 Fabric
48+
49+
```bash
50+
source install/setup.bash
51+
ros2 launch capabilities2_fabric fabric.launch.py
52+
```

capabilities2_fabric/docs/waypoint_runner_ex1.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## WaypointRunner Example 1
1+
## WaypointRunner Example 1 - Single Goal
22

33
### Dependencies
44

@@ -37,7 +37,7 @@ source install/setup.bash
3737
ros2 launch capabilities2_server server.launch.py
3838
```
3939

40-
### Start the fabric
40+
### Start the Capabilities2 Fabric
4141

4242
```bash
4343
source install/setup.bash

capabilities2_fabric/docs/waypoint_runner_ex2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## WaypointRunner Example 2
1+
## WaypointRunner Example 2 - Goal Sequence
22

33
### Dependencies
44

@@ -37,7 +37,7 @@ source install/setup.bash
3737
ros2 launch capabilities2_server server.launch.py
3838
```
3939

40-
### Start the fabric
40+
### Start the Capabilities2 Fabric
4141

4242
```bash
4343
source install/setup.bash

0 commit comments

Comments
 (0)