[Fawkes Git] branch/common/master-merge-review: 3 revs updated. (0.5.0-3334-g7999eee)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Mon Sep 5 15:52:16 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  7999eee33c24bf1edf652f5549227aa6f5157cff (commit)
       via  f9243f704d71465ff916e0e735946655bc0e0d99 (commit)
       via  bf9d5b332ac92881dfec35e22e849667638aea8a (commit)
      from  6590aa9efeffef18b51fb3438bb79c2d5afeacf4 (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 f9243f704d71465ff916e0e735946655bc0e0d99
Merge: 6590aa9 bf9d5b3
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 15:24:32 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 15:24:32 2016 +0200

    Merge remote-tracking branch 'origin/timn/ros-webview-fawkes_msgs'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 7999eee33c24bf1edf652f5549227aa6f5157cff
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 15:51:21 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 15:51:21 2016 +0200

    laser-lines: documentation fixes for line tracking code

http://git.fawkesrobotics.org/fawkes.git/commit/7999eee
http://trac.fawkesrobotics.org/changeset/7999eee

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


- *Summary* -----------------------------------------------------------
 src/plugins/laser-lines/line_info.cpp |   20 ++++++++++++++---
 src/plugins/ros/Makefile              |   13 +++++------
 src/plugins/ros/webview_reqproc.cpp   |   12 +++++-----
 src/plugins/ros/webview_thread.cpp    |   36 ++++++++++++++------------------
 src/plugins/ros/webview_thread.h      |   20 +++++++++---------
 5 files changed, 54 insertions(+), 47 deletions(-)


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

- *commit* f9243f704d71465ff916e0e735946655bc0e0d99 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 15:24:32 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/ros-webview-fawkes_msgs'

 src/plugins/ros/Makefile            |   13 +++++------
 src/plugins/ros/webview_reqproc.cpp |   12 +++++-----
 src/plugins/ros/webview_thread.cpp  |   36 +++++++++++++++-------------------
 src/plugins/ros/webview_thread.h    |   20 +++++++++---------
 4 files changed, 38 insertions(+), 43 deletions(-)

_Diff for modified files_:

- *commit* 7999eee33c24bf1edf652f5549227aa6f5157cff - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 15:51:21 2016 +0200
Subject: laser-lines: documentation fixes for line tracking code

 src/plugins/laser-lines/line_info.cpp |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/laser-lines/line_info.cpp b/src/plugins/laser-lines/line_info.cpp
index 97cd804..db36d9f 100644
--- a/src/plugins/laser-lines/line_info.cpp
+++ b/src/plugins/laser-lines/line_info.cpp
@@ -24,7 +24,19 @@
 
 using namespace std;
 
+/** @class TrackedLineInfo "line_info.h"
+ * Container for a line with tracking and smoothing info.
+ */
 
+/** Constructor.
+ * @param tfer tf transformer
+ * @param input_frame_id frame id of incoming data
+ * @param tracking_frame_id fixed frame in which to perform tracking
+ * @param cfg_switch_tolerance tolerance in m for when to assume a line ID switch
+ * @param cfg_moving_avg_len length of buffer for moving average
+ * @param logger logger for informational messages
+ * @param plugin_name component for informational messages
+ */
 TrackedLineInfo::TrackedLineInfo(
     fawkes::tf::Transformer *tfer,
     const string &input_frame_id,
@@ -44,8 +56,8 @@ TrackedLineInfo::TrackedLineInfo(
 {}
 
 
-/**
- * Compute this line's distance from @param linfo, using odom as reference frame.
+/** Compute this line's distance from line info
+ * @param linfo line info
  * @return the scalar distance between the two base points in meters.
  */
 btScalar TrackedLineInfo::distance(const LineInfo &linfo) const
@@ -66,8 +78,8 @@ btScalar TrackedLineInfo::distance(const LineInfo &linfo) const
 }
 
 
-/**
- * Update this line with the data from @param linfo.
+/** Update this line.
+ * @param linfo new info to consume
  * This also updates moving averages for all fields.
  */
 void TrackedLineInfo::update(LineInfo &linfo)




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


More information about the fawkes-commits mailing list