Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[modules] computer vision modules only for ap target

Browse Source 
until it is properly implemented for nps as well...
This commit is contained in:
Felix Ruess
2016-06-06 14:25:19 +02:00
parent da2b501c24
commit 888af334d7
11 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/BR/bebop_default.xml
-3
View File
@@ -51,9 +51,6 @@
<module name="nav" type="survey_rectangle_rotorcraft">
<define name="RECTANGLE_SURVEY_DEFAULT_SWEEP" value="10"/>
</module>
<module name="video_capture">
<define name="VIDEO_CAPTURE_CAMERA" value="bottom_camera"/>
</module>
<module name="digital_cam_video">
<define name="DC_AUTOSHOOT_DISTANCE_INTERVAL" value="10"/>
</module>
conf/airframes/BR/conf.xml
+1 -1
View File
@@ -40,7 +40,7 @@
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_survey.xml"
settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/estimation/ahrs_float_mlkf.xml settings/control/stabilization_att_int_quat.xml"
settings_modules="modules/geo_mag.xml modules/air_data.xml modules/video_thread.xml modules/video_rtp_stream.xml modules/nav_survey_rectangle_rotorcraft.xml modules/digital_cam_video.xml modules/cv_colorfilter.xml"
settings_modules="modules/geo_mag.xml modules/air_data.xml modules/cv_colorfilter.xml modules/video_capture.xml modules/video_rtp_stream.xml modules/nav_survey_rectangle_rotorcraft.xml modules/digital_cam_video.xml"
gui_color="green"
/>
<aircraft
conf/modules/cv_blob_locator.xml
+1 -1
View File
@@ -39,7 +39,7 @@
<init fun="cv_blob_locator_init()"/>
<periodic fun="cv_blob_locator_periodic()" freq="30" start="cv_blob_locator_start()" stop="cv_blob_locator_stop()" autorun="TRUE"/>
<event fun="cv_blob_locator_event()"/>
<makefile>
<makefile target="ap">
<file name="cv_blob_locator.c"/>
<file name="imavmarker.c" dir="modules/computer_vision/blob" />
<file name="blob_finder.c" dir="modules/computer_vision/blob" />
conf/modules/cv_colorfilter.xml
+1 -1
View File
@@ -26,7 +26,7 @@
</header>
<init fun="colorfilter_init()"/>
<makefile>
<makefile target="ap">
<file name="colorfilter.c"/>
</makefile>
</module>
conf/modules/cv_detect_window.xml
-1
View File
@@ -4,7 +4,6 @@
<doc>
<description>
Detect window
</description>
</doc>
conf/modules/cv_opencvdemo.xml
+16 -18
View File
@@ -3,35 +3,33 @@
<module name="cv_opencvdemo" dir="computer_vision">
<doc>
<description>This example shows how opencv can be used on (for example) the Bebop drone.
Important to know is that sw/ext/opencv_bebop must be downloaded, and made.
After this is done the folder sw/ext/opencv_bebop/install has a opencv.xml file.
The LDFLAGS in this file should be the same as in this conf file.
Important to know is that sw/ext/opencv_bebop must be downloaded, and made.
After this is done the folder sw/ext/opencv_bebop/install has a opencv.xml file.
The LDFLAGS in this file should be the same as in this conf file.
</description>
</doc>
<header>
<file name="cv_opencvdemo.h"/>
</header>
<init fun="opencvdemo_init()"/>
<makefile>
<makefile target="ap">
<file name="cv_opencvdemo.c"/>
<file name="opencv_example.cpp"/>
<file name="opencv_image_functions.cpp"/>
<flag name="CXXFLAGS" value="I$(PAPARAZZI_SRC)/sw/ext/opencv_bebop/install/include"/>
<flag name="LDFLAGS" value="L$(PAPARAZZI_SRC)/sw/ext/opencv_bebop/install/lib" />
<flag name="LDFLAGS" value="lopencv_imgcodecs" />
<flag name="LDFLAGS" value="lopencv_imgproc" />
<flag name="LDFLAGS" value="lopencv_core" />
<flag name="LDFLAGS" value="L$(PAPARAZZI_HOME)/sw/ext/opencv_bebop/install/share/OpenCV/3rdparty/lib" />
<flag name="LDFLAGS" value="lzlib" />
<flag name="LDFLAGS" value="llibpng" />
<flag name="LDFLAGS" value="lstdc++" />
<flag name="LDFLAGS" value="ldl" />
<flag name="LDFLAGS" value="lm" />
<flag name="LDFLAGS" value="lpthread" />
<flag name="LDFLAGS" value="lrt" />
<flag name="LDFLAGS" value="L$(PAPARAZZI_SRC)/sw/ext/opencv_bebop/install/lib" />
<flag name="LDFLAGS" value="lopencv_imgcodecs" />
<flag name="LDFLAGS" value="lopencv_imgproc" />
<flag name="LDFLAGS" value="lopencv_core" />
<flag name="LDFLAGS" value="L$(PAPARAZZI_HOME)/sw/ext/opencv_bebop/install/share/OpenCV/3rdparty/lib" />
<flag name="LDFLAGS" value="lzlib" />
<flag name="LDFLAGS" value="llibpng" />
<flag name="LDFLAGS" value="lstdc++" />
<flag name="LDFLAGS" value="ldl" />
<flag name="LDFLAGS" value="lm" />
<flag name="LDFLAGS" value="lpthread" />
<flag name="LDFLAGS" value="lrt" />
</makefile>
</module>
conf/modules/cv_textons.xml
+1 -1
View File
@@ -41,7 +41,7 @@
</header>
<init fun="textons_init()"/>
<makefile>
<makefile target="ap">
<file name="textons.c"/>
<file name="image.c" dir="modules/computer_vision/lib/vision"/>
</makefile>
conf/modules/digital_cam_video.xml
+1 -1
View File
@@ -47,7 +47,7 @@
<periodic fun="digital_cam_video_periodic()" freq="10" autorun="TRUE"/>
<makefile target="ap|sim|nps">
<makefile target="ap">
<define name="DIGITAL_CAM" />
<file name="video_cam_ctrl.c"/>
<file name="dc.c"/>
conf/modules/orange_avoider.xml
+1 -1
View File
@@ -14,7 +14,7 @@
</header>
<init fun="orange_avoider_init()"/>
<periodic fun="orange_avoider_periodic()" freq="4"/>
<makefile>
<makefile target="ap">
<file name="orange_avoider.c"/>
</makefile>
</module>
conf/modules/video_capture.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<init fun="video_capture_init()"/>
<makefile>
<makefile target="ap">
<file name="video_capture.c"/>
</makefile>
conf/modules/video_rtp_stream.xml
+1 -1
View File
@@ -34,7 +34,7 @@
</header>
<init fun="viewvideo_init()"/>
<makefile target="ap|nps">
<makefile target="ap">
<file name="viewvideo.c"/>
<!-- Include the needed Computer Vision files -->