Merge branch 'dev_ros_commander' into dev_ros

Conflicts: CMakeLists.txt
2026-05-21 01:12:11 +00:00 · 2014-12-30 12:34:18 +01:00
parent f968e7355d 838f860347
commit 2623ec156f
6 changed files with 175 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -203,6 +203,14 @@ target_link_libraries(mc_mixer
  px4
 )

+## Commander
+add_executable(commander
+	src/platforms/ros/nodes/commander/commander.cpp)
+add_dependencies(manual_input px4_generate_messages_cpp)
+target_link_libraries(commander
+  ${catkin_LIBRARIES}
+  px4
+)

 #############
 ## Install ##