From f6aae9141baf36aeb325ff09a32b0971c0da7c1e Mon Sep 17 00:00:00 2001 From: Jessica Date: Wed, 18 Jul 2012 09:34:59 -0700 Subject: [PATCH] Unit tests compile and run but still fail 4 tests. Segfault fixed which was caused by colors list in UASInterface.h. --- src/uas/UAS.cc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc index 37c83d3..e9188bc 100644 --- a/src/uas/UAS.cc +++ b/src/uas/UAS.cc @@ -112,7 +112,6 @@ UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(), connect(this, SIGNAL(systemSpecsChanged(int)), this, SLOT(writeSettings())); statusTimeout->start(500); readSettings(); -// autopilot = 11; // Initial signals emit disarmed(); emit armingChanged(false); @@ -123,14 +122,6 @@ UAS::~UAS() writeSettings(); delete links; links=NULL; - //if(statusTimeout != NULL){ - // delete statusTimeout; - // statusTimeout = NULL;//} - // if(simulation != NULL){ - // delete simulation; - // simulation = NULL; - // } - } void UAS::writeSettings() { @@ -161,7 +152,7 @@ void UAS::readSettings() void UAS::deleteSettings() { this->name = ""; - this->airframe = QGC_AIRFRAME_EASYSTAR, + this->airframe = QGC_AIRFRAME_EASYSTAR; this->autopilot = -1; setBatterySpecs(QString("9V,9.5V,12.6V")); }