|
From: <jl...@us...> - 2008-11-19 10:11:19
|
Revision: 6982
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=6982&view=rev
Author: jleibs
Date: 2008-11-19 10:11:09 +0000 (Wed, 19 Nov 2008)
Log Message:
-----------
Sysdep changes to get a make buildtest of roscpp to work for gutsy. Changes to MoveBase.cpp and point_cloud_assembler.cpp to make them correctly read non natively typed parameters from the parameter server.
Modified Paths:
--------------
pkg/trunk/3rdparty/bfl_latest/manifest.xml
pkg/trunk/3rdparty/gazebo/manifest.xml
pkg/trunk/3rdparty/kdl/manifest.xml
pkg/trunk/3rdparty/soqt/manifest.xml
pkg/trunk/3rdparty/svl-1.0/manifest.xml
pkg/trunk/3rdparty/wxmpl/manifest.xml
pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml
pkg/trunk/drivers/robot/pr2/point_cloud_assembler/src/point_cloud_assembler.cpp
pkg/trunk/highlevel/highlevel_controllers/src/MoveBase.cpp
pkg/trunk/util/tf/manifest.xml
pkg/trunk/visualization/ogre_tools/manifest.xml
pkg/trunk/visualization/ogre_visualizer/manifest.xml
pkg/trunk/visualization/wx_rosout/manifest.xml
Modified: pkg/trunk/3rdparty/bfl_latest/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/bfl_latest/manifest.xml 2008-11-19 10:08:57 UTC (rev 6981)
+++ pkg/trunk/3rdparty/bfl_latest/manifest.xml 2008-11-19 10:11:09 UTC (rev 6982)
@@ -19,6 +19,7 @@
<sysdepend os="ubuntu" version="7.04-feisty" package="subversion"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="subversion"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
+<sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-dev=1.34.1-2ubuntu1"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-dev"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="libcppunit-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libcppunit-dev"/>
Modified: pkg/trunk/3rdparty/gazebo/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/gazebo/manifest.xml 2008-11-19 10:08:57 UTC (rev 6981)
+++ pkg/trunk/3rdparty/gazebo/manifest.xml 2008-11-19 10:11:09 UTC (rev 6982)
@@ -20,6 +20,8 @@
<sysdepend os="ubuntu" version="8.04-hardy" package="libltdl3-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libfltk1.1"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libfltk1.1-dev"/>
+ <sysdepend os="ubuntu" version="7.04-feisty" package="libboost-signals1.34.1"/>
+ <sysdepend os="ubuntu" version="7.04-feisty" package="libboost-signals-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-signals1.34.1"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-signals-dev"/>
</package>
Modified: pkg/trunk/3rdparty/kdl/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/kdl/manifest.xml 2008-11-19 10:08:57 UTC (rev 6981)
+++ pkg/trunk/3rdparty/kdl/manifest.xml 2008-11-19 10:11:09 UTC (rev 6982)
@@ -13,6 +13,8 @@
<sysdepend os="ubuntu" version="7.04-feisty" package="python-sip4"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="sip4"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
+<sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-dev=1.34.1-2ubuntu1"/>
+<sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-sip4-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-sip4"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="sip4"/>
Modified: pkg/trunk/3rdparty/soqt/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/soqt/manifest.xml 2008-11-19 10:08:57 UTC (rev 6981)
+++ pkg/trunk/3rdparty/soqt/manifest.xml 2008-11-19 10:11:09 UTC (rev 6982)
@@ -10,11 +10,17 @@
<cpp lflags="-Wl,-rpath,${prefix}/lib `${prefix}/bin/soqt-config --ldflags` `${prefix}/bin/soqt-config --libs`" cflags="`${prefix}/bin/soqt-config --cppflags`"/>
<doxymaker external="http://developer.nvidia.com/page/documentation.html"/>
</export>
- <sysdepend os="ubuntu" version="7.04-hardy" package="libcoin40-dev"/>
+ <sysdepend os="ubuntu" version="7.04-feisty" package="libqt4-core"/>
+ <sysdepend os="ubuntu" version="7.10-gutsy" package="libqt4-core=4.3.2-0ubuntu3"/>
+ <sysdepend os="ubuntu" version="8.04-hardy" package="libqt4-core"/>
+ <sysdepend os="ubuntu" version="7.04-feisty" package="libcoin40-dev"/>
+ <sysdepend os="ubuntu" version="7.10-gutsy" package="libcoin40-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libcoin40-dev"/>
- <sysdepend os="ubuntu" version="7.04-hardy" package="qt4-dev-tools"/>
+ <sysdepend os="ubuntu" version="7.04-feisty" package="qt4-dev-tools"/>
+ <sysdepend os="ubuntu" version="7.10-gutsy" package="qt4-dev-tools"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="qt4-dev-tools"/>
- <sysdepend os="ubuntu" version="7.04-hardy" package="libqt4-dev"/>
+ <sysdepend os="ubuntu" version="7.04-feisty" package="libqt4-dev"/>
+ <sysdepend os="ubuntu" version="7.10-gutsy" package="libqt4-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libqt4-dev"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="wget"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="wget"/>
Modified: pkg/trunk/3rdparty/svl-1.0/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/svl-1.0/manifest.xml 2008-11-19 10:08:57 UTC (rev 6981)
+++ pkg/trunk/3rdparty/svl-1.0/manifest.xml 2008-11-19 10:11:09 UTC (rev 6982)
@@ -5,7 +5,7 @@
<author>Stephen Gould, with ROS wrapping by Morgan Quigley</author>
<license>BSD</license>
<review status="unreviewed" notes=""/>
- <depend package="opencv"/>
+ <depend package="opencv_latest"/>
<depend package="std_msgs"/>
<depend package="image_utils"/>
<depend package="roscpp"/>
Modified: pkg/trunk/3rdparty/wxmpl/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/wxmpl/manifest.xml 2008-11-19 10:08:57 UTC (rev 6981)
+++ pkg/trunk/3rdparty/wxmpl/manifest.xml 2008-11-19 10:11:09 UTC (rev 6982)
@@ -15,6 +15,8 @@
<export>
<doxymaker external="http://agni.phys.iit.edu/~kmcivor/wxmpl/documentation/reference/" />
</export>
+<sysdepend os="ubuntu" version="7.04-feisty" package="python-matplotlib" />
+<sysdepend os="ubuntu" version="8.04-hardy" package="python-matplotlib" />
<sysdepend os="ubuntu" version="7.04-feisty" package="wget"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="wget"/>
</package>
Modified: pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml
===================================================================
--- pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml 2008-11-19 10:08:57 UTC (rev 6981)
+++ pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml 2008-11-19 10:11:09 UTC (rev 6982)
@@ -17,5 +17,7 @@
<cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lethercat_hardware -Wl,-rpath,${prefix}/lib"/>
</export>
<repository>http://pr.willowgarage.com/repos</repository>
+<sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
+<sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-dev=1.34.1-2ubuntu1"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-dev"/>
</package>
Modified: pkg/trunk/drivers/robot/pr2/point_cloud_assembler/src/point_cloud_assembler.cpp
===================================================================
--- pkg/trunk/drivers/robot/pr2/point_cloud_assembler/src/point_cloud_assembler.cpp 2008-11-19 10:08:57 UTC (rev 6981)
+++ pkg/trunk/drivers/robot/pr2/point_cloud_assembler/src/point_cloud_assembler.cpp 2008-11-19 10:11:09 UTC (rev 6982)
@@ -109,7 +109,13 @@
advertise_service("build_cloud", &PointCloudAssembler::buildCloud, this, 0) ; // Don't spawn threads so that we can avoid dealing with mutexing [for now]
subscribe("scan", scan_, &PointCloudAssembler::scans_callback, 40) ;
- param("point_cloud_assembler/max_scans", max_scans_, (unsigned int) 400) ;
+ int tmp_max_scans;
+ param("point_cloud_assembler/max_scans", tmp_max_scans, 400) ;
+ if (tmp_max_scans < 0)
+ tmp_max_scans = 400;
+
+ max_scans_ = tmp_max_scans;
+
param("~ignore_laser_skew", ignore_laser_skew_, true) ;
total_pts_ = 0 ; // We're always going to start with no points in our history
Modified: pkg/trunk/highlevel/highlevel_controllers/src/MoveBase.cpp
===================================================================
--- pkg/trunk/highlevel/highlevel_controllers/src/MoveBase.cpp 2008-11-19 10:08:57 UTC (rev 6981)
+++ pkg/trunk/highlevel/highlevel_controllers/src/MoveBase.cpp 2008-11-19 10:11:09 UTC (rev 6982)
@@ -233,8 +233,27 @@
double weight(0.1); // Scale costs down by a factor of 10
param("/costmap_2d/base_laser_max_range", baseLaserMaxRange_, baseLaserMaxRange_);
param("/costmap_2d/tilt_laser_max_range", tiltLaserMaxRange_, tiltLaserMaxRange_);
- param("/costmap_2d/lethal_obstacle_threshold", lethalObstacleThreshold, lethalObstacleThreshold);
- param("/costmap_2d/no_information_value", noInformation, noInformation);
+
+ // Unsigned chars cannot be stored in parameter server
+
+ int tmpLethalObstacleThreshold;
+ param("/costmap_2d/lethal_obstacle_threshold", tmpLethalObstacleThreshold, int(lethalObstacleThreshold));
+ if (tmpLethalObstacleThreshold > 255)
+ tmpLethalObstacleThreshold = 255;
+ else if (tmpLethalObstacleThreshold < 0)
+ tmpLethalObstacleThreshold = 0;
+
+ lethalObstacleThreshold = tmpLethalObstacleThreshold;
+
+ int tmpNoInformation;
+ param("/costmap_2d/no_information_value", tmpNoInformation, int(noInformation));
+ if (tmpNoInformation > 255)
+ tmpNoInformation = 255;
+ else if (tmpNoInformation < 0)
+ tmpNoInformation = 0;
+
+ noInformation = tmpNoInformation;
+
param("/costmap_2d/z_threshold", maxZ_, maxZ_);
param("/costmap_2d/freespace_projection_height", freeSpaceProjectionHeight, freeSpaceProjectionHeight);
param("/costmap_2d/inflation_radius", inflationRadius, inflationRadius);
Modified: pkg/trunk/util/tf/manifest.xml
===================================================================
--- pkg/trunk/util/tf/manifest.xml 2008-11-19 10:08:57 UTC (rev 6981)
+++ pkg/trunk/util/tf/manifest.xml 2008-11-19 10:11:09 UTC (rev 6982)
@@ -17,8 +17,11 @@
<depend package="bullet"/>
<depend package="laser_scan_utils"/>
<depend package="rosTF"/> <!-- For backwards compatibility only Fixme remove /-->
-
+<sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
+<sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-dev=1.34.1-2ubuntu1"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-dev"/>
+<sysdepend os="ubuntu" version="7.04-feisty" package="libboost-thread-dev"/>
+<sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-thread-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-thread-dev"/>
<export>
<cpp cflags="-I${prefix}/include -I${prefix}/msg/cpp" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -ltf"/>
Modified: pkg/trunk/visualization/ogre_tools/manifest.xml
===================================================================
--- pkg/trunk/visualization/ogre_tools/manifest.xml 2008-11-19 10:08:57 UTC (rev 6981)
+++ pkg/trunk/visualization/ogre_tools/manifest.xml 2008-11-19 10:11:09 UTC (rev 6982)
@@ -17,6 +17,8 @@
</export>
<sysdepend os="ubuntu" version="7.04-feisty" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libwxgtk2.8-dev"/>
+ <sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
+ <sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-dev=1.34.1-2ubuntu1"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-dev"/>
<sysdepend os="ubuntu" version="8.10-intrepid" package="libwxgtk2.8-dev"/>
</package>
Modified: pkg/trunk/visualization/ogre_visualizer/manifest.xml
===================================================================
--- pkg/trunk/visualization/ogre_visualizer/manifest.xml 2008-11-19 10:08:57 UTC (rev 6981)
+++ pkg/trunk/visualization/ogre_visualizer/manifest.xml 2008-11-19 10:11:09 UTC (rev 6982)
@@ -32,6 +32,8 @@
<sysdepend os="ubuntu" version="7.04-feisty" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libwxgtk2.8-dev"/>
+ <sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
+ <sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-dev=1.34.1-2ubuntu1"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-signals-dev"/>
<!-- Note that the presence of python-wxgtk2.6 will cause a
Modified: pkg/trunk/visualization/wx_rosout/manifest.xml
===================================================================
--- pkg/trunk/visualization/wx_rosout/manifest.xml 2008-11-19 10:08:57 UTC (rev 6981)
+++ pkg/trunk/visualization/wx_rosout/manifest.xml 2008-11-19 10:11:09 UTC (rev 6982)
@@ -19,6 +19,8 @@
</export>
<sysdepend os="ubuntu" version="7.04-feisty" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libwxgtk2.8-dev"/>
+<sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
+<sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-dev=1.34.1-2ubuntu1"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-dev"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="libboost-regex-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-regex-dev"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|