[Fawkes Git] branch/timn/master-preview: 3 revs updated. (0.5.0-3439-gea417f2)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Wed Dec 21 16:41:24 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
        to  ea417f2f5fff72ca707e11f0d18d89bedc2c7c9b (commit)
       via  bee476873ffadb7485fec26af8363267a2dc0707 (commit)
       via  699529c5fa32345e89f45d66fe7f1eb946dbf390 (commit)
      from  c175651ea123c577bedd3e35bb2dc360de7f4466 (commit)

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 699529c5fa32345e89f45d66fe7f1eb946dbf390
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Dec 21 16:40:12 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:40:12 2016 +0100

    robotino: regenerate interface

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit bee476873ffadb7485fec26af8363267a2dc0707
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Dec 21 16:40:39 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:40:39 2016 +0100

    navgraph-generator: regenerate interface

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit ea417f2f5fff72ca707e11f0d18d89bedc2c7c9b
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Dec 21 16:40:43 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:40:43 2016 +0100

    fvutils: align header and definition parameter names
    
    Newer doxygen complains.

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

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


- *Summary* -----------------------------------------------------------
 .../fvutils/colormap/bayes/bayes_histos_to_lut.cpp |    9 +--
 .../interfaces/NavGraphGeneratorInterface.h_ext    |   64 +++++---------------
 .../interfaces/RobotinoSensorInterface.h_ext       |   12 +---
 3 files changed, 22 insertions(+), 63 deletions(-)


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

- *commit* 699529c5fa32345e89f45d66fe7f1eb946dbf390 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Dec 21 16:40:12 2016 +0100
Subject: robotino: regenerate interface

 .../interfaces/RobotinoSensorInterface.h_ext       |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/robotino/interfaces/RobotinoSensorInterface.h_ext b/src/plugins/robotino/interfaces/RobotinoSensorInterface.h_ext
index f7da921..4df5f5c 100644
--- a/src/plugins/robotino/interfaces/RobotinoSensorInterface.h_ext
+++ b/src/plugins/robotino/interfaces/RobotinoSensorInterface.h_ext
@@ -39,9 +39,8 @@ class RobotinoSensorInterface : public Interface
   /* constants */
 
  private:
-#pragma pack(push,4)
   /** Internal data storage, do NOT modify! */
-  typedef struct {
+  typedef struct __attribute__((packed)) {
     int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
     int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
     float mot_velocity[3]; /**< Velocities of the wheels. */
@@ -56,7 +55,6 @@ class RobotinoSensorInterface : public Interface
       True if emergency stop on bumper contact is enabled, false otherwise.
      */
   } RobotinoSensorInterface_data_t;
-#pragma pack(pop)
 
   RobotinoSensorInterface_data_t *data;
 
@@ -65,9 +63,8 @@ class RobotinoSensorInterface : public Interface
   class SetBumperEStopEnabledMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
       bool enabled; /**< 
@@ -75,7 +72,6 @@ class RobotinoSensorInterface : public Interface
       disable. This will persist over OpenRobotino stated restarts.
      */
     } SetBumperEStopEnabledMessage_data_t;
-#pragma pack(pop)
 
     SetBumperEStopEnabledMessage_data_t *data;
 
@@ -95,9 +91,8 @@ class RobotinoSensorInterface : public Interface
   class SetDigitalOutputMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
       uint8_t digital_out; /**< 
@@ -107,7 +102,6 @@ class RobotinoSensorInterface : public Interface
       True to enable digital out, false to disable.
      */
     } SetDigitalOutputMessage_data_t;
-#pragma pack(pop)
 
     SetDigitalOutputMessage_data_t *data;
 

- *commit* bee476873ffadb7485fec26af8363267a2dc0707 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Dec 21 16:40:39 2016 +0100
Subject: navgraph-generator: regenerate interface

 .../interfaces/NavGraphGeneratorInterface.h_ext    |   64 +++++---------------
 1 files changed, 16 insertions(+), 48 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/navgraph-generator/interfaces/NavGraphGeneratorInterface.h_ext b/src/plugins/navgraph-generator/interfaces/NavGraphGeneratorInterface.h_ext
index 3d8e428..2f9f8c3 100644
--- a/src/plugins/navgraph-generator/interfaces/NavGraphGeneratorInterface.h_ext
+++ b/src/plugins/navgraph-generator/interfaces/NavGraphGeneratorInterface.h_ext
@@ -123,9 +123,8 @@ class NavGraphGeneratorInterface : public Interface
   const char * tostring_EdgeMode(EdgeMode value) const;
 
  private:
