Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
e36b3c1c
Commit
e36b3c1c
authored
Jul 16, 2013
by
Bill Bonney
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/diydrones/apm_planner
parents
eb8d8faa
111300d2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
17 deletions
+19
-17
qserialportglobal.h
libs/serialport/qserialportglobal.h
+2
-2
XbeeConfigurationWindow.cpp
src/ui/XbeeConfigurationWindow.cpp
+5
-3
FlightModeConfig.cc
src/ui/configuration/FlightModeConfig.cc
+12
-12
No files found.
libs/serialport/qserialportglobal.h
View file @
e36b3c1c
...
...
@@ -51,12 +51,12 @@ QT_BEGIN_NAMESPACE
# if defined(QT_BUILD_SERIALPORT_LIB)
# define Q_SERIALPORT_EXPORT Q_DECL_EXPORT
# else
# define Q_SERIALPORT_EXPORT Q_DECL_IMPORT
//
# define Q_SERIALPORT_EXPORT Q_DECL_IMPORT
# endif
#else
# define Q_SERIALPORT_EXPORT
#endif
# define Q_SERIALPORT_EXPORT
// The macro has been available only since Qt 5.0
#ifndef Q_DECL_OVERRIDE
#define Q_DECL_OVERRIDE
...
...
src/ui/XbeeConfigurationWindow.cpp
View file @
e36b3c1c
...
...
@@ -8,7 +8,8 @@
#include <qdatastream.h>
#ifdef _WIN32
#include <QextSerialEnumerator.h>
//#include <QextSerialEnumerator.h>
#include <qserialportinfo.h>
#endif
#if defined (__APPLE__) && defined (__MACH__)
...
...
@@ -368,11 +369,12 @@ void XbeeConfigurationWindow::setupPortList()
#ifdef _WIN32
// Get the ports available on this system
QList
<
QextPortInfo
>
ports
=
QextSerialEnumerator
::
getPorts
();
QList
<
QSerialPortInfo
>
ports
=
QSerialPortInfo
::
availablePorts
();
//QList<QextPortInfo> ports = QextSerialEnumerator::getPorts();
// Add the ports in reverse order, because we prepend them to the list
for
(
int
i
=
ports
.
size
()
-
1
;
i
>=
0
;
i
--
)
{
QString
portString
=
QString
(
ports
.
at
(
i
).
portName
.
toLocal8Bit
().
constData
())
+
" - "
+
QString
(
ports
.
at
(
i
).
friendName
.
toLocal8Bit
().
constData
()).
split
(
"("
).
first
()
;
QString
portString
=
QString
(
ports
.
at
(
i
).
portName
.
toLocal8Bit
().
constData
());
// Prepend newly found port to the list
if
(
portBox
->
findText
(
portString
)
==
-
1
)
{
portBox
->
insertItem
(
0
,
portString
);
...
...
src/ui/configuration/FlightModeConfig.cc
View file @
e36b3c1c
...
...
@@ -152,12 +152,12 @@ void FlightModeConfig::saveButtonClicked()
}
else
if
(
m_uas
->
getSystemType
()
==
MAV_TYPE_QUADROTOR
)
{
m_uas
->
getParamManager
()
->
setParameter
(
1
,
"FLTMODE1"
,(
char
)
ui
.
mode1ComboBox
->
currentIndex
()
+
1
);
m_uas
->
getParamManager
()
->
setParameter
(
1
,
"FLTMODE2"
,(
char
)
ui
.
mode2ComboBox
->
currentIndex
()
+
1
);
m_uas
->
getParamManager
()
->
setParameter
(
1
,
"FLTMODE3"
,(
char
)
ui
.
mode3ComboBox
->
currentIndex
()
+
1
);
m_uas
->
getParamManager
()
->
setParameter
(
1
,
"FLTMODE4"
,(
char
)
ui
.
mode4ComboBox
->
currentIndex
()
+
1
);
m_uas
->
getParamManager
()
->
setParameter
(
1
,
"FLTMODE5"
,(
char
)
ui
.
mode5ComboBox
->
currentIndex
()
+
1
);
m_uas
->
getParamManager
()
->
setParameter
(
1
,
"FLTMODE6"
,(
char
)
ui
.
mode6ComboBox
->
currentIndex
()
+
1
);
m_uas
->
getParamManager
()
->
setParameter
(
1
,
"FLTMODE1"
,(
char
)
ui
.
mode1ComboBox
->
currentIndex
());
m_uas
->
getParamManager
()
->
setParameter
(
1
,
"FLTMODE2"
,(
char
)
ui
.
mode2ComboBox
->
currentIndex
());
m_uas
->
getParamManager
()
->
setParameter
(
1
,
"FLTMODE3"
,(
char
)
ui
.
mode3ComboBox
->
currentIndex
());
m_uas
->
getParamManager
()
->
setParameter
(
1
,
"FLTMODE4"
,(
char
)
ui
.
mode4ComboBox
->
currentIndex
());
m_uas
->
getParamManager
()
->
setParameter
(
1
,
"FLTMODE5"
,(
char
)
ui
.
mode5ComboBox
->
currentIndex
());
m_uas
->
getParamManager
()
->
setParameter
(
1
,
"FLTMODE6"
,(
char
)
ui
.
mode6ComboBox
->
currentIndex
());
}
}
...
...
@@ -280,27 +280,27 @@ void FlightModeConfig::parameterChanged(int uas, int component, QString paramete
{
if
(
parameterName
==
"FLTMODE1"
)
{
ui
.
mode1ComboBox
->
setCurrentIndex
(
value
.
toInt
()
-
1
);
ui
.
mode1ComboBox
->
setCurrentIndex
(
value
.
toInt
());
}
else
if
(
parameterName
==
"FLTMODE2"
)
{
ui
.
mode2ComboBox
->
setCurrentIndex
(
value
.
toInt
()
-
1
);
ui
.
mode2ComboBox
->
setCurrentIndex
(
value
.
toInt
());
}
else
if
(
parameterName
==
"FLTMODE3"
)
{
ui
.
mode3ComboBox
->
setCurrentIndex
(
value
.
toInt
()
-
1
);
ui
.
mode3ComboBox
->
setCurrentIndex
(
value
.
toInt
());
}
else
if
(
parameterName
==
"FLTMODE4"
)
{
ui
.
mode4ComboBox
->
setCurrentIndex
(
value
.
toInt
()
-
1
);
ui
.
mode4ComboBox
->
setCurrentIndex
(
value
.
toInt
());
}
else
if
(
parameterName
==
"FLTMODE5"
)
{
ui
.
mode5ComboBox
->
setCurrentIndex
(
value
.
toInt
()
-
1
);
ui
.
mode5ComboBox
->
setCurrentIndex
(
value
.
toInt
());
}
else
if
(
parameterName
==
"FLTMODE6"
)
{
ui
.
mode6ComboBox
->
setCurrentIndex
(
value
.
toInt
()
-
1
);
ui
.
mode6ComboBox
->
setCurrentIndex
(
value
.
toInt
());
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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