Merge branch 'master' of github.com:rpanther/panther

rpanther · Apr 19, 2020 · 8832615 · 8832615
2 parents 1038c17 + 958f749
commit 8832615
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 1,593 deletions.
diff --git a/panther_bringup/config/webconsole.yaml b/panther_bringup/config/webconsole.yaml
@@ -0,0 +1,13 @@
+ros:
+  websocket: 9090
+  packages: 8001
+view3D:
+  tf: {angularThres: 0.01, frame: base_link, rate: 10, transThres: 0.01}
+  viewer: {antialias: true, background: '#EEEEEE'}
+  objects:
+  - config: {cellSize: 1, num_cells: 10}
+    id: grid0
+    type: grid
+  - config: {param: panther/robot_description}
+    id: urdf1
+    type: urdf
diff --git a/panther_bringup/launch/bringup.launch b/panther_bringup/launch/bringup.launch
@@ -29,7 +29,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
   <arg name="drivers"       default="true" />
   <!-- Launch web controller       -->
-  <arg name="web"          default="false" />
+  <arg name="web"          default="true" />
   <!-- Enable/disable 2D mode -->
   <arg name="two_d_mode"   default="false" />
   <!-- Enable/Disable sensor fusion -->

diff --git a/panther_bringup/launch/user_drive_interface.launch b/panther_bringup/launch/user_drive_interface.launch
@@ -47,7 +47,9 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   </group>
   <!-- Launch web controller -->
   <group if="$(arg web)">
-    <include file="$(find panther_control)/launch/web.launch" />
+    <include file="$(find ros_webconsole)/launch/ros_webconsole.launch">
+      <arg name="config" value="$(find panther_bringup)/config/webconsole.yaml" />
+    </include>
   </group>
 
 </launch>
diff --git a/...er_visualization/launch/bag_player.launch → ...up/launch/visualization/bag_player.launch b/...er_visualization/launch/bag_player.launch → ...up/launch/visualization/bag_player.launch
diff --git a/...r_visualization/launch/imu-display.launch → ...p/launch/visualization/imu-display.launch b/...r_visualization/launch/imu-display.launch → ...p/launch/visualization/imu-display.launch
diff --git a/...er_visualization/launch/rtabmapviz.launch → ...up/launch/visualization/rtabmapviz.launch b/...er_visualization/launch/rtabmapviz.launch → ...up/launch/visualization/rtabmapviz.launch
diff --git a/...isualization/launch/video_exporter.launch → ...aunch/visualization/video_exporter.launch b/...isualization/launch/video_exporter.launch → ...aunch/visualization/video_exporter.launch
diff --git a/...ization/launch/cartographer_reader.launch → ...igation/config/cartographer_reader.launch b/...ization/launch/cartographer_reader.launch → ...igation/config/cartographer_reader.launch
diff --git a/...alization/configuration_files/panther.lua → panther_navigation/config/panther.lua b/...alization/configuration_files/panther.lua → panther_navigation/config/panther.lua
diff --git a/panther_visualization/CMakeLists.txt b/panther_visualization/CMakeLists.txt
diff --git a/panther_visualization/package.xml b/panther_visualization/package.xml