Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Proposed change to assignment: #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
build/
devel/
*.npy

.vscode/*
1 change: 1 addition & 0 deletions src/CMakeLists.txt
10 changes: 5 additions & 5 deletions src/planner/launch/turtlebot_in_stage.launch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--
<!--
Turtlebot navigation simulation:
- stage
- map_server
Expand All @@ -13,15 +13,15 @@
<arg name="3d_sensor" default="$(optenv TURTLEBOT_3D_SENSOR kinect)"/> <!-- kinect, asus_xtion_pro -->

<!-- Name of the map to use (without path nor extension) and initial position -->
<arg name="map_file" default=" $(find planner)/maps/maze.yaml"/>
<arg name="map_file" default=" $(find planner)/maps/maze.yaml"/>
<arg name="world_file" default=" $(find planner)/maps/stage/maze.world"/>
<arg name="initial_pose_x" default="1.0"/>
<arg name="initial_pose_y" default="1.0"/>
<arg name="initial_pose_a" default="0.0"/>

<param name="/use_sim_time" value="true"/>
<!-- ******************** Stage ******************** -->
<!--
<!--
Publishes transforms:
/base_link -> /base_laser
/base_footprint -> /base_link (identity)
Expand All @@ -34,7 +34,7 @@
base_watchdog_timeout : time (s) after receiving the last command on cmd_vel before stopping the robot
Args:
-g : run in headless mode.
-->
-->
<node pkg="stage_ros" type="stageros" name="stageros" args="$(arg world_file)">
<param name="base_watchdog_timeout" value="0.5"/>
<remap from="odom" to="odom"/>
Expand Down Expand Up @@ -67,7 +67,7 @@
</include>

<!-- **************** Visualisation **************** -->
<node name="rviz" pkg="rviz" type="rviz" args="-d $(find planner)/rviz/robot_navigation.rviz"/>
<!-- <node name="rviz" pkg="rviz" type="rviz" args="-d $(find planner)/rviz/robot_navigation.rviz"/> -->
<!-- <node name="simple_controller" pkg="planner" type="simple_controller" filename="simple_controller.py"/>
<node name="hybrid_planner" pkg="planner" type="hybrid_planner" filename="hybrid_planner.py"/> -->
</launch>
Binary file modified src/planner/maps/maze0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/planner/maps/maze1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/planner/maps/maze2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/planner/maps/maze3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading