Changeset 62 in flair-dev for trunk/include/FlairFilter

Timestamp:

Jan 9, 2018, 11:44:14 AM (7 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/include/FlairFilter

Files:

• AhrsComplementaryFilter.h (modified) (2 diffs)
• PidThrust.h (modified) (2 diffs)
• TrajectoryGenerator1D.h (modified) (2 diffs)

trunk/include/FlairFilter/AhrsComplementaryFilter.h

@@ -24 +24 @@
     namespace gui {
         class DoubleSpinBox;
+        class Vector3DSpinBox;
     }
 }
@@ -69 +70 @@
             gui::DoubleSpinBox *ka[3];
             gui::DoubleSpinBox *kb[3];
+            gui::DoubleSpinBox *km[3];
+            gui::Vector3DSpinBox *magRef;
     };
 } // end namespace filter

trunk/include/FlairFilter/PidThrust.h

@@ -55 +55 @@
 
   /*!
-  * \brief Reset integral and offset to 0
-  *
-  */
-  void Reset(void);
-
-  /*!
   * \brief Reset integral to 0
   *
@@ -67 +61 @@
 
   /*!
-  * \brief Reset offset to 0
+  * \brief Set offset to a specified value
   *
+  * \param value desired value
   */
-  void ResetOffset(void);
-
+  void SetOffset(float value);
+  
   /*!
   * \brief Set offset to specified value in ground station
   *
   */
-  void SetOffset(void);
+  void SetDefaultOffset(void);
 
   /*!

trunk/include/FlairFilter/TrajectoryGenerator1D.h

@@ -127 +127 @@
   * \brief Position
   *
+  * \return the actual position
   */
   float Position(void) const;
@@ -133 +134 @@
   * \brief Speed
   *
+  * \return the actual speed
   */
   float Speed(void) const;
+  
+  /*!
+  * \brief Get percentage of completion
+  * 
+  * Value is between 0 and 100.
+  *
+  * \return the percentage of completion (in position)
+  */
+  float GetPercentageOfCompletion(void) const;
 
   /*!