[Fawkes Git] branch/common/current-rc16: created (0.5.0-3253-gf07c3e8)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Tue Jul 12 09:52:06 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/current-rc16 has been created
        at  f07c3e8873e12ae3a000a5a8ed47e8bb60dc3e09 (commit)

http://git.fawkesrobotics.org/fawkes.git/common/current-rc16

- *Log* ---------------------------------------------------------------
commit 1713fbd26f205004dc1b9f4bed506dac9f0f12df
Merge: 067045b 6855e04
Author:     Tobias Neumann <t.neumann at fh-aachen.de>
AuthorDate: Sat Jul 2 17:55:39 2016 +0200
Commit:     Tobias Neumann <t.neumann at fh-aachen.de>
CommitDate: Sat Jul 2 17:55:39 2016 +0200

    Merge remote-tracking branch 'origin/tneumann/colli-testing/no-ori' into common/current-rc16

http://git.fawkesrobotics.org/fawkes.git/commit/1713fbd
http://trac.fawkesrobotics.org/changeset/1713fbd

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 4be6d21bcaace5c37daba4df3b2764a9b63b0ccb
Merge: 1713fbd b144ea3
Author:     Tobias Neumann <t.neumann at fh-aachen.de>
AuthorDate: Sat Jul 2 20:38:49 2016 +0200
Commit:     Tobias Neumann <t.neumann at fh-aachen.de>
CommitDate: Sat Jul 2 20:38:49 2016 +0200

    Merge remote-tracking branch 'origin/vmatare/laser-lines-matching' into common/current-rc16

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit b58b5d00c271b57593d8d6ea88a537df221c991e
Merge: 4be6d21 50ece89
Author:     Tobias Neumann <t.neumann at fh-aachen.de>
AuthorDate: Sat Jul 2 21:34:26 2016 +0200
Commit:     Tobias Neumann <t.neumann at fh-aachen.de>
CommitDate: Sat Jul 2 21:34:26 2016 +0200

    Merge remote-tracking branch 'origin/timn/laser-filter-min-merge-ignore-empty-frame' into common/current-rc16

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 24281e7801502e8dc15d3d7498c31ead16418b60
Merge: b58b5d0 9ca67ee
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Sat Jul 2 22:36:15 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Sat Jul 2 22:36:15 2016 +0200

    Merge remote-tracking branch 'origin/timn/laser-filter-min-merge-ignore-empty-frame' into current-rc16

http://git.fawkesrobotics.org/fawkes.git/commit/24281e7
http://trac.fawkesrobotics.org/changeset/24281e7

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit f07c3e8873e12ae3a000a5a8ed47e8bb60dc3e09
Merge: 24281e7 992b0e0
Author:     Tobias Neumann <t.neumann at fh-aachen.de>
AuthorDate: Sun Jul 3 09:11:46 2016 +0200
Commit:     Tobias Neumann <t.neumann at fh-aachen.de>
CommitDate: Sun Jul 3 09:11:46 2016 +0200

    Merge remote-tracking branch 'origin/vmatare/laser-lines-matching' into common/current-rc16

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

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


- *Summary* -----------------------------------------------------------
 src/plugins/laser-filter/filter_thread.cpp         |  104 ++++----
 src/plugins/laser-filter/filter_thread.h           |    9 +-
 src/plugins/laser-filter/filters/1080to360.cpp     |   10 +-
 src/plugins/laser-filter/filters/1080to360.h       |    5 +-
 src/plugins/laser-filter/filters/720to360.cpp      |   10 +-
 src/plugins/laser-filter/filters/720to360.h        |    3 +-
 src/plugins/laser-filter/filters/cascade.cpp       |    8 +-
 src/plugins/laser-filter/filters/cascade.h         |    3 +-
 src/plugins/laser-filter/filters/circle_sector.cpp |   12 +-
 src/plugins/laser-filter/filters/circle_sector.h   |    5 +-
 src/plugins/laser-filter/filters/deadspots.cpp     |   14 +-
 src/plugins/laser-filter/filters/deadspots.h       |    7 +-
 src/plugins/laser-filter/filters/filter.cpp        |   16 +-
 src/plugins/laser-filter/filters/filter.h          |    5 +-
 src/plugins/laser-filter/filters/map_filter.cpp    |   14 +-
 src/plugins/laser-filter/filters/map_filter.h      |   11 +-
 src/plugins/laser-filter/filters/max_circle.cpp    |   10 +-
 src/plugins/laser-filter/filters/max_circle.h      |    4 +-
 src/plugins/laser-filter/filters/min_circle.cpp    |   10 +-
 src/plugins/laser-filter/filters/min_circle.h      |    4 +-
 src/plugins/laser-filter/filters/min_merge.cpp     |   82 ++++--
 src/plugins/laser-filter/filters/min_merge.h       |   26 ++-
 src/plugins/laser-filter/filters/projection.cpp    |    4 +-
 src/plugins/laser-filter/filters/projection.h      |    3 +-
 src/plugins/laser-filter/filters/reverse_angle.cpp |    8 +-
 src/plugins/laser-filter/filters/reverse_angle.h   |    3 +-
 src/plugins/laser-lines/laser-lines-thread.cpp     |  295 +++++++++++++-------
 src/plugins/laser-lines/laser-lines-thread.h       |   14 +-
 src/plugins/laser-lines/line_info.h                |   11 +
 29 files changed, 453 insertions(+), 257 deletions(-)


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