-#pragma pack(push,4)
   /** Internal data storage, do NOT modify! */
-  typedef struct {
+  typedef struct __attribute__((packed)) {
     int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
     int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
     uint32_t msgid; /**< 
@@ -138,7 +137,6 @@ class NavGraphGeneratorInterface : public Interface
       msgid field if this field applies to the correct message.
      */
   } NavGraphGeneratorInterface_data_t;
-#pragma pack(pop)
 
   NavGraphGeneratorInterface_data_t *data;
 
@@ -150,13 +148,11 @@ class NavGraphGeneratorInterface : public Interface
   class ClearMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
     } ClearMessage_data_t;
-#pragma pack(pop)
 
     ClearMessage_data_t *data;
 
@@ -175,9 +171,8 @@ class NavGraphGeneratorInterface : public Interface
   class SetBoundingBoxMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
       float p1_x; /**< X coordinate of bbox start point in global frame. */
@@ -185,7 +180,6 @@ class NavGraphGeneratorInterface : public Interface
       float p2_x; /**< X coordinate of bbox end point in global frame. */
       float p2_y; /**< Y coordinate of bbox end point in global frame. */
     } SetBoundingBoxMessage_data_t;
-#pragma pack(pop)
 
     SetBoundingBoxMessage_data_t *data;
 
@@ -217,9 +211,8 @@ class NavGraphGeneratorInterface : public Interface
   class SetFilterMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
       int32_t filter; /**< Which filter to
@@ -227,7 +220,6 @@ class NavGraphGeneratorInterface : public Interface
       bool enable; /**< True to enable, false to
     disable */
     } SetFilterMessage_data_t;
-#pragma pack(pop)
 
     SetFilterMessage_data_t *data;
 
@@ -253,9 +245,8 @@ class NavGraphGeneratorInterface : public Interface
   class SetFilterParamFloatMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
       int32_t filter; /**< Which filter to
@@ -265,7 +256,6 @@ class NavGraphGeneratorInterface : public Interface
       float value; /**< True to enable, false to
     disable */
     } SetFilterParamFloatMessage_data_t;
-#pragma pack(pop)
 
     SetFilterParamFloatMessage_data_t *data;
 
@@ -294,9 +284,8 @@ class NavGraphGeneratorInterface : public Interface
   class AddMapObstaclesMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
       float max_line_point_distance; /**< 
@@ -304,7 +293,6 @@ class NavGraphGeneratorInterface : public Interface
       this threshold in terms of maximum distance of points on line.
      */
     } AddMapObstaclesMessage_data_t;
-#pragma pack(pop)
 
     AddMapObstaclesMessage_data_t *data;
 
@@ -327,9 +315,8 @@ class NavGraphGeneratorInterface : public Interface
   class AddObstacleMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
       char name[64]; /**< 
@@ -338,7 +325,6 @@ class NavGraphGeneratorInterface : public Interface
       float x; /**< X coordinate of obstacle in global frame. */
       float y; /**< Y coordinate of obstacle in global frame. */
     } AddObstacleMessage_data_t;
-#pragma pack(pop)
 
     AddObstacleMessage_data_t *data;
 
@@ -367,16 +353,14 @@ class NavGraphGeneratorInterface : public Interface
   class RemoveObstacleMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
       char name[64]; /**< 
       ID of the obstacle to remove.
      */
     } RemoveObstacleMessage_data_t;
-#pragma pack(pop)
 
     RemoveObstacleMessage_data_t *data;
 
@@ -399,9 +383,8 @@ class NavGraphGeneratorInterface : public Interface
   class AddPointOfInterestMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
       char name[64]; /**< 
@@ -413,7 +396,6 @@ class NavGraphGeneratorInterface : public Interface
       The connection mode to use to connect the POI with the graph.
      */
     } AddPointOfInterestMessage_data_t;
-#pragma pack(pop)
 
     AddPointOfInterestMessage_data_t *data;
 
@@ -445,9 +427,8 @@ class NavGraphGeneratorInterface : public Interface
   class AddPointOfInterestWithOriMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
       char name[64]; /**< 
@@ -460,7 +441,6 @@ class NavGraphGeneratorInterface : public Interface
       The connection mode to use to connect the POI with the graph.
      */
     } AddPointOfInterestWithOriMessage_data_t;
