Comms: Update Serial Threading

mavlink · Nov 20, 2024 · bbead09 · bbead09
1 parent 2814c75
commit bbead09
Show file tree

Hide file tree

Showing 8 changed files with 305 additions and 392 deletions.
diff --git a/android/libs/qtandroidserialport/qserialport_android.cpp b/android/libs/qtandroidserialport/qserialport_android.cpp
@@ -53,7 +53,7 @@ bool QSerialPortPrivate::open(QIODevice::OpenMode mode)
         }
     }
 
-    clear(QSerialPort::AllDirections);
+    (void) clear(QSerialPort::AllDirections);
 
     return true;
 }
@@ -249,7 +249,7 @@ bool QSerialPortPrivate::clear(QSerialPort::Directions directions)
     const bool result = AndroidSerial::purgeBuffers(m_deviceId, input, output);
     if (!result) {
         qCWarning(AndroidSerialPortLog) << "Failed to purge buffers for device ID" << m_deviceId;
-        setError(QSerialPortErrorInfo(QSerialPort::UnknownError, QSerialPort::tr("Failed to purge buffers")));
+        // setError(QSerialPortErrorInfo(QSerialPort::UnknownError, QSerialPort::tr("Failed to purge buffers")));
     }
 
     return result;

diff --git a/libs/mavlink/include/mavlink/v2.0 b/libs/mavlink/include/mavlink/v2.0
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
@@ -937,7 +937,7 @@ void LinkManager::_updateSerialPorts()
     for (const QGCSerialPortInfo &info: portList) {
         const QString port = info.systemLocation().trimmed();
         _commPortList += port;
-        _commPortDisplayList += SerialConfiguration::cleanPortDisplayname(port);
+        _commPortDisplayList += SerialConfiguration::cleanPortDisplayName(port);
     }
 }
 

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

diff --git a/src/Comms/QGCSerialPortInfo.cc b/src/Comms/QGCSerialPortInfo.cc
@@ -267,7 +267,6 @@ bool QGCSerialPortInfo::isBootloader() const
     BoardType_t boardType;
     QString name;
     if (getBoardInfo(boardType, name)) {
-        // TODO: bool SerialLink::_isBootloader()
         return ((boardType == BoardTypePixhawk) && description().contains(QStringLiteral("BL")));
     }