Changeset 62 in flair-dev for trunk/include

Timestamp:

01/09/18 11:44:14 (6 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/include

Files:

• FlairCore/Semaphore.h (modified) (1 diff)
• FlairCore/SharedMem.h (modified) (2 diffs)
• FlairCore/Vector3DSpinBox.h (modified) (1 diff)
• FlairFilter/AhrsComplementaryFilter.h (modified) (2 diffs)
• FlairFilter/PidThrust.h (modified) (2 diffs)
• FlairFilter/TrajectoryGenerator1D.h (modified) (2 diffs)
• FlairMeta/UavStateMachine.h (modified) (1 diff)
• FlairSensorActuator/Imu.h (modified) (1 diff)
• FlairSensorActuator/SimuGps.h (modified) (1 diff)

trunk/include/FlairCore/Semaphore.h

@@ -48 +48 @@
 
   /*!
+  * \brief TryGetSemaphore
+  *
+  * Lock the semaphore. If not possible immediately returns false
+  *
+  */
+  bool TryGetSemaphore() const;
+
+  /*!
   * \brief GetSemaphore
   *

trunk/include/FlairCore/SharedMem.h

@@ -27 +27 @@
 *
 * Shared memory is identified by its name so it can be accessed
-* by another processus using its name.
+* by another process using its name.
 */
 
@@ -65 +65 @@
   * \param size buffer size
   */
-  void Read(char *buf, size_t size) const;
+  bool Read(char *buf, size_t size, Time nsTimeout=TIME_INFINITE) const;
 
 
   /*!
-  * \brief This function should be called when reader starts (in case of a SharedMem of type producerConsumer)
+  * \brief This function should be called when reader is ready (in case of a SharedMem of type producerConsumer)
   */
    void ReaderReady();

trunk/include/FlairCore/Vector3DSpinBox.h

@@ -68 +68 @@
   void XmlEvent(void);
 
-  core::Vector3Df box_value;
+  core::Vector3D<double> box_value;
 };
 

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;
 
   /*!

trunk/include/FlairMeta/UavStateMachine.h

@@ -228 +228 @@
   const sensor::TargetController *GetJoystick(void) const;
   MetaDualShock3 *joy;
+  
+  filter::NestedSat *GetURoll(void);
+  filter::NestedSat *GetUPitch(void);
+  filter::Pid *GetUYaw(void);
+  filter::PidThrust *GetUZ(void);
+  filter::TrajectoryGenerator1D *GetAltitudeTrajectory(void);
 
   gui::Tab *setupLawTab, *graphLawTab;

trunk/include/FlairSensorActuator/Imu.h

@@ -53 +53 @@
   *
   * \param name name
+  * \param needRotation true will enable post rotation in GCS. Post rotation must be applied manually in reimplemented code
   */
-  Imu(std::string name);
+  Imu(std::string name,bool needRotation=true);
 
   /*!

trunk/include/FlairSensorActuator/SimuGps.h

@@ -99 +99 @@
   core::SharedMem *shmem;
   gui::SpinBox *dataRate,*fixQuality,*numberOfSatellites;
-  gui::DoubleSpinBox *latitudeRef,*longitudeRef,*altitudeRef;
+  gui::DoubleSpinBox *latitudeRef,*longitudeRef,*altitudeRef,*magneticDeclination;
 };
 } // end namespace sensor