Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
humanoid_common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Show more breadcrumbs
humanoides
humanoid_common
Commits
9087ddba
Commit
9087ddba
authored
7 years ago
by
Ferran Martínez
Browse files
Options
Downloads
Patches
Plain Diff
Changed Watchdog API
parent
fa36de03
No related branches found
No related tags found
1 merge request
!4
Filtered localization
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
humanoid_modules/src/gripper_module.cpp
+3
-3
3 additions, 3 deletions
humanoid_modules/src/gripper_module.cpp
humanoid_modules/src/joints_cart_module.cpp
+1
-1
1 addition, 1 deletion
humanoid_modules/src/joints_cart_module.cpp
with
4 additions
and
4 deletions
humanoid_modules/src/gripper_module.cpp
+
3
−
3
View file @
9087ddba
...
...
@@ -114,9 +114,9 @@ void CGripperModule::reconfigure_callback(gripper_module::GripperModuleConfig &c
this
->
assign_service
.
set_max_num_retries
(
config
.
service_max_retries
);
/* motion action parameters */
this
->
gripper_action
.
set_max_num_retries
(
config
.
action_max_retries
);
if
(
this
->
config
.
enable_
timeout
)
this
->
gripper_action
.
enable_
timeout
(
config
.
feedback_watchdog_time_s
);
else
this
->
gripper_action
.
disable_
timeout
();
if
(
this
->
config
.
enable_
watchdog
)
this
->
gripper_action
.
enable_
watchdog
(
config
.
feedback_watchdog_time_s
);
else
this
->
gripper_action
.
disable_
watchdog
();
if
(
this
->
config
.
enable_timeout
)
this
->
gripper_action
.
enable_timeout
(
config
.
timeout_s
);
else
...
...
This diff is collapsed.
Click to expand it.
humanoid_modules/src/joints_cart_module.cpp
+
1
−
1
View file @
9087ddba
...
...
@@ -142,7 +142,7 @@ void CJointsCartModule::reconfigure_callback(joints_cart_module::JointsCartModul
this
->
get_ik_service
.
set_max_num_retries
(
config
.
get_ik_max_retries
);
/* motion action parameters */
this
->
joints_action
.
set_max_num_retries
(
config
.
action_max_retries
);
if
(
config
.
enable_watchdog
)
if
(
this
->
config
.
enable_watchdog
)
this
->
joints_action
.
enable_watchdog
(
config
.
feedback_watchdog_time_s
);
else
this
->
joints_action
.
disable_watchdog
();
if
(
this
->
config
.
enable_timeout
)
...
...
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