Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

subscription done between quad_control and rviz clicked_point #40

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

subscription done between quad_control and rviz clicked_point #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
143b0e9
subscription done between quad_control and rviz clicked_point
Oct 7, 2018
8d4f6ec
get live waypoints from rviz GUI
Oct 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions quad_control/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ find_package(catkin REQUIRED COMPONENTS
sensor_msgs
planning_msgs
tf
costmap_2d
)

## System dependencies are found with CMake's conventions
# find_package(Boost REQUIRED COMPONENTS system)
find_package(Boost REQUIRED)


## Uncomment this if the package has a setup.py. This macro ensures
Expand Down Expand Up @@ -109,8 +110,8 @@ find_package(catkin REQUIRED COMPONENTS
catkin_package(
INCLUDE_DIRS include
LIBRARIES quad_controller
CATKIN_DEPENDS cmake_modules geometry_msgs glog_catkin mav_msgs roscpp sensor_msgs planning_msgs tf
# DEPENDS system_lib
CATKIN_DEPENDS cmake_modules geometry_msgs glog_catkin mav_msgs roscpp sensor_msgs planning_msgs costmap_2d tf
DEPENDS Boost
)

###########
Expand All @@ -120,7 +121,7 @@ catkin_package(
## Specify additional locations of header files
## Your package locations should be listed before other locations
# include_directories(include)
include_directories(include ${catkin_INCLUDE_DIRS}
include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
)

## Declare a C++ library
Expand Down Expand Up @@ -153,7 +154,7 @@ add_dependencies(quad_controller ${catkin_EXPORTED_TARGETS})

add_executable(waypoint_publisher_node src/nodes/waypoint_publisher_node.cpp)
add_dependencies(waypoint_publisher_node ${catkin_EXPORTED_TARGETS})
target_link_libraries(waypoint_publisher_node quad_controller ${catkin_LIBRARIES})
target_link_libraries(waypoint_publisher_node quad_controller ${catkin_LIBRARIES} ${Boost_LIBRARIES})

add_executable(position_controller_node src/nodes/position_controller_node.cpp)
add_dependencies(position_controller_node ${catkin_EXPORTED_TARGETS})
Expand Down
2 changes: 2 additions & 0 deletions quad_control/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<build_depend>sensor_msgs</build_depend>
<build_depend>planning_msgs</build_depend>
<build_depend>tf</build_depend>
<build_depend>costmap_2d</build_depend>
<run_depend>cmake_modules</run_depend>
<run_depend>geometry_msgs</run_depend>
<run_depend>glog_catkin</run_depend>
Expand All @@ -56,6 +57,7 @@
<run_depend>sensor_msgs</run_depend>
<run_depend>planning_msgs</run_depend>
<run_depend>tf</run_depend>
<run_depend>costmap_2d</run_depend>

<!-- The export tag contains other, unspecified, tags -->
<export>
Expand Down
Loading