Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
Protos
Nomad 3D
nomad-3d-commons
Commits
d89ddc55
Commit
d89ddc55
authored
Jul 19, 2017
by
Ivan Dages
Browse files
controller : handle virtual axes specific property names
parent
1e4c60b9
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/fr/ill/ics/n3d/link/Nomad3DController.java
View file @
d89ddc55
...
...
@@ -146,7 +146,14 @@ public class Nomad3DController {
* @return The actual position
*/
public
double
getActualPosition
()
{
return
Double
.
parseDouble
(
getPropertyServerValue
(
"actual_position"
));
switch
(
this
.
getName
())
{
case
"DAN"
:
return
Double
.
parseDouble
(
getPropertyServerValue
(
"actual_angle"
));
case
"DH"
:
return
Double
.
parseDouble
(
getPropertyServerValue
(
"actual_height"
));
default
:
return
Double
.
parseDouble
(
getPropertyServerValue
(
"actual_position"
));
}
}
/**
...
...
@@ -154,7 +161,14 @@ public class Nomad3DController {
* @return The wanted position
*/
public
double
getWantedPosition
()
{
return
Double
.
parseDouble
(
getPropertyServerValue
(
"wanted_position"
));
switch
(
this
.
getName
())
{
case
"DAN"
:
return
Double
.
parseDouble
(
getPropertyServerValue
(
"wanted_angle"
));
case
"DH"
:
return
Double
.
parseDouble
(
getPropertyServerValue
(
"wanted_height"
));
default
:
return
Double
.
parseDouble
(
getPropertyServerValue
(
"wanted_position"
));
}
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment