Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
69167e47
Commit
69167e47
authored
Jul 03, 2011
by
lm
Browse files
Added serial support for /dev/ttyACM devices on LINUX
parent
5f021441
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/ui/SerialConfigurationWindow.cc
View file @
69167e47
...
...
@@ -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
());
...
...
src/ui/map/QGCMapWidget.h
View file @
69167e47
...
...
@@ -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
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment