Spiri
/
ROSBuzz_MISTLab
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

msg conflict correction commit

This commit is contained in:
Vivek Shankar Varadharajan 2016-10-07 16:50:11 -04:00
parent 474433def4
commit a9b1a7598a
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@ -9,7 +9,6 @@ project(rosbuzz)
find_package(catkin REQUIRED COMPONENTS find_package(catkin REQUIRED COMPONENTS
roscpp roscpp
std_msgs std_msgs
genmsg
mavros_msgs mavros_msgs
sensor_msgs sensor_msgs
) )
@ -44,12 +43,12 @@ find_package(catkin REQUIRED COMPONENTS
## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...) ## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)
## Generate messages in the 'msg' folder ## Generate messages in the 'msg' folder
add_message_files( # add_message_files(
DIRECTORY msg # DIRECTORY msg
FILES # FILES
neighbour_pos.msg # neighbour_pos.msg
# Message2.msg # Message2.msg
) # )
## Generate services in the 'srv' folder ## Generate services in the 'srv' folder
# add_service_files( # add_service_files(
@ -66,10 +65,10 @@ find_package(catkin REQUIRED COMPONENTS
# ) # )
## Generate added messages and services with any dependencies listed here ## Generate added messages and services with any dependencies listed here
generate_messages( # generate_messages(
DEPENDENCIES # DEPENDENCIES
sensor_msgs # sensor_msgs
) # )
################################################ ################################################
## Declare ROS dynamic reconfigure parameters ## ## Declare ROS dynamic reconfigure parameters ##
@ -101,7 +100,7 @@ find_package(catkin REQUIRED COMPONENTS
## CATKIN_DEPENDS: catkin_packages dependent projects also need ## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need ## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package( catkin_package(
CATKIN_DEPENDS message_runtime #CATKIN_DEPENDS message_runtime
# INCLUDE_DIRS include # INCLUDE_DIRS include
# LIBRARIES buzzros # LIBRARIES buzzros
# CATKIN_DEPENDS Buzz roscpp st_msgs # CATKIN_DEPENDS Buzz roscpp st_msgs
@ -146,7 +145,7 @@ add_executable(rosbuzz_node src/rosbuzz.cpp
src/buzzuav_closures.cpp src/buzzuav_closures.cpp
src/uav_utility.cpp) src/uav_utility.cpp)
target_link_libraries(rosbuzz_node ${catkin_LIBRARIES} /usr/local/lib/libbuzz.so /usr/local/lib/libbuzzdbg.so -lpthread) target_link_libraries(rosbuzz_node ${catkin_LIBRARIES} /usr/local/lib/libbuzz.so /usr/local/lib/libbuzzdbg.so -lpthread)
add_dependencies(rosbuzz_node rosbuzz_generate_messages_cpp) #add_dependencies(rosbuzz_node rosbuzz_generate_messages_cpp)
############# #############
## Install ## ## Install ##
############# #############

2
msg/neighbour_pos.msg
View File

@ -1,2 +0,0 @@
Header header
sensor_msgs/NavSatFix[] pos_neigh

1
src/rosbuzz.cpp
View File

@ -14,7 +14,6 @@
#include "mavros_msgs/BatteryStatus.h" #include "mavros_msgs/BatteryStatus.h"
#include "mavros_msgs/Mavlink.h" #include "mavros_msgs/Mavlink.h"
#include "sensor_msgs/NavSatStatus.h" #include "sensor_msgs/NavSatStatus.h"
#include "rosbuzz/neighbour_pos.h"
#include <sstream> #include <sstream>
#include <buzz/buzzasm.h> #include <buzz/buzzasm.h>
#include "buzzuav_closures.h" #include "buzzuav_closures.h"