Skip to content
Snippets Groups Projects
Commit f80c6232 authored by jeo65286's avatar jeo65286
Browse files

Move unnecessary files, folders to bak. Remove them after test

parent 6d7f6613
No related branches found
No related tags found
1 merge request!4Package fr3_impedance_controller_real in nix env
This commit is part of merge request !4. Comments created here will be created in the context of that merge request.
Showing
with 37 additions and 33 deletions
std_msgs/Header header
\ No newline at end of file
...@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.4) ...@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.4)
project(franka_example_controllers) project(franka_example_controllers)
set(CMAKE_BUILD_TYPE Release) set(CMAKE_BUILD_TYPE Release)
# set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
...@@ -37,18 +36,17 @@ endif() ...@@ -37,18 +36,17 @@ endif()
find_package(pinocchio REQUIRED) find_package(pinocchio REQUIRED)
find_package(common REQUIRED) find_package(common REQUIRED)
add_message_files(FILES # add_message_files(FILES
JointTorqueComparison.msg # JointTorqueComparison.msg
) # )
generate_messages() generate_messages()
generate_dynamic_reconfigure_options( generate_dynamic_reconfigure_options(
cfg/compliance_param.cfg cfg/compliance_param.cfg
cfg/desired_mass_param.cfg # cfg/desired_mass_param.cfg
cfg/dual_arm_compliance_param.cfg # cfg/dual_arm_compliance_param.cfg
cfg/teleop_param.cfg # cfg/teleop_param.cfg
cfg/teleop_gripper_param.cfg # cfg/teleop_gripper_param.cfg
) )
catkin_package( catkin_package(
...@@ -75,23 +73,25 @@ catkin_package( ...@@ -75,23 +73,25 @@ catkin_package(
) )
add_library(franka_example_controllers add_library(franka_example_controllers
src/elbow_example_controller.cpp
src/cartesian_sinpose_controller.cpp
src/cartesian_pose_example_controller.cpp
src/cartesian_pose_controller.cpp
src/cartesian_traj_controller.cpp
src/cartesian_traj_twist_correct_controller.cpp
src/cartesian_velocity_example_controller.cpp
src/joint_position_example_controller.cpp
src/joint_velocity_example_controller.cpp
src/model_example_controller.cpp
src/joint_impedance_example_controller.cpp
src/cartesian_impedance_example_controller.cpp src/cartesian_impedance_example_controller.cpp
src/force_example_controller.cpp
src/dual_arm_cartesian_impedance_example_controller.cpp # src/elbow_example_controller.cpp
src/teleop_joint_pd_example_controller.cpp # src/cartesian_pose_example_controller.cpp
src/joint_wall.cpp # src/cartesian_pose_controller.cpp
src/spacenav_teleop_twist_controller.cpp # src/cartesian_traj_controller.cpp
# src/cartesian_traj_twist_correct_controller.cpp
# src/cartesian_velocity_example_controller.cpp
# src/joint_position_example_controller.cpp
# src/joint_velocity_example_controller.cpp
# src/model_example_controller.cpp
# src/joint_impedance_example_controller.cpp
# src/force_example_controller.cpp
# src/dual_arm_cartesian_impedance_example_controller.cpp
# src/teleop_joint_pd_example_controller.cpp
# src/joint_wall.cpp
# src/cartesian_sinpose_controller.cpp
# src/spacenav_teleop_twist_controller.cpp
) )
add_dependencies(franka_example_controllers add_dependencies(franka_example_controllers
...@@ -157,10 +157,12 @@ install(DIRECTORY config ...@@ -157,10 +157,12 @@ install(DIRECTORY config
install(FILES franka_example_controllers_plugin.xml install(FILES franka_example_controllers_plugin.xml
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
) )
catkin_install_python(
PROGRAMS scripts/interactive_marker.py scripts/move_to_start.py scripts/dual_arm_interactive_marker.py ## @Jeong : comment following lines cause these scripts are not necessary for this project
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} # catkin_install_python(
) # PROGRAMS scripts/interactive_marker.py scripts/move_to_start.py scripts/dual_arm_interactive_marker.py
# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
# )
## Tools ## Tools
include(${CMAKE_CURRENT_LIST_DIR}/../cmake/ClangTools.cmake OPTIONAL include(${CMAKE_CURRENT_LIST_DIR}/../cmake/ClangTools.cmake OPTIONAL
...@@ -182,7 +184,8 @@ endif() ...@@ -182,7 +184,8 @@ endif()
include(${CMAKE_CURRENT_LIST_DIR}/../cmake/PepTools.cmake OPTIONAL include(${CMAKE_CURRENT_LIST_DIR}/../cmake/PepTools.cmake OPTIONAL
RESULT_VARIABLE PEP_TOOLS RESULT_VARIABLE PEP_TOOLS
) )
if(PEP_TOOLS) ## @Jeong : comment following lines cause these scripts are not necessary for this project
file(GLOB_RECURSE PYSOURCES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.py) # if(PEP_TOOLS)
add_pyformat_target(franka_control FILES ${PYSOURCES}) # file(GLOB_RECURSE PYSOURCES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.py)
endif() # add_pyformat_target(franka_control FILES ${PYSOURCES})
# endif()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment