Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
465fecb7
Commit
465fecb7
authored
4 years ago
by
armar-user
Browse files
Options
Downloads
Patches
Plain Diff
chore: More debug info, documentation.
parent
0e99e57d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!112
Fix/platform vel
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/RobotAPI/components/units/ObstacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.cpp
+6
-4
6 additions, 4 deletions
...acleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.cpp
with
6 additions
and
4 deletions
source/RobotAPI/components/units/ObstacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.cpp
+
6
−
4
View file @
465fecb7
...
...
@@ -359,8 +359,8 @@ armarx::ObstacleAvoidingPlatformUnit::get_velocities()
ARMARX_CHECK
(
modulated_vel
.
allFinite
())
<<
"Velocity contains non-finite values."
;
ARMARX_CHECK
(
std
::
isfinite
(
target_rot_vel
))
<<
"Rotation velocity is non-finite."
;
ARMARX_DEBUG
<<
"Target velocity: "
<<
target_vel
.
transpose
()
<<
"; "
<<
target_rot_vel
;
ARMARX_DEBUG
<<
"Modulated velocity: "
<<
modulated_vel
.
transpose
();
ARMARX_DEBUG
<<
"Target velocity: "
<<
target_vel
.
transpose
()
<<
";
norm: "
<<
target_vel
.
norm
()
<<
";
"
<<
target_rot_vel
;
ARMARX_DEBUG
<<
"Modulated velocity: "
<<
modulated_vel
.
transpose
()
<<
modulated_vel
.
norm
()
;
const
auto
r
=
Eigen
::
Rotation2D
(
m_control_data
.
agent_ori
).
toRotationMatrix
().
inverse
();
...
...
@@ -802,14 +802,16 @@ armarx::ObstacleAvoidingPlatformUnit::createPropertyDefinitions()
// Settings.
def
->
optional
(
m_control_data
.
adaptive_max_vel_exp
,
"adaptive_max_vel_exponent"
,
"Adaptive max vel exponent. 0 = disable."
);
"Adaptive max vel exponent. This throttles the max_vel adaptively "
"depending on the angle between target velocity and modulated velocity. "
"0 = disable."
);
// Control parameters.
def
->
optional
(
m_control_data
.
kp
,
"control.pos.kp"
);
def
->
optional
(
m_rot_pid_controller
.
Kp
,
"control.rot.kp"
);
def
->
optional
(
m_rot_pid_controller
.
Ki
,
"control.rot.ki"
);
def
->
optional
(
m_rot_pid_controller
.
Kd
,
"control.rot.kd"
);
def
->
optional
(
m_control_loop
.
cycle_time
,
"control.pose.cycle_time"
);
def
->
optional
(
m_control_loop
.
cycle_time
,
"control.pose.cycle_time"
,
"Control loop cycle time."
);
// Obstacle avoidance parameter.
def
->
optional
(
m_control_data
.
agent_safety_margin
,
"doa.agent_safety_margin"
);
...
...
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