Changeset 45 in flair-dev


Ignore:
Timestamp:
Jan 10, 2017, 3:57:32 PM (4 years ago)
Author:
Sanahuja Guillaume
Message:

vision filter

Location:
trunk
Files:
1 added
2 deleted
4 edited

Legend:

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

    r44 r45  
    1717else()
    1818        message(STATUS "GCC version < 4.3, c+11 is not supported!")
     19endif()
     20
     21#check if we have a flair-hds directory
     22if (IS_DIRECTORY $ENV{FLAIR_ROOT}/flair-hds )
     23        message("found flair-hds directory")
     24        SET(FOUND_HDS_DIR TRUE)
     25  SET(FLAIRHDS_LIBRARY_DIR
     26                $ENV{FLAIR_ROOT}/flair-hds/bin/lib/${ARCH_DIR}
     27        )
    1928endif()
    2029
     
    5160SET(FLAIR_LIBRARIES FlairCore ${FLAIR_LIBRARIES})
    5261
     62#vision filter lib
     63IF (FLAIR_USE_VISION_FILTER)
     64        if(FOUND_HDS_DIR)
     65                SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-hds/dev/include/VisionFilter)
     66                SET(FLAIR_LIBRARIES ${FLAIRHDS_LIBRARY_DIR}/libVisionFilter.a ${FLAIRHDS_LIBRARY_DIR}/libdspcv_gpp.a ${FLAIR_LIBRARIES})
     67  else()
     68    SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-dev/include/FlairVisionFilter)
     69                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairVisionFilter.a ${FLAIR_LIBRARIES})
     70        endif()
     71ENDIF (FLAIR_USE_VISION_FILTER)
     72
    5373#sensor and actuator lib
    5474IF (FLAIR_USE_SENSOR_ACTUATOR)
     
    6282        SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairFilter.a iir ${FLAIR_LIBRARIES})
    6383ENDIF (FLAIR_USE_FILTER)
     84
    6485
    6586#meta lib
     
    107128endif()
    108129
    109 #check if we have a flair-hds directory
    110 if (IS_DIRECTORY $ENV{FLAIR_ROOT}/flair-hds )
    111         message("found flair-hds directory")
    112         SET(FLAIRHDS_LIBRARY_DIR
    113                 $ENV{FLAIR_ROOT}/flair-hds/bin/lib/${ARCH_DIR}
    114         )       
    115 
    116         if(FLAIR_USE_FILTER)
    117                 SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-hds/dev/include/VisionFilter)
    118                 SET(FLAIR_LIBRARIES_NRT ${FLAIRHDS_LIBRARY_DIR}/libVisionFilter.a ${FLAIRHDS_LIBRARY_DIR}/libdspcv_gpp.a ${FLAIR_LIBRARIES_NRT})
    119                 SET(FLAIR_LIBRARIES_RT ${FLAIRHDS_LIBRARY_DIR}/libVisionFilter.a ${FLAIRHDS_LIBRARY_DIR}/libdspcv_gpp.a ${FLAIR_LIBRARIES_RT})
    120         endif()
    121 
    122         if(FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")       
    123                 SET (ARDRONE2_LIB -Wl,--whole-archive ${FLAIRHDS_LIBRARY_DIR}/libFlairArdrone2.a -Wl,--no-whole-archive)
    124                 set(FLAIR_LIBRARIES_NRT ${ARDRONE2_LIB}  ${FLAIR_LIBRARIES_NRT} nmea)
    125         endif()
     130#add ardrone2 lib
     131if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")     
     132  SET (ARDRONE2_LIB -Wl,--whole-archive ${FLAIRHDS_LIBRARY_DIR}/libFlairArdrone2.a -Wl,--no-whole-archive)
     133        set(FLAIR_LIBRARIES_NRT ${ARDRONE2_LIB}  ${FLAIR_LIBRARIES_NRT} nmea)
    126134endif()
  • trunk/include/FlairCore/FrameworkManager.h

    r44 r45  
    109109  */
    110110  void SetupLogger(std::string log_path);
     111       
     112        /*!
     113  * \brief Get log path
     114  *
     115        * get the path defined by SetupLogger
     116  *
     117  * \return log path
     118  */
     119  std::string GetLogPath(void) const;
    111120
    112121  /*!
  • trunk/scripts/compile_info.sh

    r27 r45  
    1 #usage svn_revision.sh gcc dir file
     1#usage compile_info.sh gcc dir file
    22#gcc: gcc path
    33#dir: directory to get svn revision
  • trunk/scripts/flair_compile_all.sh

    r44 r45  
    9898        done
    9999
    100         for projects in CircleFollower SimpleFleet Gps OpticalFlow; do
     100        for projects in OpticalFlow CircleFollower SimpleFleet Gps; do
    101101                compile_uav_and_simulator_demo $FLAIR_ROOT/flair-src/demos $projects
    102102        done
Note: See TracChangeset for help on using the changeset viewer.