-#pragma pack(pop)
 
     AddPointOfInterestWithOriMessage_data_t *data;
 
@@ -495,9 +475,8 @@ class NavGraphGeneratorInterface : public Interface
   class SetPointOfInterestPropertyMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
       char name[64]; /**< 
@@ -507,7 +486,6 @@ class NavGraphGeneratorInterface : public Interface
       char property_value[1024]; /**< Value of the property
     to set. */
     } SetPointOfInterestPropertyMessage_data_t;
-#pragma pack(pop)
 
     SetPointOfInterestPropertyMessage_data_t *data;
 
@@ -536,9 +514,8 @@ class NavGraphGeneratorInterface : public Interface
   class AddEdgeMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
       char p1[64]; /**< ID of first node. */
@@ -549,7 +526,6 @@ class NavGraphGeneratorInterface : public Interface
      */
       int32_t mode; /**< The edge insertion mode. */
     } AddEdgeMessage_data_t;
-#pragma pack(pop)
 
     AddEdgeMessage_data_t *data;
 
@@ -581,16 +557,14 @@ class NavGraphGeneratorInterface : public Interface
   class SetGraphDefaultPropertyMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
       char property_name[64]; /**< Name of the property to set. */
       char property_value[1024]; /**< Value of the property
     to set. */
     } SetGraphDefaultPropertyMessage_data_t;
-#pragma pack(pop)
 
     SetGraphDefaultPropertyMessage_data_t *data;
 
@@ -616,15 +590,13 @@ class NavGraphGeneratorInterface : public Interface
   class SetCopyGraphDefaultPropertiesMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
       bool enable_copy; /**< True to enable copying
     (default) false to disable). */
     } SetCopyGraphDefaultPropertiesMessage_data_t;
-#pragma pack(pop)
 
     SetCopyGraphDefaultPropertiesMessage_data_t *data;
 
@@ -647,16 +619,14 @@ class NavGraphGeneratorInterface : public Interface
   class RemovePointOfInterestMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
       char name[64]; /**< 
       ID of the obstacle to remove.
      */
     } RemovePointOfInterestMessage_data_t;
-#pragma pack(pop)
 
     RemovePointOfInterestMessage_data_t *data;
 
@@ -679,13 +649,11 @@ class NavGraphGeneratorInterface : public Interface
   class ComputeMessage : public Message
   {
    private:
-#pragma pack(push,4)
     /** Internal data storage, do NOT modify! */
-    typedef struct {
+    typedef struct __attribute__((packed)) {
       int64_t timestamp_sec;  /**< Interface Unix timestamp, seconds */
       int64_t timestamp_usec; /**< Interface Unix timestamp, micro-seconds */
     } ComputeMessage_data_t;
-#pragma pack(pop)
 
     ComputeMessage_data_t *data;
 

- *commit* ea417f2f5fff72ca707e11f0d18d89bedc2c7c9b - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Dec 21 16:40:43 2016 +0100
Subject: fvutils: align header and definition parameter names

 .../fvutils/colormap/bayes/bayes_histos_to_lut.cpp |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

_Diff for modified files_:
diff --git a/src/libs/fvutils/colormap/bayes/bayes_histos_to_lut.cpp b/src/libs/fvutils/colormap/bayes/bayes_histos_to_lut.cpp
index 69782bd..414b17b 100644
--- a/src/libs/fvutils/colormap/bayes/bayes_histos_to_lut.cpp
+++ b/src/libs/fvutils/colormap/bayes/bayes_histos_to_lut.cpp
@@ -58,21 +58,18 @@ namespace firevision {
 /** Constructor.
  * @param histos histograms
  * @param d depth of lookup table
- * @param object type of the foreground object
+ * @param fg_object type of the foreground object
  * @param w the width of the lookup table (u-resolution)
  * @param h the height of the lookup table (v-resolution)
  */
 BayesHistosToLut::BayesHistosToLut(std::map<hint_t, Histogram*> &histos,
-				   unsigned int d, hint_t object, unsigned int w, unsigned int h)
-  : histograms(histos)
+				   unsigned int d, hint_t fg_object, unsigned int w, unsigned int h)
+  : histograms(histos), fg_object(fg_object)
 {
   width  = w;
   height = h;
   depth  = d;
 
-  fg_object  = object;
-  //  histograms = histos;
-
   // no as shmem segment
   lut = new YuvColormap(depth, width, height);
 




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


More information about the fawkes-commits mailing list