Changeset 45 in flair-dev for trunk

Timestamp:

Jan 10, 2017, 3:57:32 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

vision filter

Location:

trunk

Files:

• cmake-modules/FlairUseFile.cmake (modified) (4 diffs)
• cmake-modules/svn_revision.cmake.in (deleted)
• include/FlairCore/FrameworkManager.h (modified) (1 diff)
• include/FlairVisionFilter/VisionFilter.h (added)
• include/FlairVisionFilter/init.h (deleted)
• scripts/compile_info.sh (modified) (1 diff)
• scripts/flair_compile_all.sh (modified) (1 diff)

trunk/cmake-modules/FlairUseFile.cmake

@@ -17 +17 @@
 else()
         message(STATUS "GCC version < 4.3, c+11 is not supported!")
+endif()
+
+#check if we have a flair-hds directory
+if (IS_DIRECTORY $ENV{FLAIR_ROOT}/flair-hds )
+        message("found flair-hds directory")
+        SET(FOUND_HDS_DIR TRUE) 
+  SET(FLAIRHDS_LIBRARY_DIR
+                $ENV{FLAIR_ROOT}/flair-hds/bin/lib/${ARCH_DIR}
+        )
 endif()
 
@@ -51 +60 @@
 SET(FLAIR_LIBRARIES FlairCore ${FLAIR_LIBRARIES})
 
+#vision filter lib
+IF (FLAIR_USE_VISION_FILTER)
+        if(FOUND_HDS_DIR)
+                SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-hds/dev/include/VisionFilter)
+                SET(FLAIR_LIBRARIES ${FLAIRHDS_LIBRARY_DIR}/libVisionFilter.a ${FLAIRHDS_LIBRARY_DIR}/libdspcv_gpp.a ${FLAIR_LIBRARIES})
+  else()
+    SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-dev/include/FlairVisionFilter)
+                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairVisionFilter.a ${FLAIR_LIBRARIES})
+        endif()
+ENDIF (FLAIR_USE_VISION_FILTER)
+
 #sensor and actuator lib
 IF (FLAIR_USE_SENSOR_ACTUATOR)
@@ -62 +82 @@
         SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairFilter.a iir ${FLAIR_LIBRARIES})
 ENDIF (FLAIR_USE_FILTER)
+
 
 #meta lib
@@ -107 +128 @@
 endif()
 
-#check if we have a flair-hds directory
-if (IS_DIRECTORY $ENV{FLAIR_ROOT}/flair-hds )
-        message("found flair-hds directory")
-        SET(FLAIRHDS_LIBRARY_DIR
-                $ENV{FLAIR_ROOT}/flair-hds/bin/lib/${ARCH_DIR}
-        )       
-
-        if(FLAIR_USE_FILTER)
-                SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-hds/dev/include/VisionFilter)
-                SET(FLAIR_LIBRARIES_NRT ${FLAIRHDS_LIBRARY_DIR}/libVisionFilter.a ${FLAIRHDS_LIBRARY_DIR}/libdspcv_gpp.a ${FLAIR_LIBRARIES_NRT})
-                SET(FLAIR_LIBRARIES_RT ${FLAIRHDS_LIBRARY_DIR}/libVisionFilter.a ${FLAIRHDS_LIBRARY_DIR}/libdspcv_gpp.a ${FLAIR_LIBRARIES_RT})
-        endif()
-
-        if(FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")        
-                SET (ARDRONE2_LIB -Wl,--whole-archive ${FLAIRHDS_LIBRARY_DIR}/libFlairArdrone2.a -Wl,--no-whole-archive)
-                set(FLAIR_LIBRARIES_NRT ${ARDRONE2_LIB}  ${FLAIR_LIBRARIES_NRT} nmea)
-        endif()
+#add ardrone2 lib
+if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")      
+  SET (ARDRONE2_LIB -Wl,--whole-archive ${FLAIRHDS_LIBRARY_DIR}/libFlairArdrone2.a -Wl,--no-whole-archive)
+        set(FLAIR_LIBRARIES_NRT ${ARDRONE2_LIB}  ${FLAIR_LIBRARIES_NRT} nmea)
 endif()

trunk/include/FlairCore/FrameworkManager.h

@@ -109 +109 @@
   */
   void SetupLogger(std::string log_path);
+        
+        /*!
+  * \brief Get log path
+  *
+        * get the path defined by SetupLogger
+  *
+  * \return log path
+  */
+  std::string GetLogPath(void) const;
 
   /*!

trunk/scripts/compile_info.sh

@@ -1 @@
-#usage svn_revision.sh gcc dir file
+#usage compile_info.sh gcc dir file
 #gcc: gcc path
 #dir: directory to get svn revision

trunk/scripts/flair_compile_all.sh

@@ -98 +98 @@
         done
 
-        for projects in CircleFollower SimpleFleet Gps OpticalFlow; do
+        for projects in OpticalFlow CircleFollower SimpleFleet Gps; do
                 compile_uav_and_simulator_demo $FLAIR_ROOT/flair-src/demos $projects
         done