-
- Downloads
Merge pull request #113 in SWDEV/franka_ros from multi_panda_beta to develop
* commit 'd7cd4473': (160 commits) removed default IP removed default IPs in dual example control launch removed robot ips from combined control yaml, ips mandatory in launch removed franka.de ending from ips in config remove const in header for pass by value params added robot ips in dual arm example control launch support robot ips as launch arg in combined control launch fixed typos, added copyright, fixed changelog fixed typo in doc string removed unused headers in control node added arm_id on error print when catchinh control exception use lock_guards for command and state acess removed saturateTorqueRate from combinable hw, set default cutoff freq to 1000 removed unneccesary scripts added missing ip and fixed controllers arg more general combined launch file improved prints in resource_helpers fix for service lib in cmake removed unnecessary global statement in interactive marker franka 0.5 -> franka 0.7, fixed cmake for service lib ...
No related branches found
No related tags found
Showing
- .clang-tidy 1 addition, 1 deletion.clang-tidy
- CHANGELOG.md 18 additions, 7 deletionsCHANGELOG.md
- cmake/ClangTools.cmake 2 additions, 2 deletionscmake/ClangTools.cmake
- franka_control/CMakeLists.txt 17 additions, 44 deletionsfranka_control/CMakeLists.txt
- franka_control/config/default_combined_controllers.yaml 88 additions, 0 deletionsfranka_control/config/default_combined_controllers.yaml
- franka_control/config/franka_combined_control_node.yaml 67 additions, 0 deletionsfranka_control/config/franka_combined_control_node.yaml
- franka_control/config/franka_control_node.yaml 12 additions, 0 deletionsfranka_control/config/franka_control_node.yaml
- franka_control/include/franka_control/services.h 0 additions, 57 deletionsfranka_control/include/franka_control/services.h
- franka_control/launch/franka_combined_control.launch 53 additions, 0 deletionsfranka_control/launch/franka_combined_control.launch
- franka_control/package.xml 0 additions, 7 deletionsfranka_control/package.xml
- franka_control/src/franka_combined_control_node.cpp 46 additions, 0 deletionsfranka_control/src/franka_combined_control_node.cpp
- franka_control/src/franka_control_node.cpp 17 additions, 142 deletionsfranka_control/src/franka_control_node.cpp
- franka_description/robots/dual_panda_example.urdf.xacro 36 additions, 0 deletionsfranka_description/robots/dual_panda_example.urdf.xacro
- franka_example_controllers/CMakeLists.txt 11 additions, 3 deletionsfranka_example_controllers/CMakeLists.txt
- franka_example_controllers/cfg/dual_arm_compliance_param.cfg 16 additions, 0 deletionsfranka_example_controllers/cfg/dual_arm_compliance_param.cfg
- franka_example_controllers/config/franka_example_controllers.yaml 23 additions, 0 deletions...xample_controllers/config/franka_example_controllers.yaml
- franka_example_controllers/franka_example_controllers_plugin.xml 7 additions, 3 deletions...example_controllers/franka_example_controllers_plugin.xml
- franka_example_controllers/include/franka_example_controllers/dual_arm_cartesian_impedance_example_controller.h 182 additions, 0 deletions...rollers/dual_arm_cartesian_impedance_example_controller.h
- franka_example_controllers/include/franka_example_controllers/pseudo_inversion.h 4 additions, 0 deletions...ers/include/franka_example_controllers/pseudo_inversion.h
- franka_example_controllers/launch/dual_arm_cartesian_impedance_example_controller.launch 23 additions, 0 deletions...ch/dual_arm_cartesian_impedance_example_controller.launch
Loading
Please register or sign in to comment