Browse Source

Improved parameter updating, added SLAB devices to mac list

QGC4.4
Lorenz Meier 13 years ago
parent
commit
6a36dc44c5
  1. 6
      src/comm/SerialLink.cc
  2. 2
      src/ui/QGCParamWidget.cc

6
src/comm/SerialLink.cc

@ -324,7 +324,11 @@ QVector<QString>* SerialLink::getCurrentPorts() @@ -324,7 +324,11 @@ QVector<QString>* 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());
}

2
src/ui/QGCParamWidget.cc

@ -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()));
// Get parameters
if (uas) mav->requestParameters();
if (uas) requestParameterList();
}
void QGCParamWidget::loadSettings()

Loading…
Cancel
Save