Browse Source

Added serial support for /dev/ttyACM devices on LINUX

QGC4.4
lm 14 years ago
parent
commit
69167e472b
  1. 2
      src/ui/SerialConfigurationWindow.cc
  2. 2
      src/ui/map/QGCMapWidget.h

2
src/ui/SerialConfigurationWindow.cc

@ -398,7 +398,7 @@ void SerialConfigurationWindow::setupPortList() @@ -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());

2
src/ui/map/QGCMapWidget.h

@ -75,7 +75,7 @@ protected: @@ -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
};

Loading…
Cancel
Save