Changeset 342 in flair-src for trunk

Timestamp:

Nov 28, 2019, 5:42:51 PM (5 years ago)

Author:

Sanahuja Guillaume

Message:

up

Location:

trunk

Files:

• cmake-modules/FlairUseFile.cmake (modified) (4 diffs)
• demos/CircleFollower/uav/src/CircleFollower.cpp (modified) (2 diffs)
• demos/CircleFollower/uav/src/CircleFollower.h (modified) (1 diff)

trunk/cmake-modules/FlairUseFile.cmake

@@ -59 +59 @@
     if(FOUND_HDS_DIR AND ("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv7a-neon" OR "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64"))
         message(${PROJECT_NAME} ": using libdspcv_gpp.a for vision filter")
-                SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-install/include/VisionFilter)
-                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libVisionFilter.a ${FLAIR_LIBRARY_DIR}/libdspcv_gpp.a ${FLAIR_LIBRARIES})
+                SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-install/include/HdsVisionFilter)
+                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libHdsVisionFilter.a ${FLAIR_LIBRARY_DIR}/libdspcv_gpp.a ${FLAIR_LIBRARIES})
   else()
         SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-install/include/FlairVisionFilter)
@@ -71 +71 @@
         SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-install/include/FlairSensorActuator)
         SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSensorActuator.a nmea ${FLAIR_LIBRARIES})
+    if(FOUND_HDS_DIR)
+        SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-install/include/HdsSensorActuator)
+            SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libHdsSensorActuator.a ${FLAIR_LIBRARIES})
+    endif()
 ENDIF (FLAIR_USE_SENSOR_ACTUATOR)
 
@@ -121 +125 @@
 endif()
 
-#add ardrone2, bebop or minidrones lib
+#add arch specific uav lib lib
 if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv7a-neon")  
   SET (PARROT_LIB -Wl,--whole-archive ${FLAIR_LIBRARY_DIR}/libFlairArdrone2.a ${FLAIR_LIBRARY_DIR}/libFlairBebop.a -Wl,--no-whole-archive)
@@ -132 +136 @@
     set(FLAIR_LIBRARIES_RT ${PARROT_LIB}  ${FLAIR_LIBRARIES_RT} nmea)
 endif()
+if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "cortexa8hf-neon")      
+  SET (PARROT_LIB -Wl,--whole-archive ${FLAIR_LIBRARY_DIR}/libFlairBeagleBlue.a -Wl,--no-whole-archive)
+        set(FLAIR_LIBRARIES_NRT ${PARROT_LIB}  ${FLAIR_LIBRARIES_NRT})
+    set(FLAIR_LIBRARIES_RT ${PARROT_LIB}  ${FLAIR_LIBRARIES_RT})
+endif()

trunk/demos/CircleFollower/uav/src/CircleFollower.cpp

@@ -54 +54 @@
     
     getFrameworkManager()->AddDeviceToLog(uavVrpn);
+    getFrameworkManager()->AddDeviceToLog(targetVrpn);
+    vrpnclient->Start();
+    
     uav->GetAhrs()->YawPlot()->AddCurve(uavVrpn->State()->Element(2),DataPlot::Green);
                                                                                                                                  
@@ -59 +62 @@
     stopCircle=new PushButton(GetButtonsLayout()->LastRowLastCol(),"stop_circle");
     positionHold=new PushButton(GetButtonsLayout()->LastRowLastCol(),"position hold");
-    
-    vrpnclient->Start();
-
-    getFrameworkManager()->AddDeviceToLog(targetVrpn);
 
     circle=new TrajectoryGenerator2DCircle(vrpnclient->GetLayout()->NewRow(),"circle");

trunk/demos/CircleFollower/uav/src/CircleFollower.h

@@ -23 +23 @@
     namespace filter {
         class TrajectoryGenerator2DCircle;
-        class CvtColor;
     }
     namespace meta {