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


Ignore:
Timestamp:
Mar 6, 2018, 12:14:17 PM (7 years ago)
Author:
Sanahuja Guillaume
Message:

maj for armv5te

Location:
trunk/include/FlairFilter
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/FlairFilter/AhrsComplementaryFilter.h

    r62 r68  
    6363            void UpdateFrom(const core::io_data *data);
    6464
    65             core::Time previous_time;
    66 
    67             bool isInit;
    6865            core::Quaternion QHat;
    6966            core::Vector3Df BHat;

  • trunk/include/FlairFilter/ButterworthLowPass.h

    r50 r68  
    1818namespace flair {
    1919namespace core {
    20 class cvmatrix;
     20class Matrix;
    2121}
    2222namespace gui {
    … …  
    9191  * \return filtered output
    9292  */
    93   core::cvmatrix *Matrix(void) const;
     93  core::Matrix *GetMatrix(void) const;
    9494
    9595  /*!

  • trunk/include/FlairFilter/ControlLaw.h

    r13 r68  
    2121}
    2222namespace core {
    23 class cvmatrix;
     23class Matrix;
    2424}
    2525}
    … …  
    8888  * \brief Reset the internal state of the control law
    8989  *
    90   * Doesn't do anything by default
     90  * Does nothing by default
    9191  *
    9292  */
    … …  
    100100  *
    101101  */
    102   core::cvmatrix *input;
     102  core::Matrix *input;
    103103
    104104  /*!
    … …  
    109109  *
    110110  */
    111   core::cvmatrix *output;
     111  core::Matrix *output;
    112112
    113113private:

  • trunk/include/FlairFilter/EulerDerivative.h

    r50 r68  
    1818namespace flair {
    1919namespace core {
    20 class cvmatrix;
     20class Matrix;
    2121}
    2222namespace gui {
    … …  
    5656  EulerDerivative(const core::IODevice *parent,
    5757                  const gui::LayoutPosition *position, std::string name,
    58                   const core::cvmatrix *init_value = NULL);
     58                  const core::Matrix *init_value = NULL);
    5959
    6060  /*!
    … …  
    7979  * \return filtered output
    8080  */
    81   core::cvmatrix *Matrix(void) const;
     81  core::Matrix *GetMatrix(void) const;
    8282
    8383private:

  • trunk/include/FlairFilter/LowPassFilter.h

    r50 r68  
    1818namespace flair {
    1919namespace core {
    20 class cvmatrix;
     20class Matrix;
    2121}
    2222namespace gui {
    … …  
    5656  LowPassFilter(const core::IODevice *parent,
    5757                const gui::LayoutPosition *position, std::string name,
    58                 const core::cvmatrix *init_value = NULL);
     58                const core::Matrix *init_value = NULL);
    5959
    6060  /*!
    … …  
    7979  * \return filtered output
    8080  */
    81   core::cvmatrix *Matrix(void) const;
     81  core::Matrix *GetMatrix(void) const;
    8282
    8383private:

  • trunk/include/FlairFilter/PidThrust.h

    r62 r68  
    5555
    5656  /*!
     57  * \brief Reset the control law
     58  * equivalent to:
     59  * ResetI();
     60  * SetDefaultOffset();
     61  * SetValues(0,0);
     62  *
     63  */
     64  void Reset(void);
     65 
     66  /*!
    5767  * \brief Reset integral to 0
    5868  *
    … …  
    7888  * \return current offset
    7989  */
    80   float GetOffset(void);
     90  float GetOffset(void) const;
     91 
     92  /*!
     93  * \brief Get intergral part
     94  *
     95  * \return current integral part
     96  */
     97  float GetIntegral(void) const;
    8198
    8299  /*!

  • trunk/include/FlairFilter/TrajectoryGenerator1D.h

    r62 r68  
    1818namespace flair {
    1919namespace core {
    20 class cvmatrix;
     20class Matrix;
    2121}
    2222namespace gui {
    … …  
    152152  * \return matrix
    153153  */
    154   core::cvmatrix *Matrix(void) const;
     154  core::Matrix *GetMatrix(void) const;
    155155
    156156private:

  • trunk/include/FlairFilter/TrajectoryGenerator2DCircle.h

    r50 r68  
    1919namespace flair {
    2020namespace core {
    21 class cvmatrix;
     21class Matrix;
    2222}
    2323namespace gui {
    … …  
    131131  * \return matrix
    132132  */
    133   core::cvmatrix *Matrix(void) const;
     133  core::Matrix *GetMatrix(void) const;
    134134
    135135  /*!
Note: See TracChangeset for help on using the changeset viewer.