Changeset 206 in flair-src for trunk/lib/FlairFilter/src

Timestamp:

01/09/18 11:43:37 (6 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/lib/FlairFilter/src

Files:

• PidThrust.cpp (modified) (2 diffs)
• PidThrust.h (modified) (2 diffs)

trunk/lib/FlairFilter/src/PidThrust.cpp

@@ -43 +43 @@
 }
 
-void PidThrust::Reset(void) {
-  pimpl_->i = 0;
-  pimpl_->offset_g = 0;
-}
-
 void PidThrust::ResetI(void) { pimpl_->i = 0; }
 
@@ -62 +57 @@
 }
 
-void PidThrust::ResetOffset(void) { pimpl_->offset_g = 0; }
+void PidThrust::SetDefaultOffset(void) { pimpl_->offset_g = pimpl_->offset->Value(); }
 
-void PidThrust::SetOffset(void) { pimpl_->offset_g = pimpl_->offset->Value(); }
+void PidThrust::SetOffset(float value) { pimpl_->offset_g = value; }
 
 bool PidThrust::OffsetStepUp(void) {

trunk/lib/FlairFilter/src/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);
 
   /*!