Changeset 342 in flair-src for trunk


Ignore:
Timestamp:
Nov 28, 2019, 5:42:51 PM (2 years ago)
Author:
Sanahuja Guillaume
Message:

up

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/cmake-modules/FlairUseFile.cmake

    r338 r342  
    5959    if(FOUND_HDS_DIR AND ("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv7a-neon" OR "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64"))
    6060        message(${PROJECT_NAME} ": using libdspcv_gpp.a for vision filter")
    61                 SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-install/include/VisionFilter)
    62                 SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libVisionFilter.a ${FLAIR_LIBRARY_DIR}/libdspcv_gpp.a ${FLAIR_LIBRARIES})
     61                SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-install/include/HdsVisionFilter)
     62                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libHdsVisionFilter.a ${FLAIR_LIBRARY_DIR}/libdspcv_gpp.a ${FLAIR_LIBRARIES})
    6363  else()
    6464        SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-install/include/FlairVisionFilter)
     
    7171        SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-install/include/FlairSensorActuator)
    7272        SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSensorActuator.a nmea ${FLAIR_LIBRARIES})
     73    if(FOUND_HDS_DIR)
     74        SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-install/include/HdsSensorActuator)
     75            SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libHdsSensorActuator.a ${FLAIR_LIBRARIES})
     76    endif()
    7377ENDIF (FLAIR_USE_SENSOR_ACTUATOR)
    7478
     
    121125endif()
    122126
    123 #add ardrone2, bebop or minidrones lib
     127#add arch specific uav lib lib
    124128if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv7a-neon") 
    125129  SET (PARROT_LIB -Wl,--whole-archive ${FLAIR_LIBRARY_DIR}/libFlairArdrone2.a ${FLAIR_LIBRARY_DIR}/libFlairBebop.a -Wl,--no-whole-archive)
     
    132136    set(FLAIR_LIBRARIES_RT ${PARROT_LIB}  ${FLAIR_LIBRARIES_RT} nmea)
    133137endif()
     138if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "cortexa8hf-neon")     
     139  SET (PARROT_LIB -Wl,--whole-archive ${FLAIR_LIBRARY_DIR}/libFlairBeagleBlue.a -Wl,--no-whole-archive)
     140        set(FLAIR_LIBRARIES_NRT ${PARROT_LIB}  ${FLAIR_LIBRARIES_NRT})
     141    set(FLAIR_LIBRARIES_RT ${PARROT_LIB}  ${FLAIR_LIBRARIES_RT})
     142endif()
  • trunk/demos/CircleFollower/uav/src/CircleFollower.cpp

    r318 r342  
    5454   
    5555    getFrameworkManager()->AddDeviceToLog(uavVrpn);
     56    getFrameworkManager()->AddDeviceToLog(targetVrpn);
     57    vrpnclient->Start();
     58   
    5659    uav->GetAhrs()->YawPlot()->AddCurve(uavVrpn->State()->Element(2),DataPlot::Green);
    5760                                                                                                                                 
     
    5962    stopCircle=new PushButton(GetButtonsLayout()->LastRowLastCol(),"stop_circle");
    6063    positionHold=new PushButton(GetButtonsLayout()->LastRowLastCol(),"position hold");
    61    
    62     vrpnclient->Start();
    63 
    64     getFrameworkManager()->AddDeviceToLog(targetVrpn);
    6564
    6665    circle=new TrajectoryGenerator2DCircle(vrpnclient->GetLayout()->NewRow(),"circle");
  • trunk/demos/CircleFollower/uav/src/CircleFollower.h

    r263 r342  
    2323    namespace filter {
    2424        class TrajectoryGenerator2DCircle;
    25         class CvtColor;
    2625    }
    2726    namespace meta {
Note: See TracChangeset for help on using the changeset viewer.