sravan/RRRobot
1
0
Fork 0
mirror of https://github.com/EECS-467-W20-RRRobot-Project/RRRobot.git synced 2025-08-27 18:12:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'GEAR' of https://github.com/EECS-467-W20-RRRobot-Project/RRRobot into GEAR

Browse Source
This commit is contained in:
Sravan Balaji
2020-04-23 22:17:01 -04:00
parent 8ae09a1b8e e1b84d4d16
commit 24ae633ad2
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/rrrobot_ws/src/rrrobot/CMakeLists.txt
View File

@@ -26,6 +26,7 @@ find_package(gazebo REQUIRED)
add_message_files( add_message_files(
FILES FILES
model_insertion.msg model_insertion.msg
arm_command.msg
) )
## Generate added messages and services with any dependencies listed here ## Generate added messages and services with any dependencies listed here
@@ -46,6 +47,7 @@ catkin_package(
## Build ## ## Build ##
########### ###########
include_directories( include_directories(
include
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
${roscpp_INCLUDE_DIRS} ${roscpp_INCLUDE_DIRS}
${std_msgs_INCLUDE_DIRS} ${std_msgs_INCLUDE_DIRS}
@@ -60,9 +62,9 @@ add_dependencies(insert_model ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPOR
## Declare a C++ executable ## Declare a C++ executable
# add_executable(rrrobot_node src/rrrobot_node.cpp) add_executable(rrrobot_node src/rrrobot_node.cpp)
# add_dependencies(rrrobot_node ${catkin_EXPORTED_TARGETS}) add_dependencies(rrrobot_node ${catkin_EXPORTED_TARGETS} rrrobot_generate_messages_cpp)
# target_link_libraries(rrrobot_node ${catkin_LIBRARIES}) target_link_libraries(rrrobot_node ${catkin_LIBRARIES})
add_executable(arm_controller_node src/arm_controller_node.cpp) add_executable(arm_controller_node src/arm_controller_node.cpp)
add_dependencies(arm_controller_node ${catkin_EXPORTED_TARGETS}) add_dependencies(arm_controller_node ${catkin_EXPORTED_TARGETS})
@@ -101,11 +103,11 @@ target_link_libraries(insert_model
# ) # )
## Mark executables and/or libraries for installation ## Mark executables and/or libraries for installation
# install(TARGETS rrrobot_node install(TARGETS rrrobot_node
# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
# ) )
install(TARGETS arm_controller_node install(TARGETS arm_controller_node
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}

0
src/rrrobot_ws/src/rrrobot/scripts/rrrobot_run.sh Normal file → Executable file
View File

0
src/rrrobot_ws/src/rrrobot/scripts/rrrobot_run_no_build.sh Normal file → Executable file
View File

0
src/rrrobot_ws/src/rrrobot/scripts/sample_run.sh Normal file → Executable file
View File