mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-11-30 08:24:11 +01:00
Merge branch 'next' into thread/OP-39
This commit is contained in:
commit
5199d9e738
@ -226,17 +226,15 @@ void ConfigGadgetWidget::tabAboutToChange(int i,bool * proceed)
|
|||||||
*/
|
*/
|
||||||
void ConfigGadgetWidget::updatePipXStatus(UAVObject *object)
|
void ConfigGadgetWidget::updatePipXStatus(UAVObject *object)
|
||||||
{
|
{
|
||||||
|
// Restart the disconnection timer.
|
||||||
// Restart the disconnection timer.
|
pipxTimeout->start(5000);
|
||||||
pipxTimeout->start(5000);
|
if (!pipxConnected)
|
||||||
if (!pipxConnected)
|
{
|
||||||
{
|
qDebug()<<"ConfigGadgetWidget onPipxtremeConnect";
|
||||||
qDebug()<<"ConfigGadgetWidget onPipxtremeConnect";
|
QWidget *qwd = new ConfigPipXtremeWidget(this);
|
||||||
QWidget *qwd = new ConfigPipXtremeWidget(this);
|
ftw->insertTab(ConfigGadgetWidget::pipxtreme, qwd, QIcon(":/configgadget/images/PipXtreme.png"), QString("PipXtreme"));
|
||||||
ftw->insertTab(ConfigGadgetWidget::pipxtreme, qwd, QIcon(":/configgadget/images/PipXtreme.png"), QString("PipXtreme"));
|
pipxConnected = true;
|
||||||
ftw->setCurrentIndex(ConfigGadgetWidget::pipxtreme);
|
}
|
||||||
pipxConnected = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConfigGadgetWidget::onPipxtremeDisconnect() {
|
void ConfigGadgetWidget::onPipxtremeDisconnect() {
|
||||||
|
Loading…
Reference in New Issue
Block a user