← Back to branch summary

~ugocupcic/stiff-flop-controllers/trunk

~ugocupcic/stiff-flop-controllers/trunk

« back to all changes in this revision

Viewing changes to sf_mechanism_controllers/sf_stiffness.yaml

Committer: Toni Oliver
Date: 2012-05-14 20:04:51 UTC
mfrom: (31.1.6 stiff_flop_controllers)
Revision ID: toliver.shadow@gmail.com-20120514200451-5tieg66tghajxlik

Merged with trunk

files added:
sf_controller_msgs/msg/PositionOrientationPassthroughCommand.msg

sf_controller_msgs/msg/Pump.msg

sf_controller_msgs/msg/Valve.msg

sf_mechanism_controllers/include/sf_mechanism_controllers/sf_haptic_controller.hpp

sf_mechanism_controllers/include/sf_mechanism_controllers/sf_position_orientation_controller_passthrough.hpp

sf_mechanism_controllers/src/sf_haptic_controller.cpp

sf_mechanism_controllers/src/sf_position_orientation_controller_passthrough.cpp

files removed:
sf_mechanism_controllers/sf_position_orientation.yaml

sf_mechanism_controllers/sf_stiffness.yaml

sf_mechanism_controllers/sf_tip_roll.yaml

files modified:
.bzrignore

sf_mechanism_controllers/CMakeLists.txt

sf_mechanism_controllers/controller_plugins.xml

sf_mechanism_controllers/include/sf_mechanism_controllers/sf_position_orientation_controller.hpp

sf_mechanism_controllers/include/sf_mechanism_controllers/sf_stiffness_controller.hpp

sf_mechanism_controllers/manifest.xml

sf_mechanism_controllers/src/sf_stiffness_controller.cpp

sf_mechanism_controllers/test/sf_controller_test.py

Show diffs side-by-side

added added

removed removed

sf_mechanism_controllers/sf_stiffness.yaml

1

sf_stiffness_controller:

2

joint: sf_1

3

type: sf_mechanism_controllers/SfStiffnessController

4

gazebo:

5

joint_prefix: body_joint_

6

start_index: 1

7

end_index: 5

8

pid:

9

p: 60.5

10

i: 31.0

11

d: 8.0

12

i_clamp: 1

Older »