Revision: 8466
http://playerstage.svn.sourceforge.net/playerstage/?rev=8466&view=rev
Author: gbiggs
Date: 2009-12-16 00:51:26 +0000 (Wed, 16 Dec 2009)
Log Message:
-----------
Merged changes 8449:8458 from trunk.
Modified Paths:
--------------
code/player/branches/release-3-0-patches/cmake/internal/DriverUtils.cmake
code/player/branches/release-3-0-patches/libplayerinterface/playerinterfacegen.py
code/player/branches/release-3-0-patches/server/CMakeLists.txt
code/player/branches/release-3-0-patches/server/drivers/dio/blobtodio/blobtodio.cc
code/player/branches/release-3-0-patches/server/drivers/gps/CMakeLists.txt
code/player/branches/release-3-0-patches/server/drivers/imu/xsens/CMakeLists.txt
code/player/branches/release-3-0-patches/server/drivers/imu/xsens/XSensMT.cc
code/player/branches/release-3-0-patches/server/drivers/localization/amcl/map/map.h
code/player/branches/release-3-0-patches/server/drivers/map/gridmap.cc
code/player/branches/release-3-0-patches/server/drivers/map/gridmap.h
code/player/branches/release-3-0-patches/server/drivers/power/CMakeLists.txt
code/player/branches/release-3-0-patches/server/drivers/ptz/ptu46.cc
code/player/branches/release-3-0-patches/server/drivers/ranger/CMakeLists.txt
code/player/branches/release-3-0-patches/server/drivers/service_adv/CMakeLists.txt
code/player/branches/release-3-0-patches/server/drivers/shell/cmdsplitter.cc
code/player/branches/release-3-0-patches/server/drivers/shell/readlog.cc
Property Changed:
----------------
code/player/branches/release-3-0-patches/
code/player/branches/release-3-0-patches/client_libs/libplayerc/doc/joydrive.py.doc
code/player/branches/release-3-0-patches/client_libs/libplayerc/doc/simpleclient.c.doc
code/player/branches/release-3-0-patches/client_libs/libplayerc++/bindings/ruby/example.rb.doc
code/player/branches/release-3-0-patches/client_libs/libplayerc++/bindings/ruby/test/
code/player/branches/release-3-0-patches/design/module.c.doc
code/player/branches/release-3-0-patches/design/player.c.doc
code/player/branches/release-3-0-patches/examples/python/playercpp_example.py
code/player/branches/release-3-0-patches/examples/python/playercpy_example.py
code/player/branches/release-3-0-patches/examples/ruby/
code/player/branches/release-3-0-patches/examples/ruby/libplayerc++_ruby_example.rb
code/player/branches/release-3-0-patches/libplayercommon/
code/player/branches/release-3-0-patches/libplayerinterface/
code/player/branches/release-3-0-patches/libplayerinterface/addr_util.c
code/player/branches/release-3-0-patches/libplayerinterface/addr_util.h
code/player/branches/release-3-0-patches/libplayerinterface/interface_util.c
code/player/branches/release-3-0-patches/libplayerinterface/interface_util.h
code/player/branches/release-3-0-patches/libplayerinterface/interfaces/
code/player/branches/release-3-0-patches/libplayerinterface/player.h
code/player/branches/release-3-0-patches/libplayerinterface/playerinterfacegen.py
Property changes on: code/player/branches/release-3-0-patches
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk:6985,8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk:6985,8249-8252,8254-8458
Property changes on:
code/player/branches/release-3-0-patches/client_libs/libplayerc/doc/joydrive.py.doc
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc/doc/joydrive.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/doc/joydrive.py:6985
/code/player/trunk/client_libs/libplayerc/doc/joydrive.py.doc:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc/doc/joydrive.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/doc/joydrive.py:6985
/code/player/trunk/client_libs/libplayerc/doc/joydrive.py.doc:8249-8252,8254-8458
Property changes on:
code/player/branches/release-3-0-patches/client_libs/libplayerc/doc/simpleclient.c.doc
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc/doc/simpleclient.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/doc/simpleclient.c:6985
/code/player/trunk/client_libs/libplayerc/doc/simpleclient.c.doc:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc/doc/simpleclient.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/doc/simpleclient.c:6985
/code/player/trunk/client_libs/libplayerc/doc/simpleclient.c.doc:8249-8252,8254-8458
Property changes on:
code/player/branches/release-3-0-patches/client_libs/libplayerc++/bindings/ruby/example.rb.doc
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/ruby/example.rb:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/example.rb:6985
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/example.rb.doc:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/ruby/example.rb:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/example.rb:6985
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/example.rb.doc:8249-8252,8254-8458
Property changes on:
code/player/branches/release-3-0-patches/client_libs/libplayerc++/bindings/ruby/test
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/ruby/examples:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/examples:6985
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/test:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/ruby/examples:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/examples:6985
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/test:8249-8252,8254-8458
Modified:
code/player/branches/release-3-0-patches/cmake/internal/DriverUtils.cmake
===================================================================
--- code/player/branches/release-3-0-patches/cmake/internal/DriverUtils.cmake
2009-12-16 00:44:13 UTC (rev 8465)
+++ code/player/branches/release-3-0-patches/cmake/internal/DriverUtils.cmake
2009-12-16 00:51:26 UTC (rev 8466)
@@ -179,9 +179,9 @@
PLAYERDRIVER_ADD_DRIVEROPTION (${_name} OFF 1)
ENDIF (${_cumulativeVar})
ELSE (NOT PKG_CONFIG_FOUND)
- IF (${ARGC} GREATER 7)
- SET (_minVersion ${ARG7})
- ENDIF (${ARGC} GREATER 7)
+ IF (${ARGC} GREATER 8)
+ SET (_minVersion ${ARGV8})
+ ENDIF (${ARGC} GREATER 8)
# Look for the package using pkg-config
SET (_pkgVar "${_package}_PKG")
@@ -198,8 +198,8 @@
SET (${_includeDirs} ${${_pkgVar}_INCLUDE_DIRS})
SET (${_libDirs} ${${_pkgVar}_LIBRARY_DIRS})
SET (${_linkLibs} ${${_pkgVar}_LIBRARIES})
- LIST_TO_STRING (${_cFlags} "${${_pkgVar}_CFLAGS}")
- LIST_TO_STRING (${_linkFlags} "${${_pkgVar}_LDFLAGS}")
+ LIST_TO_STRING (${_cFlags} "${${_pkgVar}_CFLAGS_OTHER}")
+ LIST_TO_STRING (${_linkFlags} "${${_pkgVar}_LDFLAGS_OTHER}")
ELSEIF (${_cumulativeVar})
# Case where cumulativeVar is set but package wasn't found - don't
build
SET (${_cumulativeVar} FALSE)
Property changes on:
code/player/branches/release-3-0-patches/design/module.c.doc
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/design/module.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/design/module.c:6985
/code/player/trunk/design/module.c.doc:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/design/module.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/design/module.c:6985
/code/player/trunk/design/module.c.doc:8249-8252,8254-8458
Property changes on:
code/player/branches/release-3-0-patches/design/player.c.doc
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/design/player.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/design/player.c:6985
/code/player/trunk/design/player.c.doc:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/design/player.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/design/player.c:6985
/code/player/trunk/design/player.c.doc:8249-8252,8254-8458
Property changes on:
code/player/branches/release-3-0-patches/examples/python/playercpp_example.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/python/playercpp_example.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/python/playercpp_example.py:6985
/code/player/trunk/examples/python/playercpp_example.py:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/python/playercpp_example.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/python/playercpp_example.py:6985
/code/player/trunk/examples/python/playercpp_example.py:8249-8252,8254-8458
Property changes on:
code/player/branches/release-3-0-patches/examples/python/playercpy_example.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc/bindings/python/playercpy_example.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/bindings/python/playercpy_example.py:6985
/code/player/trunk/examples/python/playercpy_example.py:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc/bindings/python/playercpy_example.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/bindings/python/playercpy_example.py:6985
/code/player/trunk/examples/python/playercpy_example.py:8249-8252,8254-8458
Property changes on: code/player/branches/release-3-0-patches/examples/ruby
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc/bindings/ruby/examples:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/bindings/ruby/examples:6985
/code/player/trunk/examples/ruby:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc/bindings/ruby/examples:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/bindings/ruby/examples:6985
/code/player/trunk/examples/ruby:8249-8252,8254-8458
Property changes on:
code/player/branches/release-3-0-patches/examples/ruby/libplayerc++_ruby_example.rb
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/ruby/example.rb:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/example.rb:6985
/code/player/trunk/examples/ruby/libplayerc++_ruby_example.rb:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/ruby/example.rb:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/example.rb:6985
/code/player/trunk/examples/ruby/libplayerc++_ruby_example.rb:8249-8252,8254-8458
Property changes on: code/player/branches/release-3-0-patches/libplayercommon
___________________________________________________________________
Modified: svn:mergeinfo
- /code/player/trunk/libplayercommon:8249-8252,8254-8449
+ /code/player/trunk/libplayercommon:8249-8252,8254-8458
Property changes on: code/player/branches/release-3-0-patches/libplayerinterface
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayerxdr:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayerinterface:8249-8252,8254-8449
/code/player/trunk/libplayerxdr:6985
+
/code/player/branches/release-2-1-patches/libplayerxdr:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayerinterface:8249-8252,8254-8458
/code/player/trunk/libplayerxdr:6985
Property changes on:
code/player/branches/release-3-0-patches/libplayerinterface/addr_util.c
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayercore/addr_util.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/addr_util.c:6985
/code/player/trunk/libplayerinterface/addr_util.c:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/libplayercore/addr_util.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/addr_util.c:6985
/code/player/trunk/libplayerinterface/addr_util.c:8249-8252,8254-8458
Property changes on:
code/player/branches/release-3-0-patches/libplayerinterface/addr_util.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayercore/addr_util.h:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/addr_util.h:6985
/code/player/trunk/libplayerinterface/addr_util.h:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/libplayercore/addr_util.h:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/addr_util.h:6985
/code/player/trunk/libplayerinterface/addr_util.h:8249-8252,8254-8458
Property changes on:
code/player/branches/release-3-0-patches/libplayerinterface/interface_util.c
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayercore/interface_util.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/interface_util.c:6985
/code/player/trunk/libplayerinterface/interface_util.c:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/libplayercore/interface_util.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/interface_util.c:6985
/code/player/trunk/libplayerinterface/interface_util.c:8249-8252,8254-8458
Property changes on:
code/player/branches/release-3-0-patches/libplayerinterface/interface_util.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayercore/interface_util.h:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/interface_util.h:6985
/code/player/trunk/libplayerinterface/interface_util.h:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/libplayercore/interface_util.h:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/interface_util.h:6985
/code/player/trunk/libplayerinterface/interface_util.h:8249-8252,8254-8458
Property changes on:
code/player/branches/release-3-0-patches/libplayerinterface/interfaces
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayercore/interfaces:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/interfaces:6985
/code/player/trunk/libplayerinterface/interfaces:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/libplayercore/interfaces:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/interfaces:6985
/code/player/trunk/libplayerinterface/interfaces:8249-8252,8254-8458
Property changes on:
code/player/branches/release-3-0-patches/libplayerinterface/player.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayercore/player.h:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/player.h:6985
/code/player/trunk/libplayerinterface/player.h:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/libplayercore/player.h:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/player.h:6985
/code/player/trunk/libplayerinterface/player.h:8249-8252,8254-8458
Modified:
code/player/branches/release-3-0-patches/libplayerinterface/playerinterfacegen.py
===================================================================
---
code/player/branches/release-3-0-patches/libplayerinterface/playerinterfacegen.py
2009-12-16 00:44:13 UTC (rev 8465)
+++
code/player/branches/release-3-0-patches/libplayerinterface/playerinterfacegen.py
2009-12-16 00:51:26 UTC (rev 8466)
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+# -*- coding: utf-8 -*-
#/*
# * Player - One Hell of a Robot Server
@@ -33,7 +34,7 @@
PLUGIN_MODE = "--plugin"
-USAGE = "USAGE: playerinterfacegen.py [%s | %s | %s] [%s] [<interface
file>|<interface dir>]" % (HEADER_MODE, FUNCTIONTABLE_MODE, UTILS_MODE,
PLUGIN_MODE)
+USAGE = "USAGE: playerinterfacegen.py [%s | %s | %s] [%s] [<interface
files>|<interface dirs>]" % (HEADER_MODE, FUNCTIONTABLE_MODE, UTILS_MODE,
PLUGIN_MODE)
class msg:
pass
@@ -210,7 +211,7 @@
if __name__ == '__main__':
mode = HEADER_MODE
- targetfile = "interfaces"
+ targets = []
plugin = False
for option in sys.argv[1:]:
@@ -222,7 +223,10 @@
elif option == PLUGIN_MODE:
plugin = True
else:
- targetfile = option
+ targets.append(option)
+
+ if targets == []:
+ targets = ["interfaces"]
print "/* START OF AUTOGENERATED CODE */"
if plugin:
@@ -231,20 +235,21 @@
print "/* This file or section was automatically generated by
playerinterfacegen.py"
print "To modify the interfaces in this file please edit their interface
definition in libplayerinterface/interfaces/ */"
- if mode == UTILS_MODE:
- process_for_utils(targetfile)
- else:
- if os.path.isdir(targetfile):
- files = glob.glob(os.path.join(targetfile ,"*.def"))
- # It is important that we sort this file list, to ensure that the
- # structure definitions are output in increasing numerical order, to
- # support the use of earlier messages structures in later ones.
- files.sort()
- for file in files:
- if not os.path.isdir(file):
- processfile(mode, file, plugin)
+ for target in targets:
+ if mode == UTILS_MODE:
+ process_for_utils(target)
else:
- processfile(mode, targetfile, plugin)
+ if os.path.isdir(target):
+ files = glob.glob(os.path.join(target ,"*.def"))
+ # It is important that we sort this file list, to ensure that the
+ # structure definitions are output in increasing numerical order, to
+ # support the use of earlier messages structures in later ones.
+ files.sort()
+ for f in files:
+ if not os.path.isdir(f):
+ processfile(mode, f, plugin)
+ else:
+ processfile(mode, target, plugin)
print "/* END OF AUTOGENERATED CODE */"
Property changes on:
code/player/branches/release-3-0-patches/libplayerinterface/playerinterfacegen.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayercore/playerinterfacegen.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/playerinterfacegen.py:6985
/code/player/trunk/libplayerinterface/playerinterfacegen.py:8249-8252,8254-8449
+
/code/player/branches/release-2-1-patches/libplayercore/playerinterfacegen.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/playerinterfacegen.py:6985
/code/player/trunk/libplayerinterface/playerinterfacegen.py:8249-8252,8254-8458
Modified: code/player/branches/release-3-0-patches/server/CMakeLists.txt
===================================================================
--- code/player/branches/release-3-0-patches/server/CMakeLists.txt
2009-12-16 00:44:13 UTC (rev 8465)
+++ code/player/branches/release-3-0-patches/server/CMakeLists.txt
2009-12-16 00:51:26 UTC (rev 8466)
@@ -24,6 +24,11 @@
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/replace)
SET (playerreplaceLib playerreplace)
ENDIF (NOT HAVE_GETOPT)
+IF (PLAYER_DRIVERSLIB_LIBDIRS)
+ FILTER_EMPTY (driverLinkDirs "${PLAYER_DRIVERSLIB_LIBDIRS}")
+ FILTER_DUPLICATES (driverLinkDirs "${driverLinkDirs}")
+ LINK_DIRECTORIES (${driverLinkDirs})
+ENDIF (PLAYER_DRIVERSLIB_LIBDIRS)
# Source files
SET (playerSrcs server.cc)
Modified:
code/player/branches/release-3-0-patches/server/drivers/dio/blobtodio/blobtodio.cc
===================================================================
---
code/player/branches/release-3-0-patches/server/drivers/dio/blobtodio/blobtodio.cc
2009-12-16 00:44:13 UTC (rev 8465)
+++
code/player/branches/release-3-0-patches/server/drivers/dio/blobtodio/blobtodio.cc
2009-12-16 00:51:26 UTC (rev 8466)
@@ -86,6 +86,10 @@
#include <assert.h>
#include <libplayercore/playercore.h>
+#if defined (WIN32)
+ #define snprintf _snprintf
+#endif
+
class BlobToDio : public Driver
{
public: BlobToDio(ConfigFile * cf, int section);
Modified:
code/player/branches/release-3-0-patches/server/drivers/gps/CMakeLists.txt
===================================================================
--- code/player/branches/release-3-0-patches/server/drivers/gps/CMakeLists.txt
2009-12-16 00:44:13 UTC (rev 8465)
+++ code/player/branches/release-3-0-patches/server/drivers/gps/CMakeLists.txt
2009-12-16 00:51:26 UTC (rev 8466)
@@ -5,7 +5,7 @@
PLAYERDRIVER_OPTION (gbxgarminacfr build_gbxgarminacfr ON)
PLAYERDRIVER_REQUIRE_PKG (gbxgarminacfr build_gbxgarminacfr GbxGarminAcfr
gbxgarminacfr_includeDirs gbxgarminacfr_libDirs gbxgarminacfr_linkLibs
- gbxgarminacfr_linkFlags gbxgarminacfr_cFlags 1.0.0)
+ gbxgarminacfr_linkFlags gbxgarminacfr_cFlags =1.0.0)
PLAYERDRIVER_ADD_DRIVER (gbxgarminacfr build_gbxgarminacfr
INCLUDEDIRS ${gbxgarminacfr_includeDirs} LIBDIRS ${gbxgarminacfr_libDirs}
LINKLIBS ${gbxgarminacfr_linkLibs} LINKFLAGS ${gbxgarminacfr_linkFlags}
Modified:
code/player/branches/release-3-0-patches/server/drivers/imu/xsens/CMakeLists.txt
===================================================================
---
code/player/branches/release-3-0-patches/server/drivers/imu/xsens/CMakeLists.txt
2009-12-16 00:44:13 UTC (rev 8465)
+++
code/player/branches/release-3-0-patches/server/drivers/imu/xsens/CMakeLists.txt
2009-12-16 00:51:26 UTC (rev 8466)
@@ -1,13 +1,15 @@
-PLAYERDRIVER_OPTION (XSensMT build_XSensMT ON)
-PLAYERDRIVER_REQUIRE_ENVVAR (XSensMT build_XSensMT XSENSMT_SOURCE_DIR
xsensmtSrcDir)
+PLAYERDRIVER_OPTION (xsensmt build_xsensmt OFF "Disabled by default - set
XSENSMT_SOURCE_DIR")
+SET (XSENSMT_SOURCE_DIR "" CACHE FILEPATH "Directory containing the XSensMT
manufacturer source files")
+MARK_AS_ADVANCED (XSENSMT_SOURCE_DIR)
SET (xsensmtSrcs XSensMT.cc
- ${xsensmtSrcDir}/xsens_list.cpp
- ${xsensmtSrcDir}/xsens_time.cpp
- ${xsensmtSrcDir}/xsens_std.cpp
- ${xsensmtSrcDir}/cmt1.cpp
- ${xsensmtSrcDir}/cmt2.cpp
- ${xsensmtSrcDir}/cmt3.cpp
- ${xsensmtSrcDir}/cmtscan.cpp
- ${xsensmtSrcDir}/cmtmessage.cpp
- ${xsensmtSrcDir}/cmtpacket.cpp)
-PLAYERDRIVER_ADD_DRIVER (XSensMT build_XSensMT SOURCES ${xsensmtSrcs})
+ ${XSENSMT_SOURCE_DIR}/xsens_time.cpp
+ ${XSENSMT_SOURCE_DIR}/xsens_std.cpp
+ ${XSENSMT_SOURCE_DIR}/cmt1.cpp
+ ${XSENSMT_SOURCE_DIR}/cmt2.cpp
+ ${XSENSMT_SOURCE_DIR}/cmt3.cpp
+ ${XSENSMT_SOURCE_DIR}/cmtscan.cpp
+ ${XSENSMT_SOURCE_DIR}/cmtmessage.cpp
+ ${XSENSMT_SOURCE_DIR}/cmtpacket.cpp)
+PLAYERDRIVER_ADD_DRIVER (xsensmt build_xsensmt SOURCES ${xsensmtSrcs}
+ INCLUDEDIRS ${XSENSMT_SOURCE_DIR})
+
Modified:
code/player/branches/release-3-0-patches/server/drivers/imu/xsens/XSensMT.cc
===================================================================
---
code/player/branches/release-3-0-patches/server/drivers/imu/xsens/XSensMT.cc
2009-12-16 00:44:13 UTC (rev 8465)
+++
code/player/branches/release-3-0-patches/server/drivers/imu/xsens/XSensMT.cc
2009-12-16 00:51:26 UTC (rev 8466)
@@ -176,7 +176,7 @@
////////////////////////////////////////////////////////////////////////////////
// Registers the driver in the driver table. Called from the
// player_driver_init function that the loader looks for
-void XSensMT_Register (DriverTable* table)
+void xsensmt_Register (DriverTable* table)
{
table->AddDriver ("xsensmt", XSensMT_Init);
}
Modified:
code/player/branches/release-3-0-patches/server/drivers/localization/amcl/map/map.h
===================================================================
---
code/player/branches/release-3-0-patches/server/drivers/localization/amcl/map/map.h
2009-12-16 00:44:13 UTC (rev 8465)
+++
code/player/branches/release-3-0-patches/server/drivers/localization/amcl/map/map.h
2009-12-16 00:51:26 UTC (rev 8466)
@@ -76,7 +76,7 @@
// Map dimensions (number of cells)
int size_x, size_y;
-
+
// The map data, stored as a grid
map_cell_t *cells;
Modified: code/player/branches/release-3-0-patches/server/drivers/map/gridmap.cc
===================================================================
--- code/player/branches/release-3-0-patches/server/drivers/map/gridmap.cc
2009-12-16 00:44:13 UTC (rev 8465)
+++ code/player/branches/release-3-0-patches/server/drivers/map/gridmap.cc
2009-12-16 00:51:26 UTC (rev 8466)
@@ -246,7 +246,7 @@
// fill the map data with free space
// reasons for this are some good obstacle avoidance always there
// can't bear to say all the world is unknown
- for(uint i=0;i<this->map.width*this->map.height;i++)
+ for(unsigned int i=0;i<this->map.width*this->map.height;i++)
this->published_map.data[i]=-1;
// Open the position interface
@@ -326,7 +326,7 @@
this->sonar_geom = *(player_sonar_geom_t*) msg->GetPayload();
// calculate the distance from the sonar to the center of the robot (in
pixels).
sonar_dist=(int *)malloc(sonar_geom.poses_count*sizeof(int));
- for(uint s;s<this->sonar_geom.poses_count;s++)
+ for(unsigned int s=0;s<this->sonar_geom.poses_count;s++)
this->sonar_dist[s]=(int)(sqrt(pow(this->sonar_geom.poses[s].px,2) +
pow(this->sonar_geom.poses[s].py,2)) /
this->map_info.scale);
@@ -387,8 +387,8 @@
published_map.col = 0;
published_map.row = 0;
published_map.data_count = this->map.data_count;
- for(uint i=0;i<this->map.width;i++) {
- for (uint j=0;j<this->map.height;j++){
+ for(unsigned int i=0;i<this->map.width;i++) {
+ for (unsigned int j=0;j<this->map.height;j++){
MAP_POINT x(i,j);
if(this->map_data.find(x) != this->map_data.end()){
if (map_data[x].P > this->map_treshold)
published_map.data[i+this->map.width*j]=1;
@@ -421,7 +421,7 @@
/// don't overwrite the map if the robot stands still
if (odom->vel.px == 0 && odom->vel.py == 0 && odom->vel.pa == 0) return(0);
- uint s,x,y;
+ unsigned int s,x,y;
int px,py,r,o;
float th_sonar;
// compute r * tan(alfa/2), where alfa is the sonar angular aperture
Modified: code/player/branches/release-3-0-patches/server/drivers/map/gridmap.h
===================================================================
--- code/player/branches/release-3-0-patches/server/drivers/map/gridmap.h
2009-12-16 00:44:13 UTC (rev 8465)
+++ code/player/branches/release-3-0-patches/server/drivers/map/gridmap.h
2009-12-16 00:51:26 UTC (rev 8466)
@@ -1,7 +1,9 @@
// objects definitions
-#include <unistd.h>
+#if !defined(WIN32)
+ #include <unistd.h>
+ #include <netinet/in.h>
+#endif
#include <string.h>
-#include <netinet/in.h>
#include <math.h>
#include <libplayercore/playercore.h>
#include <iostream>
@@ -136,7 +138,7 @@
height=800;
startx=0;
starty=0;
-scale=0.028;
+scale=0.028f;
sonar_treshold=4.5;
}
Modified:
code/player/branches/release-3-0-patches/server/drivers/power/CMakeLists.txt
===================================================================
---
code/player/branches/release-3-0-patches/server/drivers/power/CMakeLists.txt
2009-12-16 00:44:13 UTC (rev 8465)
+++
code/player/branches/release-3-0-patches/server/drivers/power/CMakeLists.txt
2009-12-16 00:51:26 UTC (rev 8466)
@@ -1,7 +1,7 @@
PLAYERDRIVER_OPTION (oceanserver build_oceanserver ON)
PLAYERDRIVER_REQUIRE_PKG (oceanserver build_oceanserver GbxSmartBatteryAcfr
gbxsmartbatteryacfr_includeDirs gbxsmartbatteryacfr_libDirs
gbxsmartbatteryacfr_linkLibs
- gbxsmartbatteryacfr_linkFlags gbxsmartbatteryacfr_cFlags 1.0.0)
+ gbxsmartbatteryacfr_linkFlags gbxsmartbatteryacfr_cFlags =1.0.0)
PLAYERDRIVER_ADD_DRIVER (oceanserver build_oceanserver
INCLUDEDIRS ${gbxsmartbatteryacfr_includeDirs} LIBDIRS
${gbxsmartbatteryacfr_libDirs}
LINKLIBS ${gbxsmartbatteryacfr_linkLibs} LINKFLAGS
${gbxsmartbatteryacfr_linkFlags}
Modified: code/player/branches/release-3-0-patches/server/drivers/ptz/ptu46.cc
===================================================================
--- code/player/branches/release-3-0-patches/server/drivers/ptz/ptu46.cc
2009-12-16 00:44:13 UTC (rev 8465)
+++ code/player/branches/release-3-0-patches/server/drivers/ptz/ptu46.cc
2009-12-16 00:51:26 UTC (rev 8466)
@@ -235,6 +235,7 @@
Write("ft "); // terse feedback
Write("ed "); // disable echo
Write("ci "); // position mode
+ Write("i "); // immediate mode, do not await "A" command for execution
// delay here so data has arrived at serial port so we can flush it
usleep(200000);
Modified:
code/player/branches/release-3-0-patches/server/drivers/ranger/CMakeLists.txt
===================================================================
---
code/player/branches/release-3-0-patches/server/drivers/ranger/CMakeLists.txt
2009-12-16 00:44:13 UTC (rev 8465)
+++
code/player/branches/release-3-0-patches/server/drivers/ranger/CMakeLists.txt
2009-12-16 00:51:26 UTC (rev 8466)
@@ -1,7 +1,7 @@
PLAYERDRIVER_OPTION (gbxsickacfr build_gbxsickacfr ON)
PLAYERDRIVER_REQUIRE_PKG (gbxsickacfr build_gbxsickacfr GbxSickAcfr
gbxsickacfr_includeDirs gbxsickacfr_libDirs gbxsickacfr_linkLibs
- gbxsickacfr_linkFlags gbxsickacfr_cFlags 1.0.0)
+ gbxsickacfr_linkFlags gbxsickacfr_cFlags =1.0.0)
PLAYERDRIVER_ADD_DRIVER (gbxsickacfr build_gbxsickacfr
INCLUDEDIRS ${gbxsickacfr_includeDirs} LIBDIRS ${gbxsickacfr_libDirs}
LINKLIBS ${gbxsickacfr_linkLibs} LINKFLAGS ${gbxsickacfr_linkFlags}
@@ -10,7 +10,7 @@
PLAYERDRIVER_OPTION (hokuyo_aist build_hokuyo_aist ON)
PLAYERDRIVER_REQUIRE_PKG (hokuyo_aist build_hokuyo_aist hokuyo_aist
hokuyo_aist_includeDirs hokuyo_aist_libDirs hokuyo_aist_linkLibs
- hokuyo_aist_linkFlags hokuyo_aist_cFlags 1.0.0)
+ hokuyo_aist_linkFlags hokuyo_aist_cFlags =1.0.0)
PLAYERDRIVER_ADD_DRIVER (hokuyo_aist build_hokuyo_aist
INCLUDEDIRS ${hokuyo_aist_includeDirs} LIBDIRS ${hokuyo_aist_libDirs}
LINKLIBS ${hokuyo_aist_linkLibs} LINKFLAGS ${hokuyo_aist_linkFlags}
Modified:
code/player/branches/release-3-0-patches/server/drivers/service_adv/CMakeLists.txt
===================================================================
---
code/player/branches/release-3-0-patches/server/drivers/service_adv/CMakeLists.txt
2009-12-16 00:44:13 UTC (rev 8465)
+++
code/player/branches/release-3-0-patches/server/drivers/service_adv/CMakeLists.txt
2009-12-16 00:51:26 UTC (rev 8466)
@@ -1,6 +1,6 @@
PLAYERDRIVER_OPTION (service_adv_mdns build_service_adv_mdns OFF "Disabled by
default")
PLAYERDRIVER_REQUIRE_PKG (service_adv_mdns build_service_adv_mdns howl
- howl__includeDirs howl_libDirs howl_linkLibs howl_linkFlags howl_cFlags
">= 0.9.6")
+ howl__includeDirs howl_libDirs howl_linkLibs howl_linkFlags howl_cFlags
">=0.9.6")
PLAYERDRIVER_ADD_DRIVER (service_adv_mdns build_service_adv_mdns
INCLUDEDIRS {howl__includeDirs} LIBDIRS ${howl_libDirs} LINKLIBS
${howl_linkLibs} LINKFLAGS ${howl_linkFlags} CFLAGS ${howl_cFlags}
Modified:
code/player/branches/release-3-0-patches/server/drivers/shell/cmdsplitter.cc
===================================================================
---
code/player/branches/release-3-0-patches/server/drivers/shell/cmdsplitter.cc
2009-12-16 00:44:13 UTC (rev 8465)
+++
code/player/branches/release-3-0-patches/server/drivers/shell/cmdsplitter.cc
2009-12-16 00:51:26 UTC (rev 8466)
@@ -82,6 +82,10 @@
#define RQ_QUEUE_LEN 10
#define MAX_DEVICES 16
+#if defined (WIN32)
+ #define snprintf _snprintf
+#endif
+
class CmdSplitter : public Driver
{
public: CmdSplitter(ConfigFile * cf, int section);
Modified:
code/player/branches/release-3-0-patches/server/drivers/shell/readlog.cc
===================================================================
--- code/player/branches/release-3-0-patches/server/drivers/shell/readlog.cc
2009-12-16 00:44:13 UTC (rev 8465)
+++ code/player/branches/release-3-0-patches/server/drivers/shell/readlog.cc
2009-12-16 00:51:26 UTC (rev 8466)
@@ -1477,7 +1477,7 @@
PLAYER_ERROR2("incomplete line at %s:%d", this->filename, linenum);
return -1;
}
- player_blobfinder_blob_t blob[blob_count];
+ player_blobfinder_blob_t *blob = new player_blobfinder_blob_t[blob_count];
for (i = 0; i < blob_count; i++)
{
@@ -1496,6 +1496,7 @@
size = sizeof(data) - sizeof(data.blobs) + blob_count *
sizeof(data.blobs[0]);
this->Publish(id,type,subtype, (void*) &data, size, &time);
+ delete[] blob;
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
