Changeset 23 in flair-src for trunk


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

igep to flair

Location:
trunk/demos/CircleFollower
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/demos/CircleFollower/simulator/CMakeLists.txt

    r21 r23  
    33
    44SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    5 SET(FRAMEWORK_USE_SIMULATOR TRUE)
    6 SET(FRAMEWORK_USE_SIMULATOR_GL TRUE)
     5SET(FLAIR_USE_SIMULATOR TRUE)
     6SET(FLAIR_USE_SIMULATOR_GL TRUE)
    77
    8 include($ENV{IGEP_ROOT}/uav_dev/cmake_modules/GlobalCmakeUAV.cmake)
    9 include(${FRAMEWORK_USE_FILE})
     8include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     9include(${FLAIR_USE_FILE})
    1010
    1111SET(SRC_FILES
    … …  
    1414
    1515LINK_DIRECTORIES (
    16         ${FRAMEWORK_LIBRARY_DIR}
     16        ${FLAIR_LIBRARY_DIR}
    1717)
    1818
    1919INCLUDE_DIRECTORIES(
    20         ${FRAMEWORK_INCLUDE_DIR}
     20        ${FLAIR_INCLUDE_DIR}
    2121)
    2222
    … …  
    2626)
    2727
    28 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FRAMEWORK_LIBRARIES_RT})
     28TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    2929
    3030#non real time executable
    … …  
    3333)
    3434
    35 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FRAMEWORK_LIBRARIES_NRT})
     35TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})

  • trunk/demos/CircleFollower/simulator/src/main.cpp

    r21 r23  
    2727using namespace TCLAP;
    2828using namespace std;
    29 using namespace framework::simulator;
    30 using namespace framework::sensor;
     29using namespace flair::simulator;
     30using namespace flair::sensor;
    3131
    3232int port;

  • trunk/demos/CircleFollower/uav/CMakeLists.txt

    r21 r23  
    33
    44SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    5 SET(FRAMEWORK_USE_FILTER TRUE)
    6 SET(FRAMEWORK_USE_SENSOR_ACTUATOR TRUE)
    7 SET(FRAMEWORK_USE_META TRUE)
    8 SET(FRAMEWORK_USE_OPTITRACK TRUE)
     5SET(FLAIR_USE_FILTER TRUE)
     6SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     7SET(FLAIR_USE_META TRUE)
     8SET(FLAIR_USE_VRPN TRUE)
    99
    10 include($ENV{IGEP_ROOT}/uav_dev/cmake_modules/GlobalCmakeUAV.cmake)
    11 include(${FRAMEWORK_USE_FILE})
     10include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     11include(${FLAIR_USE_FILE})
    1212
    1313SET(SRC_FILES
    … …  
    1717
    1818LINK_DIRECTORIES (
    19         ${FRAMEWORK_LIBRARY_DIR}
     19        ${FLAIR_LIBRARY_DIR}
    2020)
    2121
    2222INCLUDE_DIRECTORIES(
    23         ${FRAMEWORK_INCLUDE_DIR}
     23        ${FLAIR_INCLUDE_DIR}
    2424)
    2525
    … …  
    2929)
    3030
    31 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FRAMEWORK_LIBRARIES_RT})
     31TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    3232
    3333#non real time executable
    … …  
    3636)
    3737
    38 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FRAMEWORK_LIBRARIES_NRT})
     38TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})

  • 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.