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

Initial draft of changes for online map / planner updates #12

Draft
wants to merge 24 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
745d2d0
Add functionality to update map (and the planner state space boundari…
meychr Apr 5, 2021
51f0bac
Make class member of StateValidator private
meychr May 13, 2021
c8ad75d
Make some class functions constant
meychr May 13, 2021
0d0bcc0
Unify name of state space boundaries to StateSpaceBoundaries
meychr May 13, 2021
07efb89
Reorder member variables
meychr May 13, 2021
b492b7f
Implement getStartingState and getGoalState for OmplReedsSheppPlanner
meychr May 14, 2021
85723b8
Move ROS publishers and services to base class PlannerRos, use Planne…
meychr May 14, 2021
f24ce13
Make isStateValid constant
meychr May 14, 2021
11075fe
Fix typo
meychr May 14, 2021
8c0bc04
Move StateValidator functions to Planner interface
meychr May 14, 2021
0072859
Adapt se2_grid_map_generator config and add TODOs to fix frames
meychr May 19, 2021
db4a618
Set state space bounds changes
meychr May 19, 2021
2735940
Fix formatting
meychr May 19, 2021
6b3863b
Move getStateSpaceBoundaries to OmplPlanner
meychr May 19, 2021
4704095
Remove comment
meychr May 19, 2021
808bd65
Reorder code and remove TODO
meychr May 29, 2021
21e3385
Fix format
meychr Jun 7, 2021
5c1afb2
Implement map interface and occupancy map & adapt height map
meychr Jun 7, 2021
fc57077
Add ROS class for occupancy map
meychr Jun 7, 2021
632a7f6
Integrate new map for state space boundaries update, adapt tests
meychr Jun 7, 2021
db5da4d
Uncomment isTraversable again
meychr Jun 7, 2021
80db121
Make GridMapLazyStateValidatorRos similar to OccupancyMapRos
meychr Jun 7, 2021
ad3095d
Change config file to use elevation for collision checking in state v…
meychr Jun 7, 2021
d07c579
Increase footprint size in car_demo
meychr Jun 7, 2021
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
Prev Previous commit
Next Next commit
Adapt se2_grid_map_generator config and add TODOs to fix frames
  • Loading branch information
meychr committed May 19, 2021
commit 007285952a3d5745ce01cced10cffdc8e6569acd
2 changes: 1 addition & 1 deletion se2_grid_map_generator/config/default.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
map:
frame_id: odom
frame_id: map # TODO(christoph): planning breaks if start and goal are not set using map as reference frame in rviz
layers: [elevation, traversability]
default_values: [0.0, 1.0]
resolution: 0.1
Expand Down
2 changes: 2 additions & 0 deletions se2_planning_ros/src/OmplReedsSheppPlannerRos.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ bool OmplReedsSheppPlannerRos::planningService(PlanningService::Request& req, Pl

planTimeStamp_ = req.pathRequest.header.stamp;

// TODO(christoph): start and goal state are provided in map frame, grid map position is in odom frame?
const auto start = se2_planning::convert(req.pathRequest.startingPose);
const auto goal = se2_planning::convert(req.pathRequest.goalPose);
setStartingState(start);
Expand Down Expand Up @@ -184,6 +185,7 @@ void OmplReedsSheppPlannerRos::publishGoalState() const {

void OmplReedsSheppPlannerRos::publishStateSpaceBoundaryMarker() {
// Set marker info.
// TODO(christoph): This should be extracted from the map reference frame!!!
stateSpaceBoundaryMarker_.header.frame_id = parameters_.pathFrame_;
stateSpaceBoundaryMarker_.header.stamp = planTimeStamp_;

Expand Down
2 changes: 2 additions & 0 deletions se2_planning_ros/src/se2_planner_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ using namespace se2_planning;
auto planner = std::make_shared<OmplReedsSheppPlanner>();

void gridMapCallback(const grid_map_msgs::GridMap& msg) {
meychr marked this conversation as resolved.
Show resolved Hide resolved
// TODO(christoph): Have to transform map position in map frame (or start and goal state in odom frame)?
// Start and goal state are provided in map frame?
// Update planner bounds when new map is published, placed here due to class structure
grid_map::GridMap map;
grid_map::GridMapRosConverter::fromMessage(msg, map);
Expand Down
2 changes: 2 additions & 0 deletions se2_planning_rviz/src/PlanningPanel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,8 @@ std::thread t([this] {

const bool useCurrentStateAsStartingPose = currentStateAsStartCheckBox_->isChecked();
geometry_msgs::Pose startingPose, goalPose;
// TODO(christoph): This does not work correctly together (map and getStartPoseFromService) => /prius/get_current_state_service
// /prius/base_pose_ground_truth => has to be synced with state input to gridMapStateValidator?
if (useCurrentStateAsStartingPose) {
getStartPoseFromService(&startingPose);
lastPose_ = startingPose; //update last state
Expand Down