Commit 6a36dc44 authored by Lorenz Meier's avatar Lorenz Meier

Improved parameter updating, added SLAB devices to mac list

parent 3562e602
...@@ -324,7 +324,11 @@ QVector<QString>* SerialLink::getCurrentPorts() ...@@ -324,7 +324,11 @@ QVector<QString>* SerialLink::getCurrentPorts()
QFileInfoList list = dir.entryInfoList(); QFileInfoList list = dir.entryInfoList();
for (int i = list.size() - 1; i >= 0; i--) { for (int i = list.size() - 1; i >= 0; i--) {
QFileInfo fileInfo = list.at(i); QFileInfo fileInfo = list.at(i);
if (fileInfo.fileName().contains(QString("ttyUSB")) || fileInfo.fileName().contains(QString("ttyS")) || fileInfo.fileName().contains(QString("tty.usbserial")) || fileInfo.fileName().contains(QString("ttyACM"))) if (fileInfo.fileName().contains(QString("ttyUSB")) ||
fileInfo.fileName().contains(QString("tty.usb")) ||
fileInfo.fileName().contains(QString("ttyS")) ||
fileInfo.fileName().contains(QString("tty.SLAB")) ||
fileInfo.fileName().contains(QString("ttyACM")))
{ {
ports->append(fileInfo.canonicalFilePath()); ports->append(fileInfo.canonicalFilePath());
} }
......
...@@ -145,7 +145,7 @@ QGCParamWidget::QGCParamWidget(UASInterface* uas, QWidget *parent) : ...@@ -145,7 +145,7 @@ QGCParamWidget::QGCParamWidget(UASInterface* uas, QWidget *parent) :
connect(&retransmissionTimer, SIGNAL(timeout()), this, SLOT(retransmissionGuardTick())); connect(&retransmissionTimer, SIGNAL(timeout()), this, SLOT(retransmissionGuardTick()));
// Get parameters // Get parameters
if (uas) mav->requestParameters(); if (uas) requestParameterList();
} }
void QGCParamWidget::loadSettings() void QGCParamWidget::loadSettings()
......
Markdown is supported
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