Changeset 105 in flair-src for trunk/demos/PidStandalone/uav/src/PidUav.h

Timestamp:

10/18/16 09:13:08 (8 years ago)

Author:

Bayard Gildas

Message:

Passage du "framework" à flair

File:

• trunk/demos/PidStandalone/uav/src/PidUav.h (modified) (1 diff)

trunk/demos/PidStandalone/uav/src/PidUav.h

@@ -17 +17 @@
 #include <UavStateMachine.h>
 
-namespace framework {
-    namespace core {
-        class FrameworkManager;
-        class cvmatrix;
-    }
-    namespace gui {
-        class GroupBox;
-        class DoubleSpinBox;
-    }
-    namespace filter {
-        class Pid;
-    }
-    namespace sensor {
-        class TargetController;
-    }
+namespace flair {
+  namespace core {
+    class cvmatrix;
+  }
+  namespace gui {
+    class GroupBox;
+    class DoubleSpinBox;
+  }
+  namespace filter {
+    class Pid;
+  }
+  namespace sensor {
+    class TargetController;
+  }
 }
 
-class PidUav : public framework::meta::UavStateMachine {
-    public:
-        PidUav(framework::meta::Uav* uav, framework::sensor::TargetController *controller);
-        ~PidUav();
+class PidUav : public flair::meta::UavStateMachine {
+public:
+  PidUav(flair::meta::Uav *uav,
+         flair::sensor::TargetController *controller);
+  ~PidUav();
 
-    protected:
-        void SignalEvent(Event_t event);
-        void ExtraCheckJoystick(void);
-    private:
-        void ComputeCustomTorques(framework::core::Euler &torques);
-        bool StartCustomMode();
-        void StartOscillatingMode();
-        framework::filter::Pid *my_uPitch,*my_uRoll;
-        enum class BehaviourMode_t {
-            Default,
-            Oscillating
-        };
-        BehaviourMode_t behaviourMode;
+protected:
+  void SignalEvent(Event_t event);
+  void ExtraCheckJoystick(void);
+
+private:
+  void ComputeCustomTorques(flair::core::Euler &torques);
+  bool StartCustomMode();
+  void StartOscillatingMode();
+  flair::filter::Pid *my_uPitch, *my_uRoll;
+  enum class BehaviourMode_t { Default, Oscillating };
+  BehaviourMode_t behaviourMode;
 };