← Back to branch summary

~ugocupcic/stiff-flop-controllers/trunk

~ugocupcic/stiff-flop-controllers/trunk

Viewing all changes in revision 31.

Committer: Mark Addison
Date: 2012-05-11 15:11:35 UTC
mfrom: (26.1.3 stiff_flop_controllers)
Revision ID: markpitchless.shadow@gmail.com-20120511151135-5hbgy02hb9woq9n0

Merge to get Toni's stiffness controller.

files added:
sf_controller_msgs/msg/Stiffnesses.msg

sf_mechanism_controllers/include/sf_mechanism_controllers/sf_stiffness_controller.hpp

sf_mechanism_controllers/sf_stiffness.yaml

sf_mechanism_controllers/src/sf_stiffness_controller.cpp

files modified:
sf_controller_msgs/msg/JointControllerState.msg

sf_mechanism_controllers/CMakeLists.txt

sf_mechanism_controllers/controller_plugins.xml

Show diffs side-by-side

added added

removed removed

sf_controller_msgs/msg/JointControllerState.msg

sf_controller_msgs/msg/Stiffnesses.msg

sf_mechanism_controllers/CMakeLists.txt

sf_mechanism_controllers/controller_plugins.xml

sf_mechanism_controllers/include/sf_mechanism_controllers/sf_stiffness_controller.hpp

sf_mechanism_controllers/sf_stiffness.yaml

sf_mechanism_controllers/src/sf_stiffness_controller.cpp

Older »