[Fawkes Git] branch/common/master-merge-review: 17 revs updated. (0.5.0-3305-g8d91721)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Mon Sep 5 11:59:11 CEST 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, common/master-merge-review has been updated
        to  8d9172137bac9199a2ef3a19b12b6b76322d6abe (commit)
       via  bb58c4a64d30dd8e1c9c0aa5ebda3f85995672e9 (commit)
       via  1569cf2f7b123d70f323438e499287efb8b3fb3e (commit)
       via  6a2f4ec95c06887ff7637e9e44e534b119ee3e34 (commit)
       via  4a68d7f5719e148bf1bbecd648e3ad342cc226ee (commit)
       via  2ed1d57dd56f496fadd6f9f58c48a889d6778373 (commit)
       via  d4a5c134dbf5991c976f4011eb7794b72c67099d (commit)
       via  702e914cdd1ae1ea878ce7a46e21753b7b859808 (commit)
       via  f05728b1090b6d4821e6642b612eafed4386b1c4 (commit)
       via  22416862ff40b43a05dc55363c127b668bb19a6e (commit)
       via  22c0ea8a615c7d0a5d6994df5f115bf1f8610e1e (commit)
       via  993231c396b1af926ef26bb9f0b1b7bff1d0e528 (commit)
       via  1af3e1936377832db6f4ac367c1b1a0d932325be (commit)
       via  e321e6c49f8a2d4e02955c1180af2b1349e2402d (commit)
       via  533b5cd707af5811892dcf9a50cb7c061541331a (commit)
       via  9fc6d595454939ba7279f4e8f574a85fd866f57c (commit)
       via  dd60bf7d4c1643987da75f2158156c18d519440c (commit)
      from  98d05a4e54e58f009aac9428eef4d534ef4767da (commit)

http://git.fawkesrobotics.org/fawkes.git/common/master-merge-review

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- *Log* ---------------------------------------------------------------
commit 1af3e1936377832db6f4ac367c1b1a0d932325be
Merge: 98d05a4 e321e6c
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Aug 29 18:12:53 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Aug 29 18:12:53 2016 +0200

    Merge remote-tracking branch 'origin/bschaepers/amcl-segfault-fix'

http://git.fawkesrobotics.org/fawkes.git/commit/1af3e19
http://trac.fawkesrobotics.org/changeset/1af3e19

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 993231c396b1af926ef26bb9f0b1b7bff1d0e528
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Thu Feb 25 13:01:09 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Aug 29 18:14:26 2016 +0200

    libconfig: documentation fixes

http://git.fawkesrobotics.org/fawkes.git/commit/993231c
http://trac.fawkesrobotics.org/changeset/993231c

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 22416862ff40b43a05dc55363c127b668bb19a6e
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Sep 1 09:42:24 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Sep 1 09:42:24 2016 +0200

    kdl_parser: use buildsys eigen3 detection
    
    While the orocos-kdl pkg-config does include Eigen3 in the include path,
    it does not set some flags necessary for successful compilation on
    recent GCCs.
    
    This has been fixed to also use the Fawkes buildsys Eigen3 detection and
    its determination of the appropriate flags.

http://git.fawkesrobotics.org/fawkes.git/commit/2241686
http://trac.fawkesrobotics.org/changeset/2241686

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit f05728b1090b6d4821e6642b612eafed4386b1c4
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Sep 1 10:31:09 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Sep 1 10:31:09 2016 +0200

    ros-skiller: make callback arguments non-refs
    
    The goals are passed by value and not by reference. The new GCC
    (rightfully) complains about this.

http://git.fawkesrobotics.org/fawkes.git/commit/f05728b
http://trac.fawkesrobotics.org/changeset/f05728b

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 4a68d7f5719e148bf1bbecd648e3ad342cc226ee
Merge: f05728b 2ed1d57
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 11:42:29 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 11:42:29 2016 +0200

    Merge remote-tracking branch 'origin/bschaepers/debian'

