Changeset 123 in flair-src for trunk/demos/OpticalFlow

Timestamp:

01/10/17 15:56:53 (7 years ago)

Author:

Sanahuja Guillaume

Message:

vision filter

Location:

trunk/demos/OpticalFlow

Files:

• simulator/CMakeLists.txt (modified) (1 diff)
• uav/CMakeLists.txt (modified) (1 diff)
• uav/src/main.cpp (modified) (4 diffs)

trunk/demos/OpticalFlow/simulator/CMakeLists.txt

@@ -5 +5 @@
 SET(FLAIR_USE_SIMULATOR TRUE)
 SET(FLAIR_USE_SIMULATOR_GL TRUE)
+SET(FLAIR_USE_VISION_FILTER TRUE)
 
 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)

trunk/demos/OpticalFlow/uav/CMakeLists.txt

@@ -4 +4 @@
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 SET(FLAIR_USE_FILTER TRUE)
-#SET(FLAIR_USE_VISION_FILTER TRUE)
 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
+SET(FLAIR_USE_VISION_FILTER TRUE)
 SET(FLAIR_USE_META TRUE)
 

trunk/demos/OpticalFlow/uav/src/main.cpp

@@ -18 +18 @@
 #include <tclap/CmdLine.h>
 #include <TargetEthController.h>
-#include <init.h>
+#include <VisionFilter.h>
 
 using namespace TCLAP;
@@ -41 +41 @@
     parseOptions(argc,argv);
 
+                if(!InitVisionFilter("file="+dsp_file)) {
+                        exit(1);
+                }
+                
     FrameworkManager *manager;
     manager= new FrameworkManager(name);
@@ -46 +50 @@
     manager->SetupUserInterface(xml_file);
     manager->SetupLogger(log_path);
-    SetupDSP(dsp_file);
 
     Uav* drone=CreateUav(name,uav_type);
@@ -57 +60 @@
     delete manager;
 
-    CloseDSP();
+    CloseVisionFilter();
 }