Commit 69d34ea8 authored by Don Gagne's avatar Don Gagne
Browse files

Use new LinkManager::[connect|disconnect]Link api

parent f65c0a57
...@@ -353,13 +353,13 @@ void CommConfigurationWindow::setProtocol(int protocol) ...@@ -353,13 +353,13 @@ void CommConfigurationWindow::setProtocol(int protocol)
void CommConfigurationWindow::setConnection() void CommConfigurationWindow::setConnection()
{ {
if(!link->isConnected()) { if(!link->isConnected()) {
link->connect(); LinkManager::instance()->connectLink(link);
QGC::SLEEP::msleep(100); QGC::SLEEP::msleep(100);
if (link->isConnected()) if (link->isConnected())
// Auto-close window on connect // Auto-close window on connect
this->window()->close(); this->window()->close();
} else { } else {
link->disconnect(); LinkManager::instance()->disconnectLink(link);
} }
} }
......
...@@ -782,9 +782,9 @@ void DebugConsole::handleConnectButton() ...@@ -782,9 +782,9 @@ void DebugConsole::handleConnectButton()
{ {
if (currLink) { if (currLink) {
if (currLink->isConnected()) { if (currLink->isConnected()) {
currLink->disconnect(); LinkManager::instance()->disconnect(currLink);
} else { } else {
currLink->connect(); LinkManager::instance()->connectLink(currLink);
} }
} }
} }
......
...@@ -769,24 +769,25 @@ void QGCToolBar::updateLinkState(bool connected) ...@@ -769,24 +769,25 @@ void QGCToolBar::updateLinkState(bool connected)
void QGCToolBar::connectLink(bool connect) void QGCToolBar::connectLink(bool connect)
{ {
LinkManager* linkMgr = LinkManager::instance();
Q_ASSERT(linkMgr);
// No serial port yet present // No serial port yet present
if (connect && LinkManager::instance()->getSerialLinks().count() == 0) if (connect && linkMgr->getSerialLinks().count() == 0) {
{
MainWindow::instance()->addLink(); MainWindow::instance()->addLink();
currentLink = LinkManager::instance()->getLinks().last(); currentLink = linkMgr->getLinks().last();
} else if (connect) { } else if (connect) {
SerialLink *link = qobject_cast<SerialLink*>(currentLink); SerialLink *link = qobject_cast<SerialLink*>(currentLink);
if (link)
{ if (link) {
link->setPortName(portComboBox->itemData(portComboBox->currentIndex()).toString().trimmed()); link->setPortName(portComboBox->itemData(portComboBox->currentIndex()).toString().trimmed());
int baud = baudcomboBox->currentText().toInt(); int baud = baudcomboBox->currentText().toInt();
link->setBaudRate(baud); link->setBaudRate(baud);
QObject::connect(link, SIGNAL(connected(bool)), this, SLOT(updateLinkState(bool))); QObject::connect(link, SIGNAL(connected(bool)), this, SLOT(updateLinkState(bool)));
link->connect(); linkMgr->connectLink(link);
} }
} else if (!connect && currentLink) { } else if (!connect && currentLink) {
currentLink->disconnect(); linkMgr->disconnectLink(currentLink);
QObject::disconnect(currentLink, SIGNAL(connected(bool)), this, SLOT(updateLinkState(bool))); QObject::disconnect(currentLink, SIGNAL(connected(bool)), this, SLOT(updateLinkState(bool)));
} }
......
...@@ -30,7 +30,7 @@ void QGCUnconnectedInfoWidget::simulate() ...@@ -30,7 +30,7 @@ void QGCUnconnectedInfoWidget::simulate()
foreach(LinkInterface* link, links) { foreach(LinkInterface* link, links) {
MAVLinkSimulationLink* sim = dynamic_cast<MAVLinkSimulationLink*>(link); MAVLinkSimulationLink* sim = dynamic_cast<MAVLinkSimulationLink*>(link);
if (sim) { if (sim) {
sim->connectLink(); LinkManager::instance()->connectLink(sim);
} }
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment