Changeset 62 in flair-dev for trunk/include


Ignore:
Timestamp:
Jan 9, 2018, 11:44:14 AM (3 years ago)
Author:
Sanahuja Guillaume
Message:

m

Location:
trunk/include
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/FlairCore/Semaphore.h

    r47 r62  
    4848
    4949  /*!
     50  * \brief TryGetSemaphore
     51  *
     52  * Lock the semaphore. If not possible immediately returns false
     53  *
     54  */
     55  bool TryGetSemaphore() const;
     56
     57  /*!
    5058  * \brief GetSemaphore
    5159  *
  • trunk/include/FlairCore/SharedMem.h

    r50 r62  
    2727*
    2828* Shared memory is identified by its name so it can be accessed
    29 * by another processus using its name.
     29* by another process using its name.
    3030*/
    3131
     
    6565  * \param size buffer size
    6666  */
    67   void Read(char *buf, size_t size) const;
     67  bool Read(char *buf, size_t size, Time nsTimeout=TIME_INFINITE) const;
    6868
    6969
    7070  /*!
    71   * \brief This function should be called when reader starts (in case of a SharedMem of type producerConsumer)
     71  * \brief This function should be called when reader is ready (in case of a SharedMem of type producerConsumer)
    7272  */
    7373   void ReaderReady();
  • trunk/include/FlairCore/Vector3DSpinBox.h

    r50 r62  
    6868  void XmlEvent(void);
    6969
    70   core::Vector3Df box_value;
     70  core::Vector3D<double> box_value;
    7171};
    7272
  • trunk/include/FlairFilter/AhrsComplementaryFilter.h

    r50 r62  
    2424    namespace gui {
    2525        class DoubleSpinBox;
     26        class Vector3DSpinBox;
    2627    }
    2728}
     
    6970            gui::DoubleSpinBox *ka[3];
    7071            gui::DoubleSpinBox *kb[3];
     72            gui::DoubleSpinBox *km[3];
     73            gui::Vector3DSpinBox *magRef;
    7174    };
    7275} // end namespace filter
  • trunk/include/FlairFilter/PidThrust.h

    r13 r62  
    5555
    5656  /*!
    57   * \brief Reset integral and offset to 0
    58   *
    59   */
    60   void Reset(void);
    61 
    62   /*!
    6357  * \brief Reset integral to 0
    6458  *
     
    6761
    6862  /*!
    69   * \brief Reset offset to 0
     63  * \brief Set offset to a specified value
    7064  *
     65  * \param value desired value
    7166  */
    72   void ResetOffset(void);
    73 
     67  void SetOffset(float value);
     68 
    7469  /*!
    7570  * \brief Set offset to specified value in ground station
    7671  *
    7772  */
    78   void SetOffset(void);
     73  void SetDefaultOffset(void);
    7974
    8075  /*!
  • trunk/include/FlairFilter/TrajectoryGenerator1D.h

    r50 r62  
    127127  * \brief Position
    128128  *
     129  * \return the actual position
    129130  */
    130131  float Position(void) const;
     
    133134  * \brief Speed
    134135  *
     136  * \return the actual speed
    135137  */
    136138  float Speed(void) const;
     139 
     140  /*!
     141  * \brief Get percentage of completion
     142  *
     143  * Value is between 0 and 100.
     144  *
     145  * \return the percentage of completion (in position)
     146  */
     147  float GetPercentageOfCompletion(void) const;
    137148
    138149  /*!
  • trunk/include/FlairMeta/UavStateMachine.h

    r50 r62  
    228228  const sensor::TargetController *GetJoystick(void) const;
    229229  MetaDualShock3 *joy;
     230 
     231  filter::NestedSat *GetURoll(void);
     232  filter::NestedSat *GetUPitch(void);
     233  filter::Pid *GetUYaw(void);
     234  filter::PidThrust *GetUZ(void);
     235  filter::TrajectoryGenerator1D *GetAltitudeTrajectory(void);
    230236
    231237  gui::Tab *setupLawTab, *graphLawTab;
  • trunk/include/FlairSensorActuator/Imu.h

    r50 r62  
    5353  *
    5454  * \param name name
     55  * \param needRotation true will enable post rotation in GCS. Post rotation must be applied manually in reimplemented code
    5556  */
    56   Imu(std::string name);
     57  Imu(std::string name,bool needRotation=true);
    5758
    5859  /*!
  • trunk/include/FlairSensorActuator/SimuGps.h

    r50 r62  
    9999  core::SharedMem *shmem;
    100100  gui::SpinBox *dataRate,*fixQuality,*numberOfSatellites;
    101   gui::DoubleSpinBox *latitudeRef,*longitudeRef,*altitudeRef;
     101  gui::DoubleSpinBox *latitudeRef,*longitudeRef,*altitudeRef,*magneticDeclination;
    102102};
    103103} // end namespace sensor
Note: See TracChangeset for help on using the changeset viewer.