http://git.fawkesrobotics.org/fawkes.git/commit/4a68d7f
http://trac.fawkesrobotics.org/changeset/4a68d7f

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 1569cf2f7b123d70f323438e499287efb8b3fb3e
Merge: 4a68d7f 6a2f4ec
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 11:48:28 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 11:48:28 2016 +0200

    Merge remote-tracking branch 'origin/vmatare/laser-lines-matching'

http://git.fawkesrobotics.org/fawkes.git/commit/1569cf2
http://trac.fawkesrobotics.org/changeset/1569cf2

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit bb58c4a64d30dd8e1c9c0aa5ebda3f85995672e9
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 11:55:54 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 11:55:54 2016 +0200

    buildsys: no C++11 flag on GCC 6 and above
    
    The default mode for C++ on GCC 6 is C++14. Hence the CPP11 flags should
    be empty. Otherwise the flag would even be a downgrade from the default.

http://git.fawkesrobotics.org/fawkes.git/commit/bb58c4a
http://trac.fawkesrobotics.org/changeset/bb58c4a

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 8d9172137bac9199a2ef3a19b12b6b76322d6abe
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 11:57:47 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 11:57:47 2016 +0200

    gazebo: add ffmpeg flags if available
    
    Locally built Gazebo versions might include support for ffmpeg. Hence,
    if ffmpeg available, add its headers to the include path. It does not
    hurt if ffmpeg was not compiled in, but it makes builds fail if not and
    this patch is not applied.

http://git.fawkesrobotics.org/fawkes.git/commit/8d91721
http://trac.fawkesrobotics.org/changeset/8d91721

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------
 etc/buildsys/gcc.mk                            |    8 +-
 src/libs/config/config.cpp                     |    4 +-
 src/libs/kdl_parser/Makefile                   |    7 +-
 src/plugins/amcl/map/map_cspace.cpp            |   13 +-
 src/plugins/gazebo/gazebo.mk                   |    9 +
 src/plugins/laser-lines/Makefile               |    2 +-
 src/plugins/laser-lines/laser-lines-thread.cpp |  453 ++++++++++++------------
 src/plugins/laser-lines/laser-lines-thread.h   |   18 +-
 src/plugins/laser-lines/line_info.cpp          |  128 +++++++
 src/plugins/laser-lines/line_info.h            |   33 ++
 src/plugins/mongodb_log/tools/Makefile         |    4 +
 src/plugins/ros/skiller_thread.cpp             |    4 +-
 src/plugins/ros/skiller_thread.h               |    4 +-
 13 files changed, 438 insertions(+), 249 deletions(-)
 create mode 100644 src/plugins/laser-lines/line_info.cpp


- *Diffs* -------------------------------------------------------------

- *commit* 1af3e1936377832db6f4ac367c1b1a0d932325be - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Aug 29 18:12:53 2016 +0200
Subject: Merge remote-tracking branch 'origin/bschaepers/amcl-segfault-fix'

 src/plugins/amcl/map/map_cspace.cpp |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

_Diff for modified files_:

- *commit* 993231c396b1af926ef26bb9f0b1b7bff1d0e528 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Thu Feb 25 13:01:09 2016 +0100
Subject: libconfig: documentation fixes

 src/libs/config/config.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

_Diff for modified files_:
diff --git a/src/libs/config/config.cpp b/src/libs/config/config.cpp
index f22882d..bd17ad2 100644
--- a/src/libs/config/config.cpp
+++ b/src/libs/config/config.cpp
@@ -48,10 +48,10 @@ namespace fawkes {
  * 
  *
  * @fn void Configuration::copy(Configuration *copyconf)
- * Copy all values from the given configuration.
+ * Copies all values from the given configuration.
  * All values from the given configuration are copied. Old values are not erased
  * so that the copied values will overwrite existing values, new values are
- * created, but values existent in current config but not in the copie config
+ * created, but values existent in current config but not in the copied config
  * will remain unchanged.
  * @param copyconf configuration to copy
  * 

- *commit* 22416862ff40b43a05dc55363c127b668bb19a6e - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Sep 1 09:42:24 2016 +0200
Subject: kdl_parser: use buildsys eigen3 detection

 src/libs/kdl_parser/Makefile |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

_Diff for modified files_:
diff --git a/src/libs/kdl_parser/Makefile b/src/libs/kdl_parser/Makefile
index 951bd70..01e75c0 100644
--- a/src/libs/kdl_parser/Makefile
+++ b/src/libs/kdl_parser/Makefile
@@ -16,15 +16,16 @@
 BASEDIR = ../../..
 include $(BASEDIR)/etc/buildsys/config.mk
 include $(BUILDSYSDIR)/boost.mk
+include $(BUILDSYSDIR)/eigen3.mk
 
 LIBS_libfawkeskdl_parser = fawkescore
 OBJS_libfawkeskdl_parser = $(patsubst %.cpp,%.o,$(patsubst qa/%,,$(subst $(SRCDIR)/,,$(realpath $(wildcard $(SRCDIR)/*.cpp)))))
 HDRS_libfawkeskdl_parser = $(subst $(SRCDIR)/,,$(wildcard $(SRCDIR)/*.h))
 
 OBJS_all = $(OBJS_libfawkeskdl_parser)
-ifeq ($(HAVE_KDLPARSER),1)
-  CFLAGS += $(CFLAGS_KDLPARSER)
-  LDFLAGS += $(LDFLAGS_KDLPARSER)
+ifeq ($(HAVE_KDLPARSER)$(HAVE_EIGEN3),11)
+  CFLAGS  += $(CFLAGS_KDLPARSER) $(CFLAGS_EIGEN3)
+  LDFLAGS += $(LDFLAGS_KDLPARSER) $(LDFLAGS_EIGEN3)
   LIBS_all = $(LIBDIR)/libfawkeskdl_parser.so
 else
   ifneq ($(HAVE_KDL),1)

- *commit* f05728b1090b6d4821e6642b612eafed4386b1c4 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Sep 1 10:31:09 2016 +0200
Subject: ros-skiller: make callback arguments non-refs

 src/plugins/ros/skiller_thread.cpp |    4 ++--
 src/plugins/ros/skiller_thread.h   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/ros/skiller_thread.cpp b/src/plugins/ros/skiller_thread.cpp
index dc3ab94..6362f38 100644
--- a/src/plugins/ros/skiller_thread.cpp
+++ b/src/plugins/ros/skiller_thread.cpp
@@ -104,7 +104,7 @@ RosSkillerThread::stop()
 }
 
 void
-RosSkillerThread::action_goal_cb(SkillerServer::GoalHandle &goal)
+RosSkillerThread::action_goal_cb(SkillerServer::GoalHandle goal)
 {
   MutexLocker lock(loop_mutex);
   if (exec_running_ && exec_as_) {
@@ -120,7 +120,7 @@ RosSkillerThread::action_goal_cb(SkillerServer::GoalHandle &goal)
 }
 
 void
-RosSkillerThread::action_cancel_cb(SkillerServer::GoalHandle &goal)
+RosSkillerThread::action_cancel_cb(SkillerServer::GoalHandle goal)
 {
   MutexLocker lock(loop_mutex);
   stop();
diff --git a/src/plugins/ros/skiller_thread.h b/src/plugins/ros/skiller_thread.h
index c6a2ba4..7bc38fe 100644
--- a/src/plugins/ros/skiller_thread.h
+++ b/src/plugins/ros/skiller_thread.h
@@ -68,8 +68,8 @@ class RosSkillerThread
 
   typedef actionlib::ActionServer<fawkes_msgs::ExecSkillAction> SkillerServer;
 
-  void action_goal_cb(SkillerServer::GoalHandle &goal);
-  void action_cancel_cb(SkillerServer::GoalHandle &goal);
+  void action_goal_cb(SkillerServer::GoalHandle goal);
+  void action_cancel_cb(SkillerServer::GoalHandle goal);
   void message_cb(const std_msgs::String::ConstPtr & goal);
 
   void stop();

- *commit* 4a68d7f5719e148bf1bbecd648e3ad342cc226ee - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 11:42:29 2016 +0200
Subject: Merge remote-tracking branch 'origin/bschaepers/debian'

 src/plugins/mongodb_log/tools/Makefile |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

_Diff for modified files_:

- *commit* 1569cf2f7b123d70f323438e499287efb8b3fb3e - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 11:48:28 2016 +0200
Subject: Merge remote-tracking branch 'origin/vmatare/laser-lines-matching'

 src/plugins/laser-lines/Makefile               |    2 +-
 src/plugins/laser-lines/laser-lines-thread.cpp |  453 ++++++++++++------------
 src/plugins/laser-lines/laser-lines-thread.h   |   18 +-
 src/plugins/laser-lines/line_info.cpp          |  128 +++++++
 src/plugins/laser-lines/line_info.h            |   33 ++
 5 files changed, 399 insertions(+), 235 deletions(-)

_Diff for modified files_:

- *commit* bb58c4a64d30dd8e1c9c0aa5ebda3f85995672e9 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 11:55:54 2016 +0200
Subject: buildsys: no C++11 flag on GCC 6 and above

 etc/buildsys/gcc.mk |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

_Diff for modified files_:
diff --git a/etc/buildsys/gcc.mk b/etc/buildsys/gcc.mk
index b33e9e0..b836844 100644
--- a/etc/buildsys/gcc.mk
+++ b/etc/buildsys/gcc.mk
@@ -42,9 +42,11 @@ gcc_lessthan_version = $(strip $(if $(call lt,$(GCC_VERSION_MAJOR),$1),1,	\
 # Check für C++0x/C++11 availability
 ifeq ($(call gcc_atleast_version,4,3),1)
   HAVE_CPP11=1
-  CFLAGS_CPP11=-std=c++0x
-  ifeq ($(call gcc_atleast_version,4,7),1)
-    CFLAGS_CPP11=-std=c++11
+  ifneq ($(call gcc_atleast_version,6,0),1)
+    CFLAGS_CPP11=-std=c++0x
+    ifeq ($(call gcc_atleast_version,4,7),1)
+      CFLAGS_CPP11=-std=c++11
+    endif
   endif
 endif
 

- *commit* 8d9172137bac9199a2ef3a19b12b6b76322d6abe - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 11:57:47 2016 +0200
Subject: gazebo: add ffmpeg flags if available

 src/plugins/gazebo/gazebo.mk |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/gazebo/gazebo.mk b/src/plugins/gazebo/gazebo.mk
index b72ec95..0b57ad9 100644
--- a/src/plugins/gazebo/gazebo.mk
+++ b/src/plugins/gazebo/gazebo.mk
@@ -28,6 +28,15 @@ endif
 ifeq ($(HAVE_GAZEBO),1)
   CFLAGS_GAZEBO  = -DHAVE_GAZEBO $(shell $(PKGCONFIG) --cflags 'gazebo')
   LDFLAGS_GAZEBO = $(shell $(PKGCONFIG) --libs 'gazebo') -ldl
+
+  # if ffmpeg is installed, gazebo may have been compiled with support for it
+  #   # hence check for headers and add the respective include directories
+  ifneq ($(wildcard $(SYSROOT)/usr/include/ffmpeg/libavcodec/avcodec.h),)
+    CFLAGS_GAZEBO += -I$(SYSROOT)/usr/include/ffmpeg
+  endif
+  ifneq ($(wildcard $(SYSROOT)/usr/local/include/ffmpeg/libavcodec/avcodec.h),)
+    CFLAGS_GAZEBO += -I$(SYSROOT)/usr/local/include/ffmpeg
+  endif
 endif
 
 endif # __buildsys_gazebo_mk_




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list