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
67e14c3d
Commit
67e14c3d
authored
Jul 18, 2012
by
Jessica
Browse files
Airframe unit test now passes. In UAS.cc, the airframe was set to generic.
parent
f6aae914
Changes
2
Hide whitespace changes
Inline
Side-by-side
qgcunittest/UASUnitTest.cc
View file @
67e14c3d
...
...
@@ -163,10 +163,7 @@ void UASUnitTest::getYaw_test()
void
UASUnitTest
::
getSelected_test
()
{
bool
test
=
uas
->
getSelected
();
if
(
test
!=
NULL
){
QCOMPARE
(
test
,
false
);
}
QCOMPARE
(
uas
->
getSelected
(),
false
);
}
void
UASUnitTest
::
getSystemType_test
()
...
...
@@ -176,6 +173,7 @@ void UASUnitTest::getSystemType_test()
void
UASUnitTest
::
getAirframe_test
()
{
//when uas is constructed, airframe is set to QGC_AIRFRAME_GENERIC which is 0
QCOMPARE
(
uas
->
getAirframe
(),
0
);
uas
->
setAirframe
(
25
);
...
...
src/uas/UAS.cc
View file @
67e14c3d
...
...
@@ -86,7 +86,7 @@ UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(),
receivedRGBDImageTimestamp
(
0.0
),
#endif
paramsOnceRequested
(
false
),
airframe
(
QGC_AIRFRAME_
EASYSTAR
),
airframe
(
QGC_AIRFRAME_
GENERIC
),
attitudeKnown
(
false
),
paramManager
(
NULL
),
attitudeStamped
(
false
),
...
...
@@ -104,7 +104,7 @@ UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(),
componentID
[
i
]
=
-
1
;
componentMulti
[
i
]
=
false
;
}
color
=
UASInterface
::
getNextColor
();
setBatterySpecs
(
QString
(
"9V,9.5V,12.6V"
));
...
...
@@ -152,9 +152,9 @@ void UAS::readSettings()
void
UAS
::
deleteSettings
()
{
this
->
name
=
""
;
this
->
airframe
=
QGC_AIRFRAME_
EASYSTAR
;
this
->
airframe
=
QGC_AIRFRAME_
GENERIC
;
this
->
autopilot
=
-
1
;
setBatterySpecs
(
QString
(
"9V,9.5V,12.6V"
));
setBatterySpecs
(
QString
(
"9V,9.5V,12.6V"
));
}
int
UAS
::
getUASID
()
const
...
...
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