Changeset 23 in flair-src for trunk/demos/CircleFollower/uav/src


Ignore:
Timestamp:
04/20/16 17:07:36 (6 years ago)
Author:
Sanahuja Guillaume
Message:

igep to flair

Location:
trunk/demos/CircleFollower/uav/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/demos/CircleFollower/uav/src/CircleFollower.cpp

    r21 r23  
    3131
    3232using namespace std;
    33 using namespace framework::core;
    34 using namespace framework::gui;
    35 using namespace framework::filter;
    36 using namespace framework::meta;
     33using namespace flair::core;
     34using namespace flair::gui;
     35using namespace flair::filter;
     36using namespace flair::meta;
    3737
    3838CircleFollower::CircleFollower(Uav* uav): UavStateMachine(uav), behaviourMode(BehaviourMode_t::Default), vrpnLost(false) {
  • trunk/demos/CircleFollower/uav/src/CircleFollower.h

    r21 r23  
    1717#include <UavStateMachine.h>
    1818
    19 namespace framework {
     19namespace flair {
    2020    namespace gui {
    2121        class PushButton;
     
    2929}
    3030
    31 class CircleFollower : public framework::meta::UavStateMachine {
     31class CircleFollower : public flair::meta::UavStateMachine {
    3232    public:
    33         CircleFollower(framework::meta::Uav* uav);
     33        CircleFollower(flair::meta::Uav* uav);
    3434        ~CircleFollower();
    3535
     
    5050        void ExtraCheckPushButton(void);
    5151        void ExtraCheckJoystick(void);
    52         const framework::core::AhrsData *GetOrientation(void) const;
     52        const flair::core::AhrsData *GetOrientation(void) const;
    5353        void AltitudeValues(float &z,float &dz);
    54         void PositionValues(framework::core::Vector2D &pos_error,framework::core::Vector2D &vel_error,float &yaw_ref);
    55         framework::core::AhrsData *GetReferenceOrientation(void);
     54        void PositionValues(flair::core::Vector2D &pos_error,flair::core::Vector2D &vel_error,float &yaw_ref);
     55        flair::core::AhrsData *GetReferenceOrientation(void);
    5656        void SignalEvent(Event_t event);
    5757
    58         framework::filter::Pid *uX, *uY;
     58        flair::filter::Pid *uX, *uY;
    5959
    60         framework::core::Vector2D posHold;
     60        flair::core::Vector2D posHold;
    6161        float yawHold;
    6262
    63         framework::gui::PushButton *startCircle,*stopCircle;
    64         framework::meta::MetaVrpnObject *targetVrpn;
    65         framework::filter::TrajectoryGenerator2DCircle *circle;
    66         framework::core::AhrsData *customReferenceOrientation,*customOrientation;
     63        flair::gui::PushButton *startCircle,*stopCircle;
     64        flair::meta::MetaVrpnObject *targetVrpn;
     65        flair::filter::TrajectoryGenerator2DCircle *circle;
     66        flair::core::AhrsData *customReferenceOrientation,*customOrientation;
    6767};
    6868
  • trunk/demos/CircleFollower/uav/src/main.cpp

    r21 r23  
    2020using namespace TCLAP;
    2121using namespace std;
    22 using namespace framework::core;
    23 using namespace framework::meta;
     22using namespace flair::core;
     23using namespace flair::meta;
    2424
    2525string uav_type;
Note: See TracChangeset for help on using the changeset viewer.