Changeset 23 in flair-src for trunk/demos/CircleFollower
- Timestamp:
- Apr 20, 2016, 5:07:36 PM (8 years ago)
- Location:
- trunk/demos/CircleFollower
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/demos/CircleFollower/simulator/CMakeLists.txt
r21 r23 3 3 4 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) 5 SET(F RAMEWORK_USE_SIMULATOR TRUE)6 SET(F RAMEWORK_USE_SIMULATOR_GL TRUE)5 SET(FLAIR_USE_SIMULATOR TRUE) 6 SET(FLAIR_USE_SIMULATOR_GL TRUE) 7 7 8 include($ENV{ IGEP_ROOT}/uav_dev/cmake_modules/GlobalCmakeUAV.cmake)9 include(${F RAMEWORK_USE_FILE})8 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 9 include(${FLAIR_USE_FILE}) 10 10 11 11 SET(SRC_FILES … … 14 14 15 15 LINK_DIRECTORIES ( 16 ${F RAMEWORK_LIBRARY_DIR}16 ${FLAIR_LIBRARY_DIR} 17 17 ) 18 18 19 19 INCLUDE_DIRECTORIES( 20 ${F RAMEWORK_INCLUDE_DIR}20 ${FLAIR_INCLUDE_DIR} 21 21 ) 22 22 … … 26 26 ) 27 27 28 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${F RAMEWORK_LIBRARIES_RT})28 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT}) 29 29 30 30 #non real time executable … … 33 33 ) 34 34 35 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${F RAMEWORK_LIBRARIES_NRT})35 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT}) -
trunk/demos/CircleFollower/simulator/src/main.cpp
r21 r23 27 27 using namespace TCLAP; 28 28 using namespace std; 29 using namespace f ramework::simulator;30 using namespace f ramework::sensor;29 using namespace flair::simulator; 30 using namespace flair::sensor; 31 31 32 32 int port; -
trunk/demos/CircleFollower/uav/CMakeLists.txt
r21 r23 3 3 4 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) 5 SET(F RAMEWORK_USE_FILTER TRUE)6 SET(F RAMEWORK_USE_SENSOR_ACTUATOR TRUE)7 SET(F RAMEWORK_USE_META TRUE)8 SET(F RAMEWORK_USE_OPTITRACKTRUE)5 SET(FLAIR_USE_FILTER TRUE) 6 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE) 7 SET(FLAIR_USE_META TRUE) 8 SET(FLAIR_USE_VRPN TRUE) 9 9 10 include($ENV{ IGEP_ROOT}/uav_dev/cmake_modules/GlobalCmakeUAV.cmake)11 include(${F RAMEWORK_USE_FILE})10 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 11 include(${FLAIR_USE_FILE}) 12 12 13 13 SET(SRC_FILES … … 17 17 18 18 LINK_DIRECTORIES ( 19 ${F RAMEWORK_LIBRARY_DIR}19 ${FLAIR_LIBRARY_DIR} 20 20 ) 21 21 22 22 INCLUDE_DIRECTORIES( 23 ${F RAMEWORK_INCLUDE_DIR}23 ${FLAIR_INCLUDE_DIR} 24 24 ) 25 25 … … 29 29 ) 30 30 31 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${F RAMEWORK_LIBRARIES_RT})31 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT}) 32 32 33 33 #non real time executable … … 36 36 ) 37 37 38 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${F RAMEWORK_LIBRARIES_NRT})38 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT}) -
trunk/demos/CircleFollower/uav/src/CircleFollower.cpp
r21 r23 31 31 32 32 using namespace std; 33 using namespace f ramework::core;34 using namespace f ramework::gui;35 using namespace f ramework::filter;36 using namespace f ramework::meta;33 using namespace flair::core; 34 using namespace flair::gui; 35 using namespace flair::filter; 36 using namespace flair::meta; 37 37 38 38 CircleFollower::CircleFollower(Uav* uav): UavStateMachine(uav), behaviourMode(BehaviourMode_t::Default), vrpnLost(false) { -
trunk/demos/CircleFollower/uav/src/CircleFollower.h
r21 r23 17 17 #include <UavStateMachine.h> 18 18 19 namespace f ramework{19 namespace flair { 20 20 namespace gui { 21 21 class PushButton; … … 29 29 } 30 30 31 class CircleFollower : public f ramework::meta::UavStateMachine {31 class CircleFollower : public flair::meta::UavStateMachine { 32 32 public: 33 CircleFollower(f ramework::meta::Uav* uav);33 CircleFollower(flair::meta::Uav* uav); 34 34 ~CircleFollower(); 35 35 … … 50 50 void ExtraCheckPushButton(void); 51 51 void ExtraCheckJoystick(void); 52 const f ramework::core::AhrsData *GetOrientation(void) const;52 const flair::core::AhrsData *GetOrientation(void) const; 53 53 void AltitudeValues(float &z,float &dz); 54 void PositionValues(f ramework::core::Vector2D &pos_error,framework::core::Vector2D &vel_error,float &yaw_ref);55 f ramework::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); 56 56 void SignalEvent(Event_t event); 57 57 58 f ramework::filter::Pid *uX, *uY;58 flair::filter::Pid *uX, *uY; 59 59 60 f ramework::core::Vector2D posHold;60 flair::core::Vector2D posHold; 61 61 float yawHold; 62 62 63 f ramework::gui::PushButton *startCircle,*stopCircle;64 f ramework::meta::MetaVrpnObject *targetVrpn;65 f ramework::filter::TrajectoryGenerator2DCircle *circle;66 f ramework::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; 67 67 }; 68 68 -
trunk/demos/CircleFollower/uav/src/main.cpp
r21 r23 20 20 using namespace TCLAP; 21 21 using namespace std; 22 using namespace f ramework::core;23 using namespace f ramework::meta;22 using namespace flair::core; 23 using namespace flair::meta; 24 24 25 25 string uav_type;
Note:
See TracChangeset
for help on using the changeset viewer.