diff --git a/src/ui/SerialConfigurationWindow.cc b/src/ui/SerialConfigurationWindow.cc index 6307fb0..389d65e 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 c57cee5..0203368 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 };