Changeset 56 in flair-dev for trunk/include

Timestamp:

Jul 4, 2017, 10:14:05 AM (7 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/include

Files:

• FlairCore/OneAxisRotation.h (modified) (2 diffs)
• FlairSensorActuator/SimuImu.h (modified) (1 diff)

trunk/include/FlairCore/OneAxisRotation.h

@@ -37 +37 @@
 */
 class OneAxisRotation : public gui::GroupBox {
-public:
+  public:
+  /*!
+  \enum RotationType_t
+  \brief rotation type
+  */
+  enum RotationType_t {
+    PreRotation,//rotation
+    PostRotation//frame change
+  };
   /*!
   * \brief Constructor
@@ -46 +54 @@
   * \param name name
   */
-  OneAxisRotation(const gui::LayoutPosition *position, std::string namel);
+  OneAxisRotation(const gui::LayoutPosition *position, std::string name,RotationType_t rotationType);
 
   /*!

trunk/include/FlairSensorActuator/SimuImu.h

@@ -94 +94 @@
     float wy;
     float wz;
+    float ax;
+    float ay;
+    float az;
+    float mx;
+    float my;
+    float mz;
   } imu_states_t;