From 69167e472ba589a1e80a2d675d55a86cdd6c51b0 Mon Sep 17 00:00:00 2001 From: lm Date: Sun, 3 Jul 2011 18:12:23 +0200 Subject: [PATCH] Added serial support for /dev/ttyACM devices on LINUX --- src/ui/SerialConfigurationWindow.cc | 2 +- src/ui/map/QGCMapWidget.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/SerialConfigurationWindow.cc b/src/ui/SerialConfigurationWindow.cc index 6307fb041..389d65e70 100644 --- a/src/ui/SerialConfigurationWindow.cc +++ b/src/ui/SerialConfigurationWindow.cc @@ -398,7 +398,7 @@ void SerialConfigurationWindow::setupPortList() QFileInfoList list = dir.entryInfoList(); for (int i = 0; i < list.size(); ++i) { QFileInfo fileInfo = list.at(i); - if (fileInfo.fileName().contains(QString("ttyUSB")) || fileInfo.fileName().contains(QString("ttyS"))) { + if (fileInfo.fileName().contains(QString("ttyUSB")) || fileInfo.fileName().contains(QString("ttyS")) || fileInfo.fileName().contains(QString("ttyACM"))) { if (ui.portName->findText(fileInfo.canonicalFilePath()) == -1) { ui.portName->addItem(fileInfo.canonicalFilePath()); if (!userConfigured) ui.portName->setEditText(fileInfo.canonicalFilePath()); diff --git a/src/ui/map/QGCMapWidget.h b/src/ui/map/QGCMapWidget.h index c57cee505..02033684f 100644 --- a/src/ui/map/QGCMapWidget.h +++ b/src/ui/map/QGCMapWidget.h @@ -75,7 +75,7 @@ protected: // HOME, // SAFE_AREA // }; -// enum editMode currEditMode; ///< The current edit mode on the map + //editMode currEditMode; ///< The current edit mode on the map }; -- 2.22.0