Merge branch 'dev_ros_commander' into dev_ros
Conflicts: CMakeLists.txt
Showing
- CMakeLists.txt 8 additions, 0 deletionsCMakeLists.txt
- src/platforms/px4_middleware.h 4 additions, 0 deletionssrc/platforms/px4_middleware.h
- src/platforms/ros/nodes/commander/commander.cpp 96 additions, 0 deletionssrc/platforms/ros/nodes/commander/commander.cpp
- src/platforms/ros/nodes/commander/commander.h 62 additions, 0 deletionssrc/platforms/ros/nodes/commander/commander.h
- src/platforms/ros/nodes/manual_input/manual_input.cpp 4 additions, 3 deletionssrc/platforms/ros/nodes/manual_input/manual_input.cpp
- src/platforms/ros/nodes/manual_input/manual_input.h 1 addition, 1 deletionsrc/platforms/ros/nodes/manual_input/manual_input.h
Loading
Please register or sign in to comment