Comms: Convert Serial to Signals/Slots

mavlink · Sep 7, 2024 · 2c8fedb · 2c8fedb
1 parent a703ff2
commit 2c8fedb
Show file tree

Hide file tree

Showing 5 changed files with 227 additions and 417 deletions.
diff --git a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc
@@ -204,7 +204,7 @@ void APMAutoPilotPlugin::_checkForBadCubeBlack(void)
     // FIXME: Put back
     for (const QVariant& varLink: _vehicle->links()) {
         SerialLink* serialLink = varLink.value<SerialLink*>();
-        if (serialLink && QSerialPortInfo(*serialLink->_hackAccessToPort()).description().contains(QStringLiteral("CubeBlack"))) {
+        if (serialLink && QSerialPortInfo(*serialLink->port()).description().contains(QStringLiteral("CubeBlack"))) {
             cubeBlackFound = true;
         }
 

diff --git a/src/Comms/LinkManager.cc b/src/Comms/LinkManager.cc
@@ -71,7 +71,9 @@ LinkManager::LinkManager(QGCApplication* app, QGCToolbox* toolbox)
 
     qRegisterMetaType<QAbstractSocket::SocketError>();
     qRegisterMetaType<LinkInterface*>("LinkInterface*");
+#ifndef NO_SERIAL_LINK
     qRegisterMetaType<QGCSerialPortInfo>("QGCSerialPortInfo");
+#endif
 }
 
 LinkManager::~LinkManager()
@@ -257,11 +259,6 @@ void LinkManager::setConnectionsSuspended(QString reason)
     _connectionsSuspendedReason = reason;
 }
 
-void LinkManager::suspendConfigurationUpdates(bool suspend)
-{
-    _configUpdateSuspended = suspend;
-}
-
 void LinkManager::saveLinkConfigurationList()
 {
     QSettings settings;
@@ -915,7 +912,8 @@ bool LinkManager::_allowAutoConnectToBoard(QGCSerialPortInfo::BoardType_t boardT
 bool LinkManager::_portAlreadyConnected(const QString &portName)
 {
     const QString searchPort = portName.trimmed();
-    for (const SharedLinkInterfacePtr &linkConfig : _rgLinks) {
+    for (const SharedLinkInterfacePtr &linkInterface : _rgLinks) {
+        const SharedLinkConfigurationPtr linkConfig = linkInterface->linkConfiguration();
         const SerialConfiguration* const serialConfig = qobject_cast<const SerialConfiguration*>(linkConfig.get());
         if (serialConfig && (serialConfig->portName() == searchPort)) {
             return true;
@@ -933,13 +931,13 @@ void LinkManager::_updateSerialPorts()
     for (const QGCSerialPortInfo &info: portList) {
         const QString port = info.systemLocation().trimmed(); // + " " + info.description();
         _commPortList += port;
-        _commPortDisplayList += SerialConfiguration::cleanPortDisplayname(port);
+        _commPortDisplayList += SerialConfiguration::cleanPortDisplayName(port);
     }
 }
 
 QStringList LinkManager::serialPortStrings()
 {
-    if (!_commPortDisplayList.size()) {
+    if (_commPortDisplayList.isEmpty()) {
         _updateSerialPorts();
     }
 
@@ -948,7 +946,7 @@ QStringList LinkManager::serialPortStrings()
 
 QStringList LinkManager::serialPorts()
 {
-    if (!_commPortList.size()) {
+    if (_commPortList.isEmpty()) {
         _updateSerialPorts();
     }
 

diff --git a/src/Comms/LinkManager.h b/src/Comms/LinkManager.h
@@ -81,9 +81,6 @@ class LinkManager : public QGCTool
     void loadLinkConfigurationList();
     void saveLinkConfigurationList();
 
-    /// Suspend automatic confguration updates (during link maintenance for instance)
-    void suspendConfigurationUpdates(bool suspend);
-
     /// Sets the flag to suspend the all new connections
     ///     @param reason User visible reason to suspend connections
     void setConnectionsSuspended(QString reason);