Commit 786b472f authored by Don Gagne's avatar Don Gagne

Stop connection lost handling during accel cal

parent 52e1760e
...@@ -77,6 +77,11 @@ APMSensorsComponentController::APMSensorsComponentController(void) : ...@@ -77,6 +77,11 @@ APMSensorsComponentController::APMSensorsComponentController(void) :
connect(_sensorsComponent, &VehicleComponent::setupCompleteChanged, this, &APMSensorsComponentController::setupNeededChanged); connect(_sensorsComponent, &VehicleComponent::setupCompleteChanged, this, &APMSensorsComponentController::setupNeededChanged);
} }
APMSensorsComponentController::~APMSensorsComponentController()
{
_vehicle->setConnectionLostEnabled(true);
}
/// Appends the specified text to the status log area in the ui /// Appends the specified text to the status log area in the ui
void APMSensorsComponentController::_appendStatusLog(const QString& text) void APMSensorsComponentController::_appendStatusLog(const QString& text)
{ {
...@@ -143,6 +148,10 @@ void APMSensorsComponentController::_resetInternalState(void) ...@@ -143,6 +148,10 @@ void APMSensorsComponentController::_resetInternalState(void)
void APMSensorsComponentController::_stopCalibration(APMSensorsComponentController::StopCalibrationCode code) void APMSensorsComponentController::_stopCalibration(APMSensorsComponentController::StopCalibrationCode code)
{ {
if (_accelCalInProgress) {
_vehicle->setConnectionLostEnabled(true);
}
disconnect(_uas, &UASInterface::textMessageReceived, this, &APMSensorsComponentController::_handleUASTextMessage); disconnect(_uas, &UASInterface::textMessageReceived, this, &APMSensorsComponentController::_handleUASTextMessage);
_compassButton->setEnabled(true); _compassButton->setEnabled(true);
...@@ -193,6 +202,7 @@ void APMSensorsComponentController::calibrateCompass(void) ...@@ -193,6 +202,7 @@ void APMSensorsComponentController::calibrateCompass(void)
void APMSensorsComponentController::calibrateAccel(void) void APMSensorsComponentController::calibrateAccel(void)
{ {
_vehicle->setConnectionLostEnabled(false);
_startLogCalibration(); _startLogCalibration();
_accelCalInProgress = true; _accelCalInProgress = true;
_uas->startCalibration(UASInterface::StartCalibrationAccel); _uas->startCalibration(UASInterface::StartCalibrationAccel);
......
...@@ -41,7 +41,8 @@ class APMSensorsComponentController : public FactPanelController ...@@ -41,7 +41,8 @@ class APMSensorsComponentController : public FactPanelController
public: public:
APMSensorsComponentController(void); APMSensorsComponentController(void);
~APMSensorsComponentController();
Q_PROPERTY(bool fixedWing READ fixedWing CONSTANT) Q_PROPERTY(bool fixedWing READ fixedWing CONSTANT)
Q_PROPERTY(QQuickItem* statusLog MEMBER _statusLog) Q_PROPERTY(QQuickItem* statusLog MEMBER _statusLog)
......
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