- *commit* 1713fbd26f205004dc1b9f4bed506dac9f0f12df - - - - - - - - - -
Author:  Tobias Neumann <t.neumann at fh-aachen.de>
Date:    Sat Jul 2 17:55:39 2016 +0200
Subject: Merge remote-tracking branch 'origin/tneumann/colli-testing/no-ori' into common/current-rc16

 src/plugins/colli/colli_thread.cpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

_Diff for modified files_:

- *commit* 4be6d21bcaace5c37daba4df3b2764a9b63b0ccb - - - - - - - - - -
Author:  Tobias Neumann <t.neumann at fh-aachen.de>
Date:    Sat Jul 2 20:38:49 2016 +0200
Subject: Merge remote-tracking branch 'origin/vmatare/laser-lines-matching' into common/current-rc16

 src/plugins/laser-lines/laser-lines-thread.cpp |  277 +++++++++++++++---------
 src/plugins/laser-lines/laser-lines-thread.h   |   14 +-
 src/plugins/laser-lines/line_info.h            |   11 +
 3 files changed, 196 insertions(+), 106 deletions(-)

_Diff for modified files_:

- *commit* b58b5d00c271b57593d8d6ea88a537df221c991e - - - - - - - - - -
Author:  Tobias Neumann <t.neumann at fh-aachen.de>
Date:    Sat Jul 2 21:34:26 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/laser-filter-min-merge-ignore-empty-frame' into common/current-rc16

 src/plugins/laser-filter/filter_thread.cpp         |  104 ++++++++++---------
 src/plugins/laser-filter/filter_thread.h           |    9 +-
 src/plugins/laser-filter/filters/1080to360.cpp     |   10 +-
 src/plugins/laser-filter/filters/1080to360.h       |    5 +-
 src/plugins/laser-filter/filters/720to360.cpp      |   10 +-
 src/plugins/laser-filter/filters/720to360.h        |    3 +-
 src/plugins/laser-filter/filters/cascade.cpp       |    8 +-
 src/plugins/laser-filter/filters/cascade.h         |    3 +-
 src/plugins/laser-filter/filters/circle_sector.cpp |   12 ++-
 src/plugins/laser-filter/filters/circle_sector.h   |    5 +-
 src/plugins/laser-filter/filters/deadspots.cpp     |   14 ++-
 src/plugins/laser-filter/filters/deadspots.h       |    7 +-
 src/plugins/laser-filter/filters/filter.cpp        |   16 ++-
 src/plugins/laser-filter/filters/filter.h          |    5 +-
 src/plugins/laser-filter/filters/map_filter.cpp    |   14 ++-
 src/plugins/laser-filter/filters/map_filter.h      |   11 +-
 src/plugins/laser-filter/filters/max_circle.cpp    |   10 +-
 src/plugins/laser-filter/filters/max_circle.h      |    4 +-
 src/plugins/laser-filter/filters/min_circle.cpp    |   10 +-
 src/plugins/laser-filter/filters/min_circle.h      |    4 +-
 src/plugins/laser-filter/filters/min_merge.cpp     |   80 +++++++++++----
 src/plugins/laser-filter/filters/min_merge.h       |   26 ++++-
 src/plugins/laser-filter/filters/projection.cpp    |    4 +-
 src/plugins/laser-filter/filters/projection.h      |    3 +-
 src/plugins/laser-filter/filters/reverse_angle.cpp |    8 +-
 src/plugins/laser-filter/filters/reverse_angle.h   |    3 +-
 26 files changed, 242 insertions(+), 146 deletions(-)

_Diff for modified files_:

- *commit* 24281e7801502e8dc15d3d7498c31ead16418b60 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Sat Jul 2 22:36:15 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/laser-filter-min-merge-ignore-empty-frame' into current-rc16

 src/plugins/laser-filter/filters/min_merge.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

_Diff for modified files_:

- *commit* f07c3e8873e12ae3a000a5a8ed47e8bb60dc3e09 - - - - - - - - - -
Author:  Tobias Neumann <t.neumann at fh-aachen.de>
Date:    Sun Jul 3 09:11:46 2016 +0200
Subject: Merge remote-tracking branch 'origin/vmatare/laser-lines-matching' into common/current-rc16

 src/plugins/laser-lines/laser-lines-thread.cpp |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

_Diff for modified files_:




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


More information about the fawkes-commits mailing list