Skip to content

Commit 9146198

Browse files
Remove rmf_demos_panel (#235)
* Remove rmf_demos_panel Signed-off-by: Luca Della Vedova <[email protected]> * Readme for dashboard resources Signed-off-by: Luca Della Vedova <[email protected]> * Remove rmf_demos_dashboard_resources Signed-off-by: Luca Della Vedova <[email protected]> --------- Signed-off-by: Luca Della Vedova <[email protected]> Co-authored-by: Yadu <[email protected]>
1 parent 6a27d7c commit 9146198

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+9
-1809
lines changed

.github/workflows/build.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ jobs:
1414
rmf_demos
1515
rmf_demos_assets
1616
rmf_demos_bridges
17-
rmf_demos_dashboard_resources
1817
rmf_demos_fleet_adapter
1918
rmf_demos_gz
2019
rmf_demos_maps
21-
rmf_demos_panel
2220
rmf_demos_tasks
2321
dist-matrix: '[{"ros_distribution": "rolling", "ubuntu_distribution": "noble"}]'

README.md

Lines changed: 9 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -54,29 +54,6 @@ By specifying `server_uri`, the fleetadapter will update `rmf-web` `api-server`
5454
* [Campus World](#Campus-World)
5555
* [Manufacturing & Logistics World](#Manufacturing-&-Logistics-World)
5656

57-
**RMF Panel**
58-
![](../media/RMF_Panel.png?raw=true)
59-
60-
Click this link: https://open-rmf.github.io/rmf-panel-js/
61-
62-
> For a full-proof web application of Open-RMF, please refer to [rmf-web](https://github.com/open-rmf/rmf-web).
63-
64-
The [RMF panel](https://github.com/open-rmf/rmf-panel-js) is a web based dashboard for interacting with rmf_demos. It allows users to send task requests to RMF and monitor the status of robots and submitted tasks. For more [details](rmf_demos_panel/README.md).
65-
66-
There are two main modes of submitting tasks to Open-RMF via the Panel:
67-
68-
1. Submit a Task: Used to submit a single task.
69-
2. Submit a List of Tasks: Used to submit a batch of tasks. A `.json` file containing a list of tasks may be loaded via the `Choose file` button. Some example files are found in `rmf_demos_panel/task_lists`.
70-
71-
**LATEST UPDATE: Display Task States**
72-
73-
`task_state_uptates` are now published via websocket. To display task states on `rmf-panel`, specify `server_uri:="ws://localhost:7878"` during ros2 launch. Example:
74-
```
75-
ros2 launch rmf_demos_gz office.launch.xml server_uri:="ws://localhost:7878"
76-
```
77-
78-
This will let Open-RMF (websocket clients) to publish their states to port `7878`. In this case, rmf-panel's `api_simple_server` is the websocket server.
79-
8057
---
8158

8259
### Hotel World
@@ -98,15 +75,10 @@ ros2 launch rmf_demos_gz hotel.launch.xml
9875
ros2 launch rmf_demos_gz hotel.launch.xml
9976
```
10077

101-
Here, we will showcase 2 types of Tasks: **Loop** and **Clean**
102-
103-
Open [RMF Panel](https://open-rmf.github.io/rmf-panel-js/) to submit clean or loop requests.
104-
To submit a **loop task**, select `Loop` from the `Select a request type` dropdown list. Choose desired start and end locations and click submit. Similarly for **Clean task**, select `Clean`, then choose the desired `cleaning zone` from the dropdown list.
105-
106-
Or, dispatch robot via CLI
78+
Here, we will showcase 2 types of Tasks: **Loop** and **Clean**, you can dispatch them via CLI as follows:
10779
```bash
108-
ros2 run rmf_demos_tasks dispatch_clean -cs clean_lobby --use_sim_time
10980
ros2 run rmf_demos_tasks dispatch_patrol -p restaurant L3_master_suite -n 1 --use_sim_time
81+
ros2 run rmf_demos_tasks dispatch_clean -cs clean_lobby --use_sim_time
11082
```
11183

11284
Robots running Clean and Loop Task:
@@ -117,8 +89,6 @@ Robots running Clean and Loop Task:
11789
To submit a list of scheduled tasks via rmf web panel, load [hotel_tasks.json](https://github.com/open-rmf/rmf_demos/blob/main/rmf_demos_panel/task_lists/hotel_tasks.json),
11890
or paste the json list to the _Submit a List of Tasks_ section. Next, click on submit.
11991

120-
> Tip: To speedup simulation on gazebo, user can run `gz physics -s 0.01` on a separate terminal after launching the world. Use with care!
121-
12292
---
12393

12494
### Office World
@@ -134,20 +104,17 @@ ros2 launch rmf_demos_gz office.launch.xml
134104

135105
Now we will showcase 2 types of Tasks: **Delivery** and **Loop**
136106

137-
To send task requests, open rmf_demos web panel: https://open-rmf.github.io/rmf-panel-js/
138-
139107
![](../media/delivery_request.gif?raw=true)
140108

141-
To submit a **delivery task**, select `Delivery` from the `Select a request type` dropdown list. Next, select `coke` from the `Select delivery task` list. Choose an desired start time for task and click submit.
142-
143-
Or, submit a task via CLI:
109+
You can request the robot to deliver a can of coke from `pantry` to `hardware_2` through the following:
144110
```bash
145-
ros2 run rmf_demos_tasks dispatch_patrol -p coe lounge -n 3 --use_sim_time
146111
ros2 run rmf_demos_tasks dispatch_delivery -p pantry -ph coke_dispenser -d hardware_2 -dh coke_ingestor --use_sim_time
147112
```
148113

149-
To submit a **loop task**, select `Loop` from the `Select a request type` dropdown list. Choose desired start and end locations and click submit.
150-
To run a scenario with multiple task requests, load [office_tasks.json](https://github.com/open-rmf/rmf_demos/blob/main/rmf_demos_panel/task_lists/office_tasks.json) from `rmf_demos_panel/task_lists` in the `Submit a list of tasks` section. This should populate the preview window with a list of tasks. Click submit and watch the demonstration unfold.
114+
You can also request the robot to move back and forth between `coe` and `lounge` through the following:
115+
```bash
116+
ros2 run rmf_demos_tasks dispatch_patrol -p coe lounge -n 3 --use_sim_time
117+
```
151118

152119
![](../media/loop_request.gif)
153120

@@ -170,9 +137,7 @@ source ~/rmf_ws/install/setup.bash
170137
ros2 launch rmf_demos_gz airport_terminal.launch.xml
171138
```
172139

173-
Open [RMF Panel](https://open-rmf.github.io/rmf-panel-js/). Load the [airport_terminal_tasks.json](https://github.com/open-rmf/rmf_demos/blob/main/rmf_demos_panel/task_lists/airport_terminal_tasks.json) list and click submit to begin a collection of loop, delivery and cleaning tasks.
174-
175-
Or, submit `loop`, `delivery` or `clean` task via CLI:
140+
You can submit `loop`, `delivery` or `clean` task via CLI:
176141
```bash
177142
ros2 run rmf_demos_tasks dispatch_patrol -p s07 n12 -n 3 --use_sim_time
178143
ros2 run rmf_demos_tasks dispatch_delivery -p mopcart_pickup -ph mopcart_dispenser -d spill -dh mopcart_collector --use_sim_time
@@ -198,8 +163,6 @@ ros2 launch rmf_demos_gz airport_terminal_caddy.launch.xml
198163

199164
![](../media/caddy.gif)
200165

201-
> Tip: To speedup simulation on gazebo, user can run `gz physics -ps 0.01` on a separate terminal after launching the world. Use with care!
202-
203166
---
204167

205168
### Clinic World
@@ -216,9 +179,7 @@ source ~/rmf_ws/install/setup.bash
216179
ros2 launch rmf_demos_gz clinic.launch.xml
217180
```
218181

219-
Open [RMF Panel](https://open-rmf.github.io/rmf-panel-js/). Load the [clinic_tasks.json](https://github.com/open-rmf/rmf_demos/blob/main/rmf_demos_panel/task_lists/clinic_tasks.json) list and click submit to begin a collection of loop and delivery tasks.
220-
221-
Or, submit a task via CLI:
182+
You can submit tasks via CLI:
222183
```bash
223184
ros2 run rmf_demos_tasks dispatch_patrol -p L1_left_nurse_center L2_right_nurse_center -n 5 --use_sim_time
224185
ros2 run rmf_demos_tasks dispatch_patrol -p L2_north_counter L1_right_nurse_center -n 5 --use_sim_time

rmf_demos/launch/airport_terminal.launch.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<arg name="use_sim_time" value="$(var use_sim_time)"/>
1010
<arg name="viz_config_file" value ="$(find-pkg-share rmf_demos)/include/airport_terminal/airport_terminal.rviz"/>
1111
<arg name="config_file" value="$(find-pkg-share rmf_demos_maps)/airport_terminal/airport_terminal.building.yaml"/>
12-
<arg name="dashboard_config_file" value="$(find-pkg-share rmf_demos_dashboard_resources)/airport_terminal/dashboard_config.json"/>
1312
</include>
1413

1514
<!-- TinyRobot fleet adapter -->

rmf_demos/launch/clinic.launch.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<arg name="use_sim_time" value="true"/>
99
<arg name="viz_config_file" value ="$(find-pkg-share rmf_demos)/include/clinic/clinic.rviz"/>
1010
<arg name="config_file" value="$(find-pkg-share rmf_demos_maps)/clinic/clinic.building.yaml"/>
11-
<arg name="dashboard_config_file" value="$(find-pkg-share rmf_demos_dashboard_resources)/clinic/dashboard_config.json"/>
1211
</include>
1312

1413
<!-- DeliveryRobot fleet adapter -->

rmf_demos/launch/common.launch.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@
55
<arg name="use_sim_time" default="false" description="Use the /clock topic for time to sync with simulation"/>
66
<arg name="viz_config_file" default="$(find-pkg-share rmf_visualization_schedule)/config/rmf.rviz"/>
77
<arg name="config_file" description="Building description file required by rmf_building_map_tools"/>
8-
<arg name="dashboard_config_file" default="" description="Path to dashboard config for web rmf panel file"/>
98
<arg name="initial_map" default="L1" description="Initial map name for the visualizer"/>
109
<arg name="headless" default="false" description="do not launch rviz; launch gazebo in headless mode"/>
1110
<arg name="bidding_time_window" description="Time window in seconds for task bidding process" default="2.0"/>
12-
<arg name="use_rmf_panel" default="true" description="launch web and api server for rmf_demos_panel"/>
1311
<arg name="use_unique_hex_string_with_task_id" default="true" description="Appends a unique hex string to the task ID"/>
1412
<arg name="server_uri" default="" description="The URI of the api server to transmit state and task information."/>
1513

@@ -63,12 +61,4 @@
6361
<param name="server_uri" value="$(var server_uri)"/>
6462
</node>
6563
</group>
66-
67-
<group if="$(var use_rmf_panel)">
68-
<include file="$(find-pkg-share rmf_demos)/dashboard.launch.xml">
69-
<arg name="use_sim_time" value="$(var use_sim_time)"/>
70-
<arg name="dashboard_config_file" value ="$(var dashboard_config_file)"/>
71-
</include>
72-
</group>
73-
7464
</launch>

rmf_demos/launch/dashboard.launch.xml

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

rmf_demos/launch/hotel.launch.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<arg name="use_sim_time" value="$(var use_sim_time)"/>
1010
<arg name="viz_config_file" value ="$(find-pkg-share rmf_demos)/include/hotel/hotel.rviz"/>
1111
<arg name="config_file" value="$(find-pkg-share rmf_demos_maps)/hotel/hotel.building.yaml"/>
12-
<arg name="dashboard_config_file" value="$(find-pkg-share rmf_demos_dashboard_resources)/hotel/dashboard_config.json"/>
1312
</include>
1413

1514
<!-- Experimental Lift watchdog service launch, default disable -->

rmf_demos/launch/office.launch.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<arg name="use_sim_time" value="$(var use_sim_time)"/>
99
<arg name="viz_config_file" value ="$(find-pkg-share rmf_demos)/include/office/office.rviz"/>
1010
<arg name="config_file" value="$(find-pkg-share rmf_demos_maps)/office/office.building.yaml"/>
11-
<arg name="dashboard_config_file" value="$(find-pkg-share rmf_demos_dashboard_resources)/office/dashboard_config.json"/>
1211
</include>
1312

1413
<!-- TinyRobot fleet adapter -->

rmf_demos/launch/office_mock_traffic_light.launch.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<arg name="use_sim_time" value="$(var use_sim_time)"/>
99
<arg name="viz_config_file" value ="$(find-pkg-share rmf_demos)/include/office/office.rviz"/>
1010
<arg name="config_file" value="$(find-pkg-share rmf_demos_maps)/office/office.building.yaml"/>
11-
<arg name="dashboard_config_file" value="$(find-pkg-share rmf_demos_dashboard_resources)/office/dashboard_config.json"/>
1211
</include>
1312

1413
<group>

rmf_demos/package.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
<exec_depend>rmf_demos_assets</exec_depend>
2323
<exec_depend>rmf_demos_tasks</exec_depend>
24-
<exec_depend>rmf_demos_panel</exec_depend>
2524
<exec_depend>rmf_demos_fleet_adapter</exec_depend>
2625
<exec_depend>rviz2</exec_depend>
2726

0 commit comments

Comments
 (0)