Commit f6aae914 authored by Jessica's avatar Jessica

Unit tests compile and run but still fail 4 tests. Segfault fixed which was...

Unit tests compile and run but still fail 4 tests. Segfault fixed which was caused by colors list in UASInterface.h.
parent c7c7a058
...@@ -112,7 +112,6 @@ UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(), ...@@ -112,7 +112,6 @@ UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(),
connect(this, SIGNAL(systemSpecsChanged(int)), this, SLOT(writeSettings())); connect(this, SIGNAL(systemSpecsChanged(int)), this, SLOT(writeSettings()));
statusTimeout->start(500); statusTimeout->start(500);
readSettings(); readSettings();
// autopilot = 11;
// Initial signals // Initial signals
emit disarmed(); emit disarmed();
emit armingChanged(false); emit armingChanged(false);
...@@ -123,14 +122,6 @@ UAS::~UAS() ...@@ -123,14 +122,6 @@ UAS::~UAS()
writeSettings(); writeSettings();
delete links; delete links;
links=NULL; links=NULL;
//if(statusTimeout != NULL){
// delete statusTimeout;
// statusTimeout = NULL;//}
// if(simulation != NULL){
// delete simulation;
// simulation = NULL;
// }
} }
void UAS::writeSettings() void UAS::writeSettings()
{ {
...@@ -161,7 +152,7 @@ void UAS::readSettings() ...@@ -161,7 +152,7 @@ void UAS::readSettings()
void UAS::deleteSettings() void UAS::deleteSettings()
{ {
this->name = ""; this->name = "";
this->airframe = QGC_AIRFRAME_EASYSTAR, this->airframe = QGC_AIRFRAME_EASYSTAR;
this->autopilot = -1; this->autopilot = -1;
setBatterySpecs(QString("9V,9.5V,12.6V")); setBatterySpecs(QString("9V,9.5V,12.6V"));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment