Update of /cvsroot/playerstage/code/player/server/drivers/planner/wavefront
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4552/server/drivers/planner/wavefront
Modified Files:
Tag: release-2-0-patches
wavefront.cc
Log Message:
backported lots of stuff from HEAD
Index: wavefront.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/planner/wavefront/wavefront.cc,v
retrieving revision 1.57
retrieving revision 1.57.2.1
diff -C2 -d -r1.57 -r1.57.2.1
*** wavefront.cc 27 Feb 2006 18:19:03 -0000 1.57
--- wavefront.cc 7 Jun 2006 16:12:52 -0000 1.57.2.1
***************
*** 157,161 ****
(
name "p2os"
! provides ["odometry::position:1"]
port "/dev/ttyS0"
)
--- 157,161 ----
(
name "p2os"
! provides ["odometry:::position2d:0"]
port "/dev/ttyS0"
)
***************
*** 176,187 ****
(
name "amcl"
! provides ["localize:0"]
! requires ["odometry::position:1" "laser:0" "laser::map:0"]
)
driver
(
name "vfh"
! provides ["position:0"]
! requires ["position:1" "laser:0"]
safety_dist 0.1
distance_epsilon 0.3
--- 176,187 ----
(
name "amcl"
! provides ["position2d:2"]
! requires ["odometry:::position2d:1" "laser:0" "laser:::map:0"]
)
driver
(
name "vfh"
! provides ["position2d:1"]
! requires ["position2d:0" "laser:0"]
safety_dist 0.1
distance_epsilon 0.3
***************
*** 192,196 ****
name "wavefront"
provides ["planner:0"]
! requires ["position:0" "localize:0" "map:0"]
safety_dist 0.15
distance_epsilon 0.5
--- 192,196 ----
name "wavefront"
provides ["planner:0"]
! requires ["output:::position2d:1" "input:::position2d:2" "map:0"]
safety_dist 0.15
distance_epsilon 0.5
***************
*** 378,382 ****
this->request_map = cf->ReadInt(section,"request_map",1);
this->cspace_fname =
cf->ReadFilename(section,"cspace_file","player.cspace");
! this->always_insert_rotational_waypoints =
cf->ReadInt(section, "add_rotational_waypoints", 1);
}
--- 378,382 ----
this->request_map = cf->ReadInt(section,"request_map",1);
this->cspace_fname =
cf->ReadFilename(section,"cspace_file","player.cspace");
! this->always_insert_rotational_waypoints =
cf->ReadInt(section, "add_rotational_waypoints", 1);
}
***************
*** 910,914 ****
this->waypoint_a = this->target_a;
! if(this->always_insert_rotational_waypoints ||
(this->curr_waypoint == 2))
{
--- 910,914 ----
this->waypoint_a = this->target_a;
! if(this->always_insert_rotational_waypoints ||
(this->curr_waypoint == 2))
{
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
