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
564591c1
Commit
564591c1
authored
Oct 01, 2010
by
pixhawk
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of pixhawk.ethz.ch:qgroundcontrol
parents
0940ba85
058438f0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
3 deletions
+44
-3
.gitignore
.gitignore
+1
-1
qgroundcontrol.pri
qgroundcontrol.pri
+41
-0
qgroundcontrol.pro
qgroundcontrol.pro
+1
-1
SerialLink.h
src/comm/SerialLink.h
+1
-1
No files found.
.gitignore
View file @
564591c1
...
...
@@ -8,7 +8,7 @@ obj
bin/*.exe
bin/*.txt
bin/mac
*pro.user
*pro.user
*
qrc_*.cpp
*.Debug
*.Release
...
...
qgroundcontrol.pri
View file @
564591c1
...
...
@@ -108,8 +108,49 @@ linux-g++ {
LIBS += \
-L/usr/lib \
-lm \
-lflite_cmu_us_kal16 \
-lflite_usenglish \
-lflite_cmulex \
-lflite \
-lSDL \
-lSDLmain \
-lglut
#-lflite_cmu_us_rms \
#-lflite_cmu_us_slt \
}
linux-g++-64 {
CONFIG += debug
debug {
DESTDIR = $$BASEDIR
}
release {
DESTDIR = $$BASEDIR
}
INCLUDEPATH += /usr/include \
/usr/include/qt4/phonon
# $$BASEDIR/lib/flite/include \
# $$BASEDIR/lib/flite/lang
HARDWARE_PLATFORM = $$system(uname -a)
contains( HARDWARE_PLATFORM, x86_64 ) {
# 64-bit Linux
#LIBS += \
#-L$$BASEDIR/lib/flite/linux64
message(Building for GNU/Linux 64bit/x64)
} else {
# 32-bit Linux
#LIBS += \
#-L$$BASEDIR/lib/flite/linux32
message(Building for GNU/Linux 32bit/i386)
}
LIBS += \
-L/usr/lib \
-lm \
-lflite_cmu_us_kal16 \
-lflite_usenglish \
-lflite_cmulex \
...
...
qgroundcontrol.pro
View file @
564591c1
...
...
@@ -55,7 +55,7 @@ FORMS += src/ui/MainWindow.ui \
src
/
ui
/
UASControl
.
ui
\
src
/
ui
/
UASList
.
ui
\
src
/
ui
/
UASInfo
.
ui
\
src
/
ui
/
Line
C
hart
.
ui
\
src
/
ui
/
Line
c
hart
.
ui
\
src
/
ui
/
UASView
.
ui
\
src
/
ui
/
ParameterInterface
.
ui
\
src
/
ui
/
WaypointList
.
ui
\
...
...
src/comm/SerialLink.h
View file @
564591c1
...
...
@@ -57,7 +57,7 @@ class SerialLink : public SerialLinkInterface {
//Q_INTERFACES(SerialLinkInterface:LinkInterface)
public:
SerialLink
(
QString
portname
=
NULL
,
BaudRateType
baudrate
=
BAUD57600
,
FlowType
flow
=
FLOW_OFF
,
ParityType
parity
=
PAR_NONE
,
DataBitsType
dataBits
=
DATA_8
,
StopBitsType
stopBits
=
STOP_1
);
SerialLink
(
QString
portname
=
""
,
BaudRateType
baudrate
=
BAUD57600
,
FlowType
flow
=
FLOW_OFF
,
ParityType
parity
=
PAR_NONE
,
DataBitsType
dataBits
=
DATA_8
,
StopBitsType
stopBits
=
STOP_1
);
~
SerialLink
();
static
const
int
poll_interval
=
SERIAL_POLL_INTERVAL
;
///< Polling interval, defined in configuration.h
...
...
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