Skip to content
This repository has been archived by the owner on Dec 17, 2020. It is now read-only.

. #103

Open
wants to merge 1 commit into
base: kinetic
Choose a base branch
from
Open

. #103

Changes from all commits
Commits
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
Deleting the compliance library, moving it into ros_controllers.
  • Loading branch information
AndyZe committed Jan 7, 2019
commit bb510a52881d3ffe557558f4bbf7c7c4707c1da6
9 changes: 0 additions & 9 deletions jog_arm/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -18,7 +18,6 @@ catkin_package(
INCLUDE_DIRS
include
LIBRARIES
compliant_control
CATKIN_DEPENDS
roscpp
moveit_ros_manipulation
@@ -33,8 +32,6 @@ include_directories(
${Eigen_INCLUDE_DIRS}
)

add_library(compliant_control src/jog_arm/compliant_control/compliant_control.cpp)

add_executable(jog_arm_server src/jog_arm/jog_arm_server.cpp)
add_dependencies(jog_arm_server ${catkin_EXPORTED_TARGETS})
target_link_libraries(jog_arm_server ${catkin_LIBRARIES} ${Eigen_LIBRARIES})
@@ -51,8 +48,6 @@ add_executable(dragonrise_to_twist src/jog_arm/teleop_examples/dragonrise_to_twi
add_dependencies(dragonrise_to_twist ${catkin_EXPORTED_TARGETS})
target_link_libraries(dragonrise_to_twist ${catkin_LIBRARIES} ${Eigen_LIBRARIES})



install(TARGETS jog_arm_server spacenav_to_twist xbox_to_twist dragonrise_to_twist
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)
@@ -62,7 +57,3 @@ install(DIRECTORY include/${PROJECT_NAME}/
FILES_MATCHING PATTERN "*.h"
)

install(TARGETS compliant_control
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION})
154 changes: 0 additions & 154 deletions jog_arm/include/jog_arm/compliant_control.h

This file was deleted.

Loading