Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
728b350e
Commit
728b350e
authored
Oct 14, 2014
by
Anton Matosov
Browse files
Reworked code to reduce number of unnecessary virtual function calls
parent
e4baa3ce
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/ui/px4_configuration/PX4RCCalibration.cc
View file @
728b350e
...
...
@@ -163,32 +163,33 @@ void PX4RCCalibration::_setInternalCalibrationValuesFromParameters(void)
QVariant
value
;
bool
paramFound
;
bool
convertOk
;
int
componentId
=
_paramMgr
->
getDefaultComponentId
();
for
(
int
i
=
0
;
i
<
_chanMax
;
++
i
)
{
struct
ChannelInfo
*
info
=
&
_rgChannelInfo
[
i
];
paramFound
=
_paramMgr
->
getParameterValue
(
_paramMgr
->
getDefaultC
omponentId
()
,
trimTpl
.
arg
(
i
+
1
),
value
);
paramFound
=
_paramMgr
->
getParameterValue
(
c
omponentId
,
trimTpl
.
arg
(
i
+
1
),
value
);
Q_ASSERT
(
paramFound
);
if
(
paramFound
)
{
info
->
rcTrim
=
value
.
toInt
(
&
convertOk
);
Q_ASSERT
(
convertOk
);
}
paramFound
=
_paramMgr
->
getParameterValue
(
_paramMgr
->
getDefaultC
omponentId
()
,
minTpl
.
arg
(
i
+
1
),
value
);
paramFound
=
_paramMgr
->
getParameterValue
(
c
omponentId
,
minTpl
.
arg
(
i
+
1
),
value
);
Q_ASSERT
(
paramFound
);
if
(
paramFound
)
{
info
->
rcMin
=
value
.
toInt
(
&
convertOk
);
Q_ASSERT
(
convertOk
);
}
paramFound
=
_paramMgr
->
getParameterValue
(
_paramMgr
->
getDefaultC
omponentId
()
,
maxTpl
.
arg
(
i
+
1
),
value
);
paramFound
=
_paramMgr
->
getParameterValue
(
c
omponentId
,
maxTpl
.
arg
(
i
+
1
),
value
);
Q_ASSERT
(
paramFound
);
if
(
paramFound
)
{
info
->
rcMax
=
value
.
toInt
(
&
convertOk
);
Q_ASSERT
(
convertOk
);
}
paramFound
=
_paramMgr
->
getParameterValue
(
_paramMgr
->
getDefaultC
omponentId
()
,
revTpl
.
arg
(
i
+
1
),
value
);
paramFound
=
_paramMgr
->
getParameterValue
(
c
omponentId
,
revTpl
.
arg
(
i
+
1
),
value
);
Q_ASSERT
(
paramFound
);
if
(
paramFound
)
{
float
floatReversed
=
value
.
toFloat
(
&
convertOk
);
...
...
@@ -201,7 +202,7 @@ void PX4RCCalibration::_setInternalCalibrationValuesFromParameters(void)
for
(
int
i
=
0
;
i
<
rcCalFunctionMax
;
i
++
)
{
int32_t
paramChannel
;
paramFound
=
_paramMgr
->
getParameterValue
(
_paramMgr
->
getDefaultC
omponentId
()
,
_rgFunctionInfo
[
i
].
parameterName
,
value
);
paramFound
=
_paramMgr
->
getParameterValue
(
c
omponentId
,
_rgFunctionInfo
[
i
].
parameterName
,
value
);
Q_ASSERT
(
paramFound
);
if
(
paramFound
)
{
paramChannel
=
value
.
toInt
(
&
convertOk
);
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment