[Fawkes Git] branch/common/master-merge-review: 10 revs updated. (0.5.0-3258-g6ad54fd)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Mon Aug 29 16:45:36 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  6ad54fd34b26c846e4c80fa66e082e9b47c5318a (commit)
       via  6747fb6b659ac75fe274be12fe6a4847c67db3d6 (commit)
       via  901d4706a648d7274f339a669e30743ab17f8ca4 (commit)
       via  88ebc52f0d7a634bf2f11915f4a58465e011fa22 (commit)
       via  b2cdee485f55b6b8148665fca594ae599a2f8375 (commit)
       via  0685876efce394c6c5aef7bd0894e1e5833e2546 (commit)
       via  f04ba7040ef729cb60bca29c00ad0344e25f699e (commit)
       via  478d4ab8cd88bf9eb6bfe39d65fbd692ffca9d99 (commit)
       via  ed00e5db94ec36fd5e2f046e649bca57c3cf4e3d (commit)
       via  2f00cc914647b8dc9689ca44d2c52c23f4df4417 (commit)
      from  e447d9af1226d9f04123fbd834e71c980480d5ce (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 901d4706a648d7274f339a669e30743ab17f8ca4
Merge: e447d9a 88ebc52
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Fri Aug 26 16:03:02 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Fri Aug 26 16:03:02 2016 +0200

    Merge remote-tracking branch 'origin/thofmann/bash-completion'

http://git.fawkesrobotics.org/fawkes.git/commit/901d470
http://trac.fawkesrobotics.org/changeset/901d470

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 6747fb6b659ac75fe274be12fe6a4847c67db3d6
Merge: 901d470 ed00e5d
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Aug 29 16:21:32 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Aug 29 16:21:32 2016 +0200

    Merge remote-tracking branch 'origin/fzwilling/depthcam'

http://git.fawkesrobotics.org/fawkes.git/commit/6747fb6
http://trac.fawkesrobotics.org/changeset/6747fb6

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 6ad54fd34b26c846e4c80fa66e082e9b47c5318a
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Aug 29 16:44:45 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Aug 29 16:44:45 2016 +0200

    tfutils: fix tf_age return statement

http://git.fawkesrobotics.org/fawkes.git/commit/6ad54fd
http://trac.fawkesrobotics.org/changeset/6ad54fd

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


- *Summary* -----------------------------------------------------------
 cfg/conf.d/gazsim.yaml                             |    7 ++
 etc/bash/fawkes_completion.bash                    |   84 ++++++++++++++++
 src/libs/baseapp/init_options.cpp                  |   24 ++++-
 src/libs/baseapp/run.cpp                           |   68 +++++++------
 src/lua/fawkes/tfutils.lua                         |    2 +-
 src/plugins/gazebo/Makefile                        |    3 +-
 .../{gazsim-webcam => gazsim-depthcam}/Makefile    |   28 +++--
 .../gazsim_depthcam_plugin.cpp}                    |   22 ++--
 .../gazsim-depthcam/gazsim_depthcam_thread.cpp     |  105 ++++++++++++++++++++
 .../gazsim_depthcam_thread.h}                      |   54 ++++++-----
 10 files changed, 313 insertions(+), 84 deletions(-)
 create mode 100644 etc/bash/fawkes_completion.bash
 copy src/plugins/gazebo/{gazsim-webcam => gazsim-depthcam}/Makefile (59%)
 copy src/plugins/gazebo/{gazsim-webcam/gazsim_webcam_plugin.cpp => gazsim-depthcam/gazsim_depthcam_plugin.cpp} (64%)
 create mode 100644 src/plugins/gazebo/gazsim-depthcam/gazsim_depthcam_thread.cpp
 copy src/plugins/gazebo/{gazsim-vis-localization/gazsim_vis_localization_thread.h => gazsim-depthcam/gazsim_depthcam_thread.h} (61%)


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

- *commit* 901d4706a648d7274f339a669e30743ab17f8ca4 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Fri Aug 26 16:03:02 2016 +0200
Subject: Merge remote-tracking branch 'origin/thofmann/bash-completion'

 etc/bash/fawkes_completion.bash   |   84 +++++++++++++++++++++++++++++++++++++
 src/libs/baseapp/init_options.cpp |   24 ++++++++++-
 src/libs/baseapp/run.cpp          |   68 +++++++++++++++--------------
 3 files changed, 141 insertions(+), 35 deletions(-)

_Diff for modified files_:

- *commit* 6747fb6b659ac75fe274be12fe6a4847c67db3d6 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Aug 29 16:21:32 2016 +0200
Subject: Merge remote-tracking branch 'origin/fzwilling/depthcam'

 cfg/conf.d/gazsim.yaml                             |    7 ++
 src/plugins/gazebo/Makefile                        |    3 +-
 .../{gazsim-webcam => gazsim-depthcam}/Makefile    |   28 +++--
 .../gazsim_depthcam_plugin.cpp}                    |   22 ++--
 .../gazsim-depthcam/gazsim_depthcam_thread.cpp     |  105 ++++++++++++++++++++
 .../gazsim_depthcam_thread.h}                      |   54 ++++++-----
 6 files changed, 171 insertions(+), 48 deletions(-)

_Diff for modified files_:

- *commit* 6ad54fd34b26c846e4c80fa66e082e9b47c5318a - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Aug 29 16:44:45 2016 +0200
Subject: tfutils: fix tf_age return statement

 src/lua/fawkes/tfutils.lua |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

_Diff for modified files_:
diff --git a/src/lua/fawkes/tfutils.lua b/src/lua/fawkes/tfutils.lua
index 39cfa3f..d50d91b 100644
--- a/src/lua/fawkes/tfutils.lua
+++ b/src/lua/fawkes/tfutils.lua
@@ -133,7 +133,7 @@ end
 function tf_age(src_frame, target_frame)
    local transform = fawkes.tf.StampedTransform:new()
    tf:lookup_transform(src_frame, target_frame, transform)
-   return timediff = fawkes.Time:new() - transform.stamp
+   return (fawkes.Time:new() - transform.stamp)
 end
 
 




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


More information about the fawkes-commits mailing list