Browse Source

Stop connection lost handling during accel cal

QGC4.4
Don Gagne 9 years ago
parent
commit
786b472f47
  1. 10
      src/AutoPilotPlugins/APM/APMSensorsComponentController.cc
  2. 3
      src/AutoPilotPlugins/APM/APMSensorsComponentController.h

10
src/AutoPilotPlugins/APM/APMSensorsComponentController.cc

@ -77,6 +77,11 @@ APMSensorsComponentController::APMSensorsComponentController(void) : @@ -77,6 +77,11 @@ APMSensorsComponentController::APMSensorsComponentController(void) :
connect(_sensorsComponent, &VehicleComponent::setupCompleteChanged, this, &APMSensorsComponentController::setupNeededChanged);
}
APMSensorsComponentController::~APMSensorsComponentController()
{
_vehicle->setConnectionLostEnabled(true);
}
/// Appends the specified text to the status log area in the ui
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)
{
if (_accelCalInProgress) {
_vehicle->setConnectionLostEnabled(true);
}
disconnect(_uas, &UASInterface::textMessageReceived, this, &APMSensorsComponentController::_handleUASTextMessage);
_compassButton->setEnabled(true);
@ -193,6 +202,7 @@ void APMSensorsComponentController::calibrateCompass(void) @@ -193,6 +202,7 @@ void APMSensorsComponentController::calibrateCompass(void)
void APMSensorsComponentController::calibrateAccel(void)
{
_vehicle->setConnectionLostEnabled(false);
_startLogCalibration();
_accelCalInProgress = true;
_uas->startCalibration(UASInterface::StartCalibrationAccel);

3
src/AutoPilotPlugins/APM/APMSensorsComponentController.h

@ -41,7 +41,8 @@ class APMSensorsComponentController : public FactPanelController @@ -41,7 +41,8 @@ class APMSensorsComponentController : public FactPanelController
public:
APMSensorsComponentController(void);
~APMSensorsComponentController();
Q_PROPERTY(bool fixedWing READ fixedWing CONSTANT)
Q_PROPERTY(QQuickItem* statusLog MEMBER _statusLog)

Loading…
Cancel
Save