rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

OP-1458 Shorten the transition delays on the input control setup page

Browse Source
This commit is contained in:
Stefan Karlsson 2014-08-31 20:57:13 +02:00
parent 507aa51221
commit a59e4defc5
2 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
View File

@ -55,7 +55,10 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) :
transmitterType(acro),
//
loop(NULL),
skipflag(false)
skipflag(false),
nextDelayedTimer(new QTimer()),
nextDelayedTick(0),
nextDelayedLatestActivityTick(0)
{
manualCommandObj = ManualControlCommand::GetInstance(getObjectManager());
manualSettingsObj = ManualControlSettings::GetInstance(getObjectManager());
@ -420,6 +423,9 @@ void ConfigInputWidget::wzCancel()
{
dimOtherControls(false);
// Cancel any ongoing delayd next trigger.
wzNextDelayedCancel();
// Restore original input update rate.
restoreMdata();
@ -436,8 +442,45 @@ void ConfigInputWidget::wzCancel()
flightModeSettingsObj->setData(previousFlightModeSettingsData);
}
void ConfigInputWidget::registerControlActivity()
{
nextDelayedLatestActivityTick = nextDelayedTick;
}
void ConfigInputWidget::wzNextDelayed()
{
nextDelayedTick++;
// Call next after the full 2500 ms timeout has been reached,
// or if no input activity has occurred the last 500 ms.
if (nextDelayedTick == 25 ||
nextDelayedTick - nextDelayedLatestActivityTick >= 5) {
wzNext();
}
}
void ConfigInputWidget::wzNextDelayedStart()
{
// Call wzNextDelayed every 100 ms, to see if it's time to go to the next page.
connect(nextDelayedTimer, SIGNAL(timeout()), this, SLOT(wzNextDelayed()));
nextDelayedTimer->start(100);
}
// Cancel the delayed next timer, if it's active.
void ConfigInputWidget::wzNextDelayedCancel()
{
nextDelayedTick = 0;
nextDelayedLatestActivityTick = 0;
if (nextDelayedTimer->isActive()) {
nextDelayedTimer->stop();
disconnect(nextDelayedTimer, SIGNAL(timeout()), this, SLOT(wzNextDelayed()));
}
}
void ConfigInputWidget::wzNext()
{
wzNextDelayedCancel();
// In identify sticks mode the next button can indicate
// channel advance
if (wizardStep != wizardNone &&
@ -506,6 +549,8 @@ void ConfigInputWidget::wzNext()
void ConfigInputWidget::wzBack()
{
wzNextDelayedCancel();
if (wizardStep != wizardNone &&
wizardStep != wizardIdentifySticks) {
wizardTearDownStep(wizardStep);
@ -888,6 +933,7 @@ void ConfigInputWidget::identifyControls()
}
if (channelDetected) {
registerControlActivity();
return;
}
@ -936,7 +982,7 @@ void ConfigInputWidget::identifyControls()
// m_config->wzText->clear();
setTxMovement(nothing);
QTimer::singleShot(2500, this, SLOT(wzNext()));
wzNextDelayedStart();
}
void ConfigInputWidget::identifyLimits()

11
ground/openpilotgcs/src/plugins/config/configinputwidget.h
View File

@ -96,6 +96,11 @@ private:
QEventLoop *loop;
bool skipflag;
// Variables to support delayed transitions when detecting input controls.
QTimer *nextDelayedTimer;
int nextDelayedTick;
int nextDelayedLatestActivityTick;
int currentChannelNum;
QList<int> heliChannelOrder;
QList<int> acroChannelOrder;
@ -161,8 +166,14 @@ private:
void wizardSetUpStep(enum wizardSteps);
void wizardTearDownStep(enum wizardSteps);
void registerControlActivity();
void wzNextDelayedStart();
void wzNextDelayedCancel();
private slots:
void wzNext();
void wzNextDelayed();
void wzBack();
void wzCancel();
void goToWizard();