From 6a36dc44c542362e2a516a0882a7ffc59bc61a66 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sat, 28 Jul 2012 10:34:46 +0200 Subject: [PATCH] Improved parameter updating, added SLAB devices to mac list --- src/comm/SerialLink.cc | 6 +++++- src/ui/QGCParamWidget.cc | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/comm/SerialLink.cc b/src/comm/SerialLink.cc index 9b7def4aa..38900d1ce 100644 --- a/src/comm/SerialLink.cc +++ b/src/comm/SerialLink.cc @@ -324,7 +324,11 @@ QVector* SerialLink::getCurrentPorts() QFileInfoList list = dir.entryInfoList(); for (int i = list.size() - 1; i >= 0; 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()); } diff --git a/src/ui/QGCParamWidget.cc b/src/ui/QGCParamWidget.cc index 64d35ae5c..185383cfa 100644 --- a/src/ui/QGCParamWidget.cc +++ b/src/ui/QGCParamWidget.cc @@ -145,7 +145,7 @@ QGCParamWidget::QGCParamWidget(UASInterface* uas, QWidget *parent) : connect(&retransmissionTimer, SIGNAL(timeout()), this, SLOT(retransmissionGuardTick())); // Get parameters - if (uas) mav->requestParameters(); + if (uas) requestParameterList(); } void QGCParamWidget::loadSettings() -- 2.22.0