zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Airspeed/Level cal leaves log text up when cal complete

QGC4.4
DonLakeFlyer 7 years ago
parent
9db61e11f0
commit
0556fad5a3
2 changed files with 53 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 95
      src/AutoPilotPlugins/PX4/SensorsComponentController.cc
  2. 4
      src/AutoPilotPlugins/PX4/SensorsComponentController.h

95
src/AutoPilotPlugins/PX4/SensorsComponentController.cc
Unescape View File

@ -7,10 +7,6 @@ @@ -7,10 +7,6 @@
*
****************************************************************************/
/// @file
/// @author Don Gagne <don@thegagnes.com>
#include "SensorsComponentController.h"
#include "QGCMAVLink.h"
#include "UAS.h"
@ -22,46 +18,48 @@ @@ -22,46 +18,48 @@
QGC_LOGGING_CATEGORY(SensorsComponentControllerLog, "SensorsComponentControllerLog")
SensorsComponentController::SensorsComponentController(void) :
_statusLog(NULL),
_progressBar(NULL),
_compassButton(NULL),
_gyroButton(NULL),
_accelButton(NULL),
_airspeedButton(NULL),
_levelButton(NULL),
_cancelButton(NULL),
_setOrientationsButton(NULL),
_showOrientationCalArea(false),
_gyroCalInProgress(false),
_magCalInProgress(false),
_accelCalInProgress(false),
_orientationCalDownSideDone(false),
_orientationCalUpsideDownSideDone(false),
_orientationCalLeftSideDone(false),
_orientationCalRightSideDone(false),
_orientationCalNoseDownSideDone(false),
_orientationCalTailDownSideDone(false),
_orientationCalDownSideVisible(false),
_orientationCalUpsideDownSideVisible(false),
_orientationCalLeftSideVisible(false),
_orientationCalRightSideVisible(false),
_orientationCalNoseDownSideVisible(false),
_orientationCalTailDownSideVisible(false),
_orientationCalDownSideInProgress(false),
_orientationCalUpsideDownSideInProgress(false),
_orientationCalLeftSideInProgress(false),
_orientationCalRightSideInProgress(false),
_orientationCalNoseDownSideInProgress(false),
_orientationCalTailDownSideInProgress(false),
_orientationCalDownSideRotate(false),
_orientationCalUpsideDownSideRotate(false),
_orientationCalLeftSideRotate(false),
_orientationCalRightSideRotate(false),
_orientationCalNoseDownSideRotate(false),
_orientationCalTailDownSideRotate(false),
_unknownFirmwareVersion(false),
_waitingForCancel(false)
SensorsComponentController::SensorsComponentController(void)
: _statusLog (NULL)
, _progressBar (NULL)
, _compassButton (NULL)
, _gyroButton (NULL)
, _accelButton (NULL)
, _airspeedButton (NULL)
, _levelButton (NULL)
, _cancelButton (NULL)
, _setOrientationsButton (NULL)
, _showOrientationCalArea (false)
, _gyroCalInProgress (false)
, _magCalInProgress (false)
, _accelCalInProgress (false)
, _airspeedCalInProgress (false)
, _levelCalInProgress (false)
, _orientationCalDownSideDone (false)
, _orientationCalUpsideDownSideDone (false)
, _orientationCalLeftSideDone (false)
, _orientationCalRightSideDone (false)
, _orientationCalNoseDownSideDone (false)
, _orientationCalTailDownSideDone (false)
, _orientationCalDownSideVisible (false)
, _orientationCalUpsideDownSideVisible (false)
, _orientationCalLeftSideVisible (false)
, _orientationCalRightSideVisible (false)
, _orientationCalNoseDownSideVisible (false)
, _orientationCalTailDownSideVisible (false)
, _orientationCalDownSideInProgress (false)
, _orientationCalUpsideDownSideInProgress (false)
, _orientationCalLeftSideInProgress (false)
, _orientationCalRightSideInProgress (false)
, _orientationCalNoseDownSideInProgress (false)
, _orientationCalTailDownSideInProgress (false)
, _orientationCalDownSideRotate (false)
, _orientationCalUpsideDownSideRotate (false)
, _orientationCalLeftSideRotate (false)
, _orientationCalRightSideRotate (false)
, _orientationCalNoseDownSideRotate (false)
, _orientationCalTailDownSideRotate (false)
, _unknownFirmwareVersion (false)
, _waitingForCancel (false)
{
}
@ -165,7 +163,9 @@ void SensorsComponentController::_stopCalibration(SensorsComponentController::St @@ -165,7 +163,9 @@ void SensorsComponentController::_stopCalibration(SensorsComponentController::St
switch (code) {
case StopCalibrationSuccess:
_orientationCalAreaHelpText->setProperty("text", tr("Calibration complete"));
emit resetStatusTextArea();
if (!_airspeedCalInProgress && !_levelCalInProgress) {
emit resetStatusTextArea();
}
if (_magCalInProgress) {
emit setCompassRotations();
}
@ -186,6 +186,7 @@ void SensorsComponentController::_stopCalibration(SensorsComponentController::St @@ -186,6 +186,7 @@ void SensorsComponentController::_stopCalibration(SensorsComponentController::St
_magCalInProgress = false;
_accelCalInProgress = false;
_gyroCalInProgress = false;
_airspeedCalInProgress = false;
}
void SensorsComponentController::calibrateGyro(void)
@ -336,6 +337,10 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in @@ -336,6 +337,10 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
emit orientationCalSidesVisibleChanged();
emit orientationCalSidesInProgressChanged();
_updateAndEmitShowOrientationCalArea(true);
} else if (text == "airspeed") {
_airspeedCalInProgress = true;
} else if (text == "level") {
_levelCalInProgress = true;
}
return;
}

4
src/AutoPilotPlugins/PX4/SensorsComponentController.h
Unescape View File

@ -131,7 +131,9 @@ private: @@ -131,7 +131,9 @@ private:
bool _gyroCalInProgress;
bool _magCalInProgress;
bool _accelCalInProgress;
bool _airspeedCalInProgress;
bool _levelCalInProgress;
bool _orientationCalDownSideDone;
bool _orientationCalUpsideDownSideDone;
bool _orientationCalLeftSideDone;

Write Preview
Loading…
Cancel
Save