1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00

Merge branch 'next' into thread/OP-39

This commit is contained in:
Fredrik Arvidsson 2012-08-21 01:09:02 +02:00
commit 5199d9e738

View File

@ -226,17 +226,15 @@ void ConfigGadgetWidget::tabAboutToChange(int i,bool * proceed)
*/
void ConfigGadgetWidget::updatePipXStatus(UAVObject *object)
{
// Restart the disconnection timer.
pipxTimeout->start(5000);
if (!pipxConnected)
{
qDebug()<<"ConfigGadgetWidget onPipxtremeConnect";
QWidget *qwd = new ConfigPipXtremeWidget(this);
ftw->insertTab(ConfigGadgetWidget::pipxtreme, qwd, QIcon(":/configgadget/images/PipXtreme.png"), QString("PipXtreme"));
ftw->setCurrentIndex(ConfigGadgetWidget::pipxtreme);
pipxConnected = true;
}
// Restart the disconnection timer.
pipxTimeout->start(5000);
if (!pipxConnected)
{
qDebug()<<"ConfigGadgetWidget onPipxtremeConnect";
QWidget *qwd = new ConfigPipXtremeWidget(this);
ftw->insertTab(ConfigGadgetWidget::pipxtreme, qwd, QIcon(":/configgadget/images/PipXtreme.png"), QString("PipXtreme"));
pipxConnected = true;
}
}
void ConfigGadgetWidget::onPipxtremeDisconnect() {