[Fawkes Git] branch/timn/master-preview: 17 revs updated. (0.5.0-3473-g761b2d5)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Thu Dec 22 21:49:29 CET 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, timn/master-preview has been updated
  discards  3b2b272fc8e7e075471216886d1acae7ecd5baf5 (commit)
  discards  5573ee658043d676be35dea92766ee25d7c7489e (commit)
        to  761b2d52f71745cda9e9d3fd58b8a4518777d113 (commit)
       via  fde289414f01229b9e7664877635eaf68033be2e (commit)
       via  1b8b0f6b9917b4260b5589107125db4da863389d (commit)
       via  23539c9b9542350295b632f00e443dbf1b9bc653 (commit)
       via  c7feeea0f362a62e1c451c572fe35acfe0a96636 (commit)
       via  b65ca961155cc343af26c1fbc314ddbb28e8361a (commit)
       via  f44b816f35b6f625d6d8245a724bc60c72e866d1 (commit)
       via  fde8bce5d0d9861019e7b0b8c124e54f577718e8 (commit)
       via  cbb7cab6b52a72714367563523c33f9404ed2448 (commit)
       via  0eb1ca81c32819ae3bc34cc070e9220916cf040f (commit)
       via  899063bcfcabc034b1e7bbfb30fc69d74eb9fced (commit)
       via  6879c08932bdd9a356dac6a6f6d95953f6f0d2bf (commit)
       via  623b36ecd777d80b8ec5e7be2b0c6822cf4a1d7e (commit)
       via  568fc54c8e517441be455935230fd1c0177a46dc (commit)
       via  ccf6e3ba82ddbab199a0cbf75136795fd8e27397 (commit)
       via  2fafe28ec8e65813efd86c0f0186149df84bceb8 (commit)
       via  9ea4aea38cff30c76dc687c94f79a14e95fb4f6f (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (3b2b272fc8e7e075471216886d1acae7ecd5baf5)
            \
             N -- N -- N (761b2d52f71745cda9e9d3fd58b8a4518777d113)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

http://git.fawkesrobotics.org/fawkes.git/timn/master-preview

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 9ea4aea38cff30c76dc687c94f79a14e95fb4f6f
Author:     Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
AuthorDate: Thu Dec 22 16:26:02 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Dec 22 21:45:11 2016 +0100

    jaco: fixed negation of comparison
    
    Somehow this error popped up as warning during compilation
    with the new merge-preview branch and needed to be fixed.

http://git.fawkesrobotics.org/fawkes.git/commit/9ea4aea
http://trac.fawkesrobotics.org/changeset/9ea4aea

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 1b8b0f6b9917b4260b5589107125db4da863389d
Merge: 9ea4aea 23539c9
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Dec 22 21:48:03 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Dec 22 21:48:03 2016 +0100

    Merge remote-tracking branch 'origin/timn/freebsd-fixes'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit fde289414f01229b9e7664877635eaf68033be2e
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Tue Sep 6 01:42:39 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Dec 22 21:49:15 2016 +0100

    Update AUTHORS with all contributors
    
    git log --format=format:"%an <%ae>" | sort -u -k1,2 | \
      egrep -v "(no author| and )" > AUTHORS
    
    Thanks to all contributors who drive Fawkes!
    
    Another interesting command is:
    git log --format=format:"%an <%ae>" | egrep -v "(no author| and )" | \
      sort | uniq -c | sort -nr

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 761b2d52f71745cda9e9d3fd58b8a4518777d113
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Tue Sep 6 01:48:33 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Dec 22 21:49:20 2016 +0100

    fawkescore: mark as version 1.0.0

http://git.fawkesrobotics.org/fawkes.git/commit/761b2d5
http://trac.fawkesrobotics.org/changeset/761b2d5

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


- *Summary* -----------------------------------------------------------
 etc/buildsys/boost.mk                          |   11 +++++++++--
 etc/buildsys/cgal.mk                           |    8 +++++++-
 etc/buildsys/rules.mk                          |    2 +-
 src/libs/baseapp/Makefile                      |    2 +-
 src/libs/baseapp/run.cpp                       |    2 +-
 src/libs/config/yaml.cpp                       |    2 ++
 src/libs/fvutils/compression/jpeg_compressor.h |    2 +-
 src/libs/fvutils/statistical/imagediff.cpp     |    2 +-
 src/libs/netcomm/socket/socket.h               |   10 +++++-----
 src/libs/netcomm/utils/resolver_thread.h       |    1 +
 src/plugins/amcl/amcl_thread.cpp               |    2 +-
 src/plugins/gossip/aspect/Makefile             |    2 +-
 src/plugins/jaco/openrave_thread.cpp           |    2 +-
 13 files changed, 32 insertions(+), 16 deletions(-)


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

- *commit* 9ea4aea38cff30c76dc687c94f79a14e95fb4f6f - - - - - - - - - -
Author:  Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
Date:    Thu Dec 22 16:26:02 2016 +0100
Subject: jaco: fixed negation of comparison

 src/plugins/jaco/openrave_thread.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/jaco/openrave_thread.cpp b/src/plugins/jaco/openrave_thread.cpp
index 1cd2c5f..cf440d6 100644
--- a/src/plugins/jaco/openrave_thread.cpp
+++ b/src/plugins/jaco/openrave_thread.cpp
@@ -258,7 +258,7 @@ JacoOpenraveThread::loop()
       } else if( (*it)->trajec_state==TRAJEC_SKIP && (*it)->type == TARGET_ANGULAR ) {
         from = *it;
         break;
-      } else if( !(*it)->type==TARGET_GRIPPER ) {
+      } else if( !((*it)->type==TARGET_GRIPPER) ) {
         // A previous target has unknown final configuration. Cannot plan for our target yet. Abort.
         //  TARGET_GRIPPER would be the only one we could skip without problems.
         __arm->target_mutex->unlock();

- *commit* 1b8b0f6b9917b4260b5589107125db4da863389d - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Dec 22 21:48:03 2016 +0100
Subject: Merge remote-tracking branch 'origin/timn/freebsd-fixes'

 etc/buildsys/boost.mk                          |   11 +++++++++--
 etc/buildsys/cgal.mk                           |    8 +++++++-
 etc/buildsys/rules.mk                          |    2 +-
 src/libs/baseapp/Makefile                      |    2 +-
 src/libs/baseapp/run.cpp                       |    2 +-
 src/libs/config/yaml.cpp                       |    2 ++
 src/libs/fvutils/compression/jpeg_compressor.h |    2 +-
 src/libs/fvutils/statistical/imagediff.cpp     |    2 +-
 src/libs/netcomm/socket/socket.h               |   10 +++++-----
 src/libs/netcomm/utils/resolver_thread.h       |    1 +
 src/plugins/amcl/amcl_thread.cpp               |    2 +-
 src/plugins/gossip/aspect/Makefile             |    2 +-
 12 files changed, 31 insertions(+), 15 deletions(-)

_Diff for modified files_:

- *commit* fde289414f01229b9e7664877635eaf68033be2e - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Tue Sep 6 01:42:39 2016 +0200
Subject: Update AUTHORS with all contributors

 AUTHORS |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/AUTHORS b/AUTHORS
index 9be03d6..5a9600f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,20 +1,35 @@
+Alexander von Wirth <vonwirth at dbis.rwth-aachen.de>
+Andre Burghof <andre.burghof at alumni.fh-aachen.de>
 Bahram Maleki-Fard <maleki-fard at kbsg.rwth-aachen.de>
 Bastian Klingen <bastian.klingen at rwth-aachen.de>
+Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
 Christof Rath <c.rath at student.tugraz.at>
+Christoph Henke <christoph.henke at rwth-aachen.de>
 Christoph Schwering <schwering at kbsg.rwth-aachen.de>
 Daniel Beck <beck at kbsg.rwth-aachen.de>
 Daniel Ewert <daniel.ewert at ima-zlw-ifu.rwth-aachen.de>
+Florian Nolden <florian-denis.nolden at alumni.fh-aachen.de>
+Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
 Gareth Priede <garethpriede at gmail.com>
+Gesche Gierse <gierse at kbsg.rwth-aachen.de>
 Johannes Rothe <johannes.rothe at rwth-aachen.de>
 Jonathan Hoeges <jonthan.hoeges at rwth-aachen.de>
 Kyle Strabala <strabala at cmu.edu>
 Martin Liebenberg <liebenberg at kbsg.rwth-aachen.de>
 Masrur Doostdar <doostdar at kbsg.rwth-aachen.de>
+Matthias Loebach <matthias.loebach at ima-zlw-ifu.rwth-aachen.de>
+Nichola Abdo <abdon at informatik.uni-freiburg.de>
+Nicolas Limpert <nicolas.limpert at alumni.fh-aachen.de>
+Paul Dingil <paul.dingil at rwth-aachen.de>
+Randolph Maassen <randolph.maassen at alumni.fh-aachen.de>
+Safoura Rezapour Lakani <safoura.lakani at rwth-aachen.de>
 Sebastian Reuter <sebastian.reuter at ima-zlw-ifu.rwth-aachen.de>
+Sebastian Schoenitz <sebastian.schoenitz at ima-zlw-ifu.rwth-aachen.de>
 Stefan Schiffer <schiffer at kbsg.rwth-aachen.de>
 Till Hofmann <hofmann at kbsg.rwth-aachen.de>
 Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
 Tobias Kellner <t.kellner at student.tugraz.at>
+Tobias Neumann <t.neumann at fh-aachen.de>
 Vaishak Belle <belle at kbsg.rwth-aachen.de>
 Victor Mataré <matare at lih.rwth-aachen.de>
 Volker Krause <volker.krause at rwth-aachen.de>

- *commit* 761b2d52f71745cda9e9d3fd58b8a4518777d113 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Tue Sep 6 01:48:33 2016 +0200
Subject: fawkescore: mark as version 1.0.0

 src/libs/core/version.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

_Diff for modified files_:
diff --git a/src/libs/core/version.h b/src/libs/core/version.h
index 16940c9..73ad830 100644
--- a/src/libs/core/version.h
+++ b/src/libs/core/version.h
@@ -24,8 +24,8 @@
 #ifndef __CORE_VERSION_H_
 #define __CORE_VERSION_H_
 
-#define FAWKES_VERSION_MAJOR  0
-#define FAWKES_VERSION_MINOR  5
+#define FAWKES_VERSION_MAJOR  1
+#define FAWKES_VERSION_MINOR  0
 #define FAWKES_VERSION_MICRO  0
 
 #define FAWKES_VERSION_GT(major, minor) ((FAWKES_MAJOR_VERSION  > major) || (FAWKES_MAJOR_VERSION == major) && (FAWKES_MINOR_VERSION  > minor))




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


More information about the fawkes-commits mailing list