Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
franka_description
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
CeTI
ROS
ROS Packages
franka_description
Commits
21dd3ad8
Commit
21dd3ad8
authored
7 years ago
by
Simon Gabl
Browse files
Options
Downloads
Patches
Plain Diff
Fix typo.
parent
edc728ca
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
franka_example_controllers/src/force_example_controller.cpp
+1
-1
1 addition, 1 deletion
franka_example_controllers/src/force_example_controller.cpp
with
1 addition
and
1 deletion
franka_example_controllers/src/force_example_controller.cpp
+
1
−
1
View file @
21dd3ad8
...
@@ -115,7 +115,7 @@ void ForceExampleController::update(const ros::Time& /*time*/, const ros::Durati
...
@@ -115,7 +115,7 @@ void ForceExampleController::update(const ros::Time& /*time*/, const ros::Durati
tau_ext
=
tau_measured
-
gravity
-
tau_ext_initial_
;
tau_ext
=
tau_measured
-
gravity
-
tau_ext_initial_
;
tau_d
<<
jacobian
.
transpose
()
*
desired_force_torque
;
tau_d
<<
jacobian
.
transpose
()
*
desired_force_torque
;
tau_error_
=
tau_error_
+
period
.
toSec
()
*
(
tau_d
-
tau_ext
);
tau_error_
=
tau_error_
+
period
.
toSec
()
*
(
tau_d
-
tau_ext
);
// FF + PI control (PI gains are intially all 0)
// FF + PI control (PI gains are in
i
tially all 0)
tau_cmd
=
tau_d
+
k_p_
*
(
tau_d
-
tau_ext
)
+
k_i_
*
tau_error_
;
tau_cmd
=
tau_d
+
k_p_
*
(
tau_d
-
tau_ext
)
+
k_i_
*
tau_error_
;
tau_cmd
<<
saturateTorqueRate
(
tau_cmd
,
tau_J_d
);
tau_cmd
<<
saturateTorqueRate
(
tau_cmd
,
tau_J_d
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment