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
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lennard Hofmann
RobotAPI
Commits
cf1264ee
Commit
cf1264ee
authored
9 years ago
by
Eren Aksoy
Browse files
Options
Downloads
Patches
Plain Diff
RobotStateComponentName is added as an optional property..It was hard coded
parent
40e434a8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/components/units/ForceTorqueObserver.cpp
+3
-3
3 additions, 3 deletions
source/RobotAPI/components/units/ForceTorqueObserver.cpp
source/RobotAPI/components/units/ForceTorqueObserver.h
+2
-0
2 additions, 0 deletions
source/RobotAPI/components/units/ForceTorqueObserver.h
with
5 additions
and
3 deletions
source/RobotAPI/components/units/ForceTorqueObserver.cpp
+
3
−
3
View file @
cf1264ee
...
...
@@ -76,13 +76,13 @@ void ForceTorqueObserver::onInitObserver()
offerConditionCheck
(
"magnitudelarger"
,
new
ConditionCheckMagnitudeLarger
());
offerConditionCheck
(
"magnitudesmaller"
,
new
ConditionCheckMagnitudeSmaller
());
usingProxy
(
"RobotStateComponent
"
);
usingProxy
(
getProperty
<
std
::
string
>
(
"RobotStateComponent
Name"
).
getValue
()
);
offeringTopic
(
"DebugDrawerUpdates"
);
}
void
ForceTorqueObserver
::
onConnectObserver
()
{
robot
=
getProxy
<
RobotStateComponentInterfacePrx
>
(
getProperty
<
std
::
string
>
(
"RobotStateComponentName"
).
getValue
());
debugDrawer
=
getTopic
<
DebugDrawerInterfacePrx
>
(
"DebugDrawerUpdates"
);
if
(
getProperty
<
bool
>
(
"VisualizeForce"
).
getValue
())
{
...
...
@@ -125,7 +125,7 @@ void ForceTorqueObserver::visualizerFunction()
float
forceFactor
=
getProperty
<
float
>
(
"ForceVisualizerFactor"
).
getValue
();
RemoteRobot
::
synchronizeLocalClone
(
localRobot
,
robot
);
auto
channels
=
getAvailableChannels
(
false
);
for
(
auto
&
channel
:
channels
)
for
(
auto
&
channel
:
channels
)
{
if
(
localRobot
->
hasRobotNode
(
channel
.
first
))
{
...
...
This diff is collapsed.
Click to expand it.
source/RobotAPI/components/units/ForceTorqueObserver.h
+
2
−
0
View file @
cf1264ee
...
...
@@ -46,6 +46,8 @@ namespace armarx
defineOptionalProperty
<
int
>
(
"VisualizeForceUpdateFrequency"
,
20
,
"Frequency with which the force is visualized"
);
defineOptionalProperty
<
float
>
(
"ForceVisualizerFactor"
,
0.01
,
"Factor by which the forces are scaled to fit into 0..1 (only for visulization) "
);
defineOptionalProperty
<
float
>
(
"MaxForceArrowLength"
,
150
,
"Length of the force visu arrow in mm"
);
defineOptionalProperty
<
std
::
string
>
(
"RobotStateComponentName"
,
"RobotStateComponent"
,
"Name of the RobotStateComponent that should be used"
);
}
};
...
...
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