Merge branch 'dev-unstable'
Esse commit está contido em:
Boris_il_forte
+70
-29
@@ -1,37 +1,78 @@
|
||||
cmake_minimum_required(VERSION 2.4.6)
|
||||
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
|
||||
# Catkin User Guide: http://www.ros.org/doc/groovy/api/catkin/html/user_guide/user_guide.html
|
||||
# Catkin CMake Standard: http://www.ros.org/doc/groovy/api/catkin/html/user_guide/standards.html
|
||||
cmake_minimum_required(VERSION 2.8.3)
|
||||
project(ardrone_autonomy)
|
||||
|
||||
# Set the build type. Options are:
|
||||
# Coverage : w/ debug symbols, w/o optimization, w/ code-coverage
|
||||
# Debug : w/ debug symbols, w/o optimization
|
||||
# Release : w/o debug symbols, w/ optimization
|
||||
# RelWithDebInfo : w/ debug symbols, w/ optimization
|
||||
# MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries
|
||||
#set(ROS_BUILD_TYPE Release)
|
||||
# Load catkin and all dependencies required for this package
|
||||
find_package(catkin REQUIRED COMPONENTS roscpp image_transport sensor_msgs std_srvs tf camera_info_manager message_generation)
|
||||
|
||||
rosbuild_init()
|
||||
add_service_files(
|
||||
DIRECTORY srv
|
||||
FILES
|
||||
CamSelect.srv
|
||||
FlightAnim.srv
|
||||
LedAnim.srv
|
||||
RecordEnable.srv
|
||||
)
|
||||
|
||||
#set the default path for built executables to the "bin" directory
|
||||
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
|
||||
#set the default path for built libraries to the "lib" directory
|
||||
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
|
||||
add_message_files(
|
||||
DIRECTORY msg
|
||||
FILES
|
||||
matrix33.msg
|
||||
navdata_adc_data_frame.msg
|
||||
navdata_altitude.msg
|
||||
navdata_demo.msg
|
||||
navdata_euler_angles.msg
|
||||
navdata_games.msg
|
||||
navdata_gyros_offsets.msg
|
||||
navdata_hdvideo_stream.msg
|
||||
navdata_kalman_pressure.msg
|
||||
navdata_magneto.msg
|
||||
Navdata.msg
|
||||
navdata_phys_measures.msg
|
||||
navdata_pressure_raw.msg
|
||||
navdata_pwm.msg
|
||||
navdata_raw_measures.msg
|
||||
navdata_rc_references.msg
|
||||
navdata_references.msg
|
||||
navdata_time.msg
|
||||
navdata_trackers_send.msg
|
||||
navdata_trims.msg
|
||||
navdata_video_stream.msg
|
||||
navdata_vision_detect.msg
|
||||
navdata_vision.msg
|
||||
navdata_vision_of.msg
|
||||
navdata_vision_perf.msg
|
||||
navdata_vision_raw.msg
|
||||
navdata_watchdog.msg
|
||||
navdata_wifi.msg
|
||||
navdata_wind_speed.msg
|
||||
navdata_zimmu_3000.msg
|
||||
vector21.msg
|
||||
vector31.msg
|
||||
)
|
||||
|
||||
#uncomment if you have defined messages
|
||||
rosbuild_genmsg()
|
||||
#uncomment if you have defined services
|
||||
rosbuild_gensrv()
|
||||
## Generate added messages and services with any dependencies listed here
|
||||
generate_messages(DEPENDENCIES geometry_msgs std_msgs)
|
||||
|
||||
#common commands for building c++ executables and libraries
|
||||
#rosbuild_add_library(${PROJECT_NAME} src/example.cpp)
|
||||
#target_link_libraries(${PROJECT_NAME} another_library)
|
||||
#rosbuild_add_boost_directories()
|
||||
#rosbuild_link_boost(${PROJECT_NAME} thread)
|
||||
#target_link_libraries(example ${PROJECT_NAME})
|
||||
# catkin_package parameters: http://ros.org/doc/groovy/api/catkin/html/dev_guide/generated_cmake_api.html#catkin-package
|
||||
catkin_package(DEPENDS roscpp image_transport sensor_msgs std_srvs tf camera_info_manager libsdl-dev CATKIN_DEPENDS message_runtime)
|
||||
|
||||
rosbuild_add_boost_directories()
|
||||
# find sdk directories for headers and libraries
|
||||
set(SDK ARDroneLib/)
|
||||
link_directories(${PROJECT_SOURCE_DIR}/lib/)
|
||||
include_directories(${SDK} ${SDK}/FFMPEG/Includes ${SDK}/Soft/Common ${SDK}/Soft/Lib ${SDK}/VP_SDK ${SDK}/VP_SDK/VP_Os/linux )
|
||||
rosbuild_add_executable(ardrone_driver src/ardrone_driver.cpp src/video.cpp src/ardrone_sdk.cpp src/teleop_twist.cpp)
|
||||
#target_link_libraries(ardrone_driver vlib pc_ardrone sdk SDL avcodec avdevice avfilter avformat avutil swscale)
|
||||
target_link_libraries(ardrone_driver pc_ardrone avcodec avutil swscale vlib sdk SDL )
|
||||
link_directories(${PROJECT_SOURCE_DIR}/lib/)
|
||||
|
||||
|
||||
# add Boost_INCLUDE_DIRS
|
||||
include_directories(${Boost_INCLUDE_DIRS})
|
||||
|
||||
|
||||
# build executable
|
||||
add_executable(ardrone_driver src/ardrone_driver.cpp src/video.cpp src/ardrone_sdk.cpp src/teleop_twist.cpp)
|
||||
target_link_libraries(ardrone_driver pc_ardrone avcodec avutil swscale vlib sdk SDL ${Boost_LIBRARIES} ${catkin_LIBRARIES})
|
||||
|
||||
#install Rules
|
||||
install(TARGETS ardrone_driver RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
|
||||
|
||||
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
<package>
|
||||
<description brief="ardrone_autonomy">
|
||||
"ardrone_autonomy" is a ROS driver for Parrot AR-Drone quadrocopter.
|
||||
This driver is based on official AR-Drone SDK version 2.0 and supports both
|
||||
AR-Drone 1.0 and 2.0.
|
||||
"ardrone_autonomy" is a fork of AR-Drone Brown driver. This package has
|
||||
been developed in Autonomy Lab of Simon Fraser University
|
||||
</description>
|
||||
<author>Mani Monajjemi</author>
|
||||
<email>mmonajje@cs.sfu.ca</email>
|
||||
<license>BSD</license>
|
||||
<review status="unreviewed" notes=""/>
|
||||
<url>http://ros.org/wiki/ardrone_autonomy</url>
|
||||
<export>
|
||||
<rosdoc config="rosdoc.yaml" />
|
||||
</export>
|
||||
<rosdep name="libsdl-dev" />
|
||||
<depend package="roscpp"/>
|
||||
<depend package="image_transport"/>
|
||||
<depend package="sensor_msgs"/>
|
||||
<depend package="std_srvs"/>
|
||||
<depend package="tf"/>
|
||||
<depend package="camera_info_manager"/>
|
||||
</package>
|
||||
@@ -0,0 +1,43 @@
|
||||
<package>
|
||||
<name>ardrone_autonomy</name>
|
||||
<version>1.0.0</version>
|
||||
<description>"ardrone_autonomy" is a ROS driver for Parrot AR-Drone quadrocopter.
|
||||
This driver is based on official AR-Drone SDK version 2.0 and supports both
|
||||
AR-Drone 1.0 and 2.0.
|
||||
"ardrone_autonomy" is a fork of AR-Drone Brown driver. This package has
|
||||
been developed in Autonomy Lab of Simon Fraser University</description>
|
||||
<maintainer email="mail@mail.com">Mani Monajjemi</maintainer>
|
||||
|
||||
<license>BSD</license>
|
||||
|
||||
<url type="website">http://ros.org/wiki/ardrone_autonomy</url>
|
||||
<!-- <url type="bugtracker"></url> -->
|
||||
|
||||
<author>Mani Monajjemi</author>
|
||||
|
||||
<!-- Dependencies which this package needs to build itself. -->
|
||||
<buildtool_depend>catkin</buildtool_depend>
|
||||
|
||||
<!-- Dependencies needed to compile this package. -->
|
||||
<build_depend>roscpp</build_depend>
|
||||
<build_depend>image_transport</build_depend>
|
||||
<build_depend>sensor_msgs</build_depend>
|
||||
<build_depend>std_srvs</build_depend>
|
||||
<build_depend>tf</build_depend>
|
||||
<build_depend>camera_info_manager</build_depend>
|
||||
<build_depend>message_generation</build_depend>
|
||||
|
||||
<!-- Dependencies needed after this package is compiled. -->
|
||||
<run_depend>roscpp</run_depend>
|
||||
<run_depend>image_transport</run_depend>
|
||||
<run_depend>sensor_msgs</run_depend>
|
||||
<run_depend>std_srvs</run_depend>
|
||||
<run_depend>tf</run_depend>
|
||||
<run_depend>camera_info_manager</run_depend>
|
||||
<run_depend>message_runtime</run_depend>
|
||||
|
||||
<export>
|
||||
<rosdoc config="rosdoc.yaml"/>
|
||||
</export>
|
||||
|
||||
</package>
|
||||
Referência em uma Nova Issue
Bloquear um